Skip to content

Commit 517d644

Browse files
onesoundsonesounds
authored
Merge branch 'dev' into InstalledLabel5
2 parents b7e51e5 + 3920574 commit 517d644

File tree

5 files changed

+18
-22
lines changed

5 files changed

+18
-22
lines changed

‎Flow.Launcher.sln

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,7 @@ Global
213213
{C21BFF9C-2C99-4B5F-B7C9-A5E6DDDB37B0}.Release|x86.ActiveCfg = Release|Any CPU
214214
{C21BFF9C-2C99-4B5F-B7C9-A5E6DDDB37B0}.Release|x86.Build.0 = Release|Any CPU
215215
{9B130CC5-14FB-41FF-B310-0A95B6894C37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
216+
{9B130CC5-14FB-41FF-B310-0A95B6894C37}.Debug|Any CPU.Build.0 = Debug|Any CPU
216217
{9B130CC5-14FB-41FF-B310-0A95B6894C37}.Debug|x64.ActiveCfg = Debug|Any CPU
217218
{9B130CC5-14FB-41FF-B310-0A95B6894C37}.Debug|x64.Build.0 = Debug|Any CPU
218219
{9B130CC5-14FB-41FF-B310-0A95B6894C37}.Debug|x86.ActiveCfg = Debug|Any CPU

‎Flow.Launcher/Languages/en.xaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,9 @@
6161

6262
<!-- Setting Plugin -->
6363
<system:String x:Key="searchplugin">Search Plugin</system:String>
64-
<system:String x:Key="searchpluginToolTip">Ctrl+F to Search Plugins</system:String>
65-
<system:String x:Key="searchplugin_Noresult_Title">No results to display</system:String>
66-
<system:String x:Key="searchplugin_Noresult_Subtitle">Try another search term.</system:String>
67-
<system:String x:Key="searchplugin_Noresult_Subtitle_Network">Please check your network connection or try another search term.</system:String>
64+
<system:String x:Key="searchpluginToolTip">Ctrl+F to search plugins</system:String>
65+
<system:String x:Key="searchplugin_Noresult_Title">No results found</system:String>
66+
<system:String x:Key="searchplugin_Noresult_Subtitle">Please try a different search.</system:String>
6867
<system:String x:Key="plugin">Plugin</system:String>
6968
<system:String x:Key="browserMorePlugins">Find more plugins</system:String>
7069
<system:String x:Key="enable">On</system:String>

‎Flow.Launcher/SettingWindow.xaml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -324,8 +324,6 @@
324324
<Setter Property="Padding" Value="0,0,0,0" />
325325
<Setter Property="Margin" Value="0,0,8,5" />
326326
<Setter Property="BorderBrush" Value="{DynamicResource Color03B}" />
327-
<Setter Property="MinWidth" Value="100" />
328-
<Setter Property="Height" Value="Auto" />
329327
<!--#region Template for blue highlight win10-->
330328
<Setter Property="Template">
331329
<Setter.Value>
@@ -429,7 +427,7 @@
429427
Margin="0,20,0,4"
430428
FontWeight="Bold"
431429
Text="{DynamicResource searchplugin_Noresult_Title}" />
432-
<TextBlock Text="{DynamicResource searchplugin_Noresult_Subtitle_Network}" />
430+
<TextBlock Text="{DynamicResource searchplugin_Noresult}" />
433431
</StackPanel>
434432
</Grid>
435433
</ControlTemplate>
@@ -1033,7 +1031,6 @@
10331031
ScrollViewer.CanContentScroll="False"
10341032
ScrollViewer.HorizontalScrollBarVisibility="Disabled"
10351033
SelectedItem="{Binding SelectedPlugin}"
1036-
SelectionChanged="SelectedPluginChanged"
10371034
SnapsToDevicePixels="True"
10381035
Style="{DynamicResource PluginListStyle}">
10391036
<ListBox.ItemsPanel>
@@ -1223,8 +1220,7 @@
12231220
Margin="0"
12241221
Padding="1"
12251222
VerticalAlignment="Stretch"
1226-
Content="{Binding SettingControl}"
1227-
SizeChanged="ItemSizeChanged" />
1223+
Content="{Binding SettingControl}" />
12281224
</StackPanel>
12291225

12301226
<StackPanel>

‎Flow.Launcher/SettingWindow.xaml.cs

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ private void OnLoaded(object sender, RoutedEventArgs e)
6565

6666
pluginStoreView = (CollectionView)CollectionViewSource.GetDefaultView(StoreListBox.ItemsSource);
6767
pluginStoreView.Filter = PluginStoreFilter;
68+
6869
InitializePosition();
6970
}
7071

