Merge pull request #122 from JohnTheGr8/ui_enhancements

jjw24 · web-flow · commit 19aa9ca77973 · 2020-07-17T20:24:47.000+10:00
Various UI fixes and enhancements
diff --git 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
@@ -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>
diff --git 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.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" 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
@@ -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
@@ -19,8 +19,8 @@
         <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" 
-                     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" 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
@@ -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/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
diff --git 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
@@ -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;
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,6 @@ private void btnAdd_OnClick(object sender, RoutedEventArgs e)`
`57`	`57`	`App.API.ChangeQuery(pluginHotkey.ActionKeyword);`
`58`	`58`	`Application.Current.MainWindow.Visibility = Visibility.Visible;`
`59`	`59`	`});`
`60`		`- MessageBox.Show(InternationalizationManager.Instance.GetTranslation("success"));`
`61`	`60`	`}`
`62`	`61`	`else`
`63`	`62`	`{`
`@@ -76,7 +75,6 @@ private void btnAdd_OnClick(object sender, RoutedEventArgs e)`
`76`	`75`	`App.API.ChangeQuery(updateCustomHotkey.ActionKeyword);`
`77`	`76`	`Application.Current.MainWindow.Visibility = Visibility.Visible;`
`78`	`77`	`});`
`79`		`- MessageBox.Show(InternationalizationManager.Instance.GetTranslation("success"));`
`80`	`78`	`}`
`81`	`79`
`82`	`80`	`Close();`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public SettingsControl(Settings settings)`
`19`	`19`	`browserPathBox.Text = _settings.BrowserPath;`
`20`	`20`	`NewWindowBrowser.IsChecked = _settings.OpenInNewBrowserWindow;`
`21`	`21`	`NewTabInBrowser.IsChecked = !_settings.OpenInNewBrowserWindow;`
`22`		`- }`
	`22`	`+ }`
`23`	`23`
`24`	`24`	`private void OnNewBrowserWindowClick(object sender, RoutedEventArgs e)`
`25`	`25`	`{`
`@@ -43,5 +43,10 @@ private void OnChooseClick(object sender, RoutedEventArgs e)`
`43`	`43`	`_settings.BrowserPath = fileBrowserDialog.FileName;`
`44`	`44`	`}`
`45`	`45`	`}`
	`46`	`+`
	`47`	`+ private void OnBrowserPathTextChanged(object sender, TextChangedEventArgs e)`
	`48`	`+ {`
	`49`	`+ _settings.BrowserPath = browserPathBox.Text;`
	`50`	`+ }`
`46`	`51`	`}`
`47`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,5 +57,10 @@ private void OnNewTabClick(object sender, RoutedEventArgs e)`
`57`	`57`	`{`
`58`	`58`	`_settings.OpenInNewBrowserWindow = false;`
`59`	`59`	`}`
	`60`	`+`
	`61`	`+ private void OnBrowserPathTextChanged(object sender, TextChangedEventArgs e)`
	`62`	`+ {`
	`63`	`+ _settings.BrowserPath = browserPathBox.Text;`
	`64`	`+ }`
`60`	`65`	`}`
`61`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,8 +83,6 @@ private void AddSearchSource()`
`83`	`83`
`84`	`84`	`_searchSources.Add(_searchSource);`
`85`	`85`
`86`		`- var info = _api.GetTranslation("success");`
`87`		`- MessageBox.Show(info);`
`88`	`86`	`Close();`
`89`	`87`	`}`
`90`	`88`	`else`
`@@ -106,8 +104,6 @@ private void EditSearchSource()`
`106`	`104`	`var index = _searchSources.IndexOf(_oldSearchSource);`
`107`	`105`	`_searchSources[index] = _searchSource;`
`108`	`106`
`109`		`- var info = _api.GetTranslation("success");`
`110`		`- MessageBox.Show(info);`
`111`	`107`	`Close();`
`112`	`108`	`}`
`113`	`109`	`else`
Original file line number	Diff line number	Diff line change
`@@ -83,5 +83,10 @@ private void OnChooseClick(object sender, RoutedEventArgs e)`
`83`	`83`	`_settings.BrowserPath = fileBrowserDialog.FileName;`
`84`	`84`	`}`
`85`	`85`	`}`
	`86`	`+`
	`87`	`+ private void OnBrowserPathTextChanged(object sender, TextChangedEventArgs e)`
	`88`	`+ {`
	`89`	`+ _settings.BrowserPath = browserPathBox.Text;`
	`90`	`+ }`
`86`	`91`	`}`
`87`	`92`	`}`