From b3a96aed745c491834b241d8094b81e34e1a9d69 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Wed, 28 Aug 2019 13:19:24 +0200 Subject: [PATCH] WebDavScheme setting only shown under linux --- .../ui/preferences/VolumePreferencesController.java | 12 ++++++++++++ .../src/main/resources/fxml/preferences_volume.fxml | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/VolumePreferencesController.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/VolumePreferencesController.java index 079727b29..691035bd3 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/preferences/VolumePreferencesController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/VolumePreferencesController.java @@ -2,10 +2,12 @@ package org.cryptomator.ui.preferences; import javafx.beans.binding.Bindings; import javafx.beans.binding.BooleanBinding; +import javafx.beans.property.SimpleBooleanProperty; import javafx.scene.control.Button; import javafx.scene.control.ChoiceBox; import javafx.scene.control.TextField; import javafx.util.StringConverter; +import org.apache.commons.lang3.SystemUtils; import org.cryptomator.common.settings.Settings; import org.cryptomator.common.settings.VolumeImpl; import org.cryptomator.common.settings.WebDavUrlScheme; @@ -19,6 +21,7 @@ public class VolumePreferencesController implements FxController { private final Settings settings; private final BooleanBinding showWebDavSettings; + private final BooleanBinding showWebDavScheme; public ChoiceBox volumeTypeChoicBox; public TextField webDavPortField; public Button changeWebDavPortButton; @@ -28,6 +31,7 @@ public class VolumePreferencesController implements FxController { VolumePreferencesController(Settings settings) { this.settings = settings; this.showWebDavSettings = Bindings.equal(settings.preferredVolumeImpl(), VolumeImpl.WEBDAV); + this.showWebDavScheme = showWebDavSettings.and(new SimpleBooleanProperty(SystemUtils.IS_OS_LINUX)); //TODO: remove SystemUtils } public void initialize() { @@ -68,6 +72,14 @@ public class VolumePreferencesController implements FxController { return showWebDavSettings.get(); } + public BooleanBinding showWebDavSchemeProperty() { + return showWebDavScheme; + } + + public Boolean getShowWebDavScheme() { + return showWebDavScheme.get(); + } + /* Helper classes */ private static class WebDavUrlSchemeConverter extends StringConverter { diff --git a/main/ui/src/main/resources/fxml/preferences_volume.fxml b/main/ui/src/main/resources/fxml/preferences_volume.fxml index b5fc82330..06a6ac0a0 100644 --- a/main/ui/src/main/resources/fxml/preferences_volume.fxml +++ b/main/ui/src/main/resources/fxml/preferences_volume.fxml @@ -26,7 +26,7 @@