File tree Expand file tree Collapse file tree 2 files changed +17
-8
lines changed
java/com/github/introfog/gitwave/controller/main
resources/com/github/introfog/gitwave/view Expand file tree Collapse file tree 2 files changed +17
-8
lines changed Original file line number Diff line number Diff line change @@ -77,14 +77,7 @@ public void initialize(FxmlStageHolder fxmlStageHolder) {
7777 super .initialize (fxmlStageHolder );
7878 final Stage primaryStage = fxmlStageHolder .getStage ();
7979 primaryStage .setOnCloseRequest (event -> {
80- event .consume ();
81-
82- AppConfig .getInstance ().closeApp ();
83- for (ExecutionController controller : new ArrayList <>(executionTabs .values ())) {
84- controller .close ();
85- }
86- executionTabPage .getTabs ().clear ();
87- primaryStage .close ();
80+ close ();
8881 });
8982
9083 directoryTabController = new DirectoryTabController (fxmlStageHolder , directory );
@@ -148,6 +141,12 @@ protected void openAbout() {
148141 menuController .openAbout ();
149142 }
150143
144+ @ FXML
145+ protected void exitFromMenu () {
146+ close ();
147+ closeStage ();
148+ }
149+
151150 @ FXML
152151 protected void openUpdate () {
153152 menuController .openUpdate ();
@@ -157,4 +156,12 @@ protected void openUpdate() {
157156 protected void foundIssue () {
158157 AppConfig .getInstance ().getHostServices ().showDocument (AppConstants .LINK_TO_GIT_CONTRIBUTING_FILE );
159158 }
159+
160+ private void close () {
161+ AppConfig .getInstance ().closeApp ();
162+ for (ExecutionController controller : new ArrayList <>(executionTabs .values ())) {
163+ controller .close ();
164+ }
165+ executionTabPage .getTabs ().clear ();
166+ }
160167}
Original file line number Diff line number Diff line change 4141 <MenuItem mnemonicParsing =" false" onAction =" #openAbout" text =" About" />
4242 <SeparatorMenuItem fx : id =" updateMenuItemSeparator" disable =" true" mnemonicParsing =" false" visible =" false" />
4343 <MenuItem fx : id =" updateMenuItem" disable =" true" mnemonicParsing =" false" onAction =" #openUpdate" text =" Update*" visible =" false" />
44+ <SeparatorMenuItem mnemonicParsing =" false" />
45+ <MenuItem mnemonicParsing =" false" onAction =" #exitFromMenu" text =" Exit" />
4446 </items >
4547 </Menu >
4648 </menus >
You can’t perform that action at this time.
0 commit comments