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

Merge remote-tracking branch 'origin/release-v1.1.12' into release-v1.1.12

Browse Source 
# Conflicts:
#	src/main/java/org/jcnc/jnotepad/controller/event/handler/menubar/NewFile.java
#	src/main/java/org/jcnc/jnotepad/controller/event/handler/menubar/OpenFile.java
#	src/main/java/org/jcnc/jnotepad/controller/event/handler/menubar/RenameFile.java
#	src/main/java/org/jcnc/jnotepad/controller/event/handler/menubar/SaveFile.java
#	src/main/java/org/jcnc/jnotepad/controller/event/handler/tool/SetBtn.java
#	src/main/java/org/jcnc/jnotepad/tool/UiUtil.java
#	src/main/java/org/jcnc/jnotepad/ui/module/LineNumberTextArea.java
This commit is contained in:
许轲 2023-09-02 13:28:39 +08:00
commit 3ef7326bbf
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,8 +1,8 @@
package org.jcnc.jnotepad.root.center.main.center.tab;
import javafx.scene.control.TabPane;
import org.jcnc.jnotepad.root.center.main.bottom.status.JNotepadStatusBox;
import org.jcnc.jnotepad.root.top.menu.JNotepadMenuBar;
import org.jcnc.jnotepad.root.center.main.bottom.status.StatusHorizontalBox;
import org.jcnc.jnotepad.root.top.menu.TopMenuBar;
import org.jcnc.jnotepad.tool.SingletonUtil;
/**
@ -31,10 +31,10 @@ public class JNotepadTabPane extends TabPane {
(ov, from, to) -> {
if (to != null) {
// 更新菜单栏中与tab相关设置
JNotepadMenuBar.getInstance().updateMenuStatusBySelectedTab();
TopMenuBar.getInstance().updateMenuStatusBySelectedTab();
}
// 更新状态标签
JNotepadStatusBox.getInstance().updateWhenTabSelected();
StatusHorizontalBox.getInstance().updateWhenTabSelected();
}
);
}
@ -72,6 +72,6 @@ public class JNotepadTabPane extends TabPane {
public void fireTabSelected() {
JNotepadTab selectedTab = getSelected();
selectedTab.setAutoLine(SingletonUtil.getAppConfigController().getAutoLineConfig());
JNotepadStatusBox.getInstance().updateWhenTabSelected();
StatusHorizontalBox.getInstance().updateWhenTabSelected();
}
}

6
src/main/java/org/jcnc/jnotepad/root/top/RootTopBorderPane.java
View File

@ -1,6 +1,6 @@
package org.jcnc.jnotepad.root.top;
import org.jcnc.jnotepad.root.top.menu.JNotepadMenuBar;
import org.jcnc.jnotepad.root.top.menu.TopMenuBar;
import org.jcnc.jnotepad.ui.module.AbstractBorderPane;
/**
@ -32,10 +32,10 @@ public class RootTopBorderPane extends AbstractBorderPane {
/**
* 初始化 RootTopBorderPane。
*
* <p>在顶部区域添加了 JNotepadMenuBar 的单例实例。</p>
* <p>在顶部区域添加了 TopMenuBar 的单例实例。</p>
*/
private void initRootBorderPane() {
// 在顶部区域添加菜单栏
setTopComponent(JNotepadMenuBar.getInstance());
setTopComponent(TopMenuBar.getInstance());
}
}

8
src/main/java/org/jcnc/jnotepad/root/top/menu/JNotepadMenuBar.java → src/main/java/org/jcnc/jnotepad/root/top/menu/TopMenuBar.java
View File

@ -25,9 +25,9 @@ import static org.jcnc.jnotepad.constants.TextConstants.*;
*
* @author songdragon
*/
public class JNotepadMenuBar extends MenuBar {
public class TopMenuBar extends MenuBar {
private static final JNotepadMenuBar MENU_BAR = new JNotepadMenuBar();
private static final TopMenuBar MENU_BAR = new TopMenuBar();
/**
* 按钮集合
*/
@ -113,11 +113,11 @@ public class JNotepadMenuBar extends MenuBar {
*/
private RadioMenuItem englishItem;
private JNotepadMenuBar() {
private TopMenuBar() {
initMenuBar();
}
public static JNotepadMenuBar getInstance() {
public static TopMenuBar getInstance() {
return MENU_BAR;
}