From d421a950f6edef6b117cf926cec931d2cff7ed34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=98=E9=9F=AC=20=E5=BC=A0?= Date: Sat, 15 May 2021 02:17:57 +0800 Subject: [PATCH 1/4] Add special ctrl for Pluginsmanager and Shell plugin --- .../PluginsManager.cs | 6 ++++++ Plugins/Flow.Launcher.Plugin.Shell/Main.cs | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs index e671e2e9188..8f21f23e806 100644 --- a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs +++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs @@ -319,6 +319,12 @@ internal async ValueTask> RequestInstallOrUpdate(string searchName, IcoPath = icoPath, Action = e => { + if (e.SpecialKeyState.CtrlPressed) + { + SearchWeb.NewTabInBrowser(x.Website); + return ShouldHideWindow; + } + Application.Current.MainWindow.Hide(); _ = InstallOrUpdate(x); // No need to wait return ShouldHideWindow; diff --git a/Plugins/Flow.Launcher.Plugin.Shell/Main.cs b/Plugins/Flow.Launcher.Plugin.Shell/Main.cs index 4ec1807939f..d83f59be147 100644 --- a/Plugins/Flow.Launcher.Plugin.Shell/Main.cs +++ b/Plugins/Flow.Launcher.Plugin.Shell/Main.cs @@ -86,7 +86,7 @@ public List Query(Query query) IcoPath = Image, Action = c => { - Execute(Process.Start, PrepareProcessStartInfo(m)); + Execute(Process.Start, PrepareProcessStartInfo(m, c.SpecialKeyState.CtrlPressed)); return true; } })); @@ -182,7 +182,7 @@ private ProcessStartInfo PrepareProcessStartInfo(string command, bool runAsAdmin if (_settings.Shell == Shell.Cmd) { var arguments = _settings.LeaveShellOpen ? $"/k \"{command}\"" : $"/c \"{command}\" & pause"; - + info = ShellCommand.SetProcessStartInfo("cmd.exe", workingDirectory, arguments, runAsAdministratorArg); } else if (_settings.Shell == Shell.Powershell) @@ -232,11 +232,11 @@ private ProcessStartInfo PrepareProcessStartInfo(string command, bool runAsAdmin return info; } - private void Execute(Func startProcess,ProcessStartInfo info) + private void Execute(Func startProcess, ProcessStartInfo info) { try { - startProcess(info); + startProcess(info); } catch (FileNotFoundException e) { @@ -244,7 +244,7 @@ private void Execute(Func startProcess,ProcessStartIn var message = $"Command not found: {e.Message}"; context.API.ShowMsg(name, message); } - catch(Win32Exception e) + catch (Win32Exception e) { var name = "Plugin: Shell"; var message = $"Error running the command: {e.Message}"; From cb9262b450518d8c303a5fcc8cbed628a895171a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=98=E9=9F=AC=20=E5=BC=A0?= Date: Sun, 16 May 2021 14:48:03 +0800 Subject: [PATCH 2/4] Version Bump --- Plugins/Flow.Launcher.Plugin.PluginsManager/plugin.json | 2 +- Plugins/Flow.Launcher.Plugin.Shell/plugin.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/plugin.json b/Plugins/Flow.Launcher.Plugin.PluginsManager/plugin.json index 7d32a40c548..a2894a584f5 100644 --- a/Plugins/Flow.Launcher.Plugin.PluginsManager/plugin.json +++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/plugin.json @@ -6,7 +6,7 @@ "Name": "Plugins Manager", "Description": "Management of installing, uninstalling or updating Flow Launcher plugins", "Author": "Jeremy Wu", - "Version": "1.7.1", + "Version": "1.7.2", "Language": "csharp", "Website": "https://github.com/Flow-Launcher/Flow.Launcher", "ExecuteFileName": "Flow.Launcher.Plugin.PluginsManager.dll", diff --git a/Plugins/Flow.Launcher.Plugin.Shell/plugin.json b/Plugins/Flow.Launcher.Plugin.Shell/plugin.json index 80750477463..b43d43b3253 100644 --- a/Plugins/Flow.Launcher.Plugin.Shell/plugin.json +++ b/Plugins/Flow.Launcher.Plugin.Shell/plugin.json @@ -4,7 +4,7 @@ "Name": "Shell", "Description": "Provide executing commands from Flow Launcher", "Author": "qianlifeng", - "Version": "1.3.0", + "Version": "1.3.1", "Language": "csharp", "Website": "https://github.com/Flow-Launcher/Flow.Launcher", "ExecuteFileName": "Flow.Launcher.Plugin.Shell.dll", From 4d9a3dea327921b82bc76fe28db45c2e5cf3eaab Mon Sep 17 00:00:00 2001 From: Jeremy Wu Date: Mon, 17 May 2021 06:51:37 +1000 Subject: [PATCH 3/4] version bump PluginsManager --- Plugins/Flow.Launcher.Plugin.PluginsManager/plugin.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/plugin.json b/Plugins/Flow.Launcher.Plugin.PluginsManager/plugin.json index a2894a584f5..576f1e838d7 100644 --- a/Plugins/Flow.Launcher.Plugin.PluginsManager/plugin.json +++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/plugin.json @@ -6,7 +6,7 @@ "Name": "Plugins Manager", "Description": "Management of installing, uninstalling or updating Flow Launcher plugins", "Author": "Jeremy Wu", - "Version": "1.7.2", + "Version": "1.8.0", "Language": "csharp", "Website": "https://github.com/Flow-Launcher/Flow.Launcher", "ExecuteFileName": "Flow.Launcher.Plugin.PluginsManager.dll", From 4cb8f929c3bdbcb6c750ac984c70dd0f4a4cc184 Mon Sep 17 00:00:00 2001 From: Jeremy Wu Date: Mon, 17 May 2021 06:52:24 +1000 Subject: [PATCH 4/4] version bump Shell plugin --- Plugins/Flow.Launcher.Plugin.Shell/plugin.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/Flow.Launcher.Plugin.Shell/plugin.json b/Plugins/Flow.Launcher.Plugin.Shell/plugin.json index 740f53ce529..4d53c211e77 100644 --- a/Plugins/Flow.Launcher.Plugin.Shell/plugin.json +++ b/Plugins/Flow.Launcher.Plugin.Shell/plugin.json @@ -4,7 +4,7 @@ "Name": "Shell", "Description": "Provide executing commands from Flow Launcher", "Author": "qianlifeng", - "Version": "1.3.2", + "Version": "1.4.0", "Language": "csharp", "Website": "https://github.com/Flow-Launcher/Flow.Launcher", "ExecuteFileName": "Flow.Launcher.Plugin.Shell.dll",