Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-08 12:18:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

PT Run Service notification improvements (#9772)

Browse Source
This commit is contained in:
Davide Giacometti
2021-02-19 18:17:52 +01:00
committed by GitHub
parent a29b3aa500
commit ff4a78a7f9
5 changed files with 80 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Service/Helpers/ServiceHelper.cs
View File

@@ -6,7 +6,6 @@ using System;
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 @@ namespace Microsoft.PowerToys.Run.Plugin.Service.Helpers
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 @@ namespace Microsoft.PowerToys.Run.Plugin.Service.Helpers
}
}
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
{