From b97d712247f193461d3e8af483ca80622dacd643 Mon Sep 17 00:00:00 2001
From: Gary Gan <gan.fang.yi@foxmail.com>
Date: Tue, 25 Nov 2025 14:00:43 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84=E4=BA=86?=
 =?UTF-8?q?=E9=A1=B6=E9=83=A8=E5=B7=A5=E5=85=B7=E6=A0=8F=E7=9A=84=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dev/bytevibe/hyperpoint/Controller.java   | 58 +++----------------
 .../dev/bytevibe/hyperpoint/main.fxml         | 57 +++++++++++++-----
 2 files changed, 48 insertions(+), 67 deletions(-)

diff --git a/src/main/java/dev/bytevibe/hyperpoint/Controller.java b/src/main/java/dev/bytevibe/hyperpoint/Controller.java
index 181737c..b49316f 100644
--- a/src/main/java/dev/bytevibe/hyperpoint/Controller.java
+++ b/src/main/java/dev/bytevibe/hyperpoint/Controller.java
@@ -16,26 +16,6 @@ import java.net.URL;
 import java.util.ResourceBundle;
 
 public class Controller implements Initializable {
-    @FXML
-    private Button newSlideButton;
-    @FXML
-    private Button newPageButton;
-    @FXML
-    private Button deletePageButton;
-    @FXML
-    private Button addTextButton;
-    @FXML
-    private Button addLineButton;
-    @FXML
-    private Button addRectButton;
-    @FXML
-    private Button addCircleButton;
-    @FXML
-    private Button addEllipseButton;
-    @FXML
-    private Button addImageButton;
-    @FXML
-    private Button logout;
     @FXML
     private ListView<SlidePage> pageListView;
     @FXML
@@ -46,14 +26,6 @@ public class Controller implements Initializable {
     private VBox propertyPanelContainer;
     @FXML
     private AnchorPane scenePane;
-    @FXML
-    private Button openSlideButton; // 添加打开幻灯片按钮
-    @FXML
-    private Button saveSlideButton; // 添加保存幻灯片按钮
-    @FXML
-    private Button exportPageButton; // 添加导出页面按钮
-    @FXML
-    private Button exportSlideButton; // 添加导出幻灯片按钮
 
     private Slide currentSlide;
     private DrawingCanvas drawingCanvas;
@@ -63,14 +35,6 @@ public class Controller implements Initializable {
     @Override
     public void initialize(URL url, ResourceBundle resourceBundle) {
         pageListView.setDisable(true);
-        newPageButton.setDisable(true);
-        deletePageButton.setDisable(true);
-        addTextButton.setDisable(true);
-        addLineButton.setDisable(true);
-        addRectButton.setDisable(true);
-        addCircleButton.setDisable(true);
-        addEllipseButton.setDisable(true);
-        addImageButton.setDisable(true);
 
         // 添加页面列表选择监听
         pageListView.getSelectionModel().selectedItemProperty().addListener((obs, oldVal, newVal) -> {
@@ -100,7 +64,7 @@ public class Controller implements Initializable {
                 alert.setTitle("成功");
                 alert.setHeaderText("幻灯片已创建");
                 alert.setContentText("幻灯片 \"" + slideName + "\" 已创建。");
-                stage = (Stage) newSlideButton.getScene().getWindow();
+                stage = (Stage) scenePane.getScene().getWindow();
                 if (stage != null) {
                     stage.setTitle("Hyperpoint - " + slideName);
                 }
@@ -118,14 +82,6 @@ public class Controller implements Initializable {
         if (currentSlide != null) {
             pageListView.setItems(currentSlide.getPages());
             pageListView.setDisable(false);
-            newPageButton.setDisable(false);
-            deletePageButton.setDisable(false);
-            addTextButton.setDisable(false);
-            addLineButton.setDisable(false);
-            addRectButton.setDisable(false);
-            addCircleButton.setDisable(false);
-            addEllipseButton.setDisable(false);
-            addImageButton.setDisable(false);
 
             if (!currentSlide.getPages().isEmpty()) {
                 pageListView.getSelectionModel().selectFirst();
@@ -329,7 +285,7 @@ public class Controller implements Initializable {
                 new FileChooser.ExtensionFilter("所有文件", "*.*")
         );
 
-        stage = (Stage) addImageButton.getScene().getWindow();
+        stage = (Stage) scenePane.getScene().getWindow();
         File file = fileChooser.showOpenDialog(stage);
 
         if (file != null) {
@@ -349,7 +305,7 @@ public class Controller implements Initializable {
         alert.setContentText("点击确定退出，点击取消返回。");
 
         if (alert.showAndWait().orElse(null) == MyAlert.isOK()) {
-            stage = (Stage) logout.getScene().getWindow();
+            stage = (Stage) scenePane.getScene().getWindow();
             stage.close();
         }
     }
@@ -366,7 +322,7 @@ public class Controller implements Initializable {
                 new FileChooser.ExtensionFilter("所有文件", "*.*")
         );
 
-        stage = (Stage) openSlideButton.getScene().getWindow();
+        stage = (Stage) scenePane.getScene().getWindow();
         File file = fileChooser.showOpenDialog(stage);
 
         if (file != null) {
@@ -411,7 +367,7 @@ public class Controller implements Initializable {
         );
         fileChooser.setInitialFileName(currentSlide.getName() + ".hyperpoint");
 
-        stage = (Stage) saveSlideButton.getScene().getWindow();
+        stage = (Stage) scenePane.getScene().getWindow();
         File file = fileChooser.showSaveDialog(stage);
 
         if (file != null) {
@@ -457,7 +413,7 @@ public class Controller implements Initializable {
             fileChooser.setInitialFileName(currentPage.getTitle() + ".png");
         }
 
-        stage = (Stage) exportPageButton.getScene().getWindow();
+        stage = (Stage) scenePane.getScene().getWindow();
         File file = fileChooser.showSaveDialog(stage);
 
         if (file != null) {
@@ -495,7 +451,7 @@ public class Controller implements Initializable {
         );
         fileChooser.setInitialFileName(currentSlide.getName() + ".pdf");
 
-        stage = (Stage) exportSlideButton.getScene().getWindow();
+        stage = (Stage) scenePane.getScene().getWindow();
         File file = fileChooser.showSaveDialog(stage);
 
         if (file != null) {
diff --git a/src/main/resources/dev/bytevibe/hyperpoint/main.fxml b/src/main/resources/dev/bytevibe/hyperpoint/main.fxml
index ec30974..086a7ab 100644
--- a/src/main/resources/dev/bytevibe/hyperpoint/main.fxml
+++ b/src/main/resources/dev/bytevibe/hyperpoint/main.fxml
@@ -7,6 +7,8 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
 
+<?import javafx.scene.control.MenuButton?>
+<?import javafx.scene.control.MenuItem?>
 <AnchorPane fx:id="scenePane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="700.0" prefWidth="1300.0" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="dev.bytevibe.hyperpoint.Controller">
    <children>
       <!-- 顶部菜单栏 -->
@@ -14,22 +16,45 @@
          <children>
             <HBox spacing="5" style="-fx-padding: 5;">
                <children>
-                  <Button fx:id="newSlideButton" mnemonicParsing="false" onAction="#onNewSlide" text="新建幻灯片" />
-                  <Button fx:id="openSlideButton" mnemonicParsing="false" onAction="#onOpenSlideFile" text="打开幻灯片" />
-                  <Button fx:id="newPageButton" mnemonicParsing="false" onAction="#onNewPage" text="新建页面" />
-                  <Button fx:id="deletePageButton" mnemonicParsing="false" onAction="#onDeletePage" text="删除页面" />
-                  <Button fx:id="saveSlideButton" mnemonicParsing="false" onAction="#onSaveSlide" text="保存幻灯片" />
-                  <Button fx:id="exportPageButton" mnemonicParsing="false" onAction="#onExportPage" text="导出页面" />
-                  <Button fx:id="exportSlideButton" mnemonicParsing="false" onAction="#onExportSlide" text="导出幻灯片" />
-                  <Label text=" | " />
-                  <Button fx:id="addTextButton" mnemonicParsing="false" onAction="#onAddText" text="添加文本" />
-                  <Button fx:id="addLineButton" mnemonicParsing="false" onAction="#onAddLine" text="直线" />
-                  <Button fx:id="addRectButton" mnemonicParsing="false" onAction="#onAddRectangle" text="矩形" />
-                  <Button fx:id="addCircleButton" mnemonicParsing="false" onAction="#onAddCircle" text="圆形" />
-                  <Button fx:id="addEllipseButton" mnemonicParsing="false" onAction="#onAddEllipse" text="椭圆" />
-                  <Button fx:id="addImageButton" mnemonicParsing="false" onAction="#onAddImage" text="插入图片" />
-                  <Label text=" | " />
-                  <Button fx:id="logout" mnemonicParsing="false" onAction="#logout" text="退出" />
+                   <!-- 文件菜单 -->
+                   <MenuButton mnemonicParsing="false" text="文件">
+                       <items>
+                           <MenuItem mnemonicParsing="false" onAction="#onNewSlide" text="新建幻灯片" />
+                           <MenuItem mnemonicParsing="false" onAction="#onOpenSlideFile" text="打开幻灯片" />
+                           <MenuItem mnemonicParsing="false" onAction="#onSaveSlide" text="保存幻灯片" />
+                           <MenuItem mnemonicParsing="false" onAction="#onExportSlide" text="导出幻灯片(PDF)" />
+                       </items>
+                   </MenuButton>
+
+                   <!-- 页面菜单 -->
+                   <MenuButton mnemonicParsing="false" text="页面">
+                       <items>
+                           <MenuItem mnemonicParsing="false" onAction="#onNewPage" text="新建页面" />
+                           <MenuItem mnemonicParsing="false" onAction="#onDeletePage" text="删除页面" />
+                           <MenuItem mnemonicParsing="false" onAction="#onExportPage" text="导出页面(图片)" />
+                       </items>
+                   </MenuButton>
+
+                   <!-- 插入菜单 -->
+                   <MenuButton mnemonicParsing="false" text="插入">
+                       <items>
+                           <MenuItem mnemonicParsing="false" onAction="#onAddText" text="文本框" />
+                           <MenuItem mnemonicParsing="false" onAction="#onAddLine" text="直线" />
+                           <MenuItem mnemonicParsing="false" onAction="#onAddRectangle" text="矩形" />
+                           <MenuItem mnemonicParsing="false" onAction="#onAddCircle" text="圆形" />
+                           <MenuItem mnemonicParsing="false" onAction="#onAddEllipse" text="椭圆" />
+                           <MenuItem mnemonicParsing="false" onAction="#onAddImage" text="图片" />
+                       </items>
+                   </MenuButton>
+
+                   <Label text=" | " />
+
+                   <!-- 退出菜单 -->
+                   <MenuButton mnemonicParsing="false" text="更多">
+                       <items>
+                           <MenuItem mnemonicParsing="false" onAction="#logout" text="退出应用" />
+                       </items>
+                   </MenuButton>
                </children>
             </HBox>
          </children>