PT Run Service notification improvements (#9772)

microsoft · Feb 19, 2021 · ff4a78a · ff4a78a
1 parent a29b3aa
commit ff4a78a
Show file tree

Hide file tree

Showing 5 changed files with 80 additions and 20 deletions.
diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Service/Helpers/ServiceHelper.cs b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Service/Helpers/ServiceHelper.cs
@@ -6,7 +6,6 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics;
-using System.Globalization;
 using System.Linq;
 using System.Reflection;
 using System.ServiceProcess;
@@ -75,11 +74,11 @@ public static void ChangeStatus(ServiceResult serviceResult, Action action, IPub
 
                 if (exitCode == 0)
                 {
-                    contextAPI.ShowNotification(GetLocalizedMessage(serviceResult, action));
+                    contextAPI.ShowNotification(GetLocalizedMessage(action), serviceResult.DisplayName);
                 }
                 else
                 {
-                    contextAPI.ShowNotification("An error occurred");
+                    contextAPI.ShowNotification(GetLocalizedErrorMessage(action), serviceResult.DisplayName);
                     Log.Error($"The command returned {exitCode}", MethodBase.GetCurrentMethod().DeclaringType);
                 }
             }
@@ -192,19 +191,39 @@ private static string GetLocalizedStartType(ServiceStartMode startMode)
             }
         }
 
-        private static string GetLocalizedMessage(ServiceResult serviceResult, Action action)
+        private static string GetLocalizedMessage(Action action)
         {
             if (action == Action.Start)
             {
-                return string.Format(CultureInfo.CurrentCulture, Resources.wox_plugin_service_started_notification, serviceResult.DisplayName);
+                return Resources.wox_plugin_service_started_notification;
             }
             else if (action == Action.Stop)
             {
-                return string.Format(CultureInfo.CurrentCulture, Resources.wox_plugin_service_stopped_notification, serviceResult.DisplayName);
+                return Resources.wox_plugin_service_stopped_notification;
             }
             else if (action == Action.Restart)
             {
-                return string.Format(CultureInfo.CurrentCulture, Resources.wox_plugin_service_restarted_notification, serviceResult.DisplayName);
+                return Resources.wox_plugin_service_restarted_notification;
+            }
+            else
+            {
+                return string.Empty;
+            }
+        }
+
+        private static string GetLocalizedErrorMessage(Action action)
+        {
+            if (action == Action.Start)
+            {
+                return Resources.wox_plugin_service_start_error_notification;
+            }
+            else if (action == Action.Stop)
+            {
+                return Resources.wox_plugin_service_stop_error_notification;
+            }
+            else if (action == Action.Restart)
+            {
+                return Resources.wox_plugin_service_restart_error_notification;
             }
             else
             {

diff --git a/.../launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Service/Properties/Resources.Designer.cs b/.../launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Service/Properties/Resources.Designer.cs
diff --git a/...modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Service/Properties/Resources.resx b/...modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Service/Properties/Resources.resx
@@ -139,7 +139,10 @@
     <value>Restart (Ctrl+R)</value>
   </data>
   <data name="wox_plugin_service_restarted_notification" xml:space="preserve">
-    <value>{0} has been restarted</value>
+    <value>The service has been restarted</value>
+  </data>
+  <data name="wox_plugin_service_restart_error_notification" xml:space="preserve">
+    <value>An error occurred while restarting the service</value>
   </data>
   <data name="wox_plugin_service_running" xml:space="preserve">
     <value>Running</value>
@@ -151,11 +154,14 @@
     <value>Started</value>
   </data>
   <data name="wox_plugin_service_started_notification" xml:space="preserve">
-    <value>{0} has been started</value>
+    <value>The service has been started</value>
   </data>
   <data name="wox_plugin_service_startup" xml:space="preserve">
     <value>Startup</value>
   </data>
+  <data name="wox_plugin_service_start_error_notification" xml:space="preserve">
+    <value>An error occurred while starting the service</value>
+  </data>
   <data name="wox_plugin_service_start_mode_automatic" xml:space="preserve">
     <value>Automatic</value>
   </data>
@@ -184,7 +190,10 @@
     <value>Stopped</value>
   </data>
   <data name="wox_plugin_service_stopped_notification" xml:space="preserve">
-    <value>{0} has been stopped</value>
+    <value>The service has been stopped</value>
+  </data>
+  <data name="wox_plugin_service_stop_error_notification" xml:space="preserve">
+    <value>An error occurred while stopping the service</value>
   </data>
   <data name="wox_plugin_service_stop_pending" xml:space="preserve">
     <value>Stopping</value>

diff --git a/src/modules/launcher/PowerLauncher/PublicAPIInstance.cs b/src/modules/launcher/PowerLauncher/PublicAPIInstance.cs
@@ -84,14 +84,18 @@ public void ShowMsg(string title, string subTitle = "", string iconPath = "", bo
             });
         }
 
-        public void ShowNotification(string text)
+        public void ShowNotification(string text, string secondaryText = null)
         {
+            var builder = new ToastContentBuilder().AddText(text);
+
+            if (!string.IsNullOrWhiteSpace(secondaryText))
+            {
+                builder.AddText(secondaryText);
+            }
+
             Application.Current.Dispatcher.Invoke(() =>
             {
-                ToastContent toastContent = new ToastContentBuilder()
-                    .AddText(text)
-                    .GetToastContent();
-                var toast = new ToastNotification(toastContent.GetXml());
+                var toast = new ToastNotification(builder.GetToastContent().GetXml());
                 DesktopNotificationManagerCompat.CreateToastNotifier().Show(toast);
             });
         }

diff --git a/src/modules/launcher/Wox.Plugin/IPublicAPI.cs b/src/modules/launcher/Wox.Plugin/IPublicAPI.cs
@@ -78,7 +78,8 @@ public interface IPublicAPI
         /// <summary>
         /// Show toast notification
         /// </summary>
-        /// <param name="text">Notification text</param>
-        void ShowNotification(string text);
+        /// <param name="text">Notification main text</param>
+        /// <param name="secondaryText">Notification optional text</param>
+        void ShowNotification(string text, string secondaryText = null);
     }
 }