浏览代码

quit refinements

Sebastian Stenzel 5 年之前
父节点
当前提交
d4e118f331

+ 3 - 0
main/ui/src/main/java/org/cryptomator/ui/quit/QuitController.java

@@ -83,6 +83,9 @@ public class QuitController implements FxController {
 				return null;
 			}
 		};
+		task.setOnScheduled(evt -> {
+			vault.setState(VaultState.PROCESSING);
+		});
 		task.setOnSucceeded(evt -> {
 			vault.setState(VaultState.LOCKED);
 		});

+ 1 - 1
main/ui/src/main/java/org/cryptomator/ui/quit/QuitModule.java

@@ -37,7 +37,7 @@ abstract class QuitModule {
 	static Stage provideStage(@Named("windowIcon") Optional<Image> windowIcon) {
 		Stage stage = new Stage();
 		stage.setMinWidth(300);
-		stage.setMinHeight(200);
+		stage.setMinHeight(100);
 		stage.initModality(Modality.APPLICATION_MODAL);
 		windowIcon.ifPresent(stage.getIcons()::add);
 		return stage;

+ 4 - 6
main/ui/src/main/resources/fxml/quit.fxml

@@ -2,24 +2,22 @@
 
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
 <?import javafx.scene.control.ProgressIndicator?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.Region?>
 <?import javafx.scene.layout.VBox?>
-<?import javafx.scene.text.Text?>
-<?import javafx.scene.text.TextFlow?>
 <VBox xmlns="http://javafx.com/javafx"
 	  xmlns:fx="http://javafx.com/fxml"
 	  fx:controller="org.cryptomator.ui.quit.QuitController"
 	  minWidth="300"
 	  spacing="6">
 	<padding>
-		<Insets bottom="6.0" left="6.0" right="6.0" top="6.0"/>
+		<Insets bottom="12.0" left="12.0" right="12.0" top="12.0"/>
 	</padding>
 	<children>
-		<TextFlow styleClass="text-flow">
-			<Text text="%quit.prompt"/>
-		</TextFlow>
+		<Label text="%quit.prompt" wrapText="true"/>
+		<Region VBox.vgrow="ALWAYS"/>
 		<HBox>
 			<Button text="%generic.button.cancel" cancelButton="true" onAction="#cancel"/>
 			<Region HBox.hgrow="ALWAYS"/>