From 2a5b22b93862ba2799b81a90602dfa5f14ba1ba1 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 13 Mar 2025 23:29:00 +0800
Subject: [PATCH] Add command keyword change dialog & Support culture change

---
 Plugins/Flow.Launcher.Plugin.Sys/Command.cs   |  33 +++-
 .../CommandKeywordSetting.xaml                | 121 ++++++++++++++
 .../CommandKeywordSetting.xaml.cs             |  45 ++++++
 .../Languages/en.xaml                         |   9 ++
 Plugins/Flow.Launcher.Plugin.Sys/Main.cs      | 151 +++++++++---------
 .../SysSettings.xaml.cs                       |  20 +--
 6 files changed, 291 insertions(+), 88 deletions(-)
 create mode 100644 Plugins/Flow.Launcher.Plugin.Sys/CommandKeywordSetting.xaml
 create mode 100644 Plugins/Flow.Launcher.Plugin.Sys/CommandKeywordSetting.xaml.cs

diff --git a/Plugins/Flow.Launcher.Plugin.Sys/Command.cs b/Plugins/Flow.Launcher.Plugin.Sys/Command.cs
index 84f5f046f..6c3a99f3e 100644
--- a/Plugins/Flow.Launcher.Plugin.Sys/Command.cs
+++ b/Plugins/Flow.Launcher.Plugin.Sys/Command.cs
@@ -6,12 +6,39 @@ namespace Flow.Launcher.Plugin.Sys
     {
         public string Key { get; set; }
 
+        private string name;
         [JsonIgnore]
-        public string Name { get; set; }
+        public string Name
+        {
+            get => name;
+            set
+            {
+                name = value;
+                OnPropertyChanged();
+            }
+        }
 
+        private string description;
         [JsonIgnore]
-        public string Description { get; set; }
+        public string Description
+        {
+            get => description;
+            set
+            {
+                description = value;
+                OnPropertyChanged();
+            }
+        }
 
-        public string Keyword { get; set; }
+        private string keyword;
+        public string Keyword
+        {
+            get => keyword;
+            set
+            {
+                keyword = value;
+                OnPropertyChanged();
+            }
+        }
     }
 }
