From 5ef0dc55051da2684610a17ac8e9613fd58a203a Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Thu, 29 Aug 2019 14:15:49 +0200
Subject: [PATCH] same design for unlock success and remove vault dialog

---
 .../src/main/resources/fxml/remove_vault.fxml | 36 ++++++++++---------
 main/ui/src/main/resources/fxml/unlock2.fxml  | 26 +++++++-------
 .../main/resources/fxml/unlock_success.fxml   | 25 +++++++------
 3 files changed, 47 insertions(+), 40 deletions(-)

diff --git a/main/ui/src/main/resources/fxml/remove_vault.fxml b/main/ui/src/main/resources/fxml/remove_vault.fxml
index eb4f2f067..d0ae78fe3 100644
--- a/main/ui/src/main/resources/fxml/remove_vault.fxml
+++ b/main/ui/src/main/resources/fxml/remove_vault.fxml
@@ -4,6 +4,7 @@
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ButtonBar?>
 <?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.Region?>
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.layout.VBox?>
@@ -12,31 +13,32 @@
 <VBox xmlns="http://javafx.com/javafx"
 	  xmlns:fx="http://javafx.com/fxml"
 	  fx:controller="org.cryptomator.ui.removevault.RemoveVaultController"
-	  prefWidth="400.0"
-	  prefHeight="350.0"
-	  spacing="12.0"
-	  alignment="TOP_CENTER">
+	  minWidth="450"
+	  maxWidth="450"
+	  minHeight="150"
+	  spacing="12">
 	<padding>
-		<Insets top="24" right="24" bottom="24" left="24"/>
+		<Insets bottom="12.0" left="12.0" right="12.0" top="24.0"/>
 	</padding>
 	<children>
-		<Region prefHeight="24" VBox.vgrow="NEVER"/>
+		<HBox spacing="24">
+			<StackPane alignment="CENTER" HBox.hgrow="NEVER">
+				<VBox.margin>
+					<Insets topRightBottomLeft="12"/>
+				</VBox.margin>
+				<Circle styleClass="glyph-icon-primary" radius="24"/>
+				<FontAwesome5IconView styleClass="glyph-icon-main-bg" glyph="QUESTION" glyphSize="24"/>
+			</StackPane>
 
-		<StackPane alignment="CENTER">
-			<VBox.margin>
-				<Insets topRightBottomLeft="24"/>
-			</VBox.margin>
-			<Circle styleClass="glyph-icon-primary" radius="32"/>
-			<FontAwesome5IconView styleClass="glyph-icon-main-bg" glyph="QUESTION" glyphSize="32"/>
-		</StackPane>
-		<Label text="%removeVault.information" wrapText="true" labelFor="$confirmButton"/>
+			<Label text="%removeVault.information" wrapText="true" textAlignment="LEFT" HBox.hgrow="ALWAYS"/>
+		</HBox>
 
 		<Region VBox.vgrow="ALWAYS"/>
 
-		<ButtonBar buttonMinWidth="120" buttonOrder="C+I">
+		<ButtonBar buttonMinWidth="120" buttonOrder="+CI">
 			<buttons>
-				<Button text="%generic.button.back" ButtonBar.buttonData="CANCEL_CLOSE" onAction="#close"/>
-				<Button fx:id="confirmButton" text="%generic.button.confirm" ButtonBar.buttonData="FINISH" onAction="#finish" defaultButton="true"/>
+				<Button text="%generic.button.cancel" ButtonBar.buttonData="CANCEL_CLOSE" cancelButton="true" onAction="#close"/>
+				<Button text="%generic.button.confirm" ButtonBar.buttonData="FINISH" defaultButton="true" onAction="#finish"/>
 			</buttons>
 		</ButtonBar>
 	</children>
diff --git a/main/ui/src/main/resources/fxml/unlock2.fxml b/main/ui/src/main/resources/fxml/unlock2.fxml
index 9198cb58b..6111ed6c6 100644
--- a/main/ui/src/main/resources/fxml/unlock2.fxml
+++ b/main/ui/src/main/resources/fxml/unlock2.fxml
@@ -2,18 +2,18 @@
 
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ButtonBar?>
 <?import javafx.scene.control.CheckBox?>
 <?import javafx.scene.control.ProgressIndicator?>
