From f3c4120395ba2d96a0d6998ce52fe81df8cfb4e2 Mon Sep 17 00:00:00 2001
From: Vic <10308169+VictoriousRaptor@users.noreply.github.com>
Date: Sat, 8 Oct 2022 17:52:27 +0800
Subject: [PATCH] Shortcut settings dialog preview & text & bugfix

---
 Flow.Launcher/CustomShortcutSetting.xaml    | 23 ++++++++++----
 Flow.Launcher/CustomShortcutSetting.xaml.cs | 35 +++++++++++++--------
 Flow.Launcher/Languages/en.xaml             |  1 -
 Flow.Launcher/SettingWindow.xaml            |  2 +-
 Flow.Launcher/SettingWindow.xaml.cs         |  4 +--
 5 files changed, 42 insertions(+), 23 deletions(-)

diff --git a/Flow.Launcher/CustomShortcutSetting.xaml b/Flow.Launcher/CustomShortcutSetting.xaml
index 89268437b..1c87cfbe8 100644
--- a/Flow.Launcher/CustomShortcutSetting.xaml
+++ b/Flow.Launcher/CustomShortcutSetting.xaml
@@ -110,14 +110,25 @@
                             VerticalAlignment="Center"
                             FontSize="14"
                             Text="{DynamicResource customShortcutExpansion}" />
-                        <TextBox
+
+						<DockPanel
                             Grid.Row="1"
                             Grid.Column="1"
-                            Margin="10"
-                            HorizontalAlignment="Stretch"
-                            VerticalAlignment="Center"
-                            Text="{Binding Value}"/>
-                    </Grid>
+                            LastChildFill="True">
+							<Button
+                                x:Name="btnTestShortcut"
+                                Padding="10,5,10,5"
+                                Click="BtnTestShortcut_OnClick"
+                                Content="{DynamicResource preview}"
+                                DockPanel.Dock="Right" />
+							<TextBox
+                                x:Name="tbExpand"
+                                Margin="10"
+                                HorizontalAlignment="Stretch"
+								Text="{Binding Value}"
+                                VerticalAlignment="Center" />
+						</DockPanel>
+					</Grid>
                 </StackPanel>
             </StackPanel>
         </StackPanel>
diff --git a/Flow.Launcher/CustomShortcutSetting.xaml.cs b/Flow.Launcher/CustomShortcutSetting.xaml.cs
index 87245d79d..25ce82424 100644
--- a/Flow.Launcher/CustomShortcutSetting.xaml.cs
+++ b/Flow.Launcher/CustomShortcutSetting.xaml.cs
@@ -1,29 +1,30 @@
-using System;
+using Flow.Launcher.Core.Resource;
+using Flow.Launcher.Infrastructure.UserSettings;
+using System;
 using System.Windows;
 using System.Windows.Input;
-using Flow.Launcher.Core.Resource;
-using Flow.Launcher.Infrastructure.UserSettings;
 
 namespace Flow.Launcher
 {
     public partial class CustomShortcutSetting : Window
     {
-        private SettingWindow _settingWidow;
-        private bool update;
         private Settings _settings;
-
+        private bool update = false;
         public string Key { get; set; }
         public string Value { get; set; }
         public CustomShortcutModel ShortCut => (Key, Value);
 
-        public CustomShortcutSetting()
+        public CustomShortcutSetting(Settings settings)
         {
+            _settings = settings;
             InitializeComponent();
         }
 
-        public CustomShortcutSetting((string, string) shortcut)
+        public CustomShortcutSetting((string, string) shortcut, Settings settings)
         {
             (Key, Value) = shortcut;
+            _settings = settings;
+            update = true;
             InitializeComponent();
         }
 
@@ -35,17 +36,17 @@ namespace Flow.Launcher
 
         private void btnAdd_OnClick(object sender, RoutedEventArgs e)
         {
-            DialogResult = true;
-            if (_settings.CustomShortcuts.Contains(new CustomShortcutModel(Key, Value)))
+            if (!update && _settings.CustomShortcuts.Contains(new CustomShortcutModel(Key, Value)))
             {
                 MessageBox.Show(InternationalizationManager.Instance.GetTranslation("dulplicateShortcut"));
-                DialogResult = false;
+                return;
             }
-            else if (String.IsNullOrEmpty(Key) || String.IsNullOrEmpty(Value))
+            if (String.IsNullOrEmpty(Key) || String.IsNullOrEmpty(Value))
             {
                 MessageBox.Show(InternationalizationManager.Instance.GetTranslation("invalidShortcut"));
-                DialogResult = false;
+                return;
             }
+            DialogResult = true;
             Close();
         }
 
@@ -54,5 +55,13 @@ namespace Flow.Launcher
             DialogResult = false;
             Close();
         }
+
+        private void BtnTestShortcut_OnClick(object sender, RoutedEventArgs e)
+        {
+            App.API.ChangeQuery(tbExpand.Text);
+            Application.Current.MainWindow.Show();
+            Application.Current.MainWindow.Opacity = 1;
+            Application.Current.MainWindow.Focus();
+        }
     }
 }
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 9d34cff28..59a57ca80 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -215,7 +215,6 @@
 	<!--  Custom Query Shortcut Dialog  -->
 	<system:String x:Key="customeQueryShortcutTitle">Custom Query Shortcut</system:String>
 	<system:String x:Key="customeQueryShortcutTips">Enter a shortcut to automatically expand to the specified query.</system:String>
-	<system:String x:Key="preview">Preview</system:String>
 	<system:String x:Key="dulplicateShortcut">Shortcut is dulplicate, please enter a new Shortcut or edit the existing one.</system:String>
 	<system:String x:Key="invalidShortcut">Invalid Shortcut</system:String>
 
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 9d45e3862..dc290ccd6 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -2175,7 +2175,7 @@
                                         VerticalAlignment="Center"
                                         FontSize="14"
                                         Foreground="{DynamicResource Color05B}"
-                                        Text="Shortcut" />
+                                        Text="{DynamicResource customQueryShortcut}" />
                                     <ListView
                                         MinHeight="185"
                                         Margin="0,6,0,0"
diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs
index 2db00f959..86306f60d 100644
--- a/Flow.Launcher/SettingWindow.xaml.cs
+++ b/Flow.Launcher/SettingWindow.xaml.cs
@@ -398,7 +398,7 @@ namespace Flow.Launcher
             var item = viewModel.SelectedCustomShortcut;
             if (item != null)
             {
-                var shortcutSettingWindow = new CustomShortcutSetting(item);
+                var shortcutSettingWindow = new CustomShortcutSetting(item, settings);
                 if (shortcutSettingWindow.ShowDialog() == true)
                 {
                     settings.CustomShortcuts[viewModel.SelectCustomShortcutIndex.Value] = shortcutSettingWindow.ShortCut;
@@ -412,7 +412,7 @@ namespace Flow.Launcher
 
         private void OnAddCustomeShortCutClick(object sender, RoutedEventArgs e)
         {
-            var shortcutSettingWindow = new CustomShortcutSetting();
+            var shortcutSettingWindow = new CustomShortcutSetting(settings);
             if (shortcutSettingWindow.ShowDialog() == true)
             {
                 settings.CustomShortcuts.Add(shortcutSettingWindow.ShortCut);