From 268bae88792c771c6bb99ef75deb2e9bf45c5581 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Tue, 3 Nov 2020 12:13:22 +0100
Subject: [PATCH] Change Invalid mount point error window: * Add heading *
 change icon to times_with_circle * reformat text

---
 .../org/cryptomator/ui/controls/FontAwesome5Icon.java     | 1 +
 .../main/resources/fxml/unlock_invalid_mount_point.fxml   | 5 +++--
 main/ui/src/main/resources/i18n/strings.properties        | 8 +++++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/controls/FontAwesome5Icon.java b/main/ui/src/main/java/org/cryptomator/ui/controls/FontAwesome5Icon.java
index f4d0d058a..0a199fb48 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/controls/FontAwesome5Icon.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/controls/FontAwesome5Icon.java
@@ -39,6 +39,7 @@ public enum FontAwesome5Icon {
 	SPINNER("\uF110"), //
 	SYNC("\uF021"), //
 	TIMES("\uF00D"), //
+	TIMES_CIRCLE("\uF057"), //
 	TRASH("\uF1F8"), //
 	UNLINK("\uf127"), //
 	WRENCH("\uF0AD"), //
diff --git a/main/ui/src/main/resources/fxml/unlock_invalid_mount_point.fxml b/main/ui/src/main/resources/fxml/unlock_invalid_mount_point.fxml
index 707bef240..9d56a32e7 100644
--- a/main/ui/src/main/resources/fxml/unlock_invalid_mount_point.fxml
+++ b/main/ui/src/main/resources/fxml/unlock_invalid_mount_point.fxml
@@ -10,6 +10,7 @@
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.shape.Circle?>
+<?import javafx.scene.text.Text?>
 <VBox xmlns:fx="http://javafx.com/fxml"
 	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.unlock.UnlockInvalidMountPointController"
@@ -23,10 +24,10 @@
 	<children>
 		<HBox spacing="12" VBox.vgrow="ALWAYS">
 			<StackPane alignment="CENTER" HBox.hgrow="NEVER">
-				<Circle styleClass="glyph-icon-primary" radius="24"/>
-				<FontAwesome5IconView styleClass="glyph-icon-white" glyph="EXCLAMATION" glyphSize="24"/>
+				<FontAwesome5IconView styleClass="glyph-icon-red" glyph="TIMES_CIRCLE" glyphSize="67"/>
 			</StackPane>
 			<VBox spacing="6" HBox.hgrow="ALWAYS">
+				<Text text="%unlock.error.heading" styleClass="label-large"/>
 				<FormattedLabel visible="${controller.mustExist}" managed="${controller.mustExist}" format="%unlock.error.invalidMountPoint.notExisting" arg1="${controller.mountPoint}" wrapText="true"/>
 				<FormattedLabel visible="${!controller.mustExist}" managed="${!controller.mustExist}" format="%unlock.error.invalidMountPoint.existing" arg1="${controller.mountPoint}" wrapText="true"/>
 			</VBox>
diff --git a/main/ui/src/main/resources/i18n/strings.properties b/main/ui/src/main/resources/i18n/strings.properties
index 3805399aa..0767db7e5 100644
--- a/main/ui/src/main/resources/i18n/strings.properties
+++ b/main/ui/src/main/resources/i18n/strings.properties
@@ -102,9 +102,11 @@ unlock.unlockBtn=Unlock
 unlock.success.message=Unlocked "%s" successfully! Your vault is now accessible.
 unlock.success.rememberChoice=Remember choice, don't show this again
 unlock.success.revealBtn=Reveal Vault
-## Invalid Mount Point
-unlock.error.invalidMountPoint.notExisting=Mount point is not an empty directory or doesn't exist: %s
-unlock.error.invalidMountPoint.existing=Mount point/folder already exists or parent folder is missing: %s
+## Failure
+unlock.error.heading=Unable to unlock vault
+### Invalid Mount Point
+unlock.error.invalidMountPoint.notExisting=Mount point "%s" is not a directory, not empty or does not exist.
+unlock.error.invalidMountPoint.existing=Mount point "%s" already exists or parent folder is missing.
 
 # Migration
 migration.title=Upgrade Vault