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 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 @@ + + @@ -14,22 +16,45 @@ -