mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-07-29 03:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

ui adjustments & code cleanup

Browse Source
This commit is contained in:
Armin Schrenk
2021-07-14 17:33:29 +02:00
parent 21946ae6aa
commit a71e344036
5 changed files with 37 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/fxml/health_check_details.fxml
+7 -4
View File
@@ -5,15 +5,18 @@
<?import javafx.scene.control.ListView?>
<?import javafx.scene.layout.VBox?>
<?import org.cryptomator.ui.health.CheckStateIconView?>
<?import javafx.scene.layout.HBox?>
<VBox xmlns:fx="http://javafx.com/fxml"
xmlns="http://javafx.com/javafx"
fx:controller="org.cryptomator.ui.health.CheckDetailController"
spacing="6">
<FormattedLabel fx:id="checkTitle" styleClass="label-large" format="%health.check.detail.header" arg1="${controller.checkName}" contentDisplay="LEFT">
<Label fx:id="detailHeader" styleClass="label-large" text="${controller.checkName}" contentDisplay="LEFT">
<graphic>
<CheckStateIconView fx:id="checkStateIconView" check="${controller.check}" glyphSize="20"/>
<HBox alignment="CENTER" minWidth="25" maxWidth="25">
<CheckStateIconView fx:id="checkStateIconView" check="${controller.check}" glyphSize="20"/>
</HBox>
</graphic>
</FormattedLabel>
</Label>
<Label text="%health.check.detail.checkRunning" visible="${controller.checkRunning}" managed="${controller.checkRunning}"/>
<Label text="%health.check.detail.checkScheduled" visible="${controller.checkScheduled}" managed="${controller.checkScheduled}"/>
@@ -23,5 +26,5 @@
<Label text="%health.check.detail.checkSucceeded" visible="${controller.checkSucceeded &amp;&amp; !controller.warnOrCritsExist}" managed="${controller.checkSucceeded &amp;&amp; !controller.warnOrCritsExist}"/>
<Label text="TODO: check finished and found something" visible="${controller.checkSucceeded &amp;&amp; controller.warnOrCritsExist}" managed="${controller.checkSucceeded &amp;&amp; controller.warnOrCritsExist}"/>
<ListView fx:id="resultsListView" VBox.vgrow="ALWAYS" visible="${!controller.checkSkipped}"/>
<ListView fx:id="resultsListView" VBox.vgrow="ALWAYS" visible="${!controller.checkSkipped}" fixedCellSize="25"/>
</VBox>
src/main/resources/fxml/health_check_list.fxml
+1 -1
View File
@@ -24,7 +24,7 @@
</fx:define>
<children>
<HBox spacing="12" VBox.vgrow="ALWAYS">
<ListView fx:id="checksListView" VBox.vgrow="ALWAYS" prefWidth="175"/>
<ListView fx:id="checksListView" VBox.vgrow="ALWAYS" minWidth="175" maxWidth="175"/>
<VBox alignment="CENTER" visible="${!controller.mainRunStarted}" managed="${!controller.mainRunStarted}" HBox.hgrow="ALWAYS">
<Label text="TODO: Introductory/Explanatory Text? "/>
<Button onAction="#selectAllChecks" text="%health.checkList.selectAllBox" />
src/main/resources/fxml/health_start_fail.fxml
+5 -2
View File
@@ -8,6 +8,7 @@
<?import javafx.scene.control.TitledPane?>
<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
<?import javafx.scene.layout.Region?>
<?import javafx.scene.layout.HBox?>
<VBox xmlns="http://javafx.com/javafx"
xmlns:fx="http://javafx.com/fxml"
fx:controller="org.cryptomator.ui.health.StartFailController"
@@ -20,9 +21,11 @@
<Label text="TODO: Error on loading" />
<FormattedLabel format="TODO: Error reading file: %s" arg1="${controller.localizedErrorMessage}" visible="${controller.ioException}" managed="${controller.ioException}"/>
<Label text="TODO: Malformed vault config" visible="${controller.parseException}" managed="${controller.parseException}"/>
<TitledPane fx:id="moreInfoPane" text="More Info" expanded="false" contentDisplay="LEFT">
<TitledPane fx:id="moreInfoPane" text="TODO: More" expanded="false" contentDisplay="LEFT" >
<graphic>
<FontAwesome5IconView glyph="${controller.moreInfoIcon}"/>
<HBox alignment="CENTER" minWidth="8">
<FontAwesome5IconView glyph="${controller.moreInfoIcon}"/>
</HBox>
</graphic>
<content>
<TextArea VBox.vgrow="ALWAYS" text="${controller.stackTrace}" prefRowCount="20" editable="false" />