Merge branch 'develop' into feature/modular

src/main/resources/fxml/health_check_list.fxml

@@ -3,17 +3,18 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ButtonBar?>
+<?import javafx.scene.control.CheckBox?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.ListView?>
 <?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.layout.VBox?>
 <?import java.lang.Integer?>
-<?import javafx.scene.layout.StackPane?>
-<?import javafx.scene.control.CheckBox?>
 <VBox xmlns:fx="http://javafx.com/fxml"
 	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.health.CheckListController"
-	  minHeight="145"
+	  prefWidth="600"
+	  prefHeight="400"
 	  spacing="12">
 	<padding>
 		<Insets topRightBottomLeft="12"/>
@@ -28,7 +29,7 @@
 				<CheckBox onAction="#toggleSelectAll" text="%health.checkList.selectAllBox" visible="${!controller.showResultScreen}" managed="${!controller.showResultScreen}" />
 				<ListView fx:id="checksListView" VBox.vgrow="ALWAYS"/>
 			</VBox>
-			<StackPane visible="${controller.showResultScreen}" managed="${controller.showResultScreen}" HBox.hgrow="ALWAYS" >
+			<StackPane visible="${controller.showResultScreen}" HBox.hgrow="ALWAYS" >
 				<VBox minWidth="300" alignment="CENTER" visible="${!controller.anyCheckSelected}" managed="${!controller.anyCheckSelected}" >
 					<Label text="%health.check.detail.noSelectedCheck" wrapText="true" alignment="CENTER" />
 				</VBox>
@@ -39,7 +40,7 @@
 			<buttons>
 				<Button text="%generic.button.cancel" ButtonBar.buttonData="CANCEL_CLOSE" onAction="#cancelCheck" disable="${!controller.running}" visible="${controller.showResultScreen}" managed="${controller.showResultScreen}" />
 				<Button text="%health.check.exportBtn" ButtonBar.buttonData="NEXT_FORWARD" defaultButton="true" disable="${!controller.finished}" visible="${controller.showResultScreen}" managed="${controller.showResultScreen}" onAction="#exportResults"/>
-				<Button text="%health.check.runBatchBtn" ButtonBar.buttonData="NEXT_FORWARD" defaultButton="true" onAction="#runSelectedChecks" disable="${controller.numberOfPickedChecks == ZERO}" visible="${!controller.showResultScreen}" managed="${!controller.showResultScreen}"/>
+				<Button text="%health.check.runBatchBtn" ButtonBar.buttonData="NEXT_FORWARD" defaultButton="true" onAction="#runSelectedChecks" disable="${controller.chosenTaskCount == ZERO}" visible="${!controller.showResultScreen}" managed="${!controller.showResultScreen}"/>
 			</buttons>
 		</ButtonBar>
 	</children>

src/main/resources/fxml/health_result_listcell.fxml

@@ -6,6 +6,10 @@
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.Region?>
+<?import javafx.scene.control.ProgressIndicator?>
+<?import javafx.scene.text.Text?>
+<?import javafx.scene.layout.Pane?>
+<?import javafx.scene.layout.StackPane?>
 <HBox xmlns:fx="http://javafx.com/fxml"
 	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.health.ResultListCellController"
@@ -18,12 +22,18 @@
 		<Insets topRightBottomLeft="6"/>
 	</padding>
 	<children>
-		<FontAwesome5IconView fx:id="iconView" HBox.hgrow="NEVER" glyphSize="16"/>
+		<FontAwesome5IconView fx:id="iconView" HBox.hgrow="NEVER" glyphSize="16" glyph="${controller.glyph}"/>
 		<Label text="${controller.description}"/>
 		<Region HBox.hgrow="ALWAYS"/>
 		<!-- TODO: setting the minWidth of the button is just a workaround.
 		           What we actually want to do is to prevent shrinking the button more than the text
 		           -> own subclass of HBox is needed -->
-		<Button fx:id="actionButton" text="%health.check.fixBtn" onAction="#runResultAction" alignment="CENTER" visible="false" minWidth="-Infinity"/>
+		<StackPane HBox.hgrow="NEVER">
+			<children>
+				<Button fx:id="fixButton" text="%health.check.fixBtn" visible="${controller.fixable}" managed="${controller.fixable}" onAction="#fix" alignment="CENTER" minWidth="-Infinity"/>
+				<ProgressIndicator progress="-1" prefWidth="12" prefHeight="12" visible="${controller.fixing}" managed="${controller.fixing}"/>
+				<FontAwesome5IconView glyph="CHECK" glyphSize="16" visible="${controller.fixed}" managed="${controller.fixed}"/>
+			</children>
+		</StackPane>
 	</children>
 </HBox>

