[App] Show a restart action in the app toolbar

#1130
mytourbook · Jun 12, 2023 · 96e6d5c · 96e6d5c
1 parent f62c611
commit 96e6d5c
Show file tree

Hide file tree

Showing 22 changed files with 332 additions and 226 deletions.
diff --git a/bundles/net.tourbook.common/src/net/tourbook/common/Messages.java b/bundles/net.tourbook.common/src/net/tourbook/common/Messages.java
@@ -42,6 +42,7 @@ public class Messages extends NLS {
    public static String        App_Theme_ValueFor_Dark_Tooltip;
 
    public static String        Action_App_CustomizeColumnsAndProfiles;
+   public static String        Action_App_RestartApp_Tooltip;
    public static String        Action_App_SizeAllColumnsToFit;
 
    public static String        Action_ColumnManager_Column_Info;

diff --git a/bundles/net.tourbook.common/src/net/tourbook/common/font/FontFieldEditorExtended.java b/bundles/net.tourbook.common/src/net/tourbook/common/font/FontFieldEditorExtended.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (C) 2005, 2021 Wolfgang Schramm and Contributors
+ * Copyright (C) 2005, 2023 Wolfgang Schramm and Contributors
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License as published by the Free Software
@@ -24,6 +24,7 @@
 import org.eclipse.jface.layout.GridDataFactory;
 import org.eclipse.jface.layout.GridLayoutFactory;
 import org.eclipse.jface.preference.FieldEditor;
+import org.eclipse.jface.preference.FontFieldEditor;
 import org.eclipse.jface.preference.PreferenceConverter;
 import org.eclipse.jface.resource.JFaceResources;
 import org.eclipse.jface.resource.StringConverter;
@@ -47,7 +48,7 @@
 import org.eclipse.swt.widgets.Text;
 
 /**
- * This is a copy of {@link orgFontFieldEditor} with an open & close listener which is fired when
+ * This is a copy of {@link FontFieldEditor} with an open & close listener which is fired when
  * the dialog is opened or closes. There are also other adjustments.
  * <p>
  * This can be used to keep parent dialog opened when the font dialog is opened.

diff --git a/bundles/net.tourbook.common/src/net/tourbook/common/messages.properties b/bundles/net.tourbook.common/src/net/tourbook/common/messages.properties
@@ -1,5 +1,6 @@
 
 Action_App_CustomizeColumnsAndProfiles = &Customize Profiles/Columns...
+Action_App_RestartApp_Tooltip=Restart MyTourbook
 Action_App_SizeAllColumnsToFit         = Size All Columns to &Fit
 
 Action_ColumnManager_ColumnActions_Info          = \u00BB Column:   {0} \u00AB

diff --git a/.../net.tourbook.common/src/net/tourbook/common/preferences/CommonPreferenceInitializer.java b/.../net.tourbook.common/src/net/tourbook/common/preferences/CommonPreferenceInitializer.java
@@ -109,8 +109,6 @@ public void initializeDefaultPreferences() {
       store.setDefault(ICommonPreferences.DISPLAY_FORMAT_MOVING_TIME_SUMMARY,   ValueFormat.TIME_HH.name());
       store.setDefault(ICommonPreferences.DISPLAY_FORMAT_BREAK_TIME_SUMMARY,    ValueFormat.TIME_HH.name());
 
-      store.setDefault(ICommonPreferences.THEME_SHOW_THEME_SELECTOR_IN_APP_TOOLBAR,    false);
-
       /*
        * Time zone
        */

diff --git a/bundles/net.tourbook.common/src/net/tourbook/common/preferences/ICommonPreferences.java b/bundles/net.tourbook.common/src/net/tourbook/common/preferences/ICommonPreferences.java
@@ -17,6 +17,18 @@
 
 public interface ICommonPreferences {
 
+   /*
+    * Appearance
+    */
+   public static final String APPEARANCE_IS_SHOW_MEMORY_MONITOR_IN_APP     = "APPEARANCE_IS_SHOW_MEMORY_MONITOR_IN_APP";     //$NON-NLS-1$
+   public static final String APPEARANCE_IS_SHOW_RESTART_APP_ACTION_IN_APP = "APPEARANCE_IS_SHOW_RESTART_APP_ACTION_IN_APP"; //$NON-NLS-1$
+
+   /*
+    * Theme
+    */
+   public static final String THEME_IS_THEME_MODIFIED             = "THEME_IS_THEME_MODIFIED";             //$NON-NLS-1$
+   public static final String THEME_IS_SHOW_THEME_SELECTOR_IN_APP = "THEME_IS_SHOW_THEME_SELECTOR_IN_APP"; //$NON-NLS-1$
+
    /*
     * Measurement system
     */
@@ -59,12 +71,6 @@ public interface ICommonPreferences {
    public static final String DISPLAY_FORMAT_IS_LIVE_UPDATE        = "DISPLAY_FORMAT_IS_LIVE_UPDATE";        //$NON-NLS-1$
    public static final String DISPLAY_FORMAT_SELECTED_TAB          = "DISPLAY_FORMAT_SELECTED_TAB";          //$NON-NLS-1$
 
-   /*
-    * Theme
-    */
-   public static final String THEME_IS_THEME_MODIFIED                  = "THEME_IS_THEME_MODIFIED";                  //$NON-NLS-1$
-   public static final String THEME_SHOW_THEME_SELECTOR_IN_APP_TOOLBAR = "THEME_SHOW_THEME_SELECTOR_IN_APP_TOOLBAR"; //$NON-NLS-1$
-
    /*
     * Timezone
     */

diff --git a/bundles/net.tourbook/icons/app-default.png b/bundles/net.tourbook/icons/app-default.png
diff --git a/bundles/net.tourbook/src/net/tourbook/Messages.java b/bundles/net.tourbook/src/net/tourbook/Messages.java
@@ -1473,10 +1473,13 @@ public class Messages extends NLS {
    public static String        Pref_Appearance_Button_ResetAllToggleDialogs;
    public static String        Pref_Appearance_Button_ResetAllToggleDialogs_Tooltip;
    public static String        Pref_Appearance_Check_AutoOpenTagging;
+   public static String        Pref_Appearance_Check_RestartAppInAppToolbar;
    public static String        Pref_Appearance_Check_ShowThemeSelectorInAppToolbar;
    public static String        Pref_Appearance_Check_TaggingAnimation;
+   public static String        Pref_Appearance_Combo_Theme_Tooltip;
    public static String        Pref_Appearance_Dialog_ResetAllToggleDialogs_Message;
    public static String        Pref_Appearance_Dialog_ResetAllToggleDialogs_Title;
+   public static String        Pref_Appearance_Dialog_RestartAfterRestartApp_Message;
    public static String        Pref_Appearance_Dialog_RestartAfterThemeChange_Message;
    public static String        Pref_Appearance_Dialog_RestartAfterThemeSelectorIsInToolbar_Message;
    public static String        Pref_Appearance_Group_PaceAndSpeedDisplay;
@@ -1497,7 +1500,6 @@ public class Messages extends NLS {
    public static String        Pref_Appearance_Radio_UseRecordedTime_Tooltip;
    public static String        pref_appearance_showMemoryMonitor;
    public static String        pref_appearance_showMemoryMonitor_message;
-   public static String        pref_appearance_showMemoryMonitor_title;
    public static String        Pref_Appearance_ShowTourTypeContextMenu;
    public static String        Pref_Appearance_ShowTourTypeContextMenu_Tooltip;