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

Merge branch 'release-v1.1.14' of https://gitee.com/jcnc-org/JNotepad into develop

Browse Source 
# Conflicts:
#	src/main/java/org/jcnc/jnotepad/common/constants/AppConstants.java
#	src/main/java/org/jcnc/jnotepad/views/root/center/main/center/tab/CenterTab.java
This commit is contained in:
gewuyou 2023-10-08 21:10:03 +08:00
commit 9b6ec0734e
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/org/jcnc/jnotepad/views/root/center/main/center/tab/CenterTab.java
View File

@ -2,8 +2,13 @@ package org.jcnc.jnotepad.views.root.center.main.center.tab;
import javafx.scene.control.Tab; import javafx.scene.control.Tab;
import org.fxmisc.flowless.VirtualizedScrollPane; import org.fxmisc.flowless.VirtualizedScrollPane;
import org.jcnc.jnotepad.api.core.views.menu.builder.ContextMenuBuilder;
import org.jcnc.jnotepad.api.core.views.menu.builder.MenuBuilder;
import org.jcnc.jnotepad.component.module.TextCodeArea; import org.jcnc.jnotepad.component.module.TextCodeArea;
import org.jcnc.jnotepad.controller.config.UserConfigController; import org.jcnc.jnotepad.controller.config.UserConfigController;
import org.jcnc.jnotepad.controller.event.handler.menuitem.RenameFile;
import org.jcnc.jnotepad.controller.event.handler.menuitem.SaveFile;
import org.jcnc.jnotepad.util.ClipboardUtil;
import org.jcnc.jnotepad.util.LogUtil; import org.jcnc.jnotepad.util.LogUtil;
import org.jcnc.jnotepad.util.TabUtil; import org.jcnc.jnotepad.util.TabUtil;
import org.jcnc.jnotepad.views.manager.BottomStatusBoxManager; import org.jcnc.jnotepad.views.manager.BottomStatusBoxManager;
@ -35,7 +40,7 @@ public class CenterTab extends Tab {
private boolean isRelevance = false; private boolean isRelevance = false;
/** /**
* 是否关闭 * 是否固定
*/ */
private boolean isFixed = false; private boolean isFixed = false;
/** /**

2
tool/jpackage.sh
View File

@ -7,5 +7,5 @@ jpackage \
-m org.jcnc.jnotepad/org.jcnc.jnotepad.JnotepadApp \ -m org.jcnc.jnotepad/org.jcnc.jnotepad.JnotepadApp \
--runtime-image ./target/JNotepad/ \ --runtime-image ./target/JNotepad/ \
--icon src/main/resources/img/icon.ico \ --icon src/main/resources/img/icon.ico \
--app-version 1.1.13 \ --app-version 1.1.14 \
--vendor "JCNC" --vendor "JCNC"

2
tool/jpackage.txt
View File

@ -4,5 +4,5 @@ jpackage `
-m org.jcnc.jnotepad/org.jcnc.jnotepad.JnotepadApp ` -m org.jcnc.jnotepad/org.jcnc.jnotepad.JnotepadApp `
--runtime-image .\target\JNotepad\ ` --runtime-image .\target\JNotepad\ `
--icon src/main/resources/img/icon.ico ` --icon src/main/resources/img/icon.ico `
--app-version 1.1.13 ` --app-version 1.1.14 `
--vendor "JCNC" --vendor "JCNC"