From 827a95372228c6b00fe72306a3190099fe1583d6 Mon Sep 17 00:00:00 2001
From: Ioannis G <jtgftw@gmail.com>
Date: Wed, 15 Jul 2020 00:34:09 +0300
Subject: [PATCH 1/4] add PropertyChanged.Fody to Infrastructure project

fixes various settings changes requiring a restart to take effect
---
 .../Flow.Launcher.Infrastructure.csproj                       | 2 ++
 Flow.Launcher.Infrastructure/FodyWeavers.xml                  | 4 ++++
 2 files changed, 6 insertions(+)
 create mode 100644 Flow.Launcher.Infrastructure/FodyWeavers.xml

diff --git a/Flow.Launcher.Infrastructure/Flow.Launcher.Infrastructure.csproj b/Flow.Launcher.Infrastructure/Flow.Launcher.Infrastructure.csproj
index 3a756cd26eb..410d11536de 100644
--- a/Flow.Launcher.Infrastructure/Flow.Launcher.Infrastructure.csproj
+++ b/Flow.Launcher.Infrastructure/Flow.Launcher.Infrastructure.csproj
@@ -38,6 +38,7 @@
   
   <ItemGroup>
     <Compile Include="..\SolutionAssemblyInfo.cs" Link="Properties\SolutionAssemblyInfo.cs" />
+    <None Include="FodyWeavers.xml" />
   </ItemGroup>
   
   <ItemGroup>
@@ -55,6 +56,7 @@
     <PackageReference Include="Pinyin4DotNet" Version="2016.4.23.4" />
     <PackageReference Include="System.Drawing.Common" Version="4.7.0" />
     <PackageReference Include="System.Runtime" Version="4.3.1" />
+    <PackageReference Include="PropertyChanged.Fody" Version="2.5.13" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Flow.Launcher.Infrastructure/FodyWeavers.xml b/Flow.Launcher.Infrastructure/FodyWeavers.xml
new file mode 100644
index 00000000000..4e68ed1a8b6
--- /dev/null
+++ b/Flow.Launcher.Infrastructure/FodyWeavers.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <PropertyChanged />
+</Weavers>
\ No newline at end of file

From 62a245f04936ec38e40414d8ca20ec814fa98593 Mon Sep 17 00:00:00 2001
From: Ioannis G <jtgftw@gmail.com>
Date: Thu, 16 Jul 2020 22:38:09 +0300
Subject: [PATCH 2/4] remove success message boxes

---
 Flow.Launcher/CustomQueryHotkeySetting.xaml.cs                | 2 --
 .../SearchSourceSetting.xaml.cs                               | 4 ----
 2 files changed, 6 deletions(-)

diff --git a/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs b/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs
index bf5c7d7691c..d036c008c58 100644
--- a/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs
+++ b/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs
@@ -57,7 +57,6 @@ private void btnAdd_OnClick(object sender, RoutedEventArgs e)
                     App.API.ChangeQuery(pluginHotkey.ActionKeyword);
                     Application.Current.MainWindow.Visibility = Visibility.Visible;
                 });
-                MessageBox.Show(InternationalizationManager.Instance.GetTranslation("success"));
             }
             else
             {
@@ -76,7 +75,6 @@ private void btnAdd_OnClick(object sender, RoutedEventArgs e)
                     App.API.ChangeQuery(updateCustomHotkey.ActionKeyword);
                     Application.Current.MainWindow.Visibility = Visibility.Visible;
                 });
-                MessageBox.Show(InternationalizationManager.Instance.GetTranslation("success"));
             }
 
             Close();
diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/SearchSourceSetting.xaml.cs b/Plugins/Flow.Launcher.Plugin.WebSearch/SearchSourceSetting.xaml.cs
index c82fe97c039..9ecdda23f00 100644
--- a/Plugins/Flow.Launcher.Plugin.WebSearch/SearchSourceSetting.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.WebSearch/SearchSourceSetting.xaml.cs
@@ -83,8 +83,6 @@ private void AddSearchSource()
 
                 _searchSources.Add(_searchSource);
 
-                var info = _api.GetTranslation("success");
-                MessageBox.Show(info);
                 Close();
             }
             else
@@ -106,8 +104,6 @@ private void EditSearchSource()
                 var index = _searchSources.IndexOf(_oldSearchSource);
                 _searchSources[index] = _searchSource;
 
-                var info = _api.GetTranslation("success");
-                MessageBox.Show(info);
                 Close();
             }
             else