@@ -246,7 +247,6 @@ private void OnCheckUpdates(object sender, RoutedEventArgs e)
246247
viewModel.UpdateApp(); // TODO: change to command
247248
}
248249

249-
250250
private void OnRequestNavigate(object sender, RequestNavigateEventArgs e)
251251
{
252252
API.OpenUrl(e.Uri.AbsoluteUri);
@@ -383,6 +383,7 @@ private bool PluginListFilter(object item)
383383
}
384384
return false;
385385
}
386+
386387
private bool PluginStoreFilter(object item)
387388
{
388389
if (string.IsNullOrEmpty(pluginStoreFilterTxb.Text))
@@ -415,6 +416,7 @@ private void RefreshPluginStoreEventHandler(object sender, RoutedEventArgs e)
415416
pluginStoreView.Refresh();
416417
}
417418
}
419+
418420
private void PluginFilterTxb_OnKeyDown(object sender, KeyEventArgs e)
419421
{
420422
if (e.Key == Key.Enter)
@@ -426,21 +428,13 @@ private void PluginStoreFilterTxb_OnKeyDown(object sender, KeyEventArgs e)
426428
if (e.Key == Key.Enter)
427429
RefreshPluginStoreEventHandler(sender, e);
428430
}
431+
429432
private void OnPluginSettingKeydown(object sender, KeyEventArgs e)
430433
{
431434
if ((Keyboard.Modifiers & ModifierKeys.Control) == ModifierKeys.Control && e.Key == Key.F)
432435
pluginFilterTxb.Focus();
433436
}
434437

435-
private void ItemSizeChanged(object sender, SizeChangedEventArgs e)
436-
{
437-
438-
}
439-
440-
private void SelectedPluginChanged(object sender, SelectionChangedEventArgs e)
441-
{
442-
443-
}
444438
private void PluginStore_OnKeyDown(object sender, KeyEventArgs e)
445439
{
446440
if (e.Key == Key.F && (Keyboard.Modifiers & ModifierKeys.Control) != 0)

‎Flow.Launcher/ViewModel/PluginViewModel.cs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System.Windows;
1+
using System.Windows;
22
using System.Windows.Media;
33
using Flow.Launcher.Plugin;
44
using Flow.Launcher.Infrastructure.Image;
@@ -43,7 +43,13 @@ public bool IsExpanded
4343

4444
private Control _settingControl;
4545
private bool _isExpanded;
46-
public Control SettingControl => IsExpanded ? _settingControl ??= PluginPair.Plugin is not ISettingProvider settingProvider ? new Control() : settingProvider.CreateSettingPanel() : null;
46+
public Control SettingControl
47+
=> IsExpanded
48+
? _settingControl
49+
??= PluginPair.Plugin is not ISettingProvider settingProvider
50+
? new Control()
51+
: settingProvider.CreateSettingPanel()
52+
: null;
4753

4854
public Visibility ActionKeywordsVisibility => PluginPair.Metadata.ActionKeywords.Count == 1 ? Visibility.Visible : Visibility.Collapsed;
4955
public string InitilizaTime => PluginPair.Metadata.InitTime + "ms";

0 commit comments

Comments
 (0)