diff --git a/src/main/java/org/cryptomator/ui/controls/CustomDialog.java b/src/main/java/org/cryptomator/ui/dialogs/SimpleDialog.java similarity index 91% rename from src/main/java/org/cryptomator/ui/controls/CustomDialog.java rename to src/main/java/org/cryptomator/ui/dialogs/SimpleDialog.java index 430285fed..bae0e8843 100644 --- a/src/main/java/org/cryptomator/ui/controls/CustomDialog.java +++ b/src/main/java/org/cryptomator/ui/dialogs/SimpleDialog.java @@ -1,7 +1,8 @@ -package org.cryptomator.ui.controls; +package org.cryptomator.ui.dialogs; import org.cryptomator.ui.common.FxmlFile; import org.cryptomator.ui.common.FxmlLoaderFactory; +import org.cryptomator.ui.controls.FontAwesome5Icon; import javafx.fxml.FXMLLoader; import javafx.scene.Parent; @@ -14,13 +15,13 @@ import java.util.IllegalFormatException; import java.util.ResourceBundle; import java.util.function.Consumer; -public class CustomDialog { +public class SimpleDialog { private final ResourceBundle resourceBundle; private final Stage dialogStage; - CustomDialog(Builder builder) throws IOException { + SimpleDialog(Builder builder) throws IOException { this.resourceBundle = builder.resourceBundle; dialogStage = new Stage(); dialogStage.initOwner(builder.owner); @@ -28,10 +29,10 @@ public class CustomDialog { dialogStage.setTitle(resolveText(builder.titleKey, builder.titleArgs)); dialogStage.setResizable(false); - FxmlLoaderFactory loaderFactory = FxmlLoaderFactory.forController(new CustomDialogController(), Scene::new, builder.resourceBundle); + FxmlLoaderFactory loaderFactory = FxmlLoaderFactory.forController(new SimpleDialogController(), Scene::new, builder.resourceBundle); FXMLLoader loader = loaderFactory.load(FxmlFile.CUSTOM_DIALOG.getRessourcePathString()); Parent root = loader.getRoot(); - CustomDialogController controller = loader.getController(); + SimpleDialogController controller = loader.getController(); controller.setMessage(resolveText(builder.messageKey, null)); controller.setDescription(resolveText(builder.descriptionKey, null)); @@ -126,9 +127,9 @@ public class CustomDialog { return this; } - public CustomDialog build() { + public SimpleDialog build() { try { - return new CustomDialog(this); + return new SimpleDialog(this); } catch (IOException e) { throw new UncheckedIOException("Failed to create CustomDialog.", e); } diff --git a/src/main/java/org/cryptomator/ui/controls/CustomDialogController.java b/src/main/java/org/cryptomator/ui/dialogs/SimpleDialogController.java similarity index 84% rename from src/main/java/org/cryptomator/ui/controls/CustomDialogController.java rename to src/main/java/org/cryptomator/ui/dialogs/SimpleDialogController.java index 299173526..6a94867cc 100644 --- a/src/main/java/org/cryptomator/ui/controls/CustomDialogController.java +++ b/src/main/java/org/cryptomator/ui/dialogs/SimpleDialogController.java @@ -1,12 +1,14 @@ -package org.cryptomator.ui.controls; +package org.cryptomator.ui.dialogs; import org.cryptomator.ui.common.FxController; +import org.cryptomator.ui.controls.FontAwesome5Icon; +import org.cryptomator.ui.controls.FontAwesome5IconView; import javafx.fxml.FXML; import javafx.scene.control.Button; import javafx.scene.control.Label; -public class CustomDialogController implements FxController { +public class SimpleDialogController implements FxController { @FXML private Label messageLabel; diff --git a/src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java b/src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java index 0938e6064..ccc58f122 100644 --- a/src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java +++ b/src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java @@ -7,7 +7,7 @@ package org.cryptomator.ui.fxapp; import dagger.Module; import dagger.Provides; -import org.cryptomator.ui.controls.CustomDialog; +import org.cryptomator.ui.dialogs.SimpleDialog; import org.cryptomator.ui.error.ErrorComponent; import org.cryptomator.ui.health.HealthCheckComponent; import org.cryptomator.ui.lock.LockComponent; @@ -69,8 +69,8 @@ abstract class FxApplicationModule { } @Provides - static CustomDialog.Builder provideCustomDialog(ResourceBundle resourceBundle) { - return new CustomDialog.Builder(resourceBundle); + static SimpleDialog.Builder provideSimpleDialog(ResourceBundle resourceBundle) { + return new SimpleDialog.Builder(resourceBundle); } } \ No newline at end of file diff --git a/src/main/java/org/cryptomator/ui/fxapp/FxApplicationWindows.java b/src/main/java/org/cryptomator/ui/fxapp/FxApplicationWindows.java index 3f56ab0a8..51d582b59 100644 --- a/src/main/java/org/cryptomator/ui/fxapp/FxApplicationWindows.java +++ b/src/main/java/org/cryptomator/ui/fxapp/FxApplicationWindows.java @@ -5,7 +5,7 @@ import dagger.Lazy; import org.cryptomator.common.vaults.Vault; import org.cryptomator.common.vaults.VaultState; import org.cryptomator.integrations.tray.TrayIntegrationProvider; -import org.cryptomator.ui.controls.CustomDialog; +import org.cryptomator.ui.dialogs.SimpleDialog; import org.cryptomator.ui.controls.FontAwesome5Icon; import org.cryptomator.ui.error.ErrorComponent; import org.cryptomator.ui.lock.LockComponent; @@ -57,7 +57,7 @@ public class FxApplicationWindows { private final VaultOptionsComponent.Factory vaultOptionsWindow; private final ShareVaultComponent.Factory shareVaultWindow; private final FilteredList visibleWindows; - private final Provider customDialogProvider; + private final Provider simpleDialogProvider; @Inject public FxApplicationWindows(@PrimaryStage Stage primaryStage, // @@ -72,7 +72,7 @@ public class FxApplicationWindows { VaultOptionsComponent.Factory vaultOptionsWindow, // ShareVaultComponent.Factory shareVaultWindow, // ExecutorService executor, // - Provider customDialogProvider) { + Provider simpleDialogProvider) { this.primaryStage = primaryStage; this.trayIntegration = trayIntegration; this.mainWindow = mainWindow; @@ -86,7 +86,7 @@ public class FxApplicationWindows { this.vaultOptionsWindow = vaultOptionsWindow; this.shareVaultWindow = shareVaultWindow; this.visibleWindows = Window.getWindows().filtered(Window::isShowing); - this.customDialogProvider = customDialogProvider; + this.simpleDialogProvider = simpleDialogProvider; } public void initialize() { @@ -150,7 +150,7 @@ public class FxApplicationWindows { public void showDokanySupportEndWindow() { CompletableFuture.runAsync(() -> { - customDialogProvider.get().setOwner(mainWindow.get().window()) // + simpleDialogProvider.get().setOwner(mainWindow.get().window()) // .setTitleKey("dokanySupportEnd.title") // .setMessageKey("dokanySupportEnd.message") // .setDescriptionKey("dokanySupportEnd.description") // diff --git a/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailMissingVaultController.java b/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailMissingVaultController.java index 313769b64..fc8a71a0c 100644 --- a/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailMissingVaultController.java +++ b/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailMissingVaultController.java @@ -3,7 +3,7 @@ package org.cryptomator.ui.mainwindow; import org.cryptomator.common.vaults.Vault; import org.cryptomator.common.vaults.VaultListManager; import org.cryptomator.ui.common.FxController; -import org.cryptomator.ui.controls.CustomDialog; +import org.cryptomator.ui.dialogs.SimpleDialog; import org.cryptomator.ui.controls.FontAwesome5Icon; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -29,19 +29,19 @@ public class VaultDetailMissingVaultController implements FxController { private final ObservableList vaults; private final ResourceBundle resourceBundle; private final Stage window; - private final Provider customDialogProvider; + private final Provider simpleDialogProvider; @Inject public VaultDetailMissingVaultController(ObjectProperty vault, // ObservableList vaults, // ResourceBundle resourceBundle, // @MainWindow Stage window, // - Provider customDialogProvider) { + Provider simpleDialogProvider) { this.vault = vault; this.vaults = vaults; this.resourceBundle = resourceBundle; this.window = window; - this.customDialogProvider = customDialogProvider; + this.simpleDialogProvider = simpleDialogProvider; } @FXML @@ -51,7 +51,7 @@ public class VaultDetailMissingVaultController implements FxController { @FXML void didClickRemoveVault() { - customDialogProvider.get().setOwner(window) // + simpleDialogProvider.get().setOwner(window) // .setTitleKey("removeVault.title", vault.get().getDisplayName()) // .setMessageKey("removeVault.message") // .setDescriptionKey("removeVault.description") // diff --git a/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnknownErrorController.java b/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnknownErrorController.java index 4474506da..4aae26cc8 100644 --- a/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnknownErrorController.java +++ b/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnknownErrorController.java @@ -3,7 +3,7 @@ package org.cryptomator.ui.mainwindow; import org.cryptomator.common.vaults.Vault; import org.cryptomator.common.vaults.VaultListManager; import org.cryptomator.ui.common.FxController; -import org.cryptomator.ui.controls.CustomDialog; +import org.cryptomator.ui.dialogs.SimpleDialog; import org.cryptomator.ui.controls.FontAwesome5Icon; import org.cryptomator.ui.fxapp.FxApplicationWindows; import org.slf4j.Logger; @@ -27,7 +27,7 @@ public class VaultDetailUnknownErrorController implements FxController { private final Stage errorWindow; private final ObservableList vaults; private final Stage mainWindow; - private final Provider customDialogProvider; + private final Provider simpleDialogProvider; @Inject public VaultDetailUnknownErrorController(@MainWindow Stage mainWindow, // @@ -35,13 +35,13 @@ public class VaultDetailUnknownErrorController implements FxController { ObservableList vaults, // FxApplicationWindows appWindows, // @Named("errorWindow") Stage errorWindow, // - Provider customDialogProvider) { + Provider simpleDialogProvider) { this.mainWindow = mainWindow; this.vault = vault; this.vaults = vaults; this.appWindows = appWindows; this.errorWindow = errorWindow; - this.customDialogProvider = customDialogProvider; + this.simpleDialogProvider = simpleDialogProvider; } @FXML @@ -56,7 +56,7 @@ public class VaultDetailUnknownErrorController implements FxController { @FXML void didClickRemoveVault() { - customDialogProvider.get().setOwner(mainWindow) // + simpleDialogProvider.get().setOwner(mainWindow) // .setTitleKey("removeVault.title", vault.get().getDisplayName()) // .setMessageKey("removeVault.message") // .setDescriptionKey("removeVault.description") // diff --git a/src/main/java/org/cryptomator/ui/mainwindow/VaultListContextMenuController.java b/src/main/java/org/cryptomator/ui/mainwindow/VaultListContextMenuController.java index 170475858..61c2489d7 100644 --- a/src/main/java/org/cryptomator/ui/mainwindow/VaultListContextMenuController.java +++ b/src/main/java/org/cryptomator/ui/mainwindow/VaultListContextMenuController.java @@ -5,7 +5,7 @@ import org.cryptomator.common.vaults.Vault; import org.cryptomator.common.vaults.VaultState; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.common.VaultService; -import org.cryptomator.ui.controls.CustomDialog; +import org.cryptomator.ui.dialogs.SimpleDialog; import org.cryptomator.ui.controls.FontAwesome5Icon; import org.cryptomator.ui.fxapp.FxApplicationWindows; import org.cryptomator.ui.vaultoptions.SelectedVaultOptionsTab; @@ -48,7 +48,7 @@ public class VaultListContextMenuController implements FxController { private final ObservableValue selectedVaultUnlockable; private final ObservableValue selectedVaultLockable; private final ObservableList vaults; - private final Provider customDialogProvider; + private final Provider simpleDialogProvider; @Inject @@ -59,7 +59,7 @@ public class VaultListContextMenuController implements FxController { VaultService vaultService, // KeychainManager keychain, // VaultOptionsComponent.Factory vaultOptionsWindow, // - Provider customDialogProvider) { + Provider simpleDialogProvider) { this.selectedVault = selectedVault; this.vaults = vaults; this.mainWindow = mainWindow; @@ -67,7 +67,7 @@ public class VaultListContextMenuController implements FxController { this.vaultService = vaultService; this.keychain = keychain; this.vaultOptionsWindow = vaultOptionsWindow; - this.customDialogProvider = customDialogProvider; + this.simpleDialogProvider = simpleDialogProvider; this.selectedVaultState = selectedVault.flatMap(Vault::stateProperty).orElse(null); this.selectedVaultPassphraseStored = selectedVault.map(this::isPasswordStored).orElse(false); @@ -83,7 +83,7 @@ public class VaultListContextMenuController implements FxController { @FXML public void didClickRemoveVault() { var vault = Objects.requireNonNull(selectedVault.get()); - customDialogProvider.get().setOwner(mainWindow) // + simpleDialogProvider.get().setOwner(mainWindow) // .setTitleKey("removeVault.title", vault.getDisplayName()) // .setMessageKey("removeVault.message") // .setDescriptionKey("removeVault.description") // diff --git a/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java b/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java index a5e5a4376..d4a65d94b 100644 --- a/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java +++ b/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java @@ -9,7 +9,7 @@ import org.cryptomator.cryptofs.DirStructure; import org.cryptomator.ui.addvaultwizard.AddVaultWizardComponent; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.common.VaultService; -import org.cryptomator.ui.controls.CustomDialog; +import org.cryptomator.ui.dialogs.SimpleDialog; import org.cryptomator.ui.controls.FontAwesome5Icon; import org.cryptomator.ui.fxapp.FxApplicationWindows; import org.cryptomator.ui.preferences.SelectedPreferencesTab; @@ -73,7 +73,7 @@ public class VaultListController implements FxController { private final ResourceBundle resourceBundle; private final FxApplicationWindows appWindows; private final ObservableValue cellSize; - private final Provider customDialogProvider; + private final Provider simpleDialogProvider; public ListView vaultList; public StackPane root; @@ -93,7 +93,7 @@ public class VaultListController implements FxController { ResourceBundle resourceBundle, // FxApplicationWindows appWindows, // Settings settings, // - Provider customDialogProvider) { + Provider simpleDialogProvider) { this.mainWindow = mainWindow; this.vaults = vaults; this.selectedVault = selectedVault; @@ -103,7 +103,7 @@ public class VaultListController implements FxController { this.vaultListManager = vaultListManager; this.resourceBundle = resourceBundle; this.appWindows = appWindows; - this.customDialogProvider = customDialogProvider; + this.simpleDialogProvider = simpleDialogProvider; this.emptyVaultList = Bindings.isEmpty(vaults); @@ -211,7 +211,7 @@ public class VaultListController implements FxController { private void pressedShortcutToRemoveVault() { final var vault = selectedVault.get(); if (vault != null && EnumSet.of(LOCKED, MISSING, ERROR, NEEDS_MIGRATION).contains(vault.getState())) { - customDialogProvider.get().setOwner(mainWindow) // + simpleDialogProvider.get().setOwner(mainWindow) // .setTitleKey("removeVault.title", vault.getDisplayName()) // .setMessageKey("removeVault.message") // .setDescriptionKey("removeVault.description") // diff --git a/src/main/java/org/cryptomator/ui/preferences/SupporterCertificateController.java b/src/main/java/org/cryptomator/ui/preferences/SupporterCertificateController.java index 5eb7ad6c5..75baf659e 100644 --- a/src/main/java/org/cryptomator/ui/preferences/SupporterCertificateController.java +++ b/src/main/java/org/cryptomator/ui/preferences/SupporterCertificateController.java @@ -5,7 +5,7 @@ import org.cryptomator.common.LicenseHolder; import org.cryptomator.common.settings.Settings; import org.cryptomator.common.settings.UiTheme; import org.cryptomator.ui.common.FxController; -import org.cryptomator.ui.controls.CustomDialog; +import org.cryptomator.ui.dialogs.SimpleDialog; import org.cryptomator.ui.controls.FontAwesome5Icon; import javax.inject.Inject; @@ -28,7 +28,7 @@ public class SupporterCertificateController implements FxController { private final Stage window; private final LicenseHolder licenseHolder; private final Settings settings; - private final Provider customDialogProvider; + private final Provider simpleDialogProvider; @FXML private TextArea supporterCertificateField; @@ -38,12 +38,12 @@ public class SupporterCertificateController implements FxController { @PreferencesWindow Stage window, // LicenseHolder licenseHolder, // Settings settings, // - Provider customDialogProvider) { + Provider simpleDialogProvider) { this.application = application; this.window = window; this.licenseHolder = licenseHolder; this.settings = settings; - this.customDialogProvider = customDialogProvider; + this.simpleDialogProvider = simpleDialogProvider; } @FXML @@ -90,7 +90,7 @@ public class SupporterCertificateController implements FxController { @FXML void didClickRemoveCert() { - customDialogProvider.get().setOwner(window) // + simpleDialogProvider.get().setOwner(window) // .setTitleKey("removeCert.title") // .setMessageKey("removeCert.message") // .setDescriptionKey("removeCert.description") // diff --git a/src/main/resources/fxml/custom_dialog.fxml b/src/main/resources/fxml/custom_dialog.fxml index 887a35799..340798bb3 100644 --- a/src/main/resources/fxml/custom_dialog.fxml +++ b/src/main/resources/fxml/custom_dialog.fxml @@ -13,7 +13,7 @@