diff --git a/Plugins/Flow.Launcher.Plugin.Sys/CommandKeywordSetting.xaml b/Plugins/Flow.Launcher.Plugin.Sys/CommandKeywordSetting.xaml
new file mode 100644
index 000000000..a848f2f1f
--- /dev/null
+++ b/Plugins/Flow.Launcher.Plugin.Sys/CommandKeywordSetting.xaml
@@ -0,0 +1,121 @@
+<Window
+    x:Class="Flow.Launcher.Plugin.Sys.CommandKeywordSettingWindow"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    Title="{DynamicResource lowlauncher_plugin_sys_command_keyword_setting_window_title}"
+    Width="550"
+    Background="{DynamicResource PopupBGColor}"
+    Foreground="{DynamicResource PopupTextColor}"
+    ResizeMode="NoResize"
+    SizeToContent="Height"
+    WindowStartupLocation="CenterScreen"
+    mc:Ignorable="d">
+    <WindowChrome.WindowChrome>
+        <WindowChrome CaptionHeight="32" ResizeBorderThickness="{x:Static SystemParameters.WindowResizeBorderThickness}" />
+    </WindowChrome.WindowChrome>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition />
+            <RowDefinition Height="80" />
+        </Grid.RowDefinitions>
+
+        <StackPanel Grid.Row="0">
+            <StackPanel>
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <Button
+                        Grid.Column="1"
+                        Click="OnCancelButtonClick"
+                        Style="{StaticResource TitleBarCloseButtonStyle}">
+                        <Path
+                            Width="46"
+                            Height="32"
+                            Data="M 18,11 27,20 M 18,20 27,11"
+                            Stroke="{Binding Path=Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
+                            StrokeThickness="1">
+                            <Path.Style>
+                                <Style TargetType="Path">
+                                    <Style.Triggers>
+                                        <DataTrigger Binding="{Binding Path=IsActive, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Value="False">
+                                            <Setter Property="Opacity" Value="0.5" />
+                                        </DataTrigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </Path.Style>
+                        </Path>
+                    </Button>
+                </Grid>
+            </StackPanel>
+            <StackPanel Margin="26 12 26 0">
+                <StackPanel Margin="0 0 0 12">
+                    <TextBlock
+                        Grid.Column="0"
+                        Margin="0 0 0 0"
+                        FontSize="20"
+                        FontWeight="SemiBold"
+                        Text="{DynamicResource flowlauncher_plugin_sys_custom_command_keyword}"
+                        TextAlignment="Left" />
+                </StackPanel>
+
+                <StackPanel>
+                    <TextBlock
+                        x:Name="CommandKeywordTips"
+                        FontSize="14"
+                        TextAlignment="Left"
+                        TextWrapping="WrapWithOverflow" />
+                </StackPanel>
+
+                <Grid Margin="0 24 0 24">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <TextBlock
+                        Grid.Column="0"
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Center"
+                        FontSize="14"
+                        Text="{DynamicResource flowlauncher_plugin_sys_command_keyword}" />
+                    <TextBox
+                        x:Name="CommandKeyword"
+                        Grid.Column="1"
+                        Margin="10"
+                        HorizontalAlignment="Stretch" />
+                    <Button
+                        x:Name="btnTestActionKeyword"
+                        Grid.Row="1"
+                        Grid.Column="2"
+                        Margin="0 0 10 0"
+                        Padding="10 5 10 5"
+                        Click="OnResetButtonClick"
+                        Content="{DynamicResource flowlauncher_plugin_sys_reset}" />
+                </Grid>
+            </StackPanel>
+        </StackPanel>
+        <Border
+            Grid.Row="1"
+            Background="{DynamicResource PopupButtonAreaBGColor}"
+            BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
+            BorderThickness="0 1 0 0">
+            <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
+                <Button
+                    MinWidth="140"
+                    Margin="10 0 5 0"
+                    Click="OnCancelButtonClick"
+                    Content="{DynamicResource flowlauncher_plugin_sys_cancel}" />
+                <Button
+                    MinWidth="140"
+                    Margin="5 0 10 0"
+                    Click="OnConfirmButtonClick"
+                    Content="{DynamicResource flowlauncher_plugin_sys_confirm}"
+                    Style="{DynamicResource AccentButtonStyle}" />
+            </StackPanel>
+        </Border>
+    </Grid>
+</Window>
\ No newline at end of file
diff --git a/Plugins/Flow.Launcher.Plugin.Sys/CommandKeywordSetting.xaml.cs b/Plugins/Flow.Launcher.Plugin.Sys/CommandKeywordSetting.xaml.cs
new file mode 100644
index 000000000..8797bf220
--- /dev/null
+++ b/Plugins/Flow.Launcher.Plugin.Sys/CommandKeywordSetting.xaml.cs
@@ -0,0 +1,45 @@
+using System.Windows;
+
+namespace Flow.Launcher.Plugin.Sys
+{
+    public partial class CommandKeywordSettingWindow
+    {
+        private readonly Command _oldSearchSource;
+        private readonly PluginInitContext _context;
+
+        public CommandKeywordSettingWindow(PluginInitContext context, Command old)
+        {
+            _context = context;
+            _oldSearchSource = old;
+            InitializeComponent();
+            CommandKeyword.Text = old.Keyword;
+            CommandKeywordTips.Text = string.Format(_context.API.GetTranslation("flowlauncher_plugin_sys_custom_command_keyword_tip"), old.Name);
+        }
+
+        private void OnCancelButtonClick(object sender, RoutedEventArgs e)
+        {
+            Close();
+        }
+
+        private void OnConfirmButtonClick(object sender, RoutedEventArgs e)
+        {
+            var keyword = CommandKeyword.Text;
+            if (string.IsNullOrEmpty(keyword))
+            {
+                var warning = _context.API.GetTranslation("flowlauncher_plugin_sys_input_command_keyword");
+                _context.API.ShowMsgBox(warning);
+            }
+            else
+            {
+                _oldSearchSource.Keyword = keyword;
+                Close();
+            }
+        }
+
+        private void OnResetButtonClick(object sender, RoutedEventArgs e)
+        {
+            // Key is the default value of this command
+            CommandKeyword.Text = _oldSearchSource.Key;
+        }
+    }
+}
diff --git a/Plugins/Flow.Launcher.Plugin.Sys/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.Sys/Languages/en.xaml
index e1d83fa38..ad3f8553b 100644
--- a/Plugins/Flow.Launcher.Plugin.Sys/Languages/en.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Sys/Languages/en.xaml
@@ -64,6 +64,15 @@
     <system:String x:Key="flowlauncher_plugin_sys_dlgtext_restart_computer_advanced">Are you sure you want to restart the computer with Advanced Boot Options?</system:String>
     <system:String x:Key="flowlauncher_plugin_sys_dlgtext_logoff_computer">Are you sure you want to log off?</system:String>
 
