From c0c55a7af87b503d0a34e027661a9ecee3a78f7c Mon Sep 17 00:00:00 2001
From: Jeremy Wu <jeremy24wu@gmail.com>
Date: Thu, 22 Aug 2019 21:37:36 +1000
Subject: [PATCH 1/3] Add to Sys plugin- save all Wox settings

---
 Plugins/Wox.Plugin.Sys/Languages/en.xaml |  4 ++++
 Plugins/Wox.Plugin.Sys/Main.cs           | 12 ++++++++++++
 Wox.Plugin/IPublicAPI.cs                 |  5 +++++
 Wox/PublicAPIInstance.cs                 |  9 +++++++--
 4 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/Plugins/Wox.Plugin.Sys/Languages/en.xaml b/Plugins/Wox.Plugin.Sys/Languages/en.xaml
index 0d3fb8e61f..daf616989c 100644
--- a/Plugins/Wox.Plugin.Sys/Languages/en.xaml
+++ b/Plugins/Wox.Plugin.Sys/Languages/en.xaml
@@ -5,16 +5,20 @@
     <system:String x:Key="wox_plugin_sys_command">Command</system:String>
     <system:String x:Key="wox_plugin_sys_desc">Description</system:String>
 
+    <system:String x:Key="wox_plugin_sys_save_command">Save Settings</system:String>
+
     <system:String x:Key="wox_plugin_sys_shutdown_computer">Shutdown Computer</system:String>
     <system:String x:Key="wox_plugin_sys_restart_computer">Restart Computer</system:String>
     <system:String x:Key="wox_plugin_sys_log_off">Log off</system:String>
     <system:String x:Key="wox_plugin_sys_lock">Lock this computer</system:String>
     <system:String x:Key="wox_plugin_sys_exit">Close Wox</system:String>
     <system:String x:Key="wox_plugin_sys_restart">Restart Wox</system:String>
+    <system:String x:Key="wox_plugin_sys_save">Save all Wox settings</system:String>
     <system:String x:Key="wox_plugin_sys_setting">Tweak this app</system:String>
     <system:String x:Key="wox_plugin_sys_sleep">Put computer to sleep</system:String>
     <system:String x:Key="wox_plugin_sys_emptyrecyclebin">Empty recycle bin</system:String>
 
+    <system:String x:Key="wox_plugin_sys_save_success">Successfully saved all Wox settings</system:String>
     <system:String x:Key="wox_plugin_sys_plugin_name">System Commands</system:String>
     <system:String x:Key="wox_plugin_sys_plugin_description">Provides System related commands. e.g. shutdown, lock, settings etc.</system:String>
 
diff --git a/Plugins/Wox.Plugin.Sys/Main.cs b/Plugins/Wox.Plugin.Sys/Main.cs
index 1334034a3b..e9f1b6a271 100644
--- a/Plugins/Wox.Plugin.Sys/Main.cs
+++ b/Plugins/Wox.Plugin.Sys/Main.cs
@@ -168,6 +168,18 @@ namespace Wox.Plugin.Sys
                     }
                 },
                 new Result
+                {
+                    Title = context.API.GetTranslation("wox_plugin_sys_save_command"),
+                    SubTitle = context.API.GetTranslation("wox_plugin_sys_save"),
+                    IcoPath = "Images\\app.png",
+                    Action = c =>
+                    {
+                        context.API.SaveAppAllSettings();
+                        context.API.ShowMsg(string.Format(context.API.GetTranslation("wox_plugin_sys_save_success")));
+                        return true;
+                    }
+                },
+                new Result
                 {
                     Title = "Restart Wox",
                     SubTitle = context.API.GetTranslation("wox_plugin_sys_restart"),
diff --git a/Wox.Plugin/IPublicAPI.cs b/Wox.Plugin/IPublicAPI.cs
index c726c962a6..7dcac48440 100644
--- a/Wox.Plugin/IPublicAPI.cs
+++ b/Wox.Plugin/IPublicAPI.cs
@@ -57,6 +57,11 @@ namespace Wox.Plugin
         [Obsolete]
         void ShowApp();
 
+        /// <summary>
+        /// Save all Wox settings
+        /// </summary>
+        void SaveAppAllSettings();
+
         /// <summary>
         /// Show message box
         /// </summary>
diff --git a/Wox/PublicAPIInstance.cs b/Wox/PublicAPIInstance.cs
index 748c7aac65..9c8e7008bd 100644
--- a/Wox/PublicAPIInstance.cs
+++ b/Wox/PublicAPIInstance.cs
@@ -59,13 +59,18 @@ namespace Wox
             // we must manually save
             // UpdateManager.RestartApp() will call Environment.Exit(0)
             // which will cause ungraceful exit
+            SaveAppAllSettings();
+
+            UpdateManager.RestartApp();
+        }
+
+        public void SaveAppAllSettings()
+        {
             _mainVM.Save();
             _settingsVM.Save();
             PluginManager.Save();
             ImageLoader.Save();
             Alphabet.Save();
-
-            UpdateManager.RestartApp();
         }
 
         [Obsolete]

