|
@@ -37,11 +37,11 @@ public class Settings {
|
|
|
static final boolean DEFAULT_START_HIDDEN = false;
|
|
|
static final boolean DEFAULT_AUTO_CLOSE_VAULTS = false;
|
|
|
static final boolean DEFAULT_USE_KEYCHAIN = true;
|
|
|
+ static final boolean DEFAULT_USE_QUICKACCESS = true;
|
|
|
static final int DEFAULT_PORT = 42427;
|
|
|
static final int DEFAULT_NUM_TRAY_NOTIFICATIONS = 3;
|
|
|
static final boolean DEFAULT_DEBUG_MODE = false;
|
|
|
static final UiTheme DEFAULT_THEME = UiTheme.LIGHT;
|
|
|
- static final boolean DEFAULT_ADD_TO_QUICK_ACCESS = true;
|
|
|
@Deprecated // to be changed to "whatever is available" eventually
|
|
|
static final String DEFAULT_KEYCHAIN_PROVIDER = SystemUtils.IS_OS_WINDOWS ? "org.cryptomator.windows.keychain.WindowsProtectedKeychainAccess" : SystemUtils.IS_OS_MAC ? "org.cryptomator.macos.keychain.MacSystemKeychainAccess" : "org.cryptomator.linux.keychain.SecretServiceKeychainAccess";
|
|
|
static final String DEFAULT_USER_INTERFACE_ORIENTATION = NodeOrientation.LEFT_TO_RIGHT.name();
|
|
@@ -53,12 +53,13 @@ public class Settings {
|
|
|
public final BooleanProperty startHidden;
|
|
|
public final BooleanProperty autoCloseVaults;
|
|
|
public final BooleanProperty useKeychain;
|
|
|
- public final BooleanProperty addToQuickAccess; //TODO: for now, we only support Sidebar integration per System (GNOME Nautilus for Linux)
|
|
|
public final IntegerProperty port;
|
|
|
public final IntegerProperty numTrayNotifications;
|
|
|
public final BooleanProperty debugMode;
|
|
|
public final ObjectProperty<UiTheme> theme;
|
|
|
public final StringProperty keychainProvider;
|
|
|
+ public final BooleanProperty useQuickAccess;
|
|
|
+ public final StringProperty quickAccessService;
|
|
|
public final ObjectProperty<NodeOrientation> userInterfaceOrientation;
|
|
|
public final StringProperty licenseKey;
|
|
|
public final BooleanProperty showMinimizeButton;
|
|
@@ -91,7 +92,7 @@ public class Settings {
|
|
|
this.startHidden = new SimpleBooleanProperty(this, "startHidden", json.startHidden);
|
|
|
this.autoCloseVaults = new SimpleBooleanProperty(this, "autoCloseVaults", json.autoCloseVaults);
|
|
|
this.useKeychain = new SimpleBooleanProperty(this, "useKeychain", json.useKeychain);
|
|
|
- this.addToQuickAccess = new SimpleBooleanProperty(this, "addToQuickAccess", json.addToQuickAccess);
|
|
|
+ this.useQuickAccess = new SimpleBooleanProperty(this, "addToQuickAccess", json.useQuickAccess);
|
|
|
this.port = new SimpleIntegerProperty(this, "webDavPort", json.port);
|
|
|
this.numTrayNotifications = new SimpleIntegerProperty(this, "numTrayNotifications", json.numTrayNotifications);
|
|
|
this.debugMode = new SimpleBooleanProperty(this, "debugMode", json.debugMode);
|
|
@@ -107,6 +108,7 @@ public class Settings {
|
|
|
this.windowHeight = new SimpleIntegerProperty(this, "windowHeight", json.windowHeight);
|
|
|
this.language = new SimpleStringProperty(this, "language", json.language);
|
|
|
this.mountService = new SimpleStringProperty(this, "mountService", json.mountService);
|
|
|
+ this.quickAccessService = new SimpleStringProperty(this, "quickAccessService", json.quickAccessService);
|
|
|
this.lastSuccessfulUpdateCheck = new SimpleObjectProperty<>(this, "lastSuccessfulUpdateCheck", json.lastSuccessfulUpdateCheck);
|
|
|
|
|
|
this.directories.addAll(json.directories.stream().map(VaultSettings::new).toList());
|
|
@@ -119,7 +121,7 @@ public class Settings {
|
|
|
startHidden.addListener(this::somethingChanged);
|
|
|
autoCloseVaults.addListener(this::somethingChanged);
|
|
|
useKeychain.addListener(this::somethingChanged);
|
|
|
- addToQuickAccess.addListener(this::somethingChanged);
|
|
|
+ useQuickAccess.addListener(this::somethingChanged);
|
|
|
port.addListener(this::somethingChanged);
|
|
|
numTrayNotifications.addListener(this::somethingChanged);
|
|
|
debugMode.addListener(this::somethingChanged);
|
|
@@ -135,6 +137,7 @@ public class Settings {
|
|
|
windowHeight.addListener(this::somethingChanged);
|
|
|
language.addListener(this::somethingChanged);
|
|
|
mountService.addListener(this::somethingChanged);
|
|
|
+ quickAccessService.addListener(this::somethingChanged);
|
|
|
lastSuccessfulUpdateCheck.addListener(this::somethingChanged);
|
|
|
}
|
|
|
|
|
@@ -174,7 +177,7 @@ public class Settings {
|
|
|
json.startHidden = startHidden.get();
|
|
|
json.autoCloseVaults = autoCloseVaults.get();
|
|
|
json.useKeychain = useKeychain.get();
|
|
|
- json.addToQuickAccess = addToQuickAccess.get();
|
|
|
+ json.useQuickAccess = useQuickAccess.get();
|
|
|
json.port = port.get();
|
|
|
json.numTrayNotifications = numTrayNotifications.get();
|
|
|
json.debugMode = debugMode.get();
|
|
@@ -190,6 +193,7 @@ public class Settings {
|
|
|
json.windowHeight = windowHeight.get();
|
|
|
json.language = language.get();
|
|
|
json.mountService = mountService.get();
|
|
|
+ json.quickAccessService = quickAccessService.get();
|
|
|
json.lastSuccessfulUpdateCheck = lastSuccessfulUpdateCheck.get();
|
|
|
return json;
|
|
|
}
|