From c8e22fe2e36b83691fca53aa6e94f29011019544 Mon Sep 17 00:00:00 2001
From: Tobias Hagemann <tobias@hagemann.org>
Date: Thu, 5 Sep 2019 15:27:34 +0200
Subject: [PATCH] updated reveal button in vault detail

---
 main/ui/src/main/resources/css/dark_theme.css |  4 ++++
 .../ui/src/main/resources/css/light_theme.css |  4 ++++
 .../src/main/resources/fxml/vault_detail.fxml | 20 +++++++++++--------
 .../main/resources/i18n/strings.properties    |  6 +++---
 .../main/resources/i18n/strings_de.properties |  6 +++---
 5 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/main/ui/src/main/resources/css/dark_theme.css b/main/ui/src/main/resources/css/dark_theme.css
index b8e8c1967..c98697dab 100644
--- a/main/ui/src/main/resources/css/dark_theme.css
+++ b/main/ui/src/main/resources/css/dark_theme.css
@@ -511,6 +511,10 @@
 	-fx-fill: TEXT_FILL_WHITE;
 }
 
+.button:default .label {
+	-fx-text-fill: TEXT_FILL_WHITE;
+}
+
 .button-large {
 	-fx-font-size: 1.25em;
 	-fx-padding: 0.6em 1.5em 0.6em 1.5em;
diff --git a/main/ui/src/main/resources/css/light_theme.css b/main/ui/src/main/resources/css/light_theme.css
index e3bbe9120..0985623db 100644
--- a/main/ui/src/main/resources/css/light_theme.css
+++ b/main/ui/src/main/resources/css/light_theme.css
@@ -511,6 +511,10 @@
 	-fx-fill: TEXT_FILL_WHITE;
 }
 
+.button:default .label {
+	-fx-text-fill: TEXT_FILL_WHITE;
+}
+
 .button-large {
 	-fx-font-size: 1.25em;
 	-fx-padding: 0.6em 1.5em 0.6em 1.5em;
diff --git a/main/ui/src/main/resources/fxml/vault_detail.fxml b/main/ui/src/main/resources/fxml/vault_detail.fxml
index ff94661ac..745d0ac5c 100644
--- a/main/ui/src/main/resources/fxml/vault_detail.fxml
+++ b/main/ui/src/main/resources/fxml/vault_detail.fxml
@@ -65,16 +65,20 @@
 			</Hyperlink>
 		</VBox>
 		<VBox alignment="CENTER" spacing="9" visible="${controller.vault.unlocked}" managed="${controller.vault.unlocked}">
-			<Label styleClass="label-large" text="%main.vaultDetail.accessLocation"/>
-			<FontAwesome5IconView styleClass="glyph-icon-secondary" glyph="HDD" glyphSize="32"/>
-			<Label styleClass="label-secondary" text="${controller.vault.accessPoint}"/>
-
-			<Region prefHeight="12" VBox.vgrow="NEVER"/>
-
-			<Button styleClass="button-large" text="%main.vaultDetail.revealBtn" minWidth="120" onAction="#revealAccessLocation" defaultButton="${controller.vault.unlocked}">
+			<Label text="%main.vaultDetail.accessLocation"/>
+			<Button styleClass="button-large" contentDisplay="GRAPHIC_ONLY" minWidth="120" onAction="#revealAccessLocation" defaultButton="${controller.vault.unlocked}">
 				<graphic>
-					<FontAwesome5IconView glyph="EYE" glyphSize="15"/>
+					<HBox spacing="12" alignment="CENTER">
+						<FontAwesome5IconView glyph="HDD" glyphSize="24"/>
+						<VBox spacing="4" alignment="CENTER_LEFT">
+							<Label text="%main.vaultDetail.revealBtn"/>
+							<Label styleClass="label-small" text="${controller.vault.accessPoint}" textOverrun="CENTER_ELLIPSIS"/>
+						</VBox>
+					</HBox>
 				</graphic>
+				<tooltip>
+					<Tooltip text="${controller.vault.accessPoint}"/>
+				</tooltip>
 			</Button>
 			<Button text="%main.vaultDetail.lockBtn" minWidth="120" onAction="#lock">
 				<graphic>
diff --git a/main/ui/src/main/resources/i18n/strings.properties b/main/ui/src/main/resources/i18n/strings.properties
index 0f7212054..ff5d8bfd4 100644
--- a/main/ui/src/main/resources/i18n/strings.properties
+++ b/main/ui/src/main/resources/i18n/strings.properties
@@ -75,7 +75,7 @@ unlock.savePassword=Save Password
 unlock.unlockBtn=Unlock
 ## Success
 unlock.success.message=Unlocked "%s" successfully! Your vault is now accessible.
-unlock.success.revealBtn=Reveal Vault Drive
+unlock.success.revealBtn=Reveal Vault
 ## Delete Saved Password Dialog
 unlock.deleteSavedPasswordDialog.title=Delete Saved Password
 unlock.deleteSavedPasswordDialog.header=Do you really want to delete the saved password of this vault?
@@ -112,9 +112,9 @@ main.vaultDetail.lockedStatus=LOCKED
 main.vaultDetail.unlockedStatus=UNLOCKED
 main.vaultDetail.unlockBtn=Unlock
 main.vaultDetail.optionsBtn=Vault Options
-main.vaultDetail.revealBtn=Reveal
+main.vaultDetail.accessLocation=Your vault's contents are accessible here:
+main.vaultDetail.revealBtn=Reveal Drive
 main.vaultDetail.lockBtn=Lock
-main.vaultDetail.accessLocation=Access Location
 main.vaultDetail.bytesPerSecondRead=read:
 main.vaultDetail.bytesPerSecondWritten=written:
 main.vaultDetail.throughput.idle=idle
diff --git a/main/ui/src/main/resources/i18n/strings_de.properties b/main/ui/src/main/resources/i18n/strings_de.properties
index 2781b8513..a862effe3 100644
--- a/main/ui/src/main/resources/i18n/strings_de.properties
+++ b/main/ui/src/main/resources/i18n/strings_de.properties
@@ -75,7 +75,7 @@ unlock.savePassword=Passwort speichern
 unlock.unlockBtn=Entsperren
 ## Success
 unlock.success.message="%s" erfolgreich ensperrt!
-unlock.success.revealBtn=Tresorlaufwerk anzeigen
+unlock.success.revealBtn=Tresor anzeigen
 ## Delete Saved Password Dialog
 unlock.deleteSavedPasswordDialog.title=Gespeichertes Passwort vergessen
 unlock.deleteSavedPasswordDialog.header=Soll das Passwort wirklich vergessen werden?
@@ -112,9 +112,9 @@ main.vaultDetail.lockedStatus=GESPERRT
 main.vaultDetail.unlockedStatus=ENTSPERRT
 main.vaultDetail.unlockBtn=Entsperren
 main.vaultDetail.optionsBtn=Tresoroptionen
-main.vaultDetail.revealBtn=Anzeigen
+main.vaultDetail.accessLocation=Dein Tresorinhalt ist hier erreichbar:
+main.vaultDetail.revealBtn=Laufwerk anzeigen
 main.vaultDetail.lockBtn=Sperren
-main.vaultDetail.accessLocation=Tresorlaufwerk
 main.vaultDetail.bytesPerSecondRead=gelesen:
 main.vaultDetail.bytesPerSecondWritten=geschrieben:
 main.vaultDetail.throughput.idle=idle