mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-19 03:01:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes #452 and fixes #143

Browse Source
This commit is contained in:
Sebastian Stenzel
2017-03-15 12:13:34 +01:00
parent 3f03d36ad6
commit 1985e2af72
5 changed files with 56 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockController.java
View File

@@ -324,8 +324,7 @@ public class UnlockController extends LocalizedFXMLViewController {
@FXML
private void didClickUnlockButton(ActionEvent event) {
mountName.setDisable(true);
advancedOptionsButton.setDisable(true);
advancedOptions.setDisable(true);
progressIndicator.setVisible(true);
downloadsPageLink.setVisible(false);
CharSequence password = passwordField.getCharacters();
@@ -376,8 +375,7 @@ public class UnlockController extends LocalizedFXMLViewController {
});
} finally {
Platform.runLater(() -> {
mountName.setDisable(false);
advancedOptionsButton.setDisable(false);
advancedOptions.setDisable(false);
progressIndicator.setVisible(false);
});
}

2
main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockedController.java
View File

@@ -92,7 +92,7 @@ public class UnlockedController extends LocalizedFXMLViewController {
return;
}
if (!vault.get().isMounted()) {
if (newVault.getVaultSettings().mountAfterUnlock().get() && !newVault.isMounted()) {
// TODO Markus Kreusch #393: hyperlink auf FAQ oder sowas?
messageLabel.setText(localization.getString("unlocked.label.mountFailed"));
}

19
main/ui/src/main/resources/css/linux_theme.css
View File

@@ -137,6 +137,10 @@
.text-input:focused {
-fx-background-color: COLOR_BORDER_DARK, #FFF;
}
.text-input:disabled {
-fx-background-color: COLOR_BORDER, COLOR_BACKGROUND;
-fx-text-fill: COLOR_TEXT_DISABLED;
}
/****************************************************************************
* *
@@ -310,7 +314,7 @@
}
.check-box > .box {
-fx-padding: 3px;
-fx-background-color: COLOR_BORDER_DARK, #FFF;
-fx-background-color: COLOR_BORDER, #FFF;
-fx-background-insets: 0, 1;
}
.check-box > .box > .mark {
@@ -318,12 +322,21 @@
-fx-padding: 4px;
-fx-shape: "M-1,4, L-1,5.5 L3.5,8.5 L9,0 L9,-1 L7,-1 L3,6 L1,4 Z";
}
.check-box:selected > .box {
-fx-background-color: COLOR_BORDER_DARK, COLOR_BACKGROUND;
/* armed: */
.check-box:armed > .box {
-fx-background-color: COLOR_BORDER_DARK, #FFF;
}
/* selected: */
.check-box:selected > .box > .mark {
-fx-background-color: COLOR_TEXT;
}
/* disabled: */
.check-box:disabled > .box {
-fx-background-color: COLOR_BORDER, COLOR_BACKGROUND;
}
.check-box:disabled:selected > .box > .mark {
-fx-background-color: COLOR_TEXT_DISABLED;
}
/*******************************************************************************
* *

21
main/ui/src/main/resources/css/mac_theme.css
View File

@@ -16,7 +16,7 @@
COLOR_TEXT: #000;
COLOR_TEXT_LIGHT: #888;
COLOR_TEXT_DISABLED: #B5B5B5;
COLOR_TEXT_DISABLED: #7B7B7B;
COLOR_HYPERLINK: #0069D9;
COLOR_BORDER: #C8C8C8;
COLOR_BORDER_DARK: #B5B5B5;
@@ -165,6 +165,10 @@
-fx-background-radius: 3, 0;
-fx-prompt-text-fill: transparent;
}
.text-input:disabled {
-fx-text-fill: COLOR_TEXT_DISABLED;
-fx-border-color: #CDCDCD;
}
/****************************************************************************
* *
@@ -400,6 +404,7 @@
-fx-padding: 4px;
-fx-shape: "M-1,4, L-1,5.5 L3.5,8.5 L9,0 L9,-1 L7,-1 L3,6 L1,4 Z";
}
/* selected: */
.root.active-window .check-box:selected > .box {
-fx-background-color: #2C90FC, #3B99FC;
-fx-background-insets: 0, 1;
@@ -410,6 +415,20 @@
.root.inactive-window .check-box:selected > .box > .mark {
-fx-background-color: #444444;
}
/* disabled: */
.check-box:disabled {
-fx-text-fill: COLOR_TEXT_DISABLED;
}
.root.active-window .check-box:disabled > .box,
.root.active-window .check-box:disabled:selected > .box,
.root.inactive-window .check-box:disabled > .box,
.root.inactive-window .check-box:disabled:selected > .box {
-fx-background-color: linear-gradient(to bottom, #BBBBBB 0%, #C2C2C2 100%), #E9E9E9, #F1F1F1;
}
.root.active-window .check-box:disabled:selected > .box > .mark,
.root.inactive-window .check-box:disabled:selected > .box > .mark {
-fx-background-color: COLOR_TEXT_DISABLED;
}
/****************************************************************************
* *

21
main/ui/src/main/resources/css/win_theme.css
View File

@@ -140,6 +140,10 @@
.text-input:focused {
-fx-background-color: COLOR_BORDER_FOCUS, #FFF;
}
.text-input:disabled {
-fx-background-color: COLOR_BORDER, #F1F1F1;
-fx-text-fill: COLOR_TEXT_DISABLED;
}
/****************************************************************************
* *
@@ -362,18 +366,27 @@
-fx-border-color: COLOR_BORDER;
-fx-background-color: #FFF;
}
.check-box:hover > .box,
.check-box:armed > .box {
-fx-border-color: COLOR_BORDER_FOCUS;
}
.check-box > .box > .mark {
-fx-background-color: transparent;
-fx-padding: 4px;
-fx-shape: "M-1,4, L-1,5.5 L3.5,8.5 L9,0 L9,-1 L7,-1 L3,6 L1,4 Z";
}
/* armed/hover: */
.check-box:hover > .box,
.check-box:armed > .box {
-fx-border-color: COLOR_BORDER_FOCUS;
}
/* selected: */
.check-box:selected > .box > .mark {
-fx-background-color: black;
}
/* disabled: */
.check-box:disabled > .box {
-fx-background-color: #F1F1F1;
}
.check-box:disabled:selected > .box > .mark {
-fx-background-color: COLOR_TEXT_DISABLED;
}
/*******************************************************************************
* *