|
@@ -7,6 +7,8 @@ import org.cryptomator.common.settings.VaultSettings;
|
|
|
import org.cryptomator.common.vaults.Vault;
|
|
|
import org.cryptomator.integrations.mount.MountCapability;
|
|
|
import org.cryptomator.ui.common.FxController;
|
|
|
+import org.cryptomator.ui.fxapp.FxApplicationWindows;
|
|
|
+import org.cryptomator.ui.preferences.SelectedPreferencesTab;
|
|
|
|
|
|
import javax.inject.Inject;
|
|
|
import javafx.beans.value.ObservableValue;
|
|
@@ -41,6 +43,7 @@ public class MountOptionsController implements FxController {
|
|
|
private final ObservableValue<Boolean> readOnlySupported;
|
|
|
private final ObservableValue<Boolean> mountFlagsSupported;
|
|
|
private final ObservableValue<String> directoryPath;
|
|
|
+ private final FxApplicationWindows applicationWindows;
|
|
|
|
|
|
|
|
|
//-- FXML objects --
|
|
@@ -55,7 +58,7 @@ public class MountOptionsController implements FxController {
|
|
|
public ChoiceBox<Path> driveLetterSelection;
|
|
|
|
|
|
@Inject
|
|
|
- MountOptionsController(@VaultOptionsWindow Stage window, @VaultOptionsWindow Vault vault, ObservableValue<ActualMountService> mountService, WindowsDriveLetters windowsDriveLetters, ResourceBundle resourceBundle) {
|
|
|
+ MountOptionsController(@VaultOptionsWindow Stage window, @VaultOptionsWindow Vault vault, ObservableValue<ActualMountService> mountService, WindowsDriveLetters windowsDriveLetters, ResourceBundle resourceBundle, FxApplicationWindows applicationWindows) {
|
|
|
this.window = window;
|
|
|
this.vaultSettings = vault.getVaultSettings();
|
|
|
this.windowsDriveLetters = windowsDriveLetters;
|
|
@@ -72,6 +75,7 @@ public class MountOptionsController implements FxController {
|
|
|
this.mountFlagsSupported = mountService.map(as -> as.service().hasCapability(MountCapability.MOUNT_FLAGS));
|
|
|
this.readOnlySupported = mountService.map(as -> as.service().hasCapability(MountCapability.READ_ONLY));
|
|
|
this.directoryPath = vault.getVaultSettings().mountPoint().map(p -> isDriveLetter(p) ? null : p.toString());
|
|
|
+ this.applicationWindows = applicationWindows;
|
|
|
}
|
|
|
|
|
|
@FXML
|
|
@@ -104,6 +108,11 @@ public class MountOptionsController implements FxController {
|
|
|
mountPointToggleGroup.selectedToggleProperty().addListener(this::selectedToggleChanged);
|
|
|
}
|
|
|
|
|
|
+ @FXML
|
|
|
+ public void openVolumePreferences() {
|
|
|
+ applicationWindows.showPreferencesWindow(SelectedPreferencesTab.VOLUME);
|
|
|
+ }
|
|
|
+
|
|
|
@FXML
|
|
|
public void toggleUseCustomMountFlags() {
|
|
|
if (customMountFlagsCheckbox.isSelected()) {
|