+    <system:String x:Key="flowlauncher_plugin_sys_command_keyword_setting_window_title">Command Keyword Setting</system:String>
+    <system:String x:Key="flowlauncher_plugin_sys_custom_command_keyword">Custom Command Keyword</system:String>
+    <system:String x:Key="flowlauncher_plugin_sys_custom_command_keyword_tip">Enter a keyword to search for command: {0}. This keyword is used to match your query.</system:String>
+    <system:String x:Key="flowlauncher_plugin_sys_command_keyword">Command Keyword</system:String>
+    <system:String x:Key="flowlauncher_plugin_sys_reset">Reset</system:String>
+    <system:String x:Key="flowlauncher_plugin_sys_confirm">Confirm</system:String>
+    <system:String x:Key="flowlauncher_plugin_sys_cancel">Cancel</system:String>
+    <system:String x:Key="flowlauncher_plugin_sys_input_command_keyword">Please enter a non-empty command keyword</system:String>
+
     <system:String x:Key="flowlauncher_plugin_sys_plugin_name">System Commands</system:String>
     <system:String x:Key="flowlauncher_plugin_sys_plugin_description">Provides System related commands. e.g. shutdown, lock, settings etc.</system:String>
 
diff --git a/Plugins/Flow.Launcher.Plugin.Sys/Main.cs b/Plugins/Flow.Launcher.Plugin.Sys/Main.cs
index ef9da2719..fd72ddcaf 100644
--- a/Plugins/Flow.Launcher.Plugin.Sys/Main.cs
+++ b/Plugins/Flow.Launcher.Plugin.Sys/Main.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Globalization;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Windows;
@@ -18,10 +19,6 @@ namespace Flow.Launcher.Plugin.Sys
 {
     public class Main : IPlugin, ISettingProvider, IPluginI18n
     {
-        private PluginInitContext context;
-        private Settings settings;
-        private ThemeSelector themeSelector;
-
         private readonly Dictionary<string, string> KeywordTitleMappings = new()
         {
             {"Shutdown", "flowlauncher_plugin_sys_shutdown_computer_cmd"},
@@ -48,23 +45,28 @@ namespace Flow.Launcher.Plugin.Sys
         };
         private readonly Dictionary<string, string> KeywordDescriptionMappings = new();
 
-        private SettingsViewModel _viewModel;
-
-        // SHTDN_REASON_MAJOR_OTHER indicates a generic shutdown reason that isn't categorized under hardware failure, software updates, or other predefined reasons.
+        // SHTDN_REASON_MAJOR_OTHER indicates a generic shutdown reason that isn't categorized under hardware failure,
+        // software updates, or other predefined reasons.
         // SHTDN_REASON_FLAG_PLANNED marks the shutdown as planned rather than an unexpected shutdown or failure
-        private const SHUTDOWN_REASON REASON = SHUTDOWN_REASON.SHTDN_REASON_MAJOR_OTHER | SHUTDOWN_REASON.SHTDN_REASON_FLAG_PLANNED;
+        private const SHUTDOWN_REASON REASON = SHUTDOWN_REASON.SHTDN_REASON_MAJOR_OTHER |
+            SHUTDOWN_REASON.SHTDN_REASON_FLAG_PLANNED;
+
+        private PluginInitContext _context;
+        private Settings _settings;
+        private ThemeSelector _themeSelector;
+        private SettingsViewModel _viewModel;
 
         public Control CreateSettingPanel()
         {
             UpdateLocalizedNameDescription(false);
-            return new SysSettings(_viewModel);
+            return new SysSettings(_context, _viewModel);
         }
 
         public List<Result> Query(Query query)
         {
             if(query.Search.StartsWith(ThemeSelector.Keyword))
             {
-                return themeSelector.Query(query);
+                return _themeSelector.Query(query);
             }
 
             var commands = Commands();
@@ -99,7 +101,7 @@ namespace Flow.Launcher.Plugin.Sys
                 return "Title Not Found";
             }
 
-            return context.API.GetTranslation(translationKey);
+            return _context.API.GetTranslation(translationKey);
         }
 
         private string GetDescription(string key)
@@ -110,7 +112,7 @@ namespace Flow.Launcher.Plugin.Sys
                 return "Description Not Found";
             }
 
