From ffe4201921355ed1f6da87eac29e8545b0c3c8e7 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Tue, 20 Jul 2021 12:02:50 +0200
Subject: [PATCH] Add tooltip for fix icon.

---
 .../ui/health/ResultListCellController.java   | 19 +++++++++++++++----
 .../fxml/health_result_listcell.fxml          |  4 ++--
 src/main/resources/i18n/strings.properties    |  5 ++++-
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/cryptomator/ui/health/ResultListCellController.java b/src/main/java/org/cryptomator/ui/health/ResultListCellController.java
index 2717a054c..0cdbf4bf0 100644
--- a/src/main/java/org/cryptomator/ui/health/ResultListCellController.java
+++ b/src/main/java/org/cryptomator/ui/health/ResultListCellController.java
@@ -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);
 		}
 	}
 
diff --git a/src/main/resources/fxml/health_result_listcell.fxml b/src/main/resources/fxml/health_result_listcell.fxml
index 558e078c3..6ef86b486 100644
--- a/src/main/resources/fxml/health_result_listcell.fxml
+++ b/src/main/resources/fxml/health_result_listcell.fxml
@@ -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>
diff --git a/src/main/resources/i18n/strings.properties b/src/main/resources/i18n/strings.properties
index 6ab289ac2..66d127622 100644
--- a/src/main/resources/i18n/strings.properties
+++ b/src/main/resources/i18n/strings.properties
@@ -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