diff --git a/src/main/java/org/jcnc/jnotepad/controller/event/handler/setting/DirTreeBtn.java b/src/main/java/org/jcnc/jnotepad/controller/event/handler/setting/DirTreeBtn.java index 82436b7032718f2d0dbe7c1fe25039574b673dc9..2108880f490f81d1a7cdf4e94f7cbcc39b8ea5b5 100644 --- a/src/main/java/org/jcnc/jnotepad/controller/event/handler/setting/DirTreeBtn.java +++ b/src/main/java/org/jcnc/jnotepad/controller/event/handler/setting/DirTreeBtn.java @@ -14,7 +14,7 @@ import org.jcnc.jnotepad.views.manager.DirectorySidebarManager; */ public class DirTreeBtn implements EventHandler { - private static final DirectorySidebarManager DIRECTORY_SIDEBAR_MANAGER = DirectorySidebarManager.getInstance(); + private static final DirectorySidebarManager DIRECTORY_SIDEBAR_MANAGER = DirectorySidebarManager.getInstance(); @Override public void handle(ActionEvent actionEvent) { diff --git a/src/main/java/org/jcnc/jnotepad/ui/setstage/SetStage.java b/src/main/java/org/jcnc/jnotepad/ui/setstage/SetStage.java index 95554a03bd69f2dd8eabc74cce61b017f49fc9ce..4f1f0e50fdbf20218308c94a3fbf8b96d21548cb 100644 --- a/src/main/java/org/jcnc/jnotepad/ui/setstage/SetStage.java +++ b/src/main/java/org/jcnc/jnotepad/ui/setstage/SetStage.java @@ -1,6 +1,10 @@ package org.jcnc.jnotepad.ui.setstage; +import atlantafx.base.controls.CustomTextField; +import atlantafx.base.theme.Dracula; +import atlantafx.base.theme.PrimerDark; import atlantafx.base.theme.Styles; +import javafx.application.Application; import javafx.geometry.Insets; import javafx.geometry.Pos; import javafx.scene.Node; @@ -11,6 +15,8 @@ import javafx.scene.layout.HBox; import javafx.scene.layout.StackPane; import javafx.scene.layout.VBox; import javafx.scene.paint.Color; +import javafx.scene.text.Font; +import javafx.scene.text.Text; import javafx.stage.Stage; import org.jcnc.jnotepad.common.util.UiUtil; import org.jcnc.jnotepad.plugin.PluginManagerInterface; @@ -213,8 +219,28 @@ public class SetStage extends Stage { * @return 常规设置项1的布局节点 */ private Node createGeneralSettingsLayout1() { - VBox generalLayout = new VBox(); - generalLayout.getChildren().add(new Label("常规设置项1的布局")); + VBox generalLayout = new VBox(10); + generalLayout.setPadding(new Insets(25)); + + var hBox=new HBox(5); + + var fileChooseText =new Text("路径选择: "); + fileChooseText.setFont(new Font(18)); + + var fileChoose =new CustomTextField(""); + fileChoose.getStyleClass().add(Styles.SMALL); + fileChoose.setPrefWidth(420); + + var fileChooseBtn =new Button(); + fileChooseBtn.setText("选择文件夹"); + fileChooseBtn.getStyleClass().addAll(Styles.SMALL); + fileChooseBtn.setOnAction(event -> { + // TODO: 2023/10/4 选择文件 + + }); + hBox.getChildren().addAll(fileChooseText,fileChoose,fileChooseBtn); + + generalLayout.getChildren().addAll(hBox); return generalLayout; } diff --git a/src/main/java/org/jcnc/jnotepad/views/root/left/sidebar/tools/SidebarToolBar.java b/src/main/java/org/jcnc/jnotepad/views/root/left/sidebar/tools/SidebarToolBar.java index ba916d6e3834bda452faa9a285b4061de3883b95..07ba78ca0bf02dced1ae8cff1937328e4d1116c1 100644 --- a/src/main/java/org/jcnc/jnotepad/views/root/left/sidebar/tools/SidebarToolBar.java +++ b/src/main/java/org/jcnc/jnotepad/views/root/left/sidebar/tools/SidebarToolBar.java @@ -37,6 +37,9 @@ public class SidebarToolBar extends javafx.scene.control.ToolBar { private SidebarToolBar() { // 垂直排列 this.setOrientation(Orientation.VERTICAL); + this.setOnMouseClicked(event -> { + // SidebarToolBar 点击事件 + }); } diff --git a/tool/jpackage.sh b/tool/jpackage.sh deleted file mode 100644 index d88f20d4b0596cb74c3a54215693e07f7108f65b..0000000000000000000000000000000000000000 --- a/tool/jpackage.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -cd .. -jpackage \ - --name JNotepad \ - --type app-image \ - -m org.jcnc.jnotepad/org.jcnc.jnotepad.LunchApp \ - --runtime-image ./target/JNotepad/ \ - --icon src/main/resources/img/icon.ico \ - --app-version 1.1.13 \ - --vendor "JCNC" diff --git a/tool/jpackage.txt b/tool/jpackage.txt index 64247548fa7dc9bbfb878f1b44e7fa0a5607ead7..033ed2bf62d28f45e945b390f0c533511a73a811 100644 --- a/tool/jpackage.txt +++ b/tool/jpackage.txt @@ -5,13 +5,4 @@ jpackage ` --runtime-image .\target\JNotepad\ ` --icon src/main/resources/img/icon.ico ` --app-version 1.1.13 ` - --vendor "JCNC" - - -jpackage ` - --name demo ` - --type app-image ` - -m com.example.demo/com.example.demo.Demo ` - --runtime-image .\target\app\ ` - --app-version 1.0.0 ` - --vendor "JCNC" + --vendor "JCNC" \ No newline at end of file