From b505a32693296cd922df9ad0f6958ec1ed65bb63 Mon Sep 17 00:00:00 2001
From: Ioannis G <jtgftw@gmail.com>
Date: Thu, 16 Jul 2020 23:12:54 +0300
Subject: [PATCH 3/4] UI: use NoWrap for browser-path text boxes

---
 .../Views/SettingsControl.xaml                                  | 2 +-
 Plugins/Flow.Launcher.Plugin.Url/SettingsControl.xaml           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml
index 0aea8f04e37..a87841b1631 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml
@@ -31,7 +31,7 @@
         <StackPanel VerticalAlignment="Top" Grid.Row="1" Height="106" Margin="41,13,0,0">
             <Label Content="{DynamicResource flowlauncher_plugin_browserbookmark_settings_setBrowserFromPath}"
                    Height="28" Margin="0,0,155,0" HorizontalAlignment="Left" Width="290"/>
-            <TextBox x:Name="browserPathBox" HorizontalAlignment="Left" Height="34" TextWrapping="Wrap" VerticalAlignment="Top" Width="311" RenderTransformOrigin="0.502,-1.668"/>
+            <TextBox x:Name="browserPathBox" HorizontalAlignment="Left" Height="34" TextWrapping="NoWrap" VerticalAlignment="Top" Width="311" RenderTransformOrigin="0.502,-1.668"/>
             <Button x:Name="viewButton" Content="{DynamicResource flowlauncher_plugin_browserbookmark_settings_choose}"
                     HorizontalAlignment="Left" Margin="340,-35,-1,0" Width="100" Height="34" Click="OnChooseClick" FontSize="14" />
         </StackPanel>
diff --git a/Plugins/Flow.Launcher.Plugin.Url/SettingsControl.xaml b/Plugins/Flow.Launcher.Plugin.Url/SettingsControl.xaml
index 704b59c1e69..9880e8c49a6 100644
--- a/Plugins/Flow.Launcher.Plugin.Url/SettingsControl.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Url/SettingsControl.xaml
@@ -19,7 +19,7 @@
         <StackPanel VerticalAlignment="Top" Grid.Row="1" Height="106" Margin="0 20 0 0">
             <Label Content="{DynamicResource flowlauncher_plugin_url_plugin_set_tip}" Height="28" Margin="0,0,155,0"
                    HorizontalAlignment="Left" Width="290" />
-            <TextBox x:Name="browserPathBox" HorizontalAlignment="Left" Height="34" TextWrapping="Wrap" 
+            <TextBox x:Name="browserPathBox" HorizontalAlignment="Left" Height="34" TextWrapping="NoWrap"
                      VerticalAlignment="Top" Width="311" RenderTransformOrigin="0.502,-1.668" />
             <Button x:Name="viewButton" HorizontalAlignment="Left" Margin="340,-33,-1,0" Width="100" 
                     Height="32" Click="OnChooseClick" FontSize="14" 

From 1f73fdbecc083c2dd7fee5a1d6784f385d50e1fd Mon Sep 17 00:00:00 2001
From: Ioannis G <jtgftw@gmail.com>
Date: Fri, 17 Jul 2020 05:32:08 +0300
Subject: [PATCH 4/4] UI: allow manual editing of browser-path textboxes

---
 .../Views/SettingsControl.xaml                             | 2 +-
 .../Views/SettingsControl.xaml.cs                          | 7 ++++++-
 Plugins/Flow.Launcher.Plugin.Url/SettingsControl.xaml      | 2 +-
 Plugins/Flow.Launcher.Plugin.Url/SettingsControl.xaml.cs   | 5 +++++
 .../Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml    | 2 +-
 .../Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml.cs | 5 +++++
 6 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml
index a87841b1631..8457f52f737 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml
@@ -31,7 +31,7 @@
         <StackPanel VerticalAlignment="Top" Grid.Row="1" Height="106" Margin="41,13,0,0">
             <Label Content="{DynamicResource flowlauncher_plugin_browserbookmark_settings_setBrowserFromPath}"
                    Height="28" Margin="0,0,155,0" HorizontalAlignment="Left" Width="290"/>
