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

hide/disable interactive elements when vault is processing

Browse Source
This commit is contained in:
Tobias Hagemann
2020-04-28 17:05:00 +02:00
parent 8d2fe2fc03
commit 1702c6a243
5 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main/ui/src/main/resources/css/dark_theme.css
View File

@@ -854,7 +854,7 @@
.progress-bar > .bar { .progress-bar > .bar {
-fx-background-color: CONTROL_PRIMARY_BG_NORMAL; -fx-background-color: CONTROL_PRIMARY_BG_NORMAL;
-fx-background-radius: 4px; -fx-background-radius: 4px;
-fx-padding: 0.5em; -fx-padding: 1em 0.5em;
} }
.progress-bar:indeterminate > .bar { .progress-bar:indeterminate > .bar {

2
main/ui/src/main/resources/css/light_theme.css
View File

@@ -853,7 +853,7 @@
.progress-bar > .bar { .progress-bar > .bar {
-fx-background-color: CONTROL_PRIMARY_BG_NORMAL; -fx-background-color: CONTROL_PRIMARY_BG_NORMAL;
-fx-background-radius: 4px; -fx-background-radius: 4px;
-fx-padding: 0.5em; -fx-padding: 1em 0.5em;
} }
.progress-bar:indeterminate > .bar { .progress-bar:indeterminate > .bar {

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

@@ -3,6 +3,7 @@
<?import javafx.geometry.Insets?> <?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?> <?import javafx.scene.control.Button?>
<?import javafx.scene.control.ButtonBar?> <?import javafx.scene.control.ButtonBar?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.ProgressBar?> <?import javafx.scene.control.ProgressBar?>
<?import javafx.scene.control.ProgressIndicator?> <?import javafx.scene.control.ProgressIndicator?>
<?import javafx.scene.layout.VBox?> <?import javafx.scene.layout.VBox?>
@@ -19,17 +20,20 @@
<Insets topRightBottomLeft="12"/> <Insets topRightBottomLeft="12"/>
</padding> </padding>
<children> <children>
<VBox spacing="6"> <VBox spacing="6" visible="${!controller.vault.processing}" managed="${!controller.vault.processing}">
<FormattedLabel format="%migration.run.enterPassword" arg1="${controller.vault.displayableName}" wrapText="true"/> <FormattedLabel format="%migration.run.enterPassword" arg1="${controller.vault.displayableName}" wrapText="true"/>
<NiceSecurePasswordField fx:id="passwordField"/> <NiceSecurePasswordField fx:id="passwordField"/>
</VBox> </VBox>
<ProgressBar progress="${controller.migrationProgress}" prefWidth="Infinity" visible="${controller.vault.processing}"/> <VBox spacing="6" visible="${controller.vault.processing}" managed="${controller.vault.processing}">
<Label text="%migration.run.progressHint" wrapText="true"/>
<ProgressBar progress="${controller.migrationProgress}" prefWidth="Infinity"/>
</VBox>
<VBox alignment="BOTTOM_CENTER" VBox.vgrow="ALWAYS"> <VBox alignment="BOTTOM_CENTER" VBox.vgrow="ALWAYS">
<ButtonBar buttonMinWidth="120" buttonOrder="B+X"> <ButtonBar buttonMinWidth="120" buttonOrder="B+X">
<buttons> <buttons>
<Button text="%generic.button.back" ButtonBar.buttonData="BACK_PREVIOUS" cancelButton="true" onAction="#back"/> <Button text="%generic.button.back" ButtonBar.buttonData="BACK_PREVIOUS" cancelButton="true" onAction="#back" disable="${controller.vault.processing}"/>
<Button text="%migration.run.startMigrationBtn" ButtonBar.buttonData="NEXT_FORWARD" defaultButton="true" onAction="#migrate" contentDisplay="${controller.migrateButtonContentDisplay}" <Button text="%migration.run.startMigrationBtn" ButtonBar.buttonData="NEXT_FORWARD" defaultButton="true" onAction="#migrate" contentDisplay="${controller.migrateButtonContentDisplay}"
disable="${controller.migrationButtonDisabled}"> disable="${controller.migrationButtonDisabled}">
<graphic> <graphic>

4
main/ui/src/main/resources/fxml/unlock.fxml
View File

@@ -22,13 +22,13 @@
<VBox spacing="6"> <VBox spacing="6">
<FormattedLabel format="%unlock.passwordPrompt" arg1="${controller.vault.displayableName}" wrapText="true"/> <FormattedLabel format="%unlock.passwordPrompt" arg1="${controller.vault.displayableName}" wrapText="true"/>
<NiceSecurePasswordField fx:id="passwordField"/> <NiceSecurePasswordField fx:id="passwordField"/>
<CheckBox fx:id="savePassword" text="%unlock.savePassword" onAction="#didClickSavePasswordCheckbox"/> <CheckBox fx:id="savePassword" text="%unlock.savePassword" onAction="#didClickSavePasswordCheckbox" disable="${controller.vault.processing}"/>
</VBox> </VBox>
<VBox alignment="BOTTOM_CENTER" VBox.vgrow="ALWAYS"> <VBox alignment="BOTTOM_CENTER" VBox.vgrow="ALWAYS">
<ButtonBar buttonMinWidth="120" buttonOrder="+CI"> <ButtonBar buttonMinWidth="120" buttonOrder="+CI">
<buttons> <buttons>
<Button text="%generic.button.cancel" ButtonBar.buttonData="CANCEL_CLOSE" cancelButton="true" onAction="#cancel"/> <Button text="%generic.button.cancel" ButtonBar.buttonData="CANCEL_CLOSE" cancelButton="true" onAction="#cancel" disable="${controller.vault.processing}"/>
<Button text="%unlock.unlockBtn" ButtonBar.buttonData="FINISH" defaultButton="true" onAction="#unlock" contentDisplay="${controller.unlockButtonState}" disable="${controller.unlockButtonDisabled}"> <Button text="%unlock.unlockBtn" ButtonBar.buttonData="FINISH" defaultButton="true" onAction="#unlock" contentDisplay="${controller.unlockButtonState}" disable="${controller.unlockButtonDisabled}">
<graphic> <graphic>
<ProgressIndicator progress="-1" prefWidth="12" prefHeight="12"/> <ProgressIndicator progress="-1" prefWidth="12" prefHeight="12"/>

1
main/ui/src/main/resources/i18n/strings.properties
View File

@@ -108,6 +108,7 @@ migration.start.confirm=Yes, my vault is fully synced
## Run ## Run
migration.run.enterPassword=Enter the password for "%s" migration.run.enterPassword=Enter the password for "%s"
migration.run.startMigrationBtn=Migrate Vault migration.run.startMigrationBtn=Migrate Vault
migration.run.progressHint=This might take some time…
## Sucess ## Sucess
migration.success.nextStepsInstructions=Migrated "%s" successfully.\nYou can now unlock your vault. migration.success.nextStepsInstructions=Migrated "%s" successfully.\nYou can now unlock your vault.
migration.success.unlockNow=Unlock Now migration.success.unlockNow=Unlock Now