mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-17 10:11:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

quit refinements

Browse Source
This commit is contained in:
Sebastian Stenzel
2019-08-28 13:35:57 +02:00
parent 2900a9672a
commit d4e118f331
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
main/ui/src/main/java/org/cryptomator/ui/quit/QuitController.java
View File

@@ -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);
});

2
main/ui/src/main/java/org/cryptomator/ui/quit/QuitModule.java
View File

@@ -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;

10
main/ui/src/main/resources/fxml/quit.fxml
View File

@@ -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"/>