JCNC/JNotepad
JCNC/JNotepad
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决冲突

Browse Source
This commit is contained in:
许轲 2023-09-02 13:33:39 +08:00
parent 3ef7326bbf
commit bc26c69bb8
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/jcnc/jnotepad/controller/event/handler/menubar/SaveFile.java
View File

@ -8,7 +8,7 @@ import org.jcnc.jnotepad.constants.TextConstants;
import org.jcnc.jnotepad.controller.i18n.LocalizationController;
import org.jcnc.jnotepad.root.center.main.center.tab.JNotepadTab;
import org.jcnc.jnotepad.root.center.main.center.tab.JNotepadTabPane;
import org.jcnc.jnotepad.root.top.menu.JNotepadMenuBar;
import org.jcnc.jnotepad.root.top.menu.TopMenuBar;
import org.jcnc.jnotepad.tool.LogUtil;
import org.jcnc.jnotepad.tool.SingletonUtil;
import org.jcnc.jnotepad.tool.UiUtil;
@ -56,7 +56,7 @@ public class SaveFile implements EventHandler<ActionEvent> {
if (CONFIG_NAME.equals(selectedTab.getText())) {
// 重新加载语言包和快捷键
SingletonUtil.getAppConfigController().loadConfig();
JNotepadMenuBar.getInstance().initShortcutKeys();
TopMenuBar.getInstance().initShortcutKeys();
LocalizationController.initLocal();
logger.info("已刷新语言包！");
logger.info("已刷新快捷键！");

6
src/main/java/org/jcnc/jnotepad/root/center/main/center/tab/JNotepadTabPane.java
View File

@ -1,7 +1,7 @@
package org.jcnc.jnotepad.root.center.main.center.tab;
import javafx.scene.control.TabPane;
import org.jcnc.jnotepad.root.center.main.bottom.status.StatusHorizontalBox;
import org.jcnc.jnotepad.root.center.main.bottom.status.JNotepadStatusBox;
import org.jcnc.jnotepad.root.top.menu.TopMenuBar;
import org.jcnc.jnotepad.tool.SingletonUtil;
@ -34,7 +34,7 @@ public class JNotepadTabPane extends TabPane {
TopMenuBar.getInstance().updateMenuStatusBySelectedTab();
}
// 更新状态标签
StatusHorizontalBox.getInstance().updateWhenTabSelected();
JNotepadStatusBox.getInstance().updateWhenTabSelected();
}
);
}
@ -72,6 +72,6 @@ public class JNotepadTabPane extends TabPane {
public void fireTabSelected() {
JNotepadTab selectedTab = getSelected();
selectedTab.setAutoLine(SingletonUtil.getAppConfigController().getAutoLineConfig());
StatusHorizontalBox.getInstance().updateWhenTabSelected();
JNotepadStatusBox.getInstance().updateWhenTabSelected();
}
}

1
src/main/java/org/jcnc/jnotepad/ui/module/LineNumberTextArea.java
View File

@ -8,7 +8,6 @@ import org.jcnc.jnotepad.root.center.main.center.tab.JNotepadTab;
import org.jcnc.jnotepad.root.center.main.center.tab.JNotepadTabPane;
import org.jcnc.jnotepad.tool.LogUtil;
import org.jcnc.jnotepad.tool.SingletonUtil;
import org.jcnc.jnotepad.tool.UiUtil;
import org.slf4j.Logger;
import java.io.BufferedWriter;