From 7bc1d52bf8ac1e474bb054ed5fb2b1de0dcd8fc2 Mon Sep 17 00:00:00 2001
From: Jan-Peter Klein <jan-peter.klein@skymatic.de>
Date: Sun, 12 Nov 2023 13:49:47 +0100
Subject: [PATCH] set deprecated since of settingsjson port to 1.12.0, changed
 button text and added tooltip to 'show vault options' button

---
 .../java/org/cryptomator/common/settings/SettingsJson.java | 2 +-
 src/main/resources/fxml/unlock_fuse_restart_required.fxml  | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/cryptomator/common/settings/SettingsJson.java b/src/main/java/org/cryptomator/common/settings/SettingsJson.java
index cb7bcd534..bf1514b1d 100644
--- a/src/main/java/org/cryptomator/common/settings/SettingsJson.java
+++ b/src/main/java/org/cryptomator/common/settings/SettingsJson.java
@@ -46,7 +46,7 @@ class SettingsJson {
 	@JsonProperty("numTrayNotifications")
 	int numTrayNotifications = Settings.DEFAULT_NUM_TRAY_NOTIFICATIONS;
 
-	@Deprecated(since = "1.10.2")
+	@Deprecated(since = "1.12.0")
 	@JsonProperty(value = "port", access = JsonProperty.Access.WRITE_ONLY) // WRITE_ONLY means value is "written" into the java object during deserialization. Upvote this: https://github.com/FasterXML/jackson-annotations/issues/233
 	int port;
 
diff --git a/src/main/resources/fxml/unlock_fuse_restart_required.fxml b/src/main/resources/fxml/unlock_fuse_restart_required.fxml
index 2be731ce4..91f4cc35c 100644
--- a/src/main/resources/fxml/unlock_fuse_restart_required.fxml
+++ b/src/main/resources/fxml/unlock_fuse_restart_required.fxml
@@ -11,6 +11,7 @@
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.shape.Circle?>
+<?import javafx.scene.control.Tooltip?>
 <HBox xmlns:fx="http://javafx.com/fxml"
 	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.unlock.UnlockFuseRestartRequiredController"
@@ -45,7 +46,11 @@
 			<ButtonBar buttonMinWidth="120" buttonOrder="+CI">
 				<buttons>
 					<Button text="%generic.button.cancel" ButtonBar.buttonData="CANCEL_CLOSE" cancelButton="true" onAction="#close"/>
-					<Button text="%main.vaultDetail.optionsBtn" ButtonBar.buttonData="FINISH" defaultButton="true" onAction="#closeAndOpenVaultOptions" />
+					<Button text="%main.vaultlist.contextMenu.vaultoptions" ButtonBar.buttonData="FINISH" defaultButton="true" onAction="#closeAndOpenVaultOptions">
+						<tooltip>
+							<Tooltip text="%main.vaultlist.contextMenu.vaultoptions"/>
+						</tooltip>
+					</Button>
 				</buttons>
 			</ButtonBar>
 		</VBox>