ソースを参照

more ui & clean up

Armin Schrenk 4 年 前
コミット
b4f268f551

+ 0 - 2
main/ui/src/main/java/org/cryptomator/ui/health/ResultListCellController.java

@@ -7,9 +7,7 @@ import org.cryptomator.ui.controls.FontAwesome5IconView;
 
 import javax.inject.Inject;
 import javafx.beans.binding.Binding;
-import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.value.ObservableValue;
 import javafx.fxml.FXML;

+ 0 - 48
main/ui/src/main/resources/css/light_theme.css

@@ -947,51 +947,3 @@
 	-fx-fill: linear-gradient(to bottom, PRIMARY, transparent);
 	-fx-stroke: transparent;
 }
-
-/*****
-	Sanitizer Results
-	TODO: make it pretty and copy it to dark theme
-****/
-
-.table-view{
-   -fx-background-color: transparent;
-}
-
-.table-view:focused{
-    -fx-background-color: transparent;
-}
-
-.table-view .column-header-background{
-    -fx-background-color: linear-gradient(#131313 0%, #424141 100%);
-}
-
-.table-view .column-header-background .label{
-    -fx-background-color: transparent;
-    -fx-text-fill: white;
-}
-
-.table-view .column-header {
-    -fx-background-color: transparent;
-}
-
-.table-view .table-cell{
-    -fx-text-fill: white;
-}
-
-.table-row-cell{
-    -fx-background-color: #616161;
-    -fx-background-insets: 0, 0 0 1 0;
-    -fx-padding: 0.0em;
-}
-
-.table-row-cell:odd{
-    -fx-background-color: #424242;
-    -fx-background-insets: 0, 0 0 1 0;
-    -fx-padding: 0.0em;
-}
-
-.table-row-cell:selected {
-    -fx-background-color: #005797;
-    -fx-background-insets: 0;
-    -fx-background-radius: 1;
-}

+ 3 - 2
main/ui/src/main/resources/fxml/health_check_details.fxml

@@ -4,11 +4,12 @@
 <?import javafx.scene.control.ListView?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Text?>
+<?import org.cryptomator.ui.controls.FormattedLabel?>
 <VBox xmlns:fx="http://javafx.com/fxml"
 	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.health.CheckDetailController"
 	  spacing="6">
-	<Label fx:id="checkTitle" styleClass="label-large" text="${controller.taskName}"/> <!-- use formatted label and let the text be "Results of [TASKNAME] -->
-	<Text fx:id="checkDescription" styleClass="label" text="${controller.taskDescription}"/>
+	<FormattedLabel fx:id="checkTitle" styleClass="label-large" format="%health.check.result.header" arg1="${controller.taskName}"/>
+	<Text fx:id="checkDescription" styleClass="label" text="FIXME: Here could be a small description."/>
 	<ListView fx:id="resultsListView"/>
 </VBox>

+ 1 - 1
main/ui/src/main/resources/fxml/health_check_list.fxml

@@ -22,7 +22,7 @@
 	</fx:define>
 	<children>
 		<HBox spacing="12" VBox.vgrow="ALWAYS">
-			<VBox minWidth="80" spacing="6" HBox.hgrow="ALWAYS" >
+			<VBox minWidth="80" maxWidth="200" spacing="6" HBox.hgrow="ALWAYS" >
 				<Label fx:id="listHeading" text="%health.check.listHeader"/>
 				<!-- TODO:HEADER with select all checkbox -->
 				<ListView fx:id="checksListView" VBox.vgrow="ALWAYS"/>

+ 1 - 0
main/ui/src/main/resources/i18n/strings.properties

@@ -151,6 +151,7 @@ health.title=Vault Check
 health.check.listHeader=Available Checks
 health.check.runBatchButton=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