#20 Add exit button in menu bar

introfog · Nov 3, 2024 · 3e26c8f · 3e26c8f
1 parent e8bd5b3
commit 3e26c8f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/src/main/java/com/github/introfog/gitwave/controller/main/MainController.java b/src/main/java/com/github/introfog/gitwave/controller/main/MainController.java
@@ -77,14 +77,7 @@ public void initialize(FxmlStageHolder fxmlStageHolder) {
         super.initialize(fxmlStageHolder);
         final Stage primaryStage = fxmlStageHolder.getStage();
         primaryStage.setOnCloseRequest(event -> {
-            event.consume();
-
-            AppConfig.getInstance().closeApp();
-            for (ExecutionController controller: new ArrayList<>(executionTabs.values())) {
-                controller.close();
-            }
-            executionTabPage.getTabs().clear();
-            primaryStage.close();
+            close();
         });
 
         directoryTabController = new DirectoryTabController(fxmlStageHolder, directory);
@@ -148,6 +141,12 @@ protected void openAbout() {
         menuController.openAbout();
     }
 
+    @FXML
+    protected void exitFromMenu() {
+        close();
+        closeStage();
+    }
+
     @FXML
     protected void openUpdate() {
         menuController.openUpdate();
@@ -157,4 +156,12 @@ protected void openUpdate() {
     protected void foundIssue() {
         AppConfig.getInstance().getHostServices().showDocument(AppConstants.LINK_TO_GIT_CONTRIBUTING_FILE);
     }
+
+    private void close() {
+        AppConfig.getInstance().closeApp();
+        for (ExecutionController controller: new ArrayList<>(executionTabs.values())) {
+            controller.close();
+        }
+        executionTabPage.getTabs().clear();
+    }
 }
diff --git a/src/main/resources/com/github/introfog/gitwave/view/main.fxml b/src/main/resources/com/github/introfog/gitwave/view/main.fxml
@@ -41,6 +41,8 @@
                         <MenuItem mnemonicParsing="false" onAction="#openAbout" text="About" />
                         <SeparatorMenuItem fx:id="updateMenuItemSeparator" disable="true" mnemonicParsing="false" visible="false" />
                         <MenuItem fx:id="updateMenuItem" disable="true" mnemonicParsing="false" onAction="#openUpdate" text="Update*" visible="false" />
+                        <SeparatorMenuItem mnemonicParsing="false" />
+                        <MenuItem mnemonicParsing="false" onAction="#exitFromMenu" text="Exit" />
                      </items>
                   </Menu>
               </menus>