From 09a7ec5adf23b40d700d3712c60ca9860ccc94ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E8=BD=B2?= <luke.k.xu@hotmail.com>
Date: Wed, 4 Oct 2023 03:08:49 +0800
Subject: [PATCH] =?UTF-8?q?Issue-I85EOB:=20=E5=A2=9E=E5=8A=A0=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E9=A1=B5=E9=9D=A2=E7=9A=84=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../event/handler/setting/DirTreeBtn.java     |  2 +-
 .../jcnc/jnotepad/ui/setstage/SetStage.java   | 30 +++++++++++++++++--
 .../left/sidebar/tools/SidebarToolBar.java    |  3 ++
 tool/jpackage.sh                              | 11 -------
 tool/jpackage.txt                             | 11 +------
 5 files changed, 33 insertions(+), 24 deletions(-)
 delete mode 100644 tool/jpackage.sh

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 82436b7..2108880 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<ActionEvent> {
 
-    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 95554a0..4f1f0e5 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 ba916d6..07ba78c 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 d88f20d..0000000
--- 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 6424754..033ed2b 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
-- 
Gitee