From 710c7d0da798243325468e0a21f424acf0f42288 Mon Sep 17 00:00:00 2001 From: Tobias Hagemann Date: Tue, 18 Aug 2020 16:08:23 +0200 Subject: [PATCH] added button to main window title if debug mode is enabled, fixes #1065 --- .../ui/controls/FontAwesome5Icon.java | 1 + .../mainwindow/MainWindowTitleController.java | 21 ++++++++++++++++++- .../resources/fxml/main_window_title.fxml | 8 +++++++ .../main/resources/i18n/strings.properties | 1 + 4 files changed, 30 insertions(+), 1 deletion(-) diff --git a/main/ui/src/main/java/org/cryptomator/ui/controls/FontAwesome5Icon.java b/main/ui/src/main/java/org/cryptomator/ui/controls/FontAwesome5Icon.java index e3d3c30d9..f4d0d058a 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/controls/FontAwesome5Icon.java +++ b/main/ui/src/main/java/org/cryptomator/ui/controls/FontAwesome5Icon.java @@ -6,6 +6,7 @@ package org.cryptomator.ui.controls; public enum FontAwesome5Icon { ANCHOR("\uF13D"), // ARROW_UP("\uF062"), // + BUG("\uF188"), // CHECK("\uF00C"), // COG("\uF013"), // COGS("\uF085"), // diff --git a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowTitleController.java b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowTitleController.java index 53044e00a..1f8fbc271 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowTitleController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowTitleController.java @@ -1,10 +1,12 @@ package org.cryptomator.ui.mainwindow; +import javafx.beans.binding.Bindings; import javafx.beans.binding.BooleanBinding; import javafx.fxml.FXML; import javafx.scene.layout.HBox; import javafx.stage.Stage; import org.cryptomator.common.LicenseHolder; +import org.cryptomator.common.settings.Settings; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.fxapp.FxApplication; import org.cryptomator.ui.fxapp.UpdateChecker; @@ -30,12 +32,14 @@ public class MainWindowTitleController implements FxController { private final UpdateChecker updateChecker; private final BooleanBinding updateAvailable; private final LicenseHolder licenseHolder; + private final Settings settings; + private final BooleanBinding debugModeEnabled; private double xOffset; private double yOffset; @Inject - MainWindowTitleController(AppLifecycleListener appLifecycle, @MainWindow Stage window, FxApplication application, @Named("trayMenuSupported") boolean minimizeToSysTray, UpdateChecker updateChecker, LicenseHolder licenseHolder) { + MainWindowTitleController(AppLifecycleListener appLifecycle, @MainWindow Stage window, FxApplication application, @Named("trayMenuSupported") boolean minimizeToSysTray, UpdateChecker updateChecker, LicenseHolder licenseHolder, Settings settings) { this.appLifecycle = appLifecycle; this.window = window; this.application = application; @@ -43,6 +47,8 @@ public class MainWindowTitleController implements FxController { this.updateChecker = updateChecker; this.updateAvailable = updateChecker.latestVersionProperty().isNotNull(); this.licenseHolder = licenseHolder; + this.settings = settings; + this.debugModeEnabled = Bindings.createBooleanBinding(this::isDebugModeEnabled, settings.debugMode()); } @FXML @@ -82,6 +88,11 @@ public class MainWindowTitleController implements FxController { application.showPreferencesWindow(SelectedPreferencesTab.ANY); } + @FXML + public void showGeneralPreferences() { + application.showPreferencesWindow(SelectedPreferencesTab.GENERAL); + } + @FXML public void showDonationKeyPreferences() { application.showPreferencesWindow(SelectedPreferencesTab.DONATION_KEY); @@ -104,4 +115,12 @@ public class MainWindowTitleController implements FxController { public boolean isMinimizeToSysTray() { return minimizeToSysTray; } + + public BooleanBinding debugModeEnabledProperty() { + return debugModeEnabled; + } + + public boolean isDebugModeEnabled() { + return settings.debugMode().get(); + } } diff --git a/main/ui/src/main/resources/fxml/main_window_title.fxml b/main/ui/src/main/resources/fxml/main_window_title.fxml index 31965fea0..031e48b07 100644 --- a/main/ui/src/main/resources/fxml/main_window_title.fxml +++ b/main/ui/src/main/resources/fxml/main_window_title.fxml @@ -32,6 +32,14 @@ +