redesigned upgrade view

main/ui/src/main/java/org/cryptomator/ui/controllers/UpgradeController.java

@@ -77,6 +77,9 @@ public class UpgradeController extends LocalizedFXMLViewController {
 	private void vaultDidChange(Vault newVault) {
 		errorLabel.setText(null);
 		strategy.set(strategies.getUpgradeStrategy(newVault));
+		// trigger "default" change to refresh key bindings:
+		upgradeButton.setDefaultButton(false);
+		upgradeButton.setDefaultButton(true);
 	}
 
 	// ****************************************

main/ui/src/main/resources/fxml/upgrade.fxml

@@ -11,20 +11,38 @@
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.ProgressIndicator?>
 <?import javafx.scene.control.Button?>
-<?import javafx.scene.layout.VBox?>
 <?import org.cryptomator.ui.controls.SecPasswordField?>
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.Pane?>
+<?import javafx.scene.layout.HBox?>
 
-<VBox prefWidth="400.0" prefHeight="400.0" spacing="24.0" alignment="CENTER" xmlns:fx="http://javafx.com/fxml" cacheShape="true" cache="true">
+<GridPane vgap="12.0" hgap="12.0" prefWidth="400.0" xmlns:fx="http://javafx.com/fxml" cacheShape="true" cache="true">
+	<padding>
+		<Insets top="24.0" right="12.0" bottom="24.0" left="12.0" />
+	</padding>
 
-	<Label fx:id="upgradeLabel" textAlignment="CENTER" wrapText="true"/>
-	
-	<SecPasswordField fx:id="passwordField" prefWidth="300.0" cacheShape="true" cache="true" />
+	<columnConstraints>
+		<ColumnConstraints percentWidth="38.2" />
+		<ColumnConstraints percentWidth="61.8" />
+	</columnConstraints>
 
-	<Button fx:id="upgradeButton" text="%upgrade.button" prefWidth="150.0" onAction="#didClickUpgradeButton" cacheShape="true" cache="true" />
+	<children>
+		<Label fx:id="upgradeLabel" wrapText="true" GridPane.rowIndex="0" GridPane.columnIndex="0" GridPane.columnSpan="2" cacheShape="true" cache="true" />
 
-	<ProgressIndicator progress="-1" fx:id="progressIndicator" visible="false" cacheShape="true" cache="true" cacheHint="SPEED" />
-	
-	<Label fx:id="errorLabel" textAlignment="CENTER" wrapText="true"/>
-</VBox>
+		<Pane prefHeight="12.0" GridPane.rowIndex="1" GridPane.columnIndex="0" GridPane.columnSpan="2" cacheShape="true" cache="true">
+		</Pane>
 
+		<Label text="%unlock.label.password" cacheShape="true" cache="true" GridPane.rowIndex="2" GridPane.columnIndex="0" />
+		<SecPasswordField fx:id="passwordField" cacheShape="true" cache="true" GridPane.rowIndex="2" GridPane.columnIndex="1" />
 
+		<HBox alignment="CENTER_RIGHT" GridPane.hgrow="ALWAYS" GridPane.rowIndex="3" GridPane.columnIndex="0" GridPane.columnSpan="2" cacheShape="true" cache="true">
+			<Button fx:id="upgradeButton" text="%upgrade.button" prefWidth="150.0" onAction="#didClickUpgradeButton" cacheShape="true" cache="true" />
+		</HBox>
+
+		<ProgressIndicator progress="-1" fx:id="progressIndicator" visible="false" cacheShape="true" cache="true" cacheHint="SPEED" GridPane.rowIndex="4" GridPane.columnIndex="0" GridPane.columnSpan="2" />
+
+		<Label fx:id="errorLabel" wrapText="true" GridPane.rowIndex="5" GridPane.columnIndex="0" GridPane.columnSpan="2" cacheShape="true" cache="true" />
+	</children>
+</GridPane>