src/main/resources/fxml/health_start.fxml

@@ -17,23 +17,25 @@
 		<Insets topRightBottomLeft="12"/>
 	</padding>
 	<children>
-		<Label text="%health.start.introduction" wrapText="true"/>
-
-		<!-- TODO: combine the two below labels to one and bind the properties accordingly or, preferably think about a new flow -->
-		<Label text="%health.start.configInvalid" visible="${controller.invalidConfig}" managed="${controller.invalidConfig}" wrapText="true" contentDisplay="LEFT">
+		<Label text="TODO loading config..." visible="${controller.loading}" managed="${controller.loading}" wrapText="true" contentDisplay="LEFT">
 			<graphic>
-				<FontAwesome5IconView glyph="TIMES" styleClass="glyph-icon-red" />
+				<FontAwesome5IconView glyph="SPINNER"/>
 			</graphic>
 		</Label>
-		<Label text="%health.start.configValid" visible="${!controller.invalidConfig}" managed="${!controller.invalidConfig}" wrapText="true" contentDisplay="LEFT">
+		<Label text="%health.start.configInvalid" visible="${controller.failed}" managed="${controller.failed}" wrapText="true" contentDisplay="LEFT">
 			<graphic>
-				<FontAwesome5IconView glyph="CHECK" styleClass="glyph-icon-primary" />
+				<FontAwesome5IconView glyph="TIMES" styleClass="glyph-icon-red"/>
+			</graphic>
+		</Label>
+		<Label text="%health.start.configValid" visible="${controller.loaded}" managed="${controller.loaded}" wrapText="true" contentDisplay="LEFT">
+			<graphic>
+				<FontAwesome5IconView glyph="CHECK" styleClass="glyph-icon-primary"/>
 			</graphic>
 		</Label>
 		<ButtonBar buttonMinWidth="120" buttonOrder="+CX">
 			<buttons>
 				<Button text="%generic.button.cancel" ButtonBar.buttonData="CANCEL_CLOSE" cancelButton="true" onAction="#close"/>
-				<Button text="%generic.button.next" ButtonBar.buttonData="NEXT_FORWARD" disable="${controller.invalidConfig}" defaultButton="true" onAction="#next"/>
+				<Button text="%generic.button.next" ButtonBar.buttonData="NEXT_FORWARD" disable="${!controller.loaded}" defaultButton="true" onAction="#next"/>
 			</buttons>
 		</ButtonBar>
 	</children>

src/main/resources/fxml/vault_options.fxml

@@ -36,12 +36,12 @@
 				<fx:include source="vault_options_masterkey.fxml"/>
 			</content>
 		</Tab>
-		<Tab fx:id="autoLockTab" id="AUTOLOCK" text="%vaultOptions.autoLock">
+		<Tab fx:id="healthTab" id="HEALTH" text="%vaultOptions.health">
 			<graphic>
-				<FontAwesome5IconView glyph="STOPWATCH"/>
+				<FontAwesome5IconView glyph="STETHOSCOPE"/>
 			</graphic>
 			<content>
-				<fx:include source="vault_options_autolock.fxml"/>
+				<fx:include source="vault_options_health.fxml"/>
 			</content>
 		</Tab>
 	</tabs>

src/main/resources/fxml/vault_options_autolock.fxml

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import org.cryptomator.ui.controls.FormattedLabel?>
-<?import org.cryptomator.ui.controls.NumericTextField?>
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.CheckBox?>
-<?import javafx.scene.layout.VBox?>
-<?import javafx.scene.text.Text?>
-<?import javafx.scene.text.TextFlow?>
-<VBox xmlns:fx="http://javafx.com/fxml"
-	  xmlns="http://javafx.com/javafx"
-	  fx:controller="org.cryptomator.ui.vaultoptions.AutoLockVaultOptionsController"
-	  spacing="6">
-	<padding>
-		<Insets topRightBottomLeft="12"/>
-	</padding>
-	<children>
-		<TextFlow styleClass="text-flow" prefWidth="-Infinity">
-			<CheckBox text="%vaultOptions.autoLock.lockAfterTimePart1" fx:id="lockAfterTimeCheckbox"/>
-			<Text text=" "/>
-			<NumericTextField fx:id="lockTimeInMinutesTextField" prefWidth="50"/>
-			<Text text=" "/>
-			<FormattedLabel format="%vaultOptions.autoLock.lockAfterTimePart2"/>
-		</TextFlow>
-	</children>
-</VBox>

