diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 000000000..454c4e976
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,17 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+ - package-ecosystem: "nuget" # See documentation for possible values
+ directory: "/" # Location of package manifests
+ schedule:
+ interval: "weekly"
+ ignore:
+ - dependency-name: "squirrel-windows"
+ reviewers:
+ - "jjw24"
+ - "taooceros"
+ - "JohnTheGr8"
diff --git a/Flow.Launcher.Core/Flow.Launcher.Core.csproj b/Flow.Launcher.Core/Flow.Launcher.Core.csproj
index 9f9fa8ff5..7d18c467b 100644
--- a/Flow.Launcher.Core/Flow.Launcher.Core.csproj
+++ b/Flow.Launcher.Core/Flow.Launcher.Core.csproj
@@ -54,7 +54,7 @@
-
+
diff --git a/Flow.Launcher.Core/Updater.cs b/Flow.Launcher.Core/Updater.cs
index 976c4eec1..bad0344eb 100644
--- a/Flow.Launcher.Core/Updater.cs
+++ b/Flow.Launcher.Core/Updater.cs
@@ -141,6 +141,7 @@ namespace Flow.Launcher.Core
{
var translater = InternationalizationManager.Instance;
var tips = string.Format(translater.GetTranslation("newVersionTips"), version);
+
return tips;
}
diff --git a/Flow.Launcher.Infrastructure/Flow.Launcher.Infrastructure.csproj b/Flow.Launcher.Infrastructure/Flow.Launcher.Infrastructure.csproj
index 930cf0b91..4a7bc20e3 100644
--- a/Flow.Launcher.Infrastructure/Flow.Launcher.Infrastructure.csproj
+++ b/Flow.Launcher.Infrastructure/Flow.Launcher.Infrastructure.csproj
@@ -53,7 +53,7 @@
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
diff --git a/Flow.Launcher.sln b/Flow.Launcher.sln
index ec4a29ee7..f59d3d26f 100644
--- a/Flow.Launcher.sln
+++ b/Flow.Launcher.sln
@@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29806.167
+# Visual Studio Version 17
+VisualStudioVersion = 17.3.32901.215
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flow.Launcher.Test", "Flow.Launcher.Test\Flow.Launcher.Test.csproj", "{FF742965-9A80-41A5-B042-D6C7D3A21708}"
ProjectSection(ProjectDependencies) = postProject
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 39ecb18f3..95b2241c7 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -61,6 +61,10 @@
Shadow effect is not allowed while current theme has blur effect enabled
+ Search Plugin
+ Ctrl+F to search plugins
+ No results found
+ Please try a different search.
Plugin
Find more plugins
On
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 82ea08c0c..3e8a4f0a1 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -323,8 +323,6 @@
-
-
@@ -388,6 +386,55 @@
+
+
+
+
+
+
+
+ SnapsToDevicePixels="True"
+ Style="{DynamicResource PluginListStyle}">
@@ -947,7 +1047,7 @@
Padding="0"
Background="Transparent"
FlowDirection="RightToLeft"
- IsExpanded="{Binding Mode=TwoWay, Path=IsSelected, RelativeSource={RelativeSource AncestorType=ListBoxItem, Mode=FindAncestor}}"
+ IsExpanded="{Binding Mode=TwoWay, Path=IsExpanded}"
Style="{StaticResource ExpanderStyle1}">
+ Content="{Binding SettingControl}" />
@@ -1250,7 +1349,7 @@
-
+
@@ -1287,19 +1386,66 @@
Text="{DynamicResource pluginStore}"
TextAlignment="left" />
-
+ Margin="5,24,0,0">
+
+
+
+
+
-
+
+ SelectionMode="Single"
+ Style="{DynamicResource StoreListStyle}">
@@ -1356,15 +1503,56 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ VerticalAlignment="Top">
@@ -1447,12 +1640,13 @@
-
+ VerticalAlignment="Top">
+
-
+
-
+
-
@@ -2175,7 +2370,7 @@
diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs
index 1a4f4da58..51017b96b 100644
--- a/Flow.Launcher/SettingWindow.xaml.cs
+++ b/Flow.Launcher/SettingWindow.xaml.cs
@@ -17,6 +17,7 @@ using System.IO;
using System.Linq;
using System.Windows;
using System.Windows.Controls;
+using System.Windows.Data;
using System.Windows.Forms;
using System.Windows.Input;
using System.Windows.Interop;
@@ -25,6 +26,7 @@ using System.Windows.Navigation;
using Button = System.Windows.Controls.Button;
using Control = System.Windows.Controls.Control;
using ListViewItem = System.Windows.Controls.ListViewItem;
+using KeyEventArgs = System.Windows.Input.KeyEventArgs;
using MessageBox = System.Windows.MessageBox;
using TextBox = System.Windows.Controls.TextBox;
using ThemeManager = ModernWpf.ThemeManager;
@@ -57,6 +59,13 @@ namespace Flow.Launcher
HwndSource hwndSource = PresentationSource.FromVisual(this) as HwndSource;
HwndTarget hwndTarget = hwndSource.CompositionTarget;
hwndTarget.RenderMode = RenderMode.SoftwareOnly;
+
+ pluginListView = (CollectionView)CollectionViewSource.GetDefaultView(Plugins.ItemsSource);
+ pluginListView.Filter = PluginListFilter;
+
+ pluginStoreView = (CollectionView)CollectionViewSource.GetDefaultView(StoreListBox.ItemsSource);
+ pluginStoreView.Filter = PluginStoreFilter;
+
InitializePosition();
}
@@ -163,7 +172,7 @@ namespace Flow.Launcher
}
}
- private void OnAddCustomeHotkeyClick(object sender, RoutedEventArgs e)
+ private void OnAddCustomHotkeyClick(object sender, RoutedEventArgs e)
{
new CustomQueryHotkeySetting(this, settings).ShowDialog();
}
@@ -361,13 +370,77 @@ namespace Flow.Launcher
RefreshMaximizeRestoreButton();
}
- private void SelectedPluginChanged(object sender, SelectionChangedEventArgs e)
+ private CollectionView pluginListView;
+ private CollectionView pluginStoreView;
+
+ private bool PluginListFilter(object item)
{
- Plugins.ScrollIntoView(Plugins.SelectedItem);
+ if (string.IsNullOrEmpty(pluginFilterTxb.Text))
+ return true;
+ if (item is PluginViewModel model)
+ {
+ return StringMatcher.FuzzySearch(pluginFilterTxb.Text, model.PluginPair.Metadata.Name).IsSearchPrecisionScoreMet();
+ }
+ return false;
}
- private void ItemSizeChanged(object sender, SizeChangedEventArgs e)
+
+ private bool PluginStoreFilter(object item)
{
- Plugins.ScrollIntoView(Plugins.SelectedItem);
+ if (string.IsNullOrEmpty(pluginStoreFilterTxb.Text))
+ return true;
+ if (item is UserPlugin model)
+ {
+ return StringMatcher.FuzzySearch(pluginStoreFilterTxb.Text, model.Name).IsSearchPrecisionScoreMet()
+ || StringMatcher.FuzzySearch(pluginStoreFilterTxb.Text, model.Description).IsSearchPrecisionScoreMet();
+ }
+ return false;
+ }
+
+ private string lastPluginListSearch = "";
+ private string lastPluginStoreSearch = "";
+
+ private void RefreshPluginListEventHandler(object sender, RoutedEventArgs e)
+ {
+ if (pluginFilterTxb.Text != lastPluginListSearch)
+ {
+ lastPluginListSearch = pluginFilterTxb.Text;
+ pluginListView.Refresh();
+ }
+ }
+
+ private void RefreshPluginStoreEventHandler(object sender, RoutedEventArgs e)
+ {
+ if (pluginStoreFilterTxb.Text != lastPluginStoreSearch)
+ {
+ lastPluginStoreSearch = pluginStoreFilterTxb.Text;
+ pluginStoreView.Refresh();
+ }
+ }
+
+ private void PluginFilterTxb_OnKeyDown(object sender, KeyEventArgs e)
+ {
+ if (e.Key == Key.Enter)
+ RefreshPluginListEventHandler(sender, e);
+ }
+
+ private void PluginStoreFilterTxb_OnKeyDown(object sender, KeyEventArgs e)
+ {
+ 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 PluginStore_OnKeyDown(object sender, KeyEventArgs e)
+ {
+ if (e.Key == Key.F && (Keyboard.Modifiers & ModifierKeys.Control) != 0)
+ {
+ pluginStoreFilterTxb.Focus();
+ }
}
public void InitializePosition()
diff --git a/Flow.Launcher/ViewModel/PluginViewModel.cs b/Flow.Launcher/ViewModel/PluginViewModel.cs
index 738bd0ec4..2294681b4 100644
--- a/Flow.Launcher/ViewModel/PluginViewModel.cs
+++ b/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;
@@ -30,9 +30,26 @@ namespace Flow.Launcher.ViewModel
get => !PluginPair.Metadata.Disabled;
set => PluginPair.Metadata.Disabled = !value;
}
+ public bool IsExpanded
+ {
+ get => _isExpanded;
+ set
+ {
+ _isExpanded = value;
+ OnPropertyChanged();
+ OnPropertyChanged(nameof(SettingControl));
+ }
+ }
private Control _settingControl;
- public Control SettingControl => _settingControl ??= PluginPair.Plugin is not ISettingProvider settingProvider ? new Control() : settingProvider.CreateSettingPanel();
+ private bool _isExpanded;
+ 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";
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Images/deletefilefolder.png b/Plugins/Flow.Launcher.Plugin.Explorer/Images/deletefilefolder.png
index a8e27d342..745b34935 100644
Binary files a/Plugins/Flow.Launcher.Plugin.Explorer/Images/deletefilefolder.png and b/Plugins/Flow.Launcher.Plugin.Explorer/Images/deletefilefolder.png differ
diff --git a/README.md b/README.md
index 58dbd0be9..1441c8b39 100644
--- a/README.md
+++ b/README.md
@@ -288,6 +288,12 @@ Yes please, let us know in the [Q&A](https://github.com/Flow-Launcher/Flow.Launc
## Development
+### New changes
+
+All changes to flow are captured via pull requests. Some new changes will have been merged but still pending release, this means whilst a change may not exist in the current latest release, it may very well have been accepted and merged into the dev branch and available as a pre-release download. It is therefore a good idea that before you start to make changes, search through the open and closed pull requests to make sure the change you intend to make is not already done.
+
+Each of the pull requests will be marked with a milestone indicating the planned release version for the change.
+
### Contributing
Contributions are very welcome, in addition to the main project(C#) there are also [documentation](https://github.com/Flow-Launcher/docs)(md), [website](https://github.com/Flow-Launcher/flow-launcher.github.io)(html/css) and [others](https://github.com/Flow-Launcher) that can be contributed to. If you are unsure of a change you want to make, let us know in the [Discussions](https://github.com/Flow-Launcher/Flow.Launcher/discussions/categories/ideas), otherwise feel free to put in a pull request.