From 42c0aa9c4c7b172406cf95ae483b7a312ab1021b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E8=BD=B2?= Date: Sun, 6 Aug 2023 11:00:31 +0800 Subject: [PATCH] v1.1.0 --- src/main/java/org/jcnc/jnotepad/JNotepad.java | 12 ++++++------ src/main/resources/img/icon.icns | 0 src/main/resources/img/icon.ico | 0 .../{org/jcnc/jnotepad => }/img/icon.png | Bin .../resources/org/jcnc/jnotepad/img/icon.icns | Bin 4660 -> 0 bytes .../resources/org/jcnc/jnotepad/img/icon.ico | Bin 120838 -> 0 bytes 6 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 src/main/resources/img/icon.icns create mode 100644 src/main/resources/img/icon.ico rename src/main/resources/{org/jcnc/jnotepad => }/img/icon.png (100%) delete mode 100644 src/main/resources/org/jcnc/jnotepad/img/icon.icns delete mode 100644 src/main/resources/org/jcnc/jnotepad/img/icon.ico diff --git a/src/main/java/org/jcnc/jnotepad/JNotepad.java b/src/main/java/org/jcnc/jnotepad/JNotepad.java index 104847d..cf0308a 100644 --- a/src/main/java/org/jcnc/jnotepad/JNotepad.java +++ b/src/main/java/org/jcnc/jnotepad/JNotepad.java @@ -6,6 +6,7 @@ import javafx.event.EventHandler; import javafx.geometry.Insets; import javafx.scene.Scene; import javafx.scene.control.*; +import javafx.scene.image.Image; import javafx.scene.layout.BorderPane; import javafx.stage.FileChooser; import javafx.stage.Stage; @@ -13,9 +14,7 @@ import javafx.stage.Stage; import java.io.*; public class JNotepad extends Application { -// String iconSrc = "img/icon.png"; -// -// String Title = "JNotepad"; + String Title = "JNotepad"; // 定义菜单栏 MenuBar menuBar; @@ -34,7 +33,7 @@ public class JNotepad extends Application { @Override public void start(Stage primaryStage) { - // primaryStage.setTitle(Title); + primaryStage.setTitle(Title); // 创建菜单栏并添加菜单项 menuBar = new MenuBar(); @@ -61,7 +60,7 @@ public class JNotepad extends Application { root.setCenter(tabPane); // 创建状态栏 - statusLabel = new Label("g行: 1 \t列: 1 \t字数: 0"); + statusLabel = new Label("行: 1 \t列: 1 \t字数: 0"); root.setBottom(statusLabel); BorderPane.setMargin(statusLabel, new Insets(5, 10, 5, 10)); @@ -75,7 +74,8 @@ public class JNotepad extends Application { // 创建场景并设置主界面 Scene scene = new Scene(root, 800, 600); primaryStage.setScene(scene); - // primaryStage.getIcons().add(new Image(iconSrc)); + primaryStage.getIcons().add(new Image("file:src/main/resources/img/icon.png")); + primaryStage.show(); } diff --git a/src/main/resources/img/icon.icns b/src/main/resources/img/icon.icns new file mode 100644 index 0000000..e69de29 diff --git a/src/main/resources/img/icon.ico b/src/main/resources/img/icon.ico new file mode 100644 index 0000000..e69de29 diff --git a/src/main/resources/org/jcnc/jnotepad/img/icon.png b/src/main/resources/img/icon.png similarity index 100% rename from src/main/resources/org/jcnc/jnotepad/img/icon.png rename to src/main/resources/img/icon.png diff --git a/src/main/resources/org/jcnc/jnotepad/img/icon.icns b/src/main/resources/org/jcnc/jnotepad/img/icon.icns deleted file mode 100644 index 93dc2b8fb5af4bccb7be7ef4403d0d5fa8a4f606..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4660 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%0AMH0lxmB45^& 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