rearranged view elements an renamed advancedSettings to expertSettings

src/main/resources/fxml/addvault_new_expert_settings.fxml

@@ -12,9 +12,11 @@
 <?import javafx.scene.layout.Region?>
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.layout.VBox?>
+<?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.layout.Pane?>
 <VBox xmlns:fx="http://javafx.com/fxml"
 	  xmlns="http://javafx.com/javafx"
-	  fx:controller="org.cryptomator.ui.addvaultwizard.CreateNewVaultAdvancedSettingsController"
+	  fx:controller="org.cryptomator.ui.addvaultwizard.CreateNewVaultExpertSettingsController"
 	  prefWidth="450"
 	  prefHeight="450"
 	  spacing="12"
@@ -23,10 +25,17 @@
 		<Insets topRightBottomLeft="24"/>
 	</padding>
 	<children>
-
 		<Region prefHeight="12" VBox.vgrow="NEVER"/>
-
-		<VBox spacing="6">
+		<VBox>
+			<Label text="%addvaultwizard.new.namePrompt"/>
+			<Label text="${controller.vaultName}" wrapText="true" styleClass="label-muted"/>
+			<Region prefHeight="4" VBox.vgrow="NEVER"/>
+			<Label text="%addvaultwizard.new.locationLabel"/>
+			<Label text="${controller.vaultPath}" wrapText="true" styleClass="label-muted"/>
+		</VBox>
+		<Region prefHeight="12" VBox.vgrow="NEVER"/>
+		<CheckBox fx:id="expertSettingsCheckBox" text="%addvaultwizard.new.enableExpertSettings.checkbox" onAction="#toggleUseExpertSettings"/>
+		<VBox spacing="6" visible="${expertSettingsCheckBox.selected}">
 			<HBox spacing="2" HBox.hgrow="NEVER">
 				<Label text="%addvaultwizard.new.shorteningThreshold.title"/>
 				<Region prefWidth="2"/>
@@ -55,13 +64,13 @@
 					</Label>
 				</StackPane>
 			</HBox>
+			<Label text="%addvaultwizard.new.shorteningThreshold.message"/>
 		</VBox>
-		<Label text="%addvaultwizard.new.shorteningThreshold.message"/>
 		<Region VBox.vgrow="ALWAYS"/>
 
 		<ButtonBar buttonMinWidth="120" buttonOrder="B+X">
 			<buttons>
-				<Button text="%generic.button.back" ButtonBar.buttonData="BACK_PREVIOUS" onAction="#back" disable="${!controller.validShorteningThreshold}"/>
+				<Button text="%generic.button.back" ButtonBar.buttonData="BACK_PREVIOUS" onAction="#back"/>
 				<Button text="%generic.button.next" ButtonBar.buttonData="NEXT_FORWARD" onAction="#next" defaultButton="true" disable="${!controller.validShorteningThreshold}"/>
 			</buttons>
 		</ButtonBar>

src/main/resources/fxml/addvault_new_location.fxml

@@ -51,10 +51,6 @@
 			<Label fx:id="locationStatusLabel" alignment="CENTER_RIGHT" wrapText="true" visible="${controller.anyRadioButtonSelected}" maxWidth="Infinity" graphicTextGap="6" />
 		</VBox>
 
-		<Region prefHeight="12" VBox.vgrow="NEVER"/>
-
-		<CheckBox fx:id="advancedSettingsCheckBox" text="%addvaultwizard.new.showAdvancedSettings.checkbox"/>
-
 		<Region VBox.vgrow="ALWAYS"/>
 
 		<ButtonBar buttonMinWidth="120" buttonOrder="B+X">

src/main/resources/i18n/strings.properties

@@ -63,11 +63,11 @@ addvaultwizard.new.validCharacters.message=The vault name may contain the follow
 addvaultwizard.new.validCharacters.chars=Word characters (e.g. a, ж or 수)
 addvaultwizard.new.validCharacters.numbers=Numbers
 addvaultwizard.new.validCharacters.dashes=Hyphen (%s) or underscore (%s)
-addvaultwizard.new.showAdvancedSettings.checkbox=Show advanced settings in next step
+addvaultwizard.new.enableExpertSettings.checkbox=Enable expert settings
 addvaultwizard.new.shorteningThreshold.title=Limit the length of encrypted file names.
 addvaultwizard.new.shorteningThreshold.tooltip=Open the documentation to learn more.
 addvaultwizard.new.shorteningThreshold.namePrompt=36-220
-addvaultwizard.new.shorteningThreshold.message=Enter a value between 36 and 220.
+addvaultwizard.new.shorteningThreshold.message=Enter a value between 36 and 220 (default 220).
 addvaultwizard.new.shorteningThreshold.invalid=Invalid
 addvaultwizard.new.shorteningThreshold.valid=Valid
 ### Password