From 16e8cfdf311e46c73111464f56ed97d9f6595445 Mon Sep 17 00:00:00 2001
From: Jeremy Wu <jeremy24wu@gmail.com>
Date: Thu, 22 Aug 2019 22:03:51 +1000
Subject: [PATCH 2/3] Revert get translation as none is provided

---
 Plugins/Wox.Plugin.Sys/Languages/en.xaml | 4 ----
 Plugins/Wox.Plugin.Sys/Main.cs           | 6 +++---
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/Plugins/Wox.Plugin.Sys/Languages/en.xaml b/Plugins/Wox.Plugin.Sys/Languages/en.xaml
index daf616989c..0d3fb8e61f 100644
--- a/Plugins/Wox.Plugin.Sys/Languages/en.xaml
+++ b/Plugins/Wox.Plugin.Sys/Languages/en.xaml
@@ -5,20 +5,16 @@
     <system:String x:Key="wox_plugin_sys_command">Command</system:String>
     <system:String x:Key="wox_plugin_sys_desc">Description</system:String>
 
-    <system:String x:Key="wox_plugin_sys_save_command">Save Settings</system:String>
-
     <system:String x:Key="wox_plugin_sys_shutdown_computer">Shutdown Computer</system:String>
     <system:String x:Key="wox_plugin_sys_restart_computer">Restart Computer</system:String>
     <system:String x:Key="wox_plugin_sys_log_off">Log off</system:String>
     <system:String x:Key="wox_plugin_sys_lock">Lock this computer</system:String>
     <system:String x:Key="wox_plugin_sys_exit">Close Wox</system:String>
     <system:String x:Key="wox_plugin_sys_restart">Restart Wox</system:String>
-    <system:String x:Key="wox_plugin_sys_save">Save all Wox settings</system:String>
     <system:String x:Key="wox_plugin_sys_setting">Tweak this app</system:String>
     <system:String x:Key="wox_plugin_sys_sleep">Put computer to sleep</system:String>
     <system:String x:Key="wox_plugin_sys_emptyrecyclebin">Empty recycle bin</system:String>
 
-    <system:String x:Key="wox_plugin_sys_save_success">Successfully saved all Wox settings</system:String>
     <system:String x:Key="wox_plugin_sys_plugin_name">System Commands</system:String>
     <system:String x:Key="wox_plugin_sys_plugin_description">Provides System related commands. e.g. shutdown, lock, settings etc.</system:String>
 
diff --git a/Plugins/Wox.Plugin.Sys/Main.cs b/Plugins/Wox.Plugin.Sys/Main.cs
index e9f1b6a271..b3a45bf1cf 100644
--- a/Plugins/Wox.Plugin.Sys/Main.cs
+++ b/Plugins/Wox.Plugin.Sys/Main.cs
@@ -169,13 +169,13 @@ namespace Wox.Plugin.Sys
                 },
                 new Result
                 {
-                    Title = context.API.GetTranslation("wox_plugin_sys_save_command"),
-                    SubTitle = context.API.GetTranslation("wox_plugin_sys_save"),
+                    Title = "Save Settings",
+                    SubTitle = "Save all Wox settings",
                     IcoPath = "Images\\app.png",
                     Action = c =>
                     {
                         context.API.SaveAppAllSettings();
-                        context.API.ShowMsg(string.Format(context.API.GetTranslation("wox_plugin_sys_save_success")));
+                        context.API.ShowMsg(string.Format("Successfully saved all Wox settings"));
                         return true;
                     }
                 },

From 768a195c10ac501b7cc46ad853ff5bfb37aededc Mon Sep 17 00:00:00 2001
From: Jeremy Wu <jeremy24wu@gmail.com>
Date: Fri, 23 Aug 2019 07:20:50 +1000
Subject: [PATCH 3/3] update showmsg

---
 Plugins/Wox.Plugin.Sys/Main.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Plugins/Wox.Plugin.Sys/Main.cs b/Plugins/Wox.Plugin.Sys/Main.cs
index b3a45bf1cf..7cb35c55f8 100644
--- a/Plugins/Wox.Plugin.Sys/Main.cs
+++ b/Plugins/Wox.Plugin.Sys/Main.cs
@@ -175,7 +175,7 @@ namespace Wox.Plugin.Sys
                     Action = c =>
                     {
                         context.API.SaveAppAllSettings();
-                        context.API.ShowMsg(string.Format("Successfully saved all Wox settings"));
+                        context.API.ShowMsg("Success","All Wox settings saved");
                         return true;
                     }
                 },