mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-09-02 22:26:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2789 from cryptomator/feature/2786-only-restart-macfuset

Browse Source 
Feature: Only require app restart if switching between macFUSE and FUSE-T
This commit is contained in:
Armin Schrenk
2023-03-30 11:23:09 +02:00
committed by GitHub
parent ea2a48771f 827f9ad141
commit dfe17569e1
7 changed files with 86 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/css/dark_theme.css
+4
View File
@@ -116,6 +116,10 @@
-fx-font-size: 0.64em;
}
.label-red {
-fx-text-fill: RED_5;
}
.text-flow > * {
-fx-fill: TEXT_FILL;
}
src/main/resources/css/light_theme.css
+4
View File
@@ -116,6 +116,10 @@
-fx-font-size: 0.64em;
}
.label-red {
-fx-text-fill: RED_5;
}
.text-flow > * {
-fx-fill: TEXT_FILL;
}
src/main/resources/fxml/preferences_volume.fxml
+3 -1
View File
@@ -8,9 +8,9 @@
<?import javafx.scene.control.Hyperlink?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.Separator?>
<?import javafx.scene.control.Tooltip?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.control.Tooltip?>
<VBox xmlns:fx="http://javafx.com/fxml"
xmlns="http://javafx.com/javafx"
fx:controller="org.cryptomator.ui.preferences.VolumePreferencesController"
@@ -32,6 +32,8 @@
</Hyperlink>
</HBox>
<Label styleClass="label-red" text="%preferences.volume.fuseRestartRequired" visible="${controller.fuseRestartRequired}" managed="${controller.fuseRestartRequired}"/>
<HBox spacing="12" alignment="CENTER_LEFT" visible="${controller.loopbackPortSupported}" managed="${controller.loopbackPortSupported}">
<Label text="%preferences.volume.tcp.port"/>
<NumericTextField fx:id="loopbackPortField"/>
src/main/resources/i18n/strings.properties
+2 -1
View File
@@ -275,9 +275,10 @@ preferences.interface.showMinimizeButton=Show minimize button
preferences.interface.showTrayIcon=Show tray icon (requires restart)
## Volume
preferences.volume=Virtual Drive
preferences.volume.type=Volume Type (requires restart)
preferences.volume.type=Volume Type
preferences.volume.type.automatic=Automatic
preferences.volume.docsTooltip=Open the documentation to learn more about the different volume types.
preferences.volume.fuseRestartRequired=To apply the changes, Cryptomator needs to be restarted.
preferences.volume.tcp.port=TCP Port
preferences.volume.supportedFeatures=The chosen volume type supports the following features:
preferences.volume.feature.mountAuto=Automatic mount point selection