Skip to content

Commit 507a3d2

Browse files
jjw24TBM13
authored andcommitted
Merge pull request Flow-Launcher#3572 from Flow-Launcher/plugin_store_item_vm_null
Fix separation of Plugin Store and Plugins Manager plugin
1 parent 8ca6299 commit 507a3d2

File tree

7 files changed

+27
-27
lines changed

7 files changed

+27
-27
lines changed

.github/actions/spelling/expect.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,3 +99,7 @@ pluginsmanager
9999
alreadyexists
100100
Softpedia
101101
img
102+
Reloadable
103+
metadatas
104+
WMP
105+
VSTHRD

.github/actions/spelling/patterns.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,3 +133,4 @@
133133
\bPortuguês (Brasil)\b
134134
\bčeština\b
135135
\bPortuguês\b
136+
\bIoc\b

Flow.Launcher.Core/Plugin/PluginManager.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,19 @@
33
using System.Collections.Generic;
44
using System.IO;
55
using System.Linq;
6-
using System.Text.Json;
76
using System.Threading;
87
using System.Threading.Tasks;
98
using CommunityToolkit.Mvvm.DependencyInjection;
109
using Flow.Launcher.Core.ExternalPlugins;
1110
using Flow.Launcher.Infrastructure;
1211
using Flow.Launcher.Infrastructure.UserSettings;
1312
using Flow.Launcher.Plugin;
14-
using Flow.Launcher.Plugin.SharedCommands;
15-
using IRemovable = Flow.Launcher.Core.Storage.IRemovable;
1613
using ISavable = Flow.Launcher.Plugin.ISavable;
1714

