From 1818344c49a76578bc1fe2aa23f579bc68decfe7 Mon Sep 17 00:00:00 2001 From: Jan-Peter Klein Date: Mon, 30 Oct 2023 14:33:01 +0100 Subject: [PATCH] different labeling for volume type option in general volume preferences and vault options --- .../common/mount/MountServiceConverter.java | 29 ------------------- .../VolumePreferencesController.java | 22 ++++++++++++-- .../vaultoptions/MountOptionsController.java | 19 ++++++++++-- .../resources/fxml/preferences_volume.fxml | 4 +-- src/main/resources/i18n/strings.properties | 4 ++- 5 files changed, 41 insertions(+), 37 deletions(-) delete mode 100644 src/main/java/org/cryptomator/common/mount/MountServiceConverter.java diff --git a/src/main/java/org/cryptomator/common/mount/MountServiceConverter.java b/src/main/java/org/cryptomator/common/mount/MountServiceConverter.java deleted file mode 100644 index f83380e1e..000000000 --- a/src/main/java/org/cryptomator/common/mount/MountServiceConverter.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.cryptomator.common.mount; - -import org.cryptomator.integrations.mount.MountService; - -import javafx.util.StringConverter; -import java.util.ResourceBundle; - -public class MountServiceConverter extends StringConverter { - - private final ResourceBundle resourceBundle; - - public MountServiceConverter(ResourceBundle resourceBundle) { - this.resourceBundle = resourceBundle; - } - - @Override - public String toString(MountService provider) { - if (provider == null) { - return resourceBundle.getString("preferences.volume.type.automatic"); - } else { - return provider.displayName(); - } - } - - @Override - public MountService fromString(String string) { - throw new UnsupportedOperationException(); - } -} \ No newline at end of file diff --git a/src/main/java/org/cryptomator/ui/preferences/VolumePreferencesController.java b/src/main/java/org/cryptomator/ui/preferences/VolumePreferencesController.java index 38b6eb9b6..1fbcc2509 100644 --- a/src/main/java/org/cryptomator/ui/preferences/VolumePreferencesController.java +++ b/src/main/java/org/cryptomator/ui/preferences/VolumePreferencesController.java @@ -2,7 +2,6 @@ package org.cryptomator.ui.preferences; import dagger.Lazy; import org.cryptomator.common.ObservableUtil; -import org.cryptomator.common.mount.MountServiceConverter; import org.cryptomator.common.settings.Settings; import org.cryptomator.common.vaults.VaultModule; import org.cryptomator.integrations.mount.MountCapability; @@ -70,7 +69,7 @@ public class VolumePreferencesController implements FxController { public void initialize() { volumeTypeChoiceBox.getItems().add(null); volumeTypeChoiceBox.getItems().addAll(mountProviders); - volumeTypeChoiceBox.setConverter(new MountServiceConverter(resourceBundle)); + volumeTypeChoiceBox.setConverter(new MountServiceConverter()); boolean autoSelected = settings.mountService.get() == null; volumeTypeChoiceBox.getSelectionModel().select(autoSelected ? null : selectedMountService.getValue()); volumeTypeChoiceBox.valueProperty().addListener((observableValue, oldProvider, newProvider) -> { @@ -149,6 +148,25 @@ public class VolumePreferencesController implements FxController { return fuseRestartRequired.getValue(); } + /* Helpers */ + + public class MountServiceConverter extends StringConverter { + + @Override + public String toString(MountService provider) { + if (provider == null) { + return resourceBundle.getString("preferences.volume.type.automatic"); + } else { + return provider.displayName(); + } + } + + @Override + public MountService fromString(String string) { + throw new UnsupportedOperationException(); + } + } + public void openDocs() { application.get().getHostServices().showDocument(DOCS_MOUNTING_URL); } diff --git a/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java b/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java index 80b2214a5..8b57a22da 100644 --- a/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java +++ b/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java @@ -3,7 +3,6 @@ package org.cryptomator.ui.vaultoptions; import com.google.common.base.Strings; import dagger.Lazy; import org.cryptomator.common.ObservableUtil; -import org.cryptomator.common.mount.MountServiceConverter; import org.cryptomator.common.mount.WindowsDriveLetters; import org.cryptomator.common.settings.VaultSettings; import org.cryptomator.common.vaults.Vault; @@ -147,7 +146,7 @@ public class MountOptionsController implements FxController { vaultVolumeTypeChoiceBox.getItems().add(null); vaultVolumeTypeChoiceBox.getItems().addAll(mountProviders); - vaultVolumeTypeChoiceBox.setConverter(new MountServiceConverter(resourceBundle)); + vaultVolumeTypeChoiceBox.setConverter(new MountServiceConverter()); boolean autoSelected = vaultSettings.mountService.get() == null; vaultVolumeTypeChoiceBox.getSelectionModel().select(autoSelected ? null : selectedMountService.getValue()); vaultVolumeTypeChoiceBox.valueProperty().addListener((observableValue, oldProvider, newProvider) -> { @@ -359,4 +358,20 @@ public class MountOptionsController implements FxController { return loopbackPortSupported.get(); } + private class MountServiceConverter extends StringConverter { + + @Override + public String toString(MountService provider) { + if (provider == null) { + return resourceBundle.getString("preferences.volume.type.default"); + } else { + return provider.displayName(); + } + } + + @Override + public MountService fromString(String string) { + throw new UnsupportedOperationException(); + } + } } diff --git a/src/main/resources/fxml/preferences_volume.fxml b/src/main/resources/fxml/preferences_volume.fxml index f48b1c1c8..fef85aadc 100644 --- a/src/main/resources/fxml/preferences_volume.fxml +++ b/src/main/resources/fxml/preferences_volume.fxml @@ -20,7 +20,7 @@ - -