mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-21 04:01:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

reordered and renamed to org.ui.dialogs.SimpleDialog...

Browse Source
This commit is contained in:
Jan-Peter Klein
2024-11-25 19:23:48 +01:00
parent 600aca083c
commit e929d41d67
10 changed files with 46 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/org/cryptomator/ui/controls/CustomDialog.java → src/main/java/org/cryptomator/ui/dialogs/SimpleDialog.java
View File

@@ -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);
}

6
src/main/java/org/cryptomator/ui/controls/CustomDialogController.java → src/main/java/org/cryptomator/ui/dialogs/SimpleDialogController.java
View File

@@ -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;

6
src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java
View File

@@ -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);
}
}

10
src/main/java/org/cryptomator/ui/fxapp/FxApplicationWindows.java
View File

@@ -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<Window> visibleWindows;
private final Provider<CustomDialog.Builder> customDialogProvider;
private final Provider<SimpleDialog.Builder> simpleDialogProvider;
@Inject
public FxApplicationWindows(@PrimaryStage Stage primaryStage, //
@@ -72,7 +72,7 @@ public class FxApplicationWindows {
VaultOptionsComponent.Factory vaultOptionsWindow, //
ShareVaultComponent.Factory shareVaultWindow, //
ExecutorService executor, //
Provider<CustomDialog.Builder> customDialogProvider) {
Provider<SimpleDialog.Builder> 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") //

10
src/main/java/org/cryptomator/ui/mainwindow/VaultDetailMissingVaultController.java
View File

@@ -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<Vault> vaults;
private final ResourceBundle resourceBundle;
private final Stage window;
private final Provider<CustomDialog.Builder> customDialogProvider;
private final Provider<SimpleDialog.Builder> simpleDialogProvider;
@Inject
public VaultDetailMissingVaultController(ObjectProperty<Vault> vault, //
ObservableList<Vault> vaults, //
ResourceBundle resourceBundle, //
@MainWindow Stage window, //
Provider<CustomDialog.Builder> customDialogProvider) {
Provider<SimpleDialog.Builder> 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") //

10
src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnknownErrorController.java
View File

@@ -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<Vault> vaults;
private final Stage mainWindow;
private final Provider<CustomDialog.Builder> customDialogProvider;
private final Provider<SimpleDialog.Builder> simpleDialogProvider;
@Inject
public VaultDetailUnknownErrorController(@MainWindow Stage mainWindow, //
@@ -35,13 +35,13 @@ public class VaultDetailUnknownErrorController implements FxController {
ObservableList<Vault> vaults, //
FxApplicationWindows appWindows, //
@Named("errorWindow") Stage errorWindow, //
Provider<CustomDialog.Builder> customDialogProvider) {
Provider<SimpleDialog.Builder> 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") //

10
src/main/java/org/cryptomator/ui/mainwindow/VaultListContextMenuController.java
View File

@@ -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<Boolean> selectedVaultUnlockable;
private final ObservableValue<Boolean> selectedVaultLockable;
private final ObservableList<Vault> vaults;
private final Provider<CustomDialog.Builder> customDialogProvider;
private final Provider<SimpleDialog.Builder> simpleDialogProvider;
@Inject
@@ -59,7 +59,7 @@ public class VaultListContextMenuController implements FxController {
VaultService vaultService, //
KeychainManager keychain, //
VaultOptionsComponent.Factory vaultOptionsWindow, //
Provider<CustomDialog.Builder> customDialogProvider) {
Provider<SimpleDialog.Builder> 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") //

10
src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java
View File

@@ -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<Double> cellSize;
private final Provider<CustomDialog.Builder> customDialogProvider;
private final Provider<SimpleDialog.Builder> simpleDialogProvider;
public ListView<Vault> vaultList;
public StackPane root;
@@ -93,7 +93,7 @@ public class VaultListController implements FxController {
ResourceBundle resourceBundle, //
FxApplicationWindows appWindows, //
Settings settings, //
Provider<CustomDialog.Builder> customDialogProvider) {
Provider<SimpleDialog.Builder> 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") //

10
src/main/java/org/cryptomator/ui/preferences/SupporterCertificateController.java
View File

@@ -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<CustomDialog.Builder> customDialogProvider;
private final Provider<SimpleDialog.Builder> simpleDialogProvider;
@FXML
private TextArea supporterCertificateField;
@@ -38,12 +38,12 @@ public class SupporterCertificateController implements FxController {
@PreferencesWindow Stage window, //
LicenseHolder licenseHolder, //
Settings settings, //
Provider<CustomDialog.Builder> customDialogProvider) {
Provider<SimpleDialog.Builder> 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") //

2
src/main/resources/fxml/custom_dialog.fxml
View File

@@ -13,7 +13,7 @@
<?import javafx.scene.control.ButtonBar?>
<HBox xmlns:fx="http://javafx.com/fxml"
xmlns="http://javafx.com/javafx"
fx:controller="org.cryptomator.ui.controls.CustomDialogController"
fx:controller="org.cryptomator.ui.dialogs.SimpleDialogController"
minWidth="400"
maxWidth="400"
minHeight="145"