From ccefb3613ea8aa503a6f5dfb4d4a346a428c43ab Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Fri, 27 Sep 2019 20:01:02 +0200 Subject: [PATCH] renamed file --- main/ui/src/main/java/org/cryptomator/ui/common/FxmlFile.java | 2 +- .../src/main/java/org/cryptomator/ui/unlock/UnlockModule.java | 2 +- main/ui/src/main/resources/fxml/{unlock2.fxml => unlock.fxml} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename main/ui/src/main/resources/fxml/{unlock2.fxml => unlock.fxml} (100%) diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/FxmlFile.java b/main/ui/src/main/java/org/cryptomator/ui/common/FxmlFile.java index fc449a1ca..c5bfb0bd4 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/common/FxmlFile.java +++ b/main/ui/src/main/java/org/cryptomator/ui/common/FxmlFile.java @@ -16,7 +16,7 @@ public enum FxmlFile { PREFERENCES("/fxml/preferences.fxml"), // QUIT("/fxml/quit.fxml"), // REMOVE_VAULT("/fxml/remove_vault.fxml"), // - UNLOCK("/fxml/unlock2.fxml"), // TODO rename + UNLOCK("/fxml/unlock.fxml"), UNLOCK_SUCCESS("/fxml/unlock_success.fxml"), // VAULT_OPTIONS("/fxml/vault_options.fxml"), // WRONGFILEALERT("/fxml/wrongfilealert.fxml"); diff --git a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockModule.java b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockModule.java index 7ee1f71e3..8dbb7c7b8 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockModule.java +++ b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockModule.java @@ -50,7 +50,7 @@ abstract class UnlockModule { @FxmlScene(FxmlFile.UNLOCK) @UnlockScoped static Scene provideUnlockScene(@UnlockWindow FXMLLoaderFactory fxmlLoaders, @UnlockWindow Stage window) { - Scene scene = fxmlLoaders.createScene("/fxml/unlock2.fxml"); // TODO rename fxml file + Scene scene = fxmlLoaders.createScene("/fxml/unlock.fxml"); KeyCombination cmdW = new KeyCodeCombination(KeyCode.W, KeyCombination.SHORTCUT_DOWN); scene.getAccelerators().put(cmdW, window::close); diff --git a/main/ui/src/main/resources/fxml/unlock2.fxml b/main/ui/src/main/resources/fxml/unlock.fxml similarity index 100% rename from main/ui/src/main/resources/fxml/unlock2.fxml rename to main/ui/src/main/resources/fxml/unlock.fxml