-<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.Region?>
 <?import javafx.scene.layout.VBox?>
 <?import org.cryptomator.ui.controls.FormattedLabel?>
 <?import org.cryptomator.ui.controls.SecPasswordField?>
-<?import javafx.scene.layout.Region?>
 <VBox xmlns="http://javafx.com/javafx"
 	  xmlns:fx="http://javafx.com/fxml"
 	  fx:controller="org.cryptomator.ui.unlock.UnlockController"
-	  minWidth="350"
-	  maxWidth="350"
+	  minWidth="450"
+	  maxWidth="450"
 	  minHeight="150"
 	  spacing="6">
 	<padding>
@@ -26,13 +26,15 @@
 
 		<Region VBox.vgrow="ALWAYS"/>
 
-		<HBox alignment="CENTER_RIGHT" spacing="9">
-			<Button text="%generic.button.cancel" cancelButton="true" onAction="#cancel"/>
-			<Button text="%unlock.unlockBtn" defaultButton="true" onAction="#unlock" contentDisplay="${controller.unlockButtonState}" disable="${controller.unlockButtonDisabled}">
-				<graphic>
-					<ProgressIndicator progress="-1" prefWidth="12" prefHeight="12"/>
-				</graphic>
-			</Button>
-		</HBox>
+		<ButtonBar buttonMinWidth="120" buttonOrder="+CI">
+			<buttons>
+				<Button text="%generic.button.cancel" ButtonBar.buttonData="CANCEL_CLOSE" cancelButton="true" onAction="#cancel"/>
+				<Button text="%unlock.unlockBtn" ButtonBar.buttonData="FINISH" defaultButton="true" onAction="#unlock" contentDisplay="${controller.unlockButtonState}" disable="${controller.unlockButtonDisabled}">
+					<graphic>
+						<ProgressIndicator progress="-1" prefWidth="12" prefHeight="12"/>
+					</graphic>
+				</Button>
+			</buttons>
+		</ButtonBar>
 	</children>
 </VBox>
diff --git a/main/ui/src/main/resources/fxml/unlock_success.fxml b/main/ui/src/main/resources/fxml/unlock_success.fxml
index f8784b501..a43b85ac4 100644
--- a/main/ui/src/main/resources/fxml/unlock_success.fxml
+++ b/main/ui/src/main/resources/fxml/unlock_success.fxml
@@ -2,19 +2,20 @@
 
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ButtonBar?>
 <?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.shape.Circle?>
 <?import org.cryptomator.ui.controls.FontAwesome5IconView?>
 <?import org.cryptomator.ui.controls.FormattedLabel?>
-<?import javafx.scene.shape.Circle?>
 <VBox xmlns="http://javafx.com/javafx"
 	  xmlns:fx="http://javafx.com/fxml"
 	  fx:controller="org.cryptomator.ui.unlock.UnlockSuccessController"
-	  minWidth="350"
-	  maxWidth="350"
+	  minWidth="450"
+	  maxWidth="450"
 	  minHeight="150"
 	  spacing="12">
 	<padding>
@@ -35,13 +36,15 @@
 
 		<Region VBox.vgrow="ALWAYS"/>
 
-		<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}">
-				<graphic>
-					<ProgressIndicator progress="-1" prefWidth="12" prefHeight="12"/>
-				</graphic>
-			</Button>
-		</HBox>
+		<ButtonBar buttonMinWidth="120" buttonOrder="+CI">
+			<buttons>
+				<Button text="%generic.button.done" ButtonBar.buttonData="CANCEL_CLOSE" cancelButton="true" onAction="#close"/>
+				<Button text="%unlock.success.reveal" ButtonBar.buttonData="FINISH" defaultButton="true" onAction="#revealAndClose" contentDisplay="${controller.revealButtonState}">
+					<graphic>
+						<ProgressIndicator progress="-1" prefWidth="12" prefHeight="12"/>
+					</graphic>
+				</Button>
+			</buttons>
+		</ButtonBar>
 	</children>
 </VBox>