Merge branch 'dev' into feature/web_search_private_mode

Author: zoltanvi

Plugins/Flow.Launcher.Plugin.WebSearch/Settings.cs

@@ -191,7 +191,19 @@ public Settings()
         [JsonIgnore]
         public SearchSource SelectedSearchSource { get; set; }
 
-        public bool EnableSuggestion { get; set; }
+        private bool enableSuggestion;
+        public bool EnableSuggestion
+        {
+            get => enableSuggestion;
+            set
+            {
+                if (enableSuggestion != value)
+                {
+                    enableSuggestion = value;
+                    OnPropertyChanged(nameof(EnableSuggestion));
+                }
+            }
+        }
 
         [JsonIgnore]
         public SuggestionSource[] Suggestions { get; set; } = {
@@ -221,9 +233,5 @@ public string Suggestion
                 }
             }
         }
-
-        public string BrowserPath { get; set; }
-
-        public bool OpenInNewBrowser { get; set; } = true;
     }
 }

Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml

@@ -11,10 +11,6 @@
     mc:Ignorable="d">
 
     <UserControl.Resources>
-        <Style x:Key="BrowserPathBoxStyle" TargetType="TextBox">
-            <Setter Property="Height" Value="28" />
-            <Setter Property="VerticalContentAlignment" Value="Center" />
-        </Style>
         <DataTemplate x:Key="HeaderTemplateArrowUp">
             <DockPanel>
                 <TextBlock HorizontalAlignment="Center" Text="{Binding}" />
@@ -152,7 +148,7 @@
                     Margin="{StaticResource SettingPanelItemLeftMargin}"
                     VerticalAlignment="Center"
                     FontSize="11"
-                    IsEnabled="{Binding ElementName=EnableSuggestion, Path=IsChecked}"
+                    IsEnabled="{Binding Settings.EnableSuggestion}"
                     ItemsSource="{Binding Settings.Suggestions}"
                     SelectedItem="{Binding Settings.SelectedSuggestion}" />
                 <CheckBox
@@ -163,7 +159,6 @@
                     Content="{DynamicResource flowlauncher_plugin_websearch_enable_suggestion}"
                     IsChecked="{Binding Settings.EnableSuggestion}" />
             </StackPanel>
-            <!--  Not sure why binding IsEnabled directly to Settings.EnableWebSearchSuggestion is not working  -->
         </DockPanel>
     </Grid>
 </UserControl>

Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml.cs

@@ -94,7 +94,8 @@ private void SortByColumn(object sender, RoutedEventArgs e)
             var columnBinding = headerClicked.Column.DisplayMemberBinding as Binding;
             var sortBy = columnBinding?.Path.Path ?? headerClicked.Column.Header as string;
 
-            if(sortBy != null) { 
+            if (sortBy != null)
+            {
                 Sort(sortBy, direction);
 
                 if (direction == ListSortDirection.Ascending)

Plugins/Flow.Launcher.Plugin.WebSearch/setting.json

@@ -141,6 +141,6 @@
       "Enabled": true
     }
   ],
-  "EnableWebSearchSuggestion": false,
-  "WebSearchSuggestionSource": "Google"
+  "EnableSuggestion": false,
+  "Suggestion": "Google"
 }