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

added checkmark icon to unlock success

Browse Source
This commit is contained in:
Tobias Hagemann
2019-08-27 12:57:51 +02:00
parent 8939b196c0
commit 4130dbea91
5 changed files with 37 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
main/ui/src/main/resources/css/dark_theme.css
View File

@@ -91,6 +91,14 @@
-fx-fill: TEXT_FILL;
}
.glyph-icon-main-bg {
-fx-fill: MAIN_BG;
}
.glyph-icon-primary {
-fx-fill: TEXT_FILL_PRIMARY;
}
.glyph-icon-secondary {
-fx-fill: TEXT_FILL_SECONDARY;
}
@@ -321,14 +329,6 @@
* *
******************************************************************************/
.vault-detail .vault-status-circle {
-fx-fill: SECONDARY;
}
.vault-detail .vault-status-icon {
-fx-fill: MAIN_BG;
}
.vault-detail .vault-name {
-fx-font-family: 'Open Sans SemiBold';
-fx-font-size: 1.5em;

16
main/ui/src/main/resources/css/light_theme.css
View File

@@ -91,6 +91,14 @@
-fx-fill: TEXT_FILL;
}
.glyph-icon-main-bg {
-fx-fill: MAIN_BG;
}
.glyph-icon-primary {
-fx-fill: TEXT_FILL_PRIMARY;
}
.glyph-icon-secondary {
-fx-fill: TEXT_FILL_SECONDARY;
}
@@ -321,14 +329,6 @@
* *
******************************************************************************/
.vault-detail .vault-status-circle {
-fx-fill: SECONDARY;
}
.vault-detail .vault-status-icon {
-fx-fill: MAIN_BG;
}
.vault-detail .vault-name {
-fx-font-family: 'Open Sans SemiBold';
-fx-font-size: 1.5em;

6
main/ui/src/main/resources/fxml/addvault_welcome.fxml
View File

@@ -4,7 +4,7 @@
<?import javafx.scene.control.Button?>
<?import javafx.scene.image.Image?>
<?import javafx.scene.image.ImageView?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.FlowPane?>
<?import javafx.scene.layout.Region?>
<?import javafx.scene.layout.VBox?>
<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
@@ -27,7 +27,7 @@
<Region prefHeight="12" VBox.vgrow="NEVER"/>
<HBox alignment="CENTER" spacing="6">
<FlowPane alignment="CENTER" hgap="9" vgap="9">
<Button styleClass="button-large" text="%addvaultwizard.welcome.newButton" onAction="#createNewVault">
<graphic>
<FontAwesome5IconView glyph="PLUS" glyphSize="15"/>
@@ -38,6 +38,6 @@
<FontAwesome5IconView glyph="SEARCH" glyphSize="15"/>
</graphic>
</Button>
</HBox>
</FlowPane>
</children>
</VBox>

17
main/ui/src/main/resources/fxml/unlock_success.fxml
View File

@@ -4,9 +4,12 @@
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.ProgressIndicator?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.Region?>
<?import javafx.scene.layout.StackPane?>
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Text?>
<?import javafx.scene.text.TextFlow?>
<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
<VBox xmlns="http://javafx.com/javafx"
xmlns:fx="http://javafx.com/fxml"
fx:controller="org.cryptomator.ui.unlock.UnlockSuccessController"
@@ -17,11 +20,23 @@
<Insets bottom="12.0" left="12.0" right="12.0" top="12.0"/>
</padding>
<children>
<TextFlow styleClass="text-flow">
<Region VBox.vgrow="NEVER"/>
<StackPane alignment="CENTER">
<FontAwesome5IconView styleClass="glyph-icon-primary" glyph="CIRCLE" HBox.hgrow="NEVER" glyphSize="64"/>
<FontAwesome5IconView styleClass="glyph-icon-main-bg" glyph="CHECK" HBox.hgrow="NEVER" glyphSize="32"/>
</StackPane>
<Region VBox.vgrow="NEVER"/>
<TextFlow styleClass="text-flow" textAlignment="CENTER">
<Text text="TODO Unlocked &quot;"/>
<Text text="${controller.vault.displayableName}"/>
<Text text="&quot; successfully! Your vault is now accessible at &quot;TODO&quot;."/>
</TextFlow>
<Region VBox.vgrow="NEVER"/>
<HBox alignment="CENTER_RIGHT" spacing="9">
<Button text="%generic.button.done" cancelButton="true" onAction="#close"/>
<Button text="%unlock.success.reveal" defaultButton="true" onAction="#revealAndClose" contentDisplay="${controller.revealButtonState}">

4
main/ui/src/main/resources/fxml/vault_detail.fxml
View File

@@ -36,8 +36,8 @@
</padding>
<children>
<StackPane alignment="CENTER">
<FontAwesome5IconView styleClass="vault-status-circle" glyph="CIRCLE" HBox.hgrow="NEVER" glyphSize="32"/>
<FontAwesome5IconView styleClass="vault-status-icon" glyph="${controller.glyph}" HBox.hgrow="NEVER" glyphSize="16"/>
<FontAwesome5IconView styleClass="glyph-icon-secondary" glyph="CIRCLE" HBox.hgrow="NEVER" glyphSize="32"/>
<FontAwesome5IconView styleClass="glyph-icon-main-bg" glyph="${controller.glyph}" HBox.hgrow="NEVER" glyphSize="16"/>
</StackPane>
<VBox spacing="4" HBox.hgrow="ALWAYS">
<Label styleClass="vault-name" text="${controller.vault.displayableName}">