1815
namespace Flow.Launcher.Core.Plugin
1916
{
2017
/// <summary>
21-
/// The entry for managing Flow Launcher plugins
18+
/// Class for co-ordinating and managing all plugin lifecycle.
2219
/// </summary>
2320
public static class PluginManager
2421
{

Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ public interface IPublicAPI
2323
/// </summary>
2424
/// <param name="query">query text</param>
2525
/// <param name="requery">
26-
/// Force requery. By default, Flow Launcher will not fire query if your query is same with existing one.
27-
/// Set this to <see langword="true"/> to force Flow Launcher requerying
26+
/// Force requery. By default, Flow Launcher will not fire query if your query is same with existing one.
27+
/// Set this to <see langword="true"/> to force Flow Launcher re-querying
2828
/// </param>
2929
void ChangeQuery(string query, bool requery = false);
3030

@@ -49,7 +49,7 @@ public interface IPublicAPI
4949
/// </summary>
5050
/// <param name="text">Text to save on clipboard</param>
5151
/// <param name="directCopy">When true it will directly copy the file/folder from the path specified in text</param>
52-
/// <param name="showDefaultNotification">Whether to show the default notification from this method after copy is done.
52+
/// <param name="showDefaultNotification">Whether to show the default notification from this method after copy is done.
5353
/// It will show file/folder/text is copied successfully.
5454
/// Turn this off to show your own notification after copy is done.</param>>
5555
public void CopyToClipboard(string text, bool directCopy = false, bool showDefaultNotification = true);
@@ -65,7 +65,7 @@ public interface IPublicAPI
6565
void SavePluginSettings();
6666

6767
/// <summary>
68-
/// Reloads any Plugins that have the
68+
/// Reloads any Plugins that have the
6969
/// IReloadable implemented. It refeshes
7070
/// Plugin's in memory data with new content
7171
/// added by user.
@@ -110,7 +110,7 @@ public interface IPublicAPI
110110
bool IsMainWindowVisible();
111111

112112
/// <summary>
113-
/// Invoked when the visibility of the main window has changed. Currently, the plugin will continue to be subscribed even if it is turned off.
113+
/// Invoked when the visibility of the main window has changed. Currently, the plugin will continue to be subscribed even if it is turned off.
114114
/// </summary>
115115
event VisibilityChangedEventHandler VisibilityChanged;
116116

@@ -166,7 +166,7 @@ public interface IPublicAPI
166166
string GetTranslation(string key);
167167

168168
/// <summary>
169-
/// Get all loaded plugins
169+
/// Get all loaded plugins
170170
/// </summary>
171171
/// <returns></returns>
172172
List<PluginPair> GetAllPlugins();
@@ -271,8 +271,8 @@ public interface IPublicAPI
271271
void LogError(string className, string message, [CallerMemberName] string methodName = "");
272272

273273
/// <summary>
274-
/// Log an Exception. Will throw if in debug mode so developer will be aware,
275-
/// otherwise logs the eror message. This is the primary logging method used for Flow
274+
/// Log an Exception. Will throw if in debug mode so developer will be aware,
275+
/// otherwise logs the eror message. This is the primary logging method used for Flow
276276
/// </summary>
277277
void LogException(string className, string message, Exception e, [CallerMemberName] string methodName = "");
278278

@@ -359,7 +359,7 @@ public interface IPublicAPI
359359

360360
/// <summary>
361361
/// Reloads the query.
362-
/// When current results are from context menu or history, it will go back to query results before requerying.
362+
/// When current results are from context menu or history, it will go back to query results before re-querying.
363363
/// </summary>
364364
/// <param name="reselect">Choose the first result after reload if true; keep the last selected result if false. Default is true.</param>
365365
public void ReQuery(bool reselect = true);
@@ -509,7 +509,7 @@ public interface IPublicAPI
509509
bool IsApplicationDarkTheme();
510510

511511
/// <summary>
512-
/// Invoked when the actual theme of the application has changed. Currently, the plugin will continue to be subscribed even if it is turned off.
512+
/// Invoked when the actual theme of the application has changed. Currently, the plugin will continue to be subscribed even if it is turned off.
513513
/// </summary>
514514
event ActualApplicationThemeChangedEventHandler ActualApplicationThemeChanged;
515515
}

Flow.Launcher/ProgressBoxEx.xaml.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,32 +19,32 @@ private ProgressBoxEx(Action cancelProgress)
1919

2020
public static async Task ShowAsync(string caption, Func<Action<double>, Task> reportProgressAsync, Action cancelProgress = null)
2121
{
22-
ProgressBoxEx prgBox = null;
22+
ProgressBoxEx progressBox = null;
2323
try
2424
{
2525
if (!Application.Current.Dispatcher.CheckAccess())
2626
{
2727
await Application.Current.Dispatcher.InvokeAsync(() =>
2828
{
29-
prgBox = new ProgressBoxEx(cancelProgress)
29+
progressBox = new ProgressBoxEx(cancelProgress)
3030
{
3131
Title = caption
3232
};
33-
prgBox.TitleTextBlock.Text = caption;
34-
prgBox.Show();
33+
progressBox.TitleTextBlock.Text = caption;
34+
progressBox.Show();
3535
});
3636
}
3737
else
3838
{
39-
prgBox = new ProgressBoxEx(cancelProgress)
39+
progressBox = new ProgressBoxEx(cancelProgress)
4040
{
4141
Title = caption
4242
};
43-
prgBox.TitleTextBlock.Text = caption;
44-
prgBox.Show();
43+
progressBox.TitleTextBlock.Text = caption;
44+
progressBox.Show();
4545
}
4646

47-
await reportProgressAsync(prgBox.ReportProgress).ConfigureAwait(false);
47+
await reportProgressAsync(progressBox.ReportProgress).ConfigureAwait(false);
4848
}
4949
catch (Exception e)
5050
{
@@ -58,12 +58,12 @@ await Application.Current.Dispatcher.InvokeAsync(() =>
5858
{
5959
await Application.Current.Dispatcher.InvokeAsync(() =>
6060
{
61-
prgBox?.Close();
61+
progressBox?.Close();
6262
});
6363
}
6464
else
6565
{
66-
prgBox?.Close();
66+
progressBox?.Close();
6767
}
6868
}
6969
}

Flow.Launcher/ViewModel/PluginViewModel.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using System.Linq;
2-
using System.Threading.Tasks;
1+
using System.Threading.Tasks;
32
using System.Windows;
43
using System.Windows.Controls;
54
using System.Windows.Media;

Flow.Launcher/ViewModel/SelectBrowserViewModel.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using System.Collections.ObjectModel;
22
using System.Linq;
3-
using System.Windows;
43
using CommunityToolkit.Mvvm.Input;
54
using Flow.Launcher.Infrastructure.UserSettings;
65
using Flow.Launcher.Plugin;

0 commit comments

Comments
 (0)