From 0e3b7dcaab7fb6e9d61b2dae4df24a04101ae5c6 Mon Sep 17 00:00:00 2001 From: gewuyou <1063891901@qq.com> Date: Sun, 8 Oct 2023 21:35:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=91=94=20=E5=AE=8C=E5=96=84=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E9=A1=B5=E5=8F=B3=E9=94=AE=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/jcnc/jnotepad/util/TabUtil.java | 7 +++++-- .../views/manager/CenterTabPaneManager.java | 19 ++++++++++++++----- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/jcnc/jnotepad/util/TabUtil.java b/src/main/java/org/jcnc/jnotepad/util/TabUtil.java index 6611148..dba22f9 100644 --- a/src/main/java/org/jcnc/jnotepad/util/TabUtil.java +++ b/src/main/java/org/jcnc/jnotepad/util/TabUtil.java @@ -1,5 +1,6 @@ package org.jcnc.jnotepad.util; +import javafx.scene.control.CheckMenuItem; import javafx.scene.control.Tab; import javafx.scene.control.TextField; import javafx.scene.input.KeyCode; @@ -40,6 +41,7 @@ import static org.jcnc.jnotepad.util.FileUtil.getFileText; public class TabUtil { private static final ApplicationCacheManager CACHE_MANAGER = ApplicationCacheManager.getInstance(); static Logger logger = LogUtil.getLogger(TabUtil.class); + private TabUtil() { } @@ -379,8 +381,9 @@ public class TabUtil { }) .build(), tab.isRelevance()) .addSeparatorMenuItem() - .addMenuItem("固定标签页", e -> centerTabPaneManager.updateTabPinnedState(tab), !tab.isFixed()) - .addMenuItem("取消固定", e -> centerTabPaneManager.updateTabPinnedState(tab), tab.isFixed()) + .addCheckMenuItem("固定标签页", e -> centerTabPaneManager.updateTabPinnedState(tab, (CheckMenuItem) e.getSource())) + .addSeparatorMenuItem() + .addCheckMenuItem("只读", e -> centerTabPaneManager.updateReadOnlyProperty(tab, (CheckMenuItem) e.getSource())) .build()); } } diff --git a/src/main/java/org/jcnc/jnotepad/views/manager/CenterTabPaneManager.java b/src/main/java/org/jcnc/jnotepad/views/manager/CenterTabPaneManager.java index 4a33f96..8eb5ad3 100644 --- a/src/main/java/org/jcnc/jnotepad/views/manager/CenterTabPaneManager.java +++ b/src/main/java/org/jcnc/jnotepad/views/manager/CenterTabPaneManager.java @@ -2,6 +2,7 @@ package org.jcnc.jnotepad.views.manager; import javafx.collections.ListChangeListener; import javafx.collections.ObservableList; +import javafx.scene.control.CheckMenuItem; import javafx.scene.control.Tab; import javafx.stage.Stage; import org.jcnc.jnotepad.common.manager.ApplicationCacheManager; @@ -10,7 +11,6 @@ import org.jcnc.jnotepad.controller.config.UserConfigController; import org.jcnc.jnotepad.model.enums.CacheExpirationTime; import org.jcnc.jnotepad.util.FileUtil; import org.jcnc.jnotepad.util.PopUpUtil; -import org.jcnc.jnotepad.util.TabUtil; import org.jcnc.jnotepad.views.root.center.main.center.tab.CenterTab; import org.jcnc.jnotepad.views.root.center.main.center.tab.CenterTabPane; import org.jcnc.jnotepad.views.root.top.menubar.TopMenuBar; @@ -273,11 +273,20 @@ public class CenterTabPaneManager { * * @param tab the center tab to update */ - public void updateTabPinnedState(CenterTab tab) { + public void updateTabPinnedState(CenterTab tab, CheckMenuItem checkMenuItem) { tab.setFixed(!tab.isFixed()); - TabUtil.updateTabContextMenu(tab); + checkMenuItem.setSelected(tab.isFixed()); } - - + /** + * Updates the read-only property of a given tab and its associated check menu item. + * + * @param tab the center tab to update + * @param checkMenuItem the check menu item associated with the tab + */ + public void updateReadOnlyProperty(CenterTab tab, CheckMenuItem checkMenuItem) { + TextCodeArea textCodeArea = tab.getTextCodeArea(); + textCodeArea.setEditable(!textCodeArea.isEditable()); + checkMenuItem.setSelected(!textCodeArea.isEditable()); + } } From e58ab2e3dcda7e603b26e6cf5cc667a8d188d1f0 Mon Sep 17 00:00:00 2001 From: gewuyou <1063891901@qq.com> Date: Sun, 8 Oct 2023 22:12:25 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=91=94=20=E5=AE=8C=E5=96=84=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E9=A1=B5=E5=8F=B3=E9=94=AE=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/manager/CenterTabPaneManager.java | 32 ++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/jcnc/jnotepad/views/manager/CenterTabPaneManager.java b/src/main/java/org/jcnc/jnotepad/views/manager/CenterTabPaneManager.java index 8eb5ad3..80d7d4b 100644 --- a/src/main/java/org/jcnc/jnotepad/views/manager/CenterTabPaneManager.java +++ b/src/main/java/org/jcnc/jnotepad/views/manager/CenterTabPaneManager.java @@ -92,7 +92,7 @@ public class CenterTabPaneManager { if (lastModifiedTimeOfFile.equals(lastModifiedTime)) { return; } - //fixme 这行代码不能直接放到绑定的方法中,猜测匿名内部类的延迟执行特性可能会导致在获取 FileUtil.getFileText(file) 的返回值时，文件内容还没有被正确读取，导致空串，暂无解决办法 + // 这行代码不能直接放到绑定的方法中,猜测匿名内部类的延迟执行特性可能会导致在获取 FileUtil.getFileText(file) 的返回值时，文件内容还没有被正确读取，导致空串，暂无解决办法 String fileText = FileUtil.getFileText(file); // 当前文件已被外部修改 PopUpUtil.questionAlert( @@ -240,6 +240,23 @@ public class CenterTabPaneManager { * 判断是否有左侧标签页 * * @param centerTab 标签页 + * @apiNote 由于不知道怎么监听固定状态，因此，还是使用简单的判断，如果能够监听固定状态时可以把代码修改为 + * 
+     *  public boolean hasLeftTabs(CenterTab centerTab) {
+     *     ObservableList tabs = centerTabPane.getTabs();
+     *     int edge = tabs.indexOf(centerTab);
+     *     if (edge == 0) {
+     *         return false;
+     *     }
+     *     for (int i = 0; i < edge; i++) {
+     *         CenterTab tab = (CenterTab) tabs.get(i);
+     *         if (!tab.isFixed()) {
+     *             return true;
+     *         }
+     *     }
+     *     return false;
+     * }
+     * 
      * @return 是否有左侧标签页
      */
     public boolean hasLeftTabs(CenterTab centerTab) {
@@ -252,6 +269,19 @@ public class CenterTabPaneManager {
      *
      * @param centerTab 标签页
      * @return 是否有右侧标签页
+     * @apiNote 由于不知道怎么监听固定状态，因此，还是使用简单的判断，如果能够监听固定状态时可以把代码修改为
+     * 
+     *  public boolean hasRightTabs(CenterTab centerTab) {
+     *         ObservableList tabs = centerTabPane.getTabs();
+     *         for (int i = tabs.indexOf(centerTab); i < tabs.size(); i++) {
+     *             CenterTab tab = (CenterTab) tabs.get(i);
+     *             if (!tab.isFixed()) {
+     *                 return true;
+     *             }
+     *         }
+     *         return false;
+     *     }
+     * 

      */
     public boolean hasRightTabs(CenterTab centerTab) {
         ObservableList tabs = centerTabPane.getTabs();