mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-09-01 21:57:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rework vautl detail unknown error dialog:

Browse Source 
* add buttons to reload, remove and show error dialog
* restyling
* add new strings
This commit is contained in:
Armin Schrenk
2021-10-06 14:27:28 +02:00
parent 813c69f6ac
commit ac1ff5fb79
4 changed files with 77 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/fxml/vault_detail_unknownerror.fxml
+34 -7
View File
@@ -1,15 +1,42 @@
<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.TextArea?>
<?import javafx.scene.layout.StackPane?>
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.shape.Circle?>
<VBox xmlns:fx="http://javafx.com/fxml"
xmlns="http://javafx.com/javafx"
fx:controller="org.cryptomator.ui.mainwindow.VaultDetailUnknownErrorController"
alignment="CENTER"
spacing="24">
alignment="BASELINE_CENTER"
spacing="9">
<children>
<Label text="%generic.error.title" wrapText="true"/>
<Label text="%generic.error.instruction" wrapText="true"/>
<TextArea VBox.vgrow="ALWAYS" text="${controller.stackTrace}" prefRowCount="5" editable="false"/>
<StackPane VBox.vgrow="NEVER">
<Circle styleClass="glyph-icon-primary" radius="48"/>
<FontAwesome5IconView styleClass="glyph-icon-white" glyph="FILE" glyphSize="48"/>
<FontAwesome5IconView styleClass="glyph-icon-primary" glyph="TIMES" glyphSize="24">
<StackPane.margin>
<Insets top="12"/>
</StackPane.margin>
</FontAwesome5IconView>
</StackPane>
<Label text="%main.vaultDetail.error.info" wrapText="true"/>
<VBox spacing="6" alignment="BASELINE_CENTER" VBox.vgrow="NEVER">
<Button styleClass="" text="Show Error Details" onAction="#showError">
<graphic>
<FontAwesome5IconView glyph="INFO"/>
</graphic>
</Button>
<Button text="%main.vaultDetail.error.reload" minWidth="120" onAction="#reload">
<graphic>
<FontAwesome5IconView glyph="REDO"/>
</graphic>
</Button>
<Button text="%main.vaultDetail.missing.remove" minWidth="120" onAction="#didClickRemoveVault">
<graphic>
<FontAwesome5IconView glyph="TRASH"/>
</graphic>
</Button>
</VBox>
</children>
</VBox>
src/main/resources/i18n/strings.properties
+4
View File
@@ -300,6 +300,10 @@ main.vaultDetail.missing.changeLocation=Change Vault Location…
### Needs Migration
main.vaultDetail.migrateButton=Upgrade Vault
main.vaultDetail.migratePrompt=Your vault needs to be upgraded to a new format, before you can access it
### Error
main.vaultDetail.error.info=An error occurred loading the vault from disk.
main.vaultDetail.error.reload=Reload
main.vaultDetail.error.windowTitle=Error loading vault
# Wrong File Alert
wrongFileAlert.title=How to Encrypt Files