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

Add tooltip for fix icon.

Browse Source
This commit is contained in:
Armin Schrenk
2021-07-20 12:02:50 +02:00
parent 3df688236d
commit ffe4201921
3 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,8 +18,11 @@ import javafx.beans.binding.ObjectBinding;
import javafx.beans.property.ObjectProperty;
import javafx.beans.property.SimpleObjectProperty;
import javafx.fxml.FXML;
import javafx.scene.control.Tooltip;
import javafx.util.Duration;
import java.util.ArrayList;
import java.util.List;
import java.util.ResourceBundle;
// unscoped because each cell needs its own controller
public class ResultListCellController implements FxController {
@@ -43,12 +46,15 @@ public class ResultListCellController implements FxController {
private final BooleanBinding fixFailed;
private final BooleanBinding fixRunningOrDone;
private final List<Subscription> subscriptions;
private final Tooltip fixSuccess;
private final Tooltip fixFail;
/* FXML */
public FontAwesome5IconView severityView;
public FontAwesome5IconView fixView;
@Inject
public ResultListCellController(ResultFixApplier fixApplier) {
public ResultListCellController(ResultFixApplier fixApplier, ResourceBundle resourceBundle) {
this.result = new SimpleObjectProperty<>(null);
this.description = EasyBind.wrapNullable(result).map(Result::getDescription).orElse("");
this.fixApplier = fixApplier;
@@ -61,6 +67,10 @@ public class ResultListCellController implements FxController {
this.fixFailed = Bindings.createBooleanBinding(this::isFixFailed, fixState);
this.fixRunningOrDone = fixing.or(fixed).or(fixFailed);
this.subscriptions = new ArrayList<>();
this.fixSuccess = new Tooltip(resourceBundle.getString("health.fix.successTip"));
this.fixFail = new Tooltip(resourceBundle.getString("health.fix.failTip"));
fixSuccess.setShowDelay(Duration.millis(100));
fixFail.setShowDelay(Duration.millis(100));
}
@FXML
@@ -68,8 +78,7 @@ public class ResultListCellController implements FxController {
// see getGlyph() for relevant glyphs:
severityView.getStyleClass().remove("glyph-icon");
fixView.getStyleClass().remove("glyph-icon");
subscriptions.addAll(List.of(
EasyBind.includeWhen(severityView.getStyleClass(), "glyph-icon-muted", severityView.glyphProperty().isEqualTo(INFO_ICON)), //
subscriptions.addAll(List.of(EasyBind.includeWhen(severityView.getStyleClass(), "glyph-icon-muted", severityView.glyphProperty().isEqualTo(INFO_ICON)), //
EasyBind.includeWhen(severityView.getStyleClass(), "glyph-icon-primary", severityView.glyphProperty().isEqualTo(GOOD_ICON)), //
EasyBind.includeWhen(severityView.getStyleClass(), "glyph-icon-orange", severityView.glyphProperty().isEqualTo(WARN_ICON)), //
EasyBind.includeWhen(severityView.getStyleClass(), "glyph-icon-red", severityView.glyphProperty().isEqualTo(CRIT_ICON)), //
@@ -88,7 +97,9 @@ public class ResultListCellController implements FxController {
private void fixFinished(Void unused, Throwable exception) {
if (exception != null) {
LOG.error("Failed to apply fix", exception);
// TODO ...
Tooltip.install(fixView, fixFail);
} else {
Tooltip.install(fixView, fixSuccess);
}
}

4
src/main/resources/fxml/health_result_listcell.fxml
View File

@@ -24,8 +24,8 @@
</StackPane>
<Label text="${controller.description}"/>
<Region HBox.hgrow="ALWAYS"/>
<StackPane HBox.hgrow="NEVER" >
<Button fx:id="fixButton" text="%health.check.fixBtn" visible="${controller.fixable}" onAction="#fix" alignment="CENTER" minWidth="-Infinity"/>
<StackPane HBox.hgrow="NEVER">
<Button fx:id="fixButton" text="%health.fix.fixBtn" visible="${controller.fixable}" onAction="#fix" alignment="CENTER" minWidth="-Infinity"/>
<FontAwesome5IconView fx:id="fixView" glyph="${controller.fixGlyph}" glyphSize="16" visible="${controller.fixRunningOrDone}" managed="${controller.fixRunningOrDone}"/>
</StackPane>
</children>

5
src/main/resources/i18n/strings.properties
View File

@@ -175,7 +175,10 @@ health.check.detail.checkFinishedAndFound=The check finished with results needed
health.check.detail.checkFailed=The check exited due to an error.
health.check.detail.checkCancelled=The check was cancelled.
health.check.exportBtn=Export Report
health.check.fixBtn=Fix
## Fix Application
health.fix.fixBtn=Fix
health.fix.successTip=Fix successful
health.fix.failTip=Fix failed, see log for details
# Preferences
preferences.title=Preferences