mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-25 06:01:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only show button when severity is WARN

Browse Source
This commit is contained in:
Armin Schrenk
2021-05-21 12:40:44 +02:00
parent 1abf0e1bfa
commit b6f5ddaf30
3 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
main/ui/src/main/java/org/cryptomator/ui/health/ResultListCellController.java
View File

@@ -1,38 +1,40 @@
package org.cryptomator.ui.health;
import com.tobiasdiez.easybind.EasyBind;
import org.cryptomator.cryptofs.health.api.DiagnosticResult;
import org.cryptomator.ui.common.FxController;
import org.cryptomator.ui.controls.FontAwesome5Icon;
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;
import javafx.scene.control.Button;
public class ResultListCellController implements FxController {
private final ObjectProperty<DiagnosticResultAction> result;
private final Binding<Boolean> fixButtonVisible;
private final Binding<String> description;
@FXML
public FontAwesome5IconView iconView;
@FXML
public Button actionButton;
@Inject
public ResultListCellController() {
this.result = new SimpleObjectProperty<>(null);
this.fixButtonVisible = EasyBind.wrapNullable(result) //
.map(val -> val.getSeverity() == DiagnosticResult.Severity.WARN).orElse(true); //
this.description = EasyBind.wrapNullable(result).map(DiagnosticResultAction::getDescription).orElse("");
result.addListener(this::getGlyphForSeverity);
result.addListener(this::updateCellContent);
}
private void getGlyphForSeverity(ObservableValue<? extends DiagnosticResultAction> observable, DiagnosticResultAction oldVal, DiagnosticResultAction newVal) {
private void updateCellContent(ObservableValue<? extends DiagnosticResultAction> observable, DiagnosticResultAction oldVal, DiagnosticResultAction newVal) {
iconView.getStyleClass().clear();
actionButton.setVisible(false);
switch (newVal.getSeverity()) {
case INFO -> {
iconView.setGlyph(FontAwesome5Icon.INFO_CIRCLE);
@@ -45,6 +47,7 @@ public class ResultListCellController implements FxController {
case WARN -> {
iconView.setGlyph(FontAwesome5Icon.EXCLAMATION_TRIANGLE);
iconView.getStyleClass().add("glyph-icon-orange");
actionButton.setVisible(true);
}
case CRITICAL -> {
iconView.setGlyph(FontAwesome5Icon.TIMES);
@@ -75,14 +78,6 @@ public class ResultListCellController implements FxController {
return result;
}
public boolean isFixButtonVisibile() {
return fixButtonVisible.getValue();
}
public Binding<Boolean> fixButtonVisibleProperty() {
return fixButtonVisible;
}
public String getDescription() {
return description.getValue();
}

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

@@ -21,6 +21,6 @@
<FontAwesome5IconView fx:id="iconView" HBox.hgrow="NEVER" glyphSize="16"/>
<Label text="${controller.description}" wrapText="true"/>
<Region HBox.hgrow="ALWAYS"/>
<Button text="YOLO" onAction="#runResultAction" alignment="CENTER_RIGHT" visible="${controller.fixButtonVisibile}"/>
<Button fx:id="actionButton" text="%health.check.export" onAction="#runResultAction" alignment="CENTER_RIGHT" visible="false" />
</children>
</HBox>

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

@@ -151,6 +151,7 @@ health.title=Vault Check
health.check.runBatchButton=Run selected Checks
health.check.result.noSelectedCheck=For results select a finished check in the left list.
health.check.export=Export Report
health.check.fix=Fix
# Preferences
preferences.title=Preferences