fixes #297 by disabling closing of modal windows via operating system…

… shortcut (closing the modal window is correctly handled by the appropriate buttons)
keeps · Jun 21, 2017 · 30226a6 · 30226a6
1 parent 6d21e45
commit 30226a6
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/src/main/java/org/roda/rodain/ui/ModalStage.java b/src/main/java/org/roda/rodain/ui/ModalStage.java
@@ -1,5 +1,9 @@
 package org.roda.rodain.ui;
 
+import javafx.application.Platform;
+import javafx.event.Event;
+import javafx.event.EventHandler;
+import javafx.stage.WindowEvent;
 import org.roda.rodain.core.Constants;
 import org.roda.rodain.ui.utils.UnsafeDouble;
 
@@ -34,6 +38,7 @@ public ModalStage(Stage primaryStage) {
     colorAdjust = new ColorAdjust();
     colorAdjust.setBrightness(-0.275);
 
+    setOnCloseRequest(Event::consume);
     setResizable(false);
 
     Scene scene = new Scene(new HBox(), 800, 580);

diff --git a/src/main/java/org/roda/rodain/ui/RodaInApplication.java b/src/main/java/org/roda/rodain/ui/RodaInApplication.java
@@ -11,6 +11,8 @@
 import java.util.Optional;
 import java.util.Set;
 
+import javafx.event.EventHandler;
+import javafx.scene.control.DialogEvent;
 import org.apache.commons.configuration.ConfigurationException;
 import org.roda.rodain.core.ConfigurationManager;
 import org.roda.rodain.core.Constants;
@@ -459,7 +461,7 @@ private void createMenu() {
 
     menuView.getItems().addAll(showFiles, showIgnored, showMapped);
 
-    // Help
+    // Check version
     final MenuItem checkVersion = new MenuItem(I18n.t(Constants.I18N_MAIN_CHECK_VERSION));
     checkVersion.setAccelerator(KeyCombination.keyCombination("Ctrl+U"));
     checkVersion.setOnAction(event -> {
@@ -481,6 +483,7 @@ private void createMenu() {
       }
     });
 
+    // Help
     String startingValue = ConfigurationManager.getAppConfig(Constants.CONF_K_APP_HELP_ENABLED);
     String showHelpText;
     if (Boolean.parseBoolean(startingValue)) {

diff --git a/src/main/java/org/roda/rodain/ui/creation/CreationModalStage.java b/src/main/java/org/roda/rodain/ui/creation/CreationModalStage.java
@@ -4,6 +4,7 @@
 import java.util.List;
 import java.util.Map;
 
+import javafx.event.Event;
 import org.roda.rodain.core.Constants;
 import org.roda.rodain.core.creation.CreateSips;
 import org.roda.rodain.core.schema.Sip;
@@ -47,6 +48,7 @@ public CreationModalStage(Stage primaryStage) {
     colorAdjust = new ColorAdjust();
     colorAdjust.setBrightness(-0.275);
 
+    setOnCloseRequest(Event::consume);
     setResizable(true);
 
     Scene scene = new Scene(new HBox());
@@ -133,4 +135,4 @@ public void handle(MouseEvent mouseEvent) {
 
     show();
   }
-}
+}
diff --git a/src/main/java/org/roda/rodain/ui/creation/RenameModalStage.java b/src/main/java/org/roda/rodain/ui/creation/RenameModalStage.java
@@ -1,5 +1,6 @@
 package org.roda.rodain.ui.creation;
 
+import javafx.event.Event;
 import org.roda.rodain.core.Constants;
 import org.roda.rodain.ui.utils.UnsafeDouble;
 
@@ -33,6 +34,7 @@ public RenameModalStage(Stage primaryStage) {
     colorAdjust = new ColorAdjust();
     colorAdjust.setBrightness(-0.275);
 
+    setOnCloseRequest(Event::consume);
     setResizable(true);
 
     Scene scene = new Scene(new HBox(), 400, PREPARATION_HEIGHT);
@@ -85,4 +87,4 @@ public void handle(MouseEvent mouseEvent) {
 
     show();
   }
-}
+}