From 7771181e15bb2d0348d66d1f5d138445797eb9f6 Mon Sep 17 00:00:00 2001 From: Jan-Peter Klein Date: Mon, 23 Sep 2024 14:21:55 +0200 Subject: [PATCH] changed wording to compact --- .../org/cryptomator/common/settings/Settings.java | 8 ++++---- .../cryptomator/common/settings/SettingsJson.java | 4 ++-- .../ui/mainwindow/VaultListCellController.java | 12 ++++++------ .../ui/mainwindow/VaultListController.java | 6 +++--- .../preferences/InterfacePreferencesController.java | 4 ++-- src/main/resources/fxml/preferences_interface.fxml | 2 +- src/main/resources/fxml/vault_list_cell.fxml | 2 +- src/main/resources/i18n/strings.properties | 2 +- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/main/java/org/cryptomator/common/settings/Settings.java b/src/main/java/org/cryptomator/common/settings/Settings.java index 8b99f62e6..fb09e197c 100644 --- a/src/main/java/org/cryptomator/common/settings/Settings.java +++ b/src/main/java/org/cryptomator/common/settings/Settings.java @@ -60,7 +60,7 @@ public class Settings { public final ObjectProperty userInterfaceOrientation; public final StringProperty licenseKey; public final BooleanProperty showTrayIcon; - public final BooleanProperty useCondensedMode; + public final BooleanProperty compactMode; public final IntegerProperty windowXPosition; public final IntegerProperty windowYPosition; public final IntegerProperty windowWidth; @@ -97,7 +97,7 @@ public class Settings { this.userInterfaceOrientation = new SimpleObjectProperty<>(this, "userInterfaceOrientation", parseEnum(json.uiOrientation, NodeOrientation.class, NodeOrientation.LEFT_TO_RIGHT)); this.licenseKey = new SimpleStringProperty(this, "licenseKey", json.licenseKey); this.showTrayIcon = new SimpleBooleanProperty(this, "showTrayIcon", json.showTrayIcon); - this.useCondensedMode = new SimpleBooleanProperty(this, "useCondensedMode", json.useCondensedMode); + this.compactMode = new SimpleBooleanProperty(this, "compactMode", json.compactMode); this.windowXPosition = new SimpleIntegerProperty(this, "windowXPosition", json.windowXPosition); this.windowYPosition = new SimpleIntegerProperty(this, "windowYPosition", json.windowYPosition); this.windowWidth = new SimpleIntegerProperty(this, "windowWidth", json.windowWidth); @@ -124,7 +124,7 @@ public class Settings { userInterfaceOrientation.addListener(this::somethingChanged); licenseKey.addListener(this::somethingChanged); showTrayIcon.addListener(this::somethingChanged); - useCondensedMode.addListener(this::somethingChanged); + compactMode.addListener(this::somethingChanged); windowXPosition.addListener(this::somethingChanged); windowYPosition.addListener(this::somethingChanged); windowWidth.addListener(this::somethingChanged); @@ -178,7 +178,7 @@ public class Settings { json.uiOrientation = userInterfaceOrientation.get().name(); json.licenseKey = licenseKey.get(); json.showTrayIcon = showTrayIcon.get(); - json.useCondensedMode = useCondensedMode.get(); + json.compactMode = compactMode.get(); json.windowXPosition = windowXPosition.get(); json.windowYPosition = windowYPosition.get(); json.windowWidth = windowWidth.get(); diff --git a/src/main/java/org/cryptomator/common/settings/SettingsJson.java b/src/main/java/org/cryptomator/common/settings/SettingsJson.java index 8cbda3dc2..6479f1d78 100644 --- a/src/main/java/org/cryptomator/common/settings/SettingsJson.java +++ b/src/main/java/org/cryptomator/common/settings/SettingsJson.java @@ -54,8 +54,8 @@ class SettingsJson { @JsonProperty("showTrayIcon") boolean showTrayIcon; - @JsonProperty("useCondensedMode") - boolean useCondensedMode; + @JsonProperty("compactMode") + boolean compactMode; @JsonProperty("startHidden") boolean startHidden = Settings.DEFAULT_START_HIDDEN; diff --git a/src/main/java/org/cryptomator/ui/mainwindow/VaultListCellController.java b/src/main/java/org/cryptomator/ui/mainwindow/VaultListCellController.java index b842cdd2c..6b9461106 100644 --- a/src/main/java/org/cryptomator/ui/mainwindow/VaultListCellController.java +++ b/src/main/java/org/cryptomator/ui/mainwindow/VaultListCellController.java @@ -21,7 +21,7 @@ public class VaultListCellController implements FxController { private final ObjectProperty vault = new SimpleObjectProperty<>(); private final ObservableValue glyph; - private final BooleanBinding useCondensedMode; + private final BooleanBinding compactMode; private AutoAnimator spinAnimation; @@ -31,7 +31,7 @@ public class VaultListCellController implements FxController { @Inject VaultListCellController(Settings settings) { this.glyph = vault.flatMap(Vault::stateProperty).map(this::getGlyphForVaultState); - this.useCondensedMode = Bindings.createBooleanBinding(settings.useCondensedMode::get, settings.useCondensedMode); + this.compactMode = Bindings.createBooleanBinding(settings.compactMode::get, settings.compactMode); } public void initialize() { @@ -73,11 +73,11 @@ public class VaultListCellController implements FxController { return vault.get(); } - public BooleanBinding useCondensedModeProperty() { - return useCondensedMode; + public BooleanBinding compactModeProperty() { + return compactMode; } - public boolean isUseCondensedMode() { - return useCondensedMode.get(); + public boolean getCompactMode() { + return compactMode.get(); } public void setVault(Vault value) { diff --git a/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java b/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java index 0ea6642de..a8ffde016 100644 --- a/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java +++ b/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java @@ -71,7 +71,7 @@ public class VaultListController implements FxController { private final BooleanProperty draggingVaultOver = new SimpleBooleanProperty(); private final ResourceBundle resourceBundle; private final FxApplicationWindows appWindows; - private final BooleanBinding useCondensedMode; + private final BooleanBinding compactMode; public ListView vaultList; public StackPane root; @@ -104,7 +104,7 @@ public class VaultListController implements FxController { this.appWindows = appWindows; this.emptyVaultList = Bindings.isEmpty(vaults); - this.useCondensedMode = Bindings.createBooleanBinding(settings.useCondensedMode::get, settings.useCondensedMode); + this.compactMode = Bindings.createBooleanBinding(settings.compactMode::get, settings.compactMode); selectedVault.addListener(this::selectedVaultDidChange); } @@ -114,7 +114,7 @@ public class VaultListController implements FxController { vaultList.setCellFactory(cellFactory); vaultList.fixedCellSizeProperty().bind(Bindings.createDoubleBinding(() -> - useCondensedMode.get() ? 30.0 : 60.0, useCondensedMode)); + compactMode.get() ? 30.0 : 60.0, compactMode)); selectedVault.bind(vaultList.getSelectionModel().selectedItemProperty()); vaults.addListener((ListChangeListener.Change c) -> { diff --git a/src/main/java/org/cryptomator/ui/preferences/InterfacePreferencesController.java b/src/main/java/org/cryptomator/ui/preferences/InterfacePreferencesController.java index d90241c15..573bfc394 100644 --- a/src/main/java/org/cryptomator/ui/preferences/InterfacePreferencesController.java +++ b/src/main/java/org/cryptomator/ui/preferences/InterfacePreferencesController.java @@ -37,7 +37,7 @@ public class InterfacePreferencesController implements FxController { private final SupportedLanguages supportedLanguages; public ChoiceBox themeChoiceBox; public CheckBox showTrayIconCheckbox; - public CheckBox useCondensedModeCheckbox; + public CheckBox compactModeCheckbox; public ChoiceBox preferredLanguageChoiceBox; public ToggleGroup nodeOrientation; public RadioButton nodeOrientationLtr; @@ -64,7 +64,7 @@ public class InterfacePreferencesController implements FxController { themeChoiceBox.setConverter(new UiThemeConverter(resourceBundle)); showTrayIconCheckbox.selectedProperty().bindBidirectional(settings.showTrayIcon); - useCondensedModeCheckbox.selectedProperty().bindBidirectional(settings.useCondensedMode); + compactModeCheckbox.selectedProperty().bindBidirectional(settings.compactMode); preferredLanguageChoiceBox.getItems().addAll(supportedLanguages.getLanguageTags()); preferredLanguageChoiceBox.valueProperty().bindBidirectional(settings.language); diff --git a/src/main/resources/fxml/preferences_interface.fxml b/src/main/resources/fxml/preferences_interface.fxml index a48493bc7..36f58ebb3 100644 --- a/src/main/resources/fxml/preferences_interface.fxml +++ b/src/main/resources/fxml/preferences_interface.fxml @@ -38,6 +38,6 @@ - + diff --git a/src/main/resources/fxml/vault_list_cell.fxml b/src/main/resources/fxml/vault_list_cell.fxml index 579754eca..c6cc8cf24 100644 --- a/src/main/resources/fxml/vault_list_cell.fxml +++ b/src/main/resources/fxml/vault_list_cell.fxml @@ -23,7 +23,7 @@