mirror of
https://github.com/cryptomator/cryptomator.git
synced 2024-11-23 03:59:51 +00:00
changed wording to compact
This commit is contained in:
parent
31e9f3a025
commit
7771181e15
@ -60,7 +60,7 @@ public class Settings {
|
||||
public final ObjectProperty<NodeOrientation> 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();
|
||||
|
@ -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;
|
||||
|
@ -21,7 +21,7 @@ public class VaultListCellController implements FxController {
|
||||
|
||||
private final ObjectProperty<Vault> vault = new SimpleObjectProperty<>();
|
||||
private final ObservableValue<FontAwesome5Icon> 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) {
|
||||
|
@ -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<Vault> 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<? extends Vault> c) -> {
|
||||
|
@ -37,7 +37,7 @@ public class InterfacePreferencesController implements FxController {
|
||||
private final SupportedLanguages supportedLanguages;
|
||||
public ChoiceBox<UiTheme> themeChoiceBox;
|
||||
public CheckBox showTrayIconCheckbox;
|
||||
public CheckBox useCondensedModeCheckbox;
|
||||
public CheckBox compactModeCheckbox;
|
||||
public ChoiceBox<String> 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);
|
||||
|
@ -38,6 +38,6 @@
|
||||
</HBox>
|
||||
|
||||
<CheckBox fx:id="showTrayIconCheckbox" text="%preferences.interface.showTrayIcon" visible="${controller.trayMenuSupported}" managed="${controller.trayMenuSupported}"/>
|
||||
<CheckBox fx:id="useCondensedModeCheckbox" text="%preferences.interface.condensedVaultList"/>
|
||||
<CheckBox fx:id="compactModeCheckbox" text="%preferences.interface.compactMode"/>
|
||||
</children>
|
||||
</VBox>
|
||||
|
@ -23,7 +23,7 @@
|
||||
</VBox>
|
||||
<VBox spacing="4" HBox.hgrow="ALWAYS">
|
||||
<Label styleClass="header-label" text="${controller.vault.displayName}"/>
|
||||
<Label styleClass="detail-label" text="${controller.vault.displayablePath}" textOverrun="CENTER_ELLIPSIS" visible="${!controller.useCondensedMode}" managed="${!controller.useCondensedMode}">
|
||||
<Label styleClass="detail-label" text="${controller.vault.displayablePath}" textOverrun="CENTER_ELLIPSIS" visible="${!controller.compactMode}" managed="${!controller.compactMode}">
|
||||
<tooltip>
|
||||
<Tooltip text="${controller.vault.displayablePath}"/>
|
||||
</tooltip>
|
||||
|
@ -301,7 +301,7 @@ preferences.interface.interfaceOrientation=Interface Orientation
|
||||
preferences.interface.interfaceOrientation.ltr=Left to Right
|
||||
preferences.interface.interfaceOrientation.rtl=Right to Left
|
||||
preferences.interface.showTrayIcon=Show tray icon (requires restart)
|
||||
preferences.interface.condensedVaultList=Enable compact vault list
|
||||
preferences.interface.compactMode=Enable compact vault list
|
||||
## Volume
|
||||
preferences.volume=Virtual Drive
|
||||
preferences.volume.type=Default Volume Type
|
||||
|
Loading…
Reference in New Issue
Block a user