From cf668e820b697b477ea754299d2854d542e5d068 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Thu, 12 Mar 2020 13:42:40 +0100 Subject: [PATCH] Replaced mockup image --- .../ChooseExistingVaultController.java | 23 ++++++++++++++++++ .../WrongFileAlertController.java | 20 ++++++++++----- .../main/resources/choose_existing_vault.png | Bin 13806 -> 0 bytes .../resources/fxml/addvault_existing.fxml | 4 +-- .../main/resources/select-masterkey-mac.png | Bin 0 -> 66422 bytes .../main/resources/select-masterkey-win.png | Bin 0 -> 24717 bytes 6 files changed, 38 insertions(+), 9 deletions(-) delete mode 100644 main/ui/src/main/resources/choose_existing_vault.png create mode 100644 main/ui/src/main/resources/select-masterkey-mac.png create mode 100755 main/ui/src/main/resources/select-masterkey-win.png diff --git a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/ChooseExistingVaultController.java b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/ChooseExistingVaultController.java index 5e0ab64fa..3717a844f 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/ChooseExistingVaultController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/ChooseExistingVaultController.java @@ -4,8 +4,10 @@ import dagger.Lazy; import javafx.beans.property.ObjectProperty; import javafx.fxml.FXML; import javafx.scene.Scene; +import javafx.scene.image.Image; import javafx.stage.FileChooser; import javafx.stage.Stage; +import org.apache.commons.lang3.SystemUtils; import org.cryptomator.common.vaults.Vault; import org.cryptomator.common.vaults.VaultListManager; import org.cryptomator.ui.common.ErrorComponent; @@ -18,6 +20,9 @@ import org.slf4j.LoggerFactory; import javax.inject.Inject; import javax.inject.Named; import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.UncheckedIOException; import java.nio.file.NoSuchFileException; import java.nio.file.Path; import java.util.ResourceBundle; @@ -36,6 +41,8 @@ public class ChooseExistingVaultController implements FxController { private final VaultListManager vaultListManager; private final ResourceBundle resourceBundle; + private Image screenshot; + @Inject ChooseExistingVaultController(@AddVaultWizardWindow Stage window, @FxmlScene(FxmlFile.ADDVAULT_WELCOME) Lazy welcomeScene, @FxmlScene(FxmlFile.ADDVAULT_SUCCESS) Lazy successScene, ErrorComponent.Builder errorComponent, ObjectProperty vaultPath, @AddVaultWizardWindow ObjectProperty vault, VaultListManager vaultListManager, ResourceBundle resourceBundle) { this.window = window; @@ -48,6 +55,16 @@ public class ChooseExistingVaultController implements FxController { this.resourceBundle = resourceBundle; } + @FXML + public void initialize() { + final String resource = SystemUtils.IS_OS_MAC ? "/select-masterkey-mac.png" : "/select-masterkey-win.png"; + try (InputStream in = getClass().getResourceAsStream(resource)) { + this.screenshot = new Image(in); + } catch (IOException e) { + throw new UncheckedIOException(e); + } + } + @FXML public void back() { window.setScene(welcomeScene.get()); @@ -72,4 +89,10 @@ public class ChooseExistingVaultController implements FxController { } } + /* Getter */ + + public Image getScreenshot() { + return screenshot; + } + } diff --git a/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertController.java b/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertController.java index 1c081b5ad..82eec9d28 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertController.java @@ -20,12 +20,25 @@ public class WrongFileAlertController implements FxController { private final Application app; private final Stage window; + private Image screenshot; + @Inject public WrongFileAlertController(@WrongFileAlertWindow Stage window, Application app) { this.window = window; this.app = app; } + @FXML + public void initialize() { + final String resource = SystemUtils.IS_OS_MAC ? "/vault-volume-mac.png" : "/vault-volume-win.png"; + try (InputStream in = getClass().getResourceAsStream(resource)) { + this.screenshot = new Image(in); + } catch (IOException e) { + throw new UncheckedIOException(e); + } + } + + @FXML public void close() { window.close(); } @@ -38,11 +51,6 @@ public class WrongFileAlertController implements FxController { /* Getter */ public Image getScreenshot() { - final String resource = SystemUtils.IS_OS_MAC ? "/vault-volume-mac.png" : "/vault-volume-win.png"; - try (InputStream in = getClass().getResourceAsStream(resource)) { - return new Image(in); - } catch (IOException e) { - throw new UncheckedIOException(e); - } + return screenshot; } } diff --git a/main/ui/src/main/resources/choose_existing_vault.png b/main/ui/src/main/resources/choose_existing_vault.png deleted file mode 100644 index 1447d33c590c14bf9ba51b6b6eeb5893a3920a2a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13806 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 - @@ -19,11 +18,10 @@ - + -