Merge branch 'InstalledLabel5' of https://github.com/onesounds/Flow.Launcher into InstalledLabel5

Flow.Launcher.sln

@@ -213,6 +213,7 @@ Global
 		{C21BFF9C-2C99-4B5F-B7C9-A5E6DDDB37B0}.Release|x86.ActiveCfg = Release|Any CPU
 		{C21BFF9C-2C99-4B5F-B7C9-A5E6DDDB37B0}.Release|x86.Build.0 = Release|Any CPU
 		{9B130CC5-14FB-41FF-B310-0A95B6894C37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9B130CC5-14FB-41FF-B310-0A95B6894C37}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9B130CC5-14FB-41FF-B310-0A95B6894C37}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{9B130CC5-14FB-41FF-B310-0A95B6894C37}.Debug|x64.Build.0 = Debug|Any CPU
 		{9B130CC5-14FB-41FF-B310-0A95B6894C37}.Debug|x86.ActiveCfg = Debug|Any CPU

Flow.Launcher/Languages/en.xaml

@@ -61,10 +61,9 @@
 
     <!--  Setting Plugin  -->
     <system:String x:Key="searchplugin">Search Plugin</system:String>
-    <system:String x:Key="searchpluginToolTip">Ctrl+F to Search Plugins</system:String>
+    <system:String x:Key="searchpluginToolTip">Ctrl+F to search plugins</system:String>
-    <system:String x:Key="searchplugin_Noresult_Title">No results to display</system:String>
+    <system:String x:Key="searchplugin_Noresult_Title">No results found</system:String>
-    <system:String x:Key="searchplugin_Noresult_Subtitle">Try another search term.</system:String>
+    <system:String x:Key="searchplugin_Noresult_Subtitle">Please try a different search.</system:String>
-    <system:String x:Key="searchplugin_Noresult_Subtitle_Network">Please check your network connection or try another search term.</system:String>
     <system:String x:Key="plugin">Plugin</system:String>
     <system:String x:Key="browserMorePlugins">Find more plugins</system:String>
     <system:String x:Key="enable">On</system:String>

Flow.Launcher/SettingWindow.xaml

@@ -324,8 +324,6 @@
             <Setter Property="Padding" Value="0,0,0,0" />
             <Setter Property="Margin" Value="0,0,8,5" />
             <Setter Property="BorderBrush" Value="{DynamicResource Color03B}" />
-            <Setter Property="MinWidth" Value="100" />
-            <Setter Property="Height" Value="Auto" />
             <!--#region Template for blue highlight win10-->
             <Setter Property="Template">
                 <Setter.Value>
@@ -429,7 +427,7 @@
                                             Margin="0,20,0,4"
                                             FontWeight="Bold"
                                             Text="{DynamicResource searchplugin_Noresult_Title}" />
-                                        <TextBlock Text="{DynamicResource searchplugin_Noresult_Subtitle_Network}" />
+                                        <TextBlock Text="{DynamicResource searchplugin_Noresult}" />
                                     </StackPanel>
                                 </Grid>
                             </ControlTemplate>
@@ -1033,7 +1031,6 @@
                                 ScrollViewer.CanContentScroll="False"
                                 ScrollViewer.HorizontalScrollBarVisibility="Disabled"
                                 SelectedItem="{Binding SelectedPlugin}"
-                                SelectionChanged="SelectedPluginChanged"
                                 SnapsToDevicePixels="True"
                                 Style="{DynamicResource PluginListStyle}">
                                 <ListBox.ItemsPanel>
@@ -1223,8 +1220,7 @@
                                                             Margin="0"
                                                             Padding="1"
                                                             VerticalAlignment="Stretch"
-                                                            Content="{Binding SettingControl}"
+                                                            Content="{Binding SettingControl}" />
-                                                            SizeChanged="ItemSizeChanged" />
                                                     </StackPanel>
 
                                                     <StackPanel>

Flow.Launcher/SettingWindow.xaml.cs

@@ -65,6 +65,7 @@ namespace Flow.Launcher
 
             pluginStoreView = (CollectionView)CollectionViewSource.GetDefaultView(StoreListBox.ItemsSource); 
             pluginStoreView.Filter = PluginStoreFilter;
+
             InitializePosition();
         }
 
@@ -246,7 +247,6 @@ namespace Flow.Launcher
             viewModel.UpdateApp(); // TODO: change to command
         }
 
-
         private void OnRequestNavigate(object sender, RequestNavigateEventArgs e)
         {
             API.OpenUrl(e.Uri.AbsoluteUri);
@@ -383,6 +383,7 @@ namespace Flow.Launcher
             }
             return false;
         }
+
         private bool PluginStoreFilter(object item)
         {
             if (string.IsNullOrEmpty(pluginStoreFilterTxb.Text))
@@ -415,6 +416,7 @@ namespace Flow.Launcher
                 pluginStoreView.Refresh();
             }
         }
+
         private void PluginFilterTxb_OnKeyDown(object sender, KeyEventArgs e)
         {
             if (e.Key == Key.Enter)
@@ -426,21 +428,13 @@ namespace Flow.Launcher
             if (e.Key == Key.Enter)
                 RefreshPluginStoreEventHandler(sender, e);
         }
+
         private void OnPluginSettingKeydown(object sender, KeyEventArgs e)
         {
             if ((Keyboard.Modifiers & ModifierKeys.Control) == ModifierKeys.Control && e.Key == Key.F)
                 pluginFilterTxb.Focus();
         }
 
-        private void ItemSizeChanged(object sender, SizeChangedEventArgs e)
-        {
-
-        }
-
-        private void SelectedPluginChanged(object sender, SelectionChangedEventArgs e)
-        {
-
-        }
         private void PluginStore_OnKeyDown(object sender, KeyEventArgs e)
         {
             if (e.Key == Key.F && (Keyboard.Modifiers & ModifierKeys.Control) != 0)

Flow.Launcher/ViewModel/PluginViewModel.cs

@@ -1,4 +1,4 @@
-using System.Windows;
+using System.Windows;
 using System.Windows.Media;
 using Flow.Launcher.Plugin;
 using Flow.Launcher.Infrastructure.Image;
@@ -43,7 +43,13 @@ namespace Flow.Launcher.ViewModel
 
         private Control _settingControl;
         private bool _isExpanded;
-        public Control SettingControl => IsExpanded ? _settingControl ??= PluginPair.Plugin is not ISettingProvider settingProvider ? new Control() : settingProvider.CreateSettingPanel() : null;
+        public Control SettingControl 
+            => IsExpanded
+                ? _settingControl
+                    ??= PluginPair.Plugin is not ISettingProvider settingProvider
+                        ? new Control() 
+                        : settingProvider.CreateSettingPanel() 
+                : null;
 
         public Visibility ActionKeywordsVisibility => PluginPair.Metadata.ActionKeywords.Count == 1 ? Visibility.Visible : Visibility.Collapsed;
         public string InitilizaTime => PluginPair.Metadata.InitTime + "ms";