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) {
77
77
super .initialize (fxmlStageHolder );
78
78
final Stage primaryStage = fxmlStageHolder .getStage ();
79
79
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 ();
88
81
});
89
82
90
83
directoryTabController = new DirectoryTabController (fxmlStageHolder , directory );
@@ -148,6 +141,12 @@ protected void openAbout() {
148
141
menuController .openAbout ();
149
142
}
150
143
144
+ @ FXML
145
+ protected void exitFromMenu () {
146
+ close ();
147
+ closeStage ();
148
+ }
149
+
151
150
@ FXML
152
151
protected void openUpdate () {
153
152
menuController .openUpdate ();
@@ -157,4 +156,12 @@ protected void openUpdate() {
157
156
protected void foundIssue () {
158
157
AppConfig .getInstance ().getHostServices ().showDocument (AppConstants .LINK_TO_GIT_CONTRIBUTING_FILE );
159
158
}
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
+ }
160
167
}
Original file line number Diff line number Diff line change 41
41
<MenuItem mnemonicParsing =" false" onAction =" #openAbout" text =" About" />
42
42
<SeparatorMenuItem fx : id =" updateMenuItemSeparator" disable =" true" mnemonicParsing =" false" visible =" false" />
43
43
<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" />
44
46
</items >
45
47
</Menu >
46
48
</menus >
You can’t perform that action at this time.
0 commit comments