-            return context.API.GetTranslation(translationKey);
+            return _context.API.GetTranslation(translationKey);
         }
 
         [Obsolete]
@@ -122,7 +124,7 @@ namespace Flow.Launcher.Plugin.Sys
                 return "Title Not Found";
             }
 
-            var translatedTitle = context.API.GetTranslation(translationKey);
+            var translatedTitle = _context.API.GetTranslation(translationKey);
 
             if (query == null)
             {
@@ -142,10 +144,10 @@ namespace Flow.Launcher.Plugin.Sys
 
         public void Init(PluginInitContext context)
         {
-            this.context = context;
-            settings = context.API.LoadSettingJsonStorage<Settings>();
-            _viewModel = new SettingsViewModel(settings);
-            themeSelector = new ThemeSelector(context);
+            _context = context;
+            _settings = context.API.LoadSettingJsonStorage<Settings>();
+            _viewModel = new SettingsViewModel(_settings);
+            _themeSelector = new ThemeSelector(context);
             foreach (string key in KeywordTitleMappings.Keys)
             {
                 // Remove _cmd in the last of the strings
@@ -155,9 +157,9 @@ namespace Flow.Launcher.Plugin.Sys
 
         private void UpdateLocalizedNameDescription(bool force)
         {
-            if (string.IsNullOrEmpty(settings.Commands[0].Name) || force)
+            if (string.IsNullOrEmpty(_settings.Commands[0].Name) || force)
             {
-                foreach (var c in settings.Commands)
+                foreach (var c in _settings.Commands)
                 {
                     c.Name = GetTitle(c.Key);
                     c.Description = GetDescription(c.Key);
@@ -214,14 +216,14 @@ namespace Flow.Launcher.Plugin.Sys
                 new Result
                 {
                     Title = "Shutdown",
-                    SubTitle = context.API.GetTranslation("flowlauncher_plugin_sys_shutdown_computer"),
+                    SubTitle = _context.API.GetTranslation("flowlauncher_plugin_sys_shutdown_computer"),
                     Glyph = new GlyphInfo (FontFamily:"/Resources/#Segoe Fluent Icons", Glyph:"\xe7e8"),
                     IcoPath = "Images\\shutdown.png",
                     Action = c =>
                     {
-                        var result = context.API.ShowMsgBox(
-                            context.API.GetTranslation("flowlauncher_plugin_sys_dlgtext_shutdown_computer"),
-                            context.API.GetTranslation("flowlauncher_plugin_sys_shutdown_computer"),
+                        var result = _context.API.ShowMsgBox(
+                            _context.API.GetTranslation("flowlauncher_plugin_sys_dlgtext_shutdown_computer"),
+                            _context.API.GetTranslation("flowlauncher_plugin_sys_shutdown_computer"),
                             MessageBoxButton.YesNo, MessageBoxImage.Warning);
 
                         if (result == MessageBoxResult.Yes)
@@ -236,14 +238,14 @@ namespace Flow.Launcher.Plugin.Sys
                 new Result
                 {
                     Title = "Restart",
-                    SubTitle = context.API.GetTranslation("flowlauncher_plugin_sys_restart_computer"),
+                    SubTitle = _context.API.GetTranslation("flowlauncher_plugin_sys_restart_computer"),
                     Glyph = new GlyphInfo (FontFamily:"/Resources/#Segoe Fluent Icons", Glyph:"\xe777"),
                     IcoPath = "Images\\restart.png",
                     Action = c =>
                     {
-                        var result = context.API.ShowMsgBox(
-                            context.API.GetTranslation("flowlauncher_plugin_sys_dlgtext_restart_computer"),
-                            context.API.GetTranslation("flowlauncher_plugin_sys_restart_computer"),
+                        var result = _context.API.ShowMsgBox(
+                            _context.API.GetTranslation("flowlauncher_plugin_sys_dlgtext_restart_computer"),
+                            _context.API.GetTranslation("flowlauncher_plugin_sys_restart_computer"),
                             MessageBoxButton.YesNo, MessageBoxImage.Warning);
 
                         if (result == MessageBoxResult.Yes)
@@ -258,14 +260,14 @@ namespace Flow.Launcher.Plugin.Sys
                 new Result
                 {
                     Title = "Restart With Advanced Boot Options",
-                    SubTitle = context.API.GetTranslation("flowlauncher_plugin_sys_restart_advanced"),
+                    SubTitle = _context.API.GetTranslation("flowlauncher_plugin_sys_restart_advanced"),
                     Glyph = new GlyphInfo (FontFamily:"/Resources/#Segoe Fluent Icons", Glyph:"\xecc5"),
                     IcoPath = "Images\\restart_advanced.png",
                     Action = c =>
                     {
-                        var result = context.API.ShowMsgBox(
-                            context.API.GetTranslation("flowlauncher_plugin_sys_dlgtext_restart_computer_advanced"),
-                            context.API.GetTranslation("flowlauncher_plugin_sys_restart_computer"),
+                        var result = _context.API.ShowMsgBox(
+                            _context.API.GetTranslation("flowlauncher_plugin_sys_dlgtext_restart_computer_advanced"),
+                            _context.API.GetTranslation("flowlauncher_plugin_sys_restart_computer"),
                             MessageBoxButton.YesNo, MessageBoxImage.Warning);
 
                         if (result == MessageBoxResult.Yes)
@@ -280,14 +282,14 @@ namespace Flow.Launcher.Plugin.Sys
                 new Result
                 {
                     Title = "Log Off/Sign Out",
-                    SubTitle = context.API.GetTranslation("flowlauncher_plugin_sys_log_off"),
+                    SubTitle = _context.API.GetTranslation("flowlauncher_plugin_sys_log_off"),
                     Glyph = new GlyphInfo (FontFamily:"/Resources/#Segoe Fluent Icons", Glyph:"\xe77b"),
                     IcoPath = "Images\\logoff.png",
                     Action = c =>
                     {
-                        var result = context.API.ShowMsgBox(
-                            context.API.GetTranslation("flowlauncher_plugin_sys_dlgtext_logoff_computer"),
-                            context.API.GetTranslation("flowlauncher_plugin_sys_log_off"),
+                        var result = _context.API.ShowMsgBox(
+                            _context.API.GetTranslation("flowlauncher_plugin_sys_dlgtext_logoff_computer"),
+                            _context.API.GetTranslation("flowlauncher_plugin_sys_log_off"),
                             MessageBoxButton.YesNo, MessageBoxImage.Warning);
 
                         if (result == MessageBoxResult.Yes)
@@ -299,7 +301,7 @@ namespace Flow.Launcher.Plugin.Sys
                 new Result
                 {
                     Title = "Lock",
-                    SubTitle = context.API.GetTranslation("flowlauncher_plugin_sys_lock"),
+                    SubTitle = _context.API.GetTranslation("flowlauncher_plugin_sys_lock"),
                     Glyph = new GlyphInfo (FontFamily:"/Resources/#Segoe Fluent Icons", Glyph:"\xe72e"),
                     IcoPath = "Images\\lock.png",
                     Action = c =>
@@ -311,7 +313,7 @@ namespace Flow.Launcher.Plugin.Sys
                 new Result
                 {
                     Title = "Sleep",
-                    SubTitle = context.API.GetTranslation("flowlauncher_plugin_sys_sleep"),
+                    SubTitle = _context.API.GetTranslation("flowlauncher_plugin_sys_sleep"),
                     Glyph = new GlyphInfo (FontFamily:"/Resources/#Segoe Fluent Icons", Glyph:"\xec46"),
                     IcoPath = "Images\\sleep.png",
                     Action = c =>
@@ -323,7 +325,7 @@ namespace Flow.Launcher.Plugin.Sys
                 new Result
                 {
                     Title = "Hibernate",
-                    SubTitle = context.API.GetTranslation("flowlauncher_plugin_sys_hibernate"),
+                    SubTitle = _context.API.GetTranslation("flowlauncher_plugin_sys_hibernate"),
                     Glyph = new GlyphInfo (FontFamily:"/Resources/#Segoe Fluent Icons", Glyph:"\xe945"),
                     IcoPath = "Images\\hibernate.png",
                     Action= c =>
@@ -335,7 +337,7 @@ namespace Flow.Launcher.Plugin.Sys
                  new Result
                 {
                     Title = "Index Option",
-                    SubTitle = context.API.GetTranslation("flowlauncher_plugin_sys_indexoption"),
+                    SubTitle = _context.API.GetTranslation("flowlauncher_plugin_sys_indexoption"),
                     IcoPath = "Images\\indexoption.png",
                     Glyph = new GlyphInfo (FontFamily:"/Resources/#Segoe Fluent Icons", Glyph:"\xe773"),
                     Action = c =>
@@ -347,7 +349,7 @@ namespace Flow.Launcher.Plugin.Sys
                 new Result
                 {
                     Title = "Empty Recycle Bin",
-                    SubTitle = context.API.GetTranslation("flowlauncher_plugin_sys_emptyrecyclebin"),
+                    SubTitle = _context.API.GetTranslation("flowlauncher_plugin_sys_emptyrecyclebin"),
                     IcoPath = "Images\\recyclebin.png",
                     Glyph = new GlyphInfo (FontFamily:"/Resources/#Segoe Fluent Icons", Glyph:"\xe74d"),
                     Action = c =>
@@ -358,7 +360,7 @@ namespace Flow.Launcher.Plugin.Sys
                         var result = PInvoke.SHEmptyRecycleBin(new(), string.Empty, 0);
                         if (result != HRESULT.S_OK && result != HRESULT.E_UNEXPECTED)
                         {
-                            context.API.ShowMsgBox("Failed to empty the recycle bin. This might happen if:\n" +
+                            _context.API.ShowMsgBox("Failed to empty the recycle bin. This might happen if:\n" +
                                             "- A file in the recycle bin is in use\n" +
                                             "- You don't have permission to delete some items\n" +
                                             "Please close any applications that might be using these files and try again.",
@@ -372,7 +374,7 @@ namespace Flow.Launcher.Plugin.Sys
                 new Result
                 {
                     Title = "Open Recycle Bin",
-                    SubTitle = context.API.GetTranslation("flowlauncher_plugin_sys_openrecyclebin"),
+                    SubTitle = _context.API.GetTranslation("flowlauncher_plugin_sys_openrecyclebin"),
                     IcoPath = "Images\\openrecyclebin.png",
                     Glyph = new GlyphInfo (FontFamily:"/Resources/#Segoe Fluent Icons", Glyph:"\xe74d"),
                     CopyText = recycleBinFolder,
@@ -385,7 +387,7 @@ namespace Flow.Launcher.Plugin.Sys
                 new Result
                 {
                     Title = "Exit",
-                    SubTitle = context.API.GetTranslation("flowlauncher_plugin_sys_exit"),
+                    SubTitle = _context.API.GetTranslation("flowlauncher_plugin_sys_exit"),
                     IcoPath = "Images\\app.png",
                     Action = c =>
                     {
@@ -396,52 +398,52 @@ namespace Flow.Launcher.Plugin.Sys
                 new Result
                 {
                     Title = "Save Settings",
-                    SubTitle = context.API.GetTranslation("flowlauncher_plugin_sys_save_all_settings"),
+                    SubTitle = _context.API.GetTranslation("flowlauncher_plugin_sys_save_all_settings"),
                     IcoPath = "Images\\app.png",
                     Action = c =>
                     {
-                        context.API.SaveAppAllSettings();
-                        context.API.ShowMsg(context.API.GetTranslation("flowlauncher_plugin_sys_dlgtitle_success"),
-                            context.API.GetTranslation("flowlauncher_plugin_sys_dlgtext_all_settings_saved"));
+                        _context.API.SaveAppAllSettings();
+                        _context.API.ShowMsg(_context.API.GetTranslation("flowlauncher_plugin_sys_dlgtitle_success"),
+                            _context.API.GetTranslation("flowlauncher_plugin_sys_dlgtext_all_settings_saved"));
                         return true;
                     }
                 },
                 new Result
                 {
                     Title = "Restart Flow Launcher",
-                    SubTitle = context.API.GetTranslation("flowlauncher_plugin_sys_restart"),
+                    SubTitle = _context.API.GetTranslation("flowlauncher_plugin_sys_restart"),
                     IcoPath = "Images\\app.png",
                     Action = c =>
                     {
-                        context.API.RestartApp();
+                        _context.API.RestartApp();
                         return false;
                     }
                 },
                 new Result
                 {
                     Title = "Settings",
-                    SubTitle = context.API.GetTranslation("flowlauncher_plugin_sys_setting"),
+                    SubTitle = _context.API.GetTranslation("flowlauncher_plugin_sys_setting"),
                     IcoPath = "Images\\app.png",
                     Action = c =>
                     {
-                        context.API.OpenSettingDialog();
+                        _context.API.OpenSettingDialog();
                         return true;
                     }
                 },
                 new Result
                 {
                     Title = "Reload Plugin Data",
-                    SubTitle = context.API.GetTranslation("flowlauncher_plugin_sys_reload_plugin_data"),
+                    SubTitle = _context.API.GetTranslation("flowlauncher_plugin_sys_reload_plugin_data"),
                     IcoPath = "Images\\app.png",
                     Action = c =>
                     {
                         // Hide the window first then show msg after done because sometimes the reload could take a while, so not to make user think it's frozen. 
-                        context.API.HideMainWindow();
+                        _context.API.HideMainWindow();
 
-                        _ = context.API.ReloadAllPluginData().ContinueWith(_ =>
-                            context.API.ShowMsg(
-                                context.API.GetTranslation("flowlauncher_plugin_sys_dlgtitle_success"),
-                                context.API.GetTranslation(
+                        _ = _context.API.ReloadAllPluginData().ContinueWith(_ =>
+                            _context.API.ShowMsg(
+                                _context.API.GetTranslation("flowlauncher_plugin_sys_dlgtitle_success"),
+                                _context.API.GetTranslation(
                                     "flowlauncher_plugin_sys_dlgtext_all_applicableplugins_reloaded")),
                             System.Threading.Tasks.TaskScheduler.Current);
 
@@ -451,75 +453,75 @@ namespace Flow.Launcher.Plugin.Sys
                 new Result
                 {
                     Title = "Check For Update",
-                    SubTitle = context.API.GetTranslation("flowlauncher_plugin_sys_check_for_update"),
+                    SubTitle = _context.API.GetTranslation("flowlauncher_plugin_sys_check_for_update"),
                     IcoPath = "Images\\checkupdate.png",
                     Action = c =>
                     {
-                        context.API.HideMainWindow();
-                        context.API.CheckForNewUpdate();
+                        _context.API.HideMainWindow();
+                        _context.API.CheckForNewUpdate();
                         return true;
                     }
                 },
                 new Result
                 {
                     Title = "Open Log Location",
-                    SubTitle = context.API.GetTranslation("flowlauncher_plugin_sys_open_log_location"),
+                    SubTitle = _context.API.GetTranslation("flowlauncher_plugin_sys_open_log_location"),
                     IcoPath = "Images\\app.png",
                     CopyText = logPath,
                     AutoCompleteText = logPath,
                     Action = c =>
                     {
-                        context.API.OpenDirectory(logPath);
+                        _context.API.OpenDirectory(logPath);
                         return true;
                     }
                 },
                 new Result
                 {
                     Title = "Flow Launcher Tips",
-                    SubTitle = context.API.GetTranslation("flowlauncher_plugin_sys_open_docs_tips"),
+                    SubTitle = _context.API.GetTranslation("flowlauncher_plugin_sys_open_docs_tips"),
                     IcoPath = "Images\\app.png",
                     CopyText = Constant.Documentation,
                     AutoCompleteText = Constant.Documentation,
                     Action = c =>
                     {
-                        context.API.OpenUrl(Constant.Documentation);
+                        _context.API.OpenUrl(Constant.Documentation);
                         return true;
                     }
                 },
                 new Result
                 {
                     Title = "Flow Launcher UserData Folder",
-                    SubTitle = context.API.GetTranslation("flowlauncher_plugin_sys_open_userdata_location"),
+                    SubTitle = _context.API.GetTranslation("flowlauncher_plugin_sys_open_userdata_location"),
                     IcoPath = "Images\\app.png",
                     CopyText = userDataPath,
                     AutoCompleteText = userDataPath,
                     Action = c =>
                     {
-                        context.API.OpenDirectory(userDataPath);
+                        _context.API.OpenDirectory(userDataPath);
                         return true;
                     }
                 },
                 new Result
                 {
                     Title = "Toggle Game Mode",
-                    SubTitle = context.API.GetTranslation("flowlauncher_plugin_sys_toggle_game_mode"),
+                    SubTitle = _context.API.GetTranslation("flowlauncher_plugin_sys_toggle_game_mode"),
                     IcoPath = "Images\\app.png",
                     Glyph = new GlyphInfo (FontFamily:"/Resources/#Segoe Fluent Icons", Glyph:"\ue7fc"),
                     Action = c =>
                     {
-                        context.API.ToggleGameMode();
+                        _context.API.ToggleGameMode();
                         return true;
                     }
                 },
                 new Result
                 {
                     Title = "Set Flow Launcher Theme",
-                    SubTitle = context.API.GetTranslation("flowlauncher_plugin_sys_theme_selector"),
+                    SubTitle = _context.API.GetTranslation("flowlauncher_plugin_sys_theme_selector"),
                     IcoPath = "Images\\app.png",
                     Glyph = new GlyphInfo (FontFamily:"/Resources/#Segoe Fluent Icons", Glyph:"\ue7fc"),
                     Action = c =>
                     {
-                        context.API.ChangeQuery($"{ThemeSelector.Keyword} ");
+                        _context.API.ChangeQuery($"{ThemeSelector.Keyword} ");
                         return false;
                     }
                 }
@@ -530,12 +532,17 @@ namespace Flow.Launcher.Plugin.Sys
 
         public string GetTranslatedPluginTitle()
         {
-            return context.API.GetTranslation("flowlauncher_plugin_sys_plugin_name");
+            return _context.API.GetTranslation("flowlauncher_plugin_sys_plugin_name");
         }
 
         public string GetTranslatedPluginDescription()
         {
-            return context.API.GetTranslation("flowlauncher_plugin_sys_plugin_description");
+            return _context.API.GetTranslation("flowlauncher_plugin_sys_plugin_description");
+        }
+
+        public void OnCultureInfoChanged(CultureInfo _)
+        {
+            UpdateLocalizedNameDescription(true);
         }
     }
 }
diff --git a/Plugins/Flow.Launcher.Plugin.Sys/SysSettings.xaml.cs b/Plugins/Flow.Launcher.Plugin.Sys/SysSettings.xaml.cs
index 539801a0b..0a38fda04 100644
--- a/Plugins/Flow.Launcher.Plugin.Sys/SysSettings.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.Sys/SysSettings.xaml.cs
@@ -5,11 +5,13 @@ namespace Flow.Launcher.Plugin.Sys
 {
     public partial class SysSettings : UserControl
     {
+        private readonly PluginInitContext _context;
         private readonly Settings _settings;
 
-        public SysSettings(SettingsViewModel viewModel)
+        public SysSettings(PluginInitContext context, SettingsViewModel viewModel)
         {
             InitializeComponent();
+            _context = context;
             _settings = viewModel.Settings;
             DataContext = viewModel;
         }
@@ -36,24 +38,16 @@ namespace Flow.Launcher.Plugin.Sys
 
         public void OnEditCommandKeywordClick(object sender, RoutedEventArgs e)
         {
-            /*var webSearch = new SearchSourceSettingWindow
-                (
-                    _settings.SearchSources, _context, _settings.SelectedSearchSource
-                );
-
-            webSearch.ShowDialog();*/
+            var commandKeyword = new CommandKeywordSettingWindow(_context, _settings.SelectedCommand);
+            commandKeyword.ShowDialog();
         }
 
         private void MouseDoubleClickItem(object sender, System.Windows.Input.MouseButtonEventArgs e)
         {
             if (((FrameworkElement)e.OriginalSource).DataContext is Command && _settings.SelectedCommand != null)
             {
-                /*var webSearch = new SearchSourceSettingWindow
-                (
-                    _settings.SearchSources, _context, _settings.SelectedSearchSource
-                );
-
-                webSearch.ShowDialog();*/
+                var commandKeyword = new CommandKeywordSettingWindow(_context, _settings.SelectedCommand);
+                commandKeyword.ShowDialog();
             }
         }
     }