src/main/resources/fxml/vault_options_general.fxml

@@ -8,6 +8,10 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.control.Button?>
+<?import javafx.scene.text.TextFlow?>
+<?import javafx.scene.text.Text?>
+<?import org.cryptomator.ui.controls.NumericTextField?>
+<?import org.cryptomator.ui.controls.FormattedLabel?>
 <VBox xmlns:fx="http://javafx.com/fxml"
 	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.vaultoptions.GeneralVaultOptionsController"
@@ -21,12 +25,19 @@
 			<TextField fx:id="vaultName"/>
 		</HBox>
 
+		<TextFlow styleClass="text-flow" prefWidth="-Infinity">
+			<CheckBox text="%vaultOptions.general.autoLock.lockAfterTimePart1" fx:id="lockAfterTimeCheckbox"/>
+			<Text text=" "/>
+			<NumericTextField fx:id="lockTimeInMinutesTextField" prefWidth="50"/>
+			<Text text=" "/>
+			<FormattedLabel format="%vaultOptions.general.autoLock.lockAfterTimePart2"/>
+		</TextFlow>
+
 		<CheckBox text="%vaultOptions.general.unlockAfterStartup" fx:id="unlockOnStartupCheckbox"/>
 
 		<HBox spacing="6" alignment="CENTER_LEFT">
 			<Label text="%vaultOptions.general.actionAfterUnlock"/>
 			<ChoiceBox fx:id="actionAfterUnlockChoiceBox"/>
 		</HBox>
-		<Button text="%vaultOptions.general.healthBtn" onAction="#showHealthCheck"/>
 	</children>
 </VBox>

src/main/resources/fxml/vault_options_health.fxml

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.shape.Box?>
+<?import javafx.scene.Group?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.collections.ObservableList?>
+<?import javafx.collections.FXCollections?>
+<?import javafx.scene.layout.RowConstraints?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.control.CheckBox?>
+<VBox xmlns:fx="http://javafx.com/fxml"
+	  xmlns="http://javafx.com/javafx"
+	  fx:controller="org.cryptomator.ui.vaultoptions.HealthVaultOptionsController"
+	  spacing="6">
+	<padding>
+		<Insets topRightBottomLeft="12"/>
+	</padding>
+	<children>
+		<Label text="%vaultOptions.health.introduction" wrapText="true"/>
+		<Label text="%vaultOptions.health.remarks" wrapText="true"/>
+		<GridPane >
+			<padding>
+				<Insets left="6"/>
+			</padding>
+			<columnConstraints>
+				<ColumnConstraints minWidth="20" halignment="LEFT"/>
+				<ColumnConstraints fillWidth="true"/>
+			</columnConstraints>
+			<rowConstraints>
+				<RowConstraints valignment="TOP"/>
+				<RowConstraints valignment="TOP"/>
+				<RowConstraints valignment="TOP"/>
+			</rowConstraints>
+			<Label text="1." GridPane.rowIndex="0" GridPane.columnIndex="0" />
+			<Label text="%vaultOptions.health.remarkSync" wrapText="true" GridPane.rowIndex="0" GridPane.columnIndex="1" />
+			<Label text="2." GridPane.rowIndex="1" GridPane.columnIndex="0" />
+			<Label text="%vaultOptions.health.remarkFix" wrapText="true" GridPane.rowIndex="1" GridPane.columnIndex="1" />
+			<Label text="3." GridPane.rowIndex="2" GridPane.columnIndex="0" />
+			<Label text="%vaultOptions.health.remarkBackup" wrapText="true" GridPane.rowIndex="2" GridPane.columnIndex="1" />
+		</GridPane>
+		<CheckBox text="%vaultOptions.health.affirmation" fx:id="affirmationBox"/>
+		<Button text="%vaultOptions.health.startBtn" disable="${!affirmationBox.selected}" onAction="#startHealthCheck"/>
+	</children>
+</VBox>