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

Localization and small ui fixes

Browse Source
This commit is contained in:
Armin Schrenk
2021-05-26 15:50:03 +02:00
parent 98a899c7e2
commit 6038559172
5 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
main/ui/src/main/resources/fxml/health_check_list.fxml
View File

@@ -24,8 +24,8 @@
<children>
<HBox spacing="12" VBox.vgrow="ALWAYS">
<VBox minWidth="80" maxWidth="200" spacing="6" HBox.hgrow="ALWAYS" >
<Label fx:id="listHeading" text="%health.check.listHeader"/>
<CheckBox onAction="#toggleSelectAll" text="FIX: SELECT ALL" visible="${!controller.showResultScreen}" managed="${!controller.showResultScreen}" />
<Label fx:id="listHeading" text="%health.checkList.header"/>
<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" >
@@ -38,8 +38,8 @@
<ButtonBar buttonMinWidth="120" buttonOrder="+CX">
<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.export" ButtonBar.buttonData="NEXT_FORWARD" defaultButton="true" disable="${!controller.finished}" visible="${controller.showResultScreen}" managed="${controller.showResultScreen}" onAction="#exportResults"/>
<Button text="%health.check.runBatchButton" ButtonBar.buttonData="NEXT_FORWARD" defaultButton="true" onAction="#runSelectedChecks" disable="${controller.numberOfPickedChecks == ZERO}" 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}"/>
</buttons>
</ButtonBar>
</children>

5
main/ui/src/main/resources/fxml/health_result_listcell.fxml
View File

@@ -21,6 +21,9 @@
<FontAwesome5IconView fx:id="iconView" HBox.hgrow="NEVER" glyphSize="16"/>
<Label text="${controller.description}" wrapText="true"/>
<Region HBox.hgrow="ALWAYS"/>
<Button fx:id="actionButton" text="%health.check.fix" onAction="#runResultAction" alignment="CENTER_RIGHT" visible="false" />
<!-- 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="50"/>
</children>
</HBox>

9
main/ui/src/main/resources/fxml/health_start.fxml
View File

@@ -4,10 +4,6 @@
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.ButtonBar?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.ListView?>
<?import javafx.scene.control.RadioButton?>
<?import javafx.scene.control.ToggleGroup?>
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.VBox?>
<VBox xmlns:fx="http://javafx.com/fxml"
xmlns="http://javafx.com/javafx"
@@ -20,9 +16,10 @@
<Insets topRightBottomLeft="12"/>
</padding>
<children>
<Label text="TODO: Invalid vault config" visible="${controller.invalidConfig}" managed="${controller.invalidConfig}"/>
<Label text="%health.start.introduction" wrapText="true"/>
<Label text="TODO: Blabla going to health check now...:"/>
<Label text="%health.start.configInvalid" visible="${controller.invalidConfig}" managed="${controller.invalidConfig}"/>
<Label text="%health.start.configValid" visible="${!controller.invalidConfig}" managed="${!controller.invalidConfig}" wrapText="true"/>
<ButtonBar buttonMinWidth="120" buttonOrder="+CX">
<buttons>

2
main/ui/src/main/resources/fxml/vault_detail_locked.fxml
View File

@@ -33,7 +33,7 @@
<Region VBox.vgrow="ALWAYS"/>
<HBox alignment="BOTTOM_RIGHT">
<Button text="TODO Sanitizer" onAction="#showHealthCheck"/>
<Button text="%main.vaultDetail.healthBtn" onAction="#showHealthCheck"/>
<Button text="%main.vaultDetail.optionsBtn" minWidth="120" onAction="#showVaultOptions">
<graphic>
<FontAwesome5IconView glyph="COG"/>

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

@@ -148,12 +148,16 @@ migration.impossible.moreInfo=The vault can still be opened with an older versio
# Health Check
health.title=Vault Check
health.check.listHeader=Available Checks
health.check.runBatchButton=Run selected Checks
health.start.introduction=The Vault Health Check is a collection of checks to detect and possilby fix problems in the internal structure of your vault. Please note, that not all problems are fixable. You need the vault password to perform the checks.
health.start.configValid=Reading and parsing vault configuration file was successful. Proceed to select checks.
health.start.configInvalid=Error while reading and parsing the vault configuration file.
health.checkList.header=Available Checks
health.checkList.selectAllBox=Select All
health.check.runBatchBtn=Run selected Checks
health.check.result.noSelectedCheck=For results select a finished check in the left list.
health.check.result.header=Results of %s
health.check.export=Export Report
health.check.fix=Fix
health.check.exportBtn=Export Report
health.check.fixBtn=Fix
## Checks
health.org.cryptomator.cryptofs.health.dirid.DirIdCheck=Directory Check
@@ -256,6 +260,7 @@ main.vaultDetail.welcomeOnboarding=Thanks for choosing Cryptomator to protect yo
### Locked
main.vaultDetail.lockedStatus=LOCKED
main.vaultDetail.unlockBtn=Unlock…
main.vaultDetail.healthBtn=Health Check
main.vaultDetail.unlockNowBtn=Unlock Now
main.vaultDetail.optionsBtn=Vault Options
main.vaultDetail.passwordSavedInKeychain=Password saved