-            <TextBox x:Name="browserPathBox" HorizontalAlignment="Left" Height="34" TextWrapping="NoWrap" VerticalAlignment="Top" Width="311" RenderTransformOrigin="0.502,-1.668"/>
+            <TextBox x:Name="browserPathBox" HorizontalAlignment="Left" Height="34" TextWrapping="NoWrap" VerticalAlignment="Top" Width="311" RenderTransformOrigin="0.502,-1.668" TextChanged="OnBrowserPathTextChanged" />
             <Button x:Name="viewButton" Content="{DynamicResource flowlauncher_plugin_browserbookmark_settings_choose}"
                     HorizontalAlignment="Left" Margin="340,-35,-1,0" Width="100" Height="34" Click="OnChooseClick" FontSize="14" />
         </StackPanel>
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml.cs
index 8ecb690a43f..01dc68af601 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml.cs
@@ -19,7 +19,7 @@ public SettingsControl(Settings settings)
             browserPathBox.Text = _settings.BrowserPath;
             NewWindowBrowser.IsChecked = _settings.OpenInNewBrowserWindow;
             NewTabInBrowser.IsChecked = !_settings.OpenInNewBrowserWindow;
-        }        
+        }
 
         private void OnNewBrowserWindowClick(object sender, RoutedEventArgs e)
         {
@@ -43,5 +43,10 @@ private void OnChooseClick(object sender, RoutedEventArgs e)
                 _settings.BrowserPath = fileBrowserDialog.FileName;
             }
         }
+
+        private void OnBrowserPathTextChanged(object sender, TextChangedEventArgs e)
+        {
+            _settings.BrowserPath = browserPathBox.Text;
+        }
     }
 }
diff --git a/Plugins/Flow.Launcher.Plugin.Url/SettingsControl.xaml b/Plugins/Flow.Launcher.Plugin.Url/SettingsControl.xaml
index 9880e8c49a6..f54aea878b5 100644
--- a/Plugins/Flow.Launcher.Plugin.Url/SettingsControl.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Url/SettingsControl.xaml
@@ -20,7 +20,7 @@
             <Label Content="{DynamicResource flowlauncher_plugin_url_plugin_set_tip}" Height="28" Margin="0,0,155,0"
                    HorizontalAlignment="Left" Width="290" />
             <TextBox x:Name="browserPathBox" HorizontalAlignment="Left" Height="34" TextWrapping="NoWrap"
-                     VerticalAlignment="Top" Width="311" RenderTransformOrigin="0.502,-1.668" />
+                     VerticalAlignment="Top" Width="311" RenderTransformOrigin="0.502,-1.668" TextChanged="OnBrowserPathTextChanged" />
             <Button x:Name="viewButton" HorizontalAlignment="Left" Margin="340,-33,-1,0" Width="100" 
                     Height="32" Click="OnChooseClick" FontSize="14" 
                     Content="{DynamicResource flowlauncher_plugin_url_plugin_choose}" />
diff --git a/Plugins/Flow.Launcher.Plugin.Url/SettingsControl.xaml.cs b/Plugins/Flow.Launcher.Plugin.Url/SettingsControl.xaml.cs
index 0d452593a22..6c899dbfedb 100644
--- a/Plugins/Flow.Launcher.Plugin.Url/SettingsControl.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.Url/SettingsControl.xaml.cs
@@ -57,5 +57,10 @@ private void OnNewTabClick(object sender, RoutedEventArgs e)
         {
             _settings.OpenInNewBrowserWindow = false;
         }
+
+        private void OnBrowserPathTextChanged(object sender, TextChangedEventArgs e)
+        {
+            _settings.BrowserPath = browserPathBox.Text;
+        }
     }
 }
diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml b/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml
index 81f2d739bc4..835937efd6a 100644
--- a/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml
+++ b/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml
@@ -40,7 +40,7 @@
         </StackPanel>
         <StackPanel Grid.Row="2" HorizontalAlignment="Left" Margin="0 3 0 0">
             <Label Content="Set browser from path:" Margin="0 0 350 0" HorizontalAlignment="Left" Width="140"/>
-            <TextBox x:Name="browserPathBox" HorizontalAlignment="Left" Margin="160,-22,0,0" 
+            <TextBox x:Name="browserPathBox" HorizontalAlignment="Left" Margin="160,-22,0,0" TextChanged="OnBrowserPathTextChanged"
                      Width="214" Style="{StaticResource BrowserPathBoxStyle}"/>
             <Button x:Name="viewButton" HorizontalAlignment="Left" Margin="400,-30,0,0"  
                     Click="OnChooseClick" FontSize="13" Content="Choose" Width="80"/>
diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml.cs b/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml.cs
index 4a4ac34ec02..16ef38cffa0 100644
--- a/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml.cs
@@ -83,5 +83,10 @@ private void OnChooseClick(object sender, RoutedEventArgs e)
                 _settings.BrowserPath = fileBrowserDialog.FileName;
             }
         }
+
+        private void OnBrowserPathTextChanged(object sender, TextChangedEventArgs e)
+        {
+            _settings.BrowserPath = browserPathBox.Text;
+        }
     }
 }