From 5373cd373646ceb069c35715f086481f30cae34b Mon Sep 17 00:00:00 2001
From: Vic <10308169+VictoriousRaptor@users.noreply.github.com>
Date: Sat, 17 Dec 2022 21:29:25 +0800
Subject: [PATCH 01/53] Disable PATH programs by default
---
Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs | 2 +-
Plugins/Flow.Launcher.Plugin.Program/Settings.cs | 2 +-
.../Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs b/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs
index e89970fb4..f8c220610 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs
+++ b/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs
@@ -620,7 +620,7 @@ namespace Flow.Launcher.Plugin.Program.Programs
autoIndexPrograms = autoIndexPrograms.Concat(startMenu);
}
- if (settings.EnablePATHSource)
+ if (settings.EnablePathSource)
{
var path = PATHPrograms(settings.GetSuffixes(), protocols, commonParents);
programs = programs.Concat(path);
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Settings.cs b/Plugins/Flow.Launcher.Plugin.Program/Settings.cs
index e3e8b99b9..34da42f1f 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Settings.cs
+++ b/Plugins/Flow.Launcher.Plugin.Program/Settings.cs
@@ -118,7 +118,7 @@ namespace Flow.Launcher.Plugin.Program
public bool EnableDescription { get; set; } = false;
public bool HideAppsPath { get; set; } = true;
public bool EnableRegistrySource { get; set; } = true;
- public bool EnablePATHSource { get; set; } = true;
+ public bool EnablePathSource { get; set; } = false;
public string CustomizedExplorer { get; set; } = Explorer;
public string CustomizedArgs { get; set; } = ExplorerArgs;
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs
index 7da224b69..4abb39225 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs
@@ -69,10 +69,10 @@ namespace Flow.Launcher.Plugin.Program.Views
public bool EnablePATHSource
{
- get => _settings.EnablePATHSource;
+ get => _settings.EnablePathSource;
set
{
- _settings.EnablePATHSource = value;
+ _settings.EnablePathSource = value;
ReIndexing();
}
}
From 1d77d45fe276e691abe0042080aa039ca2279b21 Mon Sep 17 00:00:00 2001
From: Vic <10308169+VictoriousRaptor@users.noreply.github.com>
Date: Sat, 17 Dec 2022 22:00:04 +0800
Subject: [PATCH 02/53] Add an option to enable/dsiable UWP indexing
---
.../Languages/en.xaml | 2 ++
Plugins/Flow.Launcher.Plugin.Program/Main.cs | 5 +----
.../Programs/UWP.cs | 18 ++++++++++++++----
.../Flow.Launcher.Plugin.Program/Settings.cs | 1 +
.../Views/ProgramSetting.xaml | 11 ++++++++++-
.../Views/ProgramSetting.xaml.cs | 12 ++++++++++++
6 files changed, 40 insertions(+), 9 deletions(-)
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml
index 8d642b600..fb663f1a4 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml
@@ -22,6 +22,8 @@
Indexing
Index Sources
Options
+ UWP Apps
+ When enabled, Flow will load UWP Applications
Start Menu
When enabled, Flow will load programs from the start menu
Registry
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Main.cs b/Plugins/Flow.Launcher.Plugin.Program/Main.cs
index c94c1dca2..340d882da 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Main.cs
+++ b/Plugins/Flow.Launcher.Plugin.Program/Main.cs
@@ -5,7 +5,6 @@ using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using System.Windows.Controls;
-using Flow.Launcher.Infrastructure;
using Flow.Launcher.Infrastructure.Logger;
using Flow.Launcher.Infrastructure.Storage;
using Flow.Launcher.Plugin.Program.Programs;
@@ -115,9 +114,7 @@ namespace Flow.Launcher.Plugin.Program
public static void IndexUwpPrograms()
{
- var windows10 = new Version(10, 0);
- var support = Environment.OSVersion.Version.Major >= windows10.Major;
- var applications = support ? UWP.All() : Array.Empty();
+ var applications = UWP.All(_settings);
_uwps = applications;
ResetCache();
}
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Programs/UWP.cs b/Plugins/Flow.Launcher.Plugin.Program/Programs/UWP.cs
index 28641dd00..35f0814a7 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Programs/UWP.cs
+++ b/Plugins/Flow.Launcher.Plugin.Program/Programs/UWP.cs
@@ -199,11 +199,14 @@ namespace Flow.Launcher.Plugin.Program.Programs
},
};
- public static Application[] All()
+ public static Application[] All(Settings settings)
{
- var windows10 = new Version(10, 0);
- var support = Environment.OSVersion.Version.Major >= windows10.Major;
- if (support)
+ var support = SupportUWP();
+ if (!support && settings.EnableUWP)
+ {
+ settings.EnableUWP = false;
+ }
+ if (settings.EnableUWP)
{
var applications = CurrentUserPackages().AsParallel().SelectMany(p =>
{
@@ -241,6 +244,13 @@ namespace Flow.Launcher.Plugin.Program.Programs
}
}
+ public static bool SupportUWP()
+ {
+ var windows10 = new Version(10, 0);
+ var support = Environment.OSVersion.Version.Major >= windows10.Major;
+ return support;
+ }
+
private static IEnumerable CurrentUserPackages()
{
var u = WindowsIdentity.GetCurrent().User;
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Settings.cs b/Plugins/Flow.Launcher.Plugin.Program/Settings.cs
index 34da42f1f..f59facaa4 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Settings.cs
+++ b/Plugins/Flow.Launcher.Plugin.Program/Settings.cs
@@ -119,6 +119,7 @@ namespace Flow.Launcher.Plugin.Program
public bool HideAppsPath { get; set; } = true;
public bool EnableRegistrySource { get; set; } = true;
public bool EnablePathSource { get; set; } = false;
+ public bool EnableUWP { get; set; } = true;
public string CustomizedExplorer { get; set; } = Explorer;
public string CustomizedArgs { get; set; } = ExplorerArgs;
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml
index 957042de5..fa97de4f2 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml
@@ -7,6 +7,9 @@
Height="520"
DataContext="{Binding RelativeSource={RelativeSource Self}}"
mc:Ignorable="d">
+
+
+
@@ -27,6 +30,13 @@
Margin="0,0,14,0"
HorizontalAlignment="Right"
DockPanel.Dock="Right">
+
-
_settings.EnableUWP;
+ set
+ {
+ _settings.EnableUWP = value;
+ ReIndexing();
+ }
+ }
+
public string CustomizedExplorerPath
{
get => _settings.CustomizedExplorer;
@@ -89,6 +99,8 @@ namespace Flow.Launcher.Plugin.Program.Views
set => _settings.CustomizedArgs = value;
}
+ public bool ShowUWPCheckbox => UWP.SupportUWP();
+
public ProgramSetting(PluginInitContext context, Settings settings, Win32[] win32s, UWP.Application[] uwps)
{
this.context = context;
From bf91bd2492c86adc2459cb627cb23d094767ec33 Mon Sep 17 00:00:00 2001
From: Vic <10308169+VictoriousRaptor@users.noreply.github.com>
Date: Sat, 17 Dec 2022 22:27:36 +0800
Subject: [PATCH 03/53] Fix double click on header
---
.../Views/ProgramSetting.xaml.cs | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs
index 163178782..4b63d38a5 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs
@@ -395,8 +395,11 @@ namespace Flow.Launcher.Plugin.Program.Views
private void programSourceView_MouseDoubleClick(object sender, MouseButtonEventArgs e)
{
- var selectedProgramSource = programSourceView.SelectedItem as ProgramSource;
- EditProgramSource(selectedProgramSource);
+ if (((FrameworkElement)e.OriginalSource).DataContext is ProgramSource)
+ {
+ var selectedProgramSource = programSourceView.SelectedItem as ProgramSource;
+ EditProgramSource(selectedProgramSource);
+ }
}
private bool IsAllItemsUserAdded(List items)
From 13eba18ac5bc70d5e5efad41373830077beac00b Mon Sep 17 00:00:00 2001
From: Vic <10308169+VictoriousRaptor@users.noreply.github.com>
Date: Sat, 17 Dec 2022 21:29:25 +0800
Subject: [PATCH 04/53] Disable PATH programs by default
---
Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs | 2 +-
Plugins/Flow.Launcher.Plugin.Program/Settings.cs | 2 +-
.../Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs b/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs
index e89970fb4..f8c220610 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs
+++ b/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs
@@ -620,7 +620,7 @@ namespace Flow.Launcher.Plugin.Program.Programs
autoIndexPrograms = autoIndexPrograms.Concat(startMenu);
}
- if (settings.EnablePATHSource)
+ if (settings.EnablePathSource)
{
var path = PATHPrograms(settings.GetSuffixes(), protocols, commonParents);
programs = programs.Concat(path);
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Settings.cs b/Plugins/Flow.Launcher.Plugin.Program/Settings.cs
index e3e8b99b9..34da42f1f 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Settings.cs
+++ b/Plugins/Flow.Launcher.Plugin.Program/Settings.cs
@@ -118,7 +118,7 @@ namespace Flow.Launcher.Plugin.Program
public bool EnableDescription { get; set; } = false;
public bool HideAppsPath { get; set; } = true;
public bool EnableRegistrySource { get; set; } = true;
- public bool EnablePATHSource { get; set; } = true;
+ public bool EnablePathSource { get; set; } = false;
public string CustomizedExplorer { get; set; } = Explorer;
public string CustomizedArgs { get; set; } = ExplorerArgs;
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs
index 7da224b69..4abb39225 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs
@@ -69,10 +69,10 @@ namespace Flow.Launcher.Plugin.Program.Views
public bool EnablePATHSource
{
- get => _settings.EnablePATHSource;
+ get => _settings.EnablePathSource;
set
{
- _settings.EnablePATHSource = value;
+ _settings.EnablePathSource = value;
ReIndexing();
}
}
From d3bae93a47ddce3558acf1f3ac9f6b4942342780 Mon Sep 17 00:00:00 2001
From: Vic <10308169+VictoriousRaptor@users.noreply.github.com>
Date: Sun, 18 Dec 2022 13:35:38 +0800
Subject: [PATCH 05/53] Revert "Disable PATH by default"
---
Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs | 2 +-
Plugins/Flow.Launcher.Plugin.Program/Settings.cs | 2 +-
.../Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs b/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs
index f8c220610..e89970fb4 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs
+++ b/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs
@@ -620,7 +620,7 @@ namespace Flow.Launcher.Plugin.Program.Programs
autoIndexPrograms = autoIndexPrograms.Concat(startMenu);
}
- if (settings.EnablePathSource)
+ if (settings.EnablePATHSource)
{
var path = PATHPrograms(settings.GetSuffixes(), protocols, commonParents);
programs = programs.Concat(path);
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Settings.cs b/Plugins/Flow.Launcher.Plugin.Program/Settings.cs
index f59facaa4..9fd6d13e7 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Settings.cs
+++ b/Plugins/Flow.Launcher.Plugin.Program/Settings.cs
@@ -118,7 +118,7 @@ namespace Flow.Launcher.Plugin.Program
public bool EnableDescription { get; set; } = false;
public bool HideAppsPath { get; set; } = true;
public bool EnableRegistrySource { get; set; } = true;
- public bool EnablePathSource { get; set; } = false;
+ public bool EnablePATHSource { get; set; } = true;
public bool EnableUWP { get; set; } = true;
public string CustomizedExplorer { get; set; } = Explorer;
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs
index 4b63d38a5..5b8ae023f 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs
@@ -69,10 +69,10 @@ namespace Flow.Launcher.Plugin.Program.Views
public bool EnablePATHSource
{
- get => _settings.EnablePathSource;
+ get => _settings.EnablePATHSource;
set
{
- _settings.EnablePathSource = value;
+ _settings.EnablePATHSource = value;
ReIndexing();
}
}
From 4fd5039e66f5a0a58b48a44afbac80fb4a50d682 Mon Sep 17 00:00:00 2001
From: Vic <10308169+VictoriousRaptor@users.noreply.github.com>
Date: Mon, 19 Dec 2022 00:37:02 +0800
Subject: [PATCH 06/53] Fix item can't be unselected after editing shortcut
---
Flow.Launcher/ViewModel/SettingWindowViewModel.cs | 3 +++
1 file changed, 3 insertions(+)
diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
index a97a328e6..f160c2e04 100644
--- a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
+++ b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
@@ -775,8 +775,11 @@ namespace Flow.Launcher.ViewModel
var shortcutSettingWindow = new CustomShortcutSetting(item.Key, item.Value, this);
if (shortcutSettingWindow.ShowDialog() == true)
{
+ // https://stackoverflow.com/questions/16789360/wpf-listbox-items-with-changing-hashcode
+ SelectedCustomShortcut = null;
item.Key = shortcutSettingWindow.Key;
item.Value = shortcutSettingWindow.Value;
+ SelectedCustomShortcut = item;
return true;
}
return false;
From 56d6433db014bcdae97e304d19f6269b2bca9aba Mon Sep 17 00:00:00 2001
From: Filip Horvat
Date: Mon, 19 Dec 2022 21:07:07 +0100
Subject: [PATCH 07/53] Improve folder editor experience
---
.../ContextMenu.cs | 9 +++--
.../Languages/da.xaml | 2 +
.../Languages/de.xaml | 2 +
.../Languages/en.xaml | 2 +
.../Languages/es-419.xaml | 2 +
.../Languages/es.xaml | 2 +
.../Languages/fr.xaml | 2 +
.../Languages/it.xaml | 2 +
.../Languages/ja.xaml | 2 +
.../Languages/ko.xaml | 2 +
.../Languages/nb.xaml | 2 +
.../Languages/nl.xaml | 2 +
.../Languages/pl.xaml | 2 +
.../Languages/pt-br.xaml | 2 +
.../Languages/pt-pt.xaml | 2 +
.../Languages/ru.xaml | 2 +
.../Languages/sk.xaml | 2 +
.../Languages/sr.xaml | 2 +
.../Languages/tr.xaml | 2 +
.../Languages/uk-UA.xaml | 2 +
.../Languages/zh-cn.xaml | 2 +
.../Languages/zh-tw.xaml | 2 +
.../Flow.Launcher.Plugin.Explorer/Settings.cs | 4 +-
.../ViewModels/SettingsViewModel.cs | 29 ++++++++++++--
.../Views/ExplorerSettings.xaml | 39 ++++++++++++++++---
25 files changed, 109 insertions(+), 14 deletions(-)
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs b/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs
index 4733e09e9..afcfe89ee 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs
@@ -40,7 +40,10 @@ namespace Flow.Launcher.Plugin.Explorer
if (selectedResult.ContextData is SearchResult record)
{
if (record.Type == ResultType.File && !string.IsNullOrEmpty(Settings.EditorPath))
- contextMenus.Add(CreateOpenWithEditorResult(record));
+ contextMenus.Add(CreateOpenWithEditorResult(record, Settings.EditorPath));
+
+ if (record.Type == ResultType.Folder && !string.IsNullOrEmpty(Settings.FolderEditorPath))
+ contextMenus.Add(CreateOpenWithEditorResult(record, Settings.FolderEditorPath));
if (record.Type == ResultType.Folder && record.WindowsIndexed)
{
@@ -309,10 +312,8 @@ namespace Flow.Launcher.Plugin.Explorer
- private Result CreateOpenWithEditorResult(SearchResult record)
+ private Result CreateOpenWithEditorResult(SearchResult record, string editorPath)
{
- string editorPath = Settings.EditorPath;
-
var name = $"{Context.API.GetTranslation("plugin_explorer_openwitheditor")} {Path.GetFileNameWithoutExtension(editorPath)}";
return new Result
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/da.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/da.xaml
index 4431e811e..331a21742 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/da.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/da.xaml
@@ -45,6 +45,8 @@
Everything
Windows Index
Direct Enumeration
+ Filredigeringssti
+ Mapperedigeringssti
Content Search Engine
Directory Recursive Search Engine
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/de.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/de.xaml
index 8ed355b8c..0f345f2ce 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/de.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/de.xaml
@@ -45,6 +45,8 @@
Everything
Windows Index
Direct Enumeration
+ Datei-Editor-Pfad
+ Ordner-Editor-Pfad
Content Search Engine
Directory Recursive Search Engine
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
index d44c67bf0..6d6ae3420 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
@@ -46,6 +46,8 @@
Everything
Windows Index
Direct Enumeration
+ File Editor Path
+ Folder Editor Path
Content Search Engine
Directory Recursive Search Engine
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/es-419.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/es-419.xaml
index 8b8d26f4c..047ecac39 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/es-419.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/es-419.xaml
@@ -45,6 +45,8 @@
Everything
Windows Index
Direct Enumeration
+ Ruta del editor
+ Folder Editor Path
Content Search Engine
Directory Recursive Search Engine
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/es.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/es.xaml
index 04647d44d..0b56f8a62 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/es.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/es.xaml
@@ -45,6 +45,8 @@
Everything
Índice de Windows
Enumeración directa
+ Ruta del editor
+ Ruta del editor de carpetas
Motor de búsqueda de contenido
Motor de búsqueda recursiva de directorio
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/fr.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/fr.xaml
index dafe01173..d6ed3f049 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/fr.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/fr.xaml
@@ -45,6 +45,8 @@
Everything
Windows Index
Direct Enumeration
+ Chemin de l'éditeur de fichiers
+ Chemin de l'éditeur de dossier
Content Search Engine
Directory Recursive Search Engine
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/it.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/it.xaml
index 264fadc09..84cd85a01 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/it.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/it.xaml
@@ -45,6 +45,8 @@
Tutto
Windows Index
Direct Enumeration
+ Percorso dell'editor di file
+ Percorso dell'editor delle cartelle
Content Search Engine
Directory Recursive Search Engine
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/ja.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/ja.xaml
index 478df4103..51bdd0259 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/ja.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/ja.xaml
@@ -45,6 +45,8 @@
Everything
Windows Index
Direct Enumeration
+ ファイル エディターのパス
+ フォルダー エディターのパス
Content Search Engine
Directory Recursive Search Engine
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/ko.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/ko.xaml
index 30cc5e1c7..63d067606 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/ko.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/ko.xaml
@@ -45,6 +45,8 @@
Everything
Windows Index
Direct Enumeration
+ 파일 편집기 경로
+ 폴더 편집기 경로
Content Search Engine
Directory Recursive Search Engine
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/nb.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/nb.xaml
index c8fd77ac2..0d0786447 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/nb.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/nb.xaml
@@ -45,6 +45,8 @@
Everything
Windows Index
Direct Enumeration
+ Filredigeringsbane
+ Mapperedigeringsbane
Content Search Engine
Directory Recursive Search Engine
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/nl.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/nl.xaml
index eeb64b0da..05c08606c 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/nl.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/nl.xaml
@@ -45,6 +45,8 @@
Everything
Windows Index
Direct Enumeration
+ Bestandseditor pad
+ Pad naar mapeditor
Content Search Engine
Directory Recursive Search Engine
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/pl.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/pl.xaml
index 55713796e..6ba8b2c9d 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/pl.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/pl.xaml
@@ -45,6 +45,8 @@
Everything
Windows Index
Direct Enumeration
+ Ścieżka edytora plików
+ Ścieżka edytora folderów
Content Search Engine
Directory Recursive Search Engine
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/pt-br.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/pt-br.xaml
index 1beae76c3..7f5253104 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/pt-br.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/pt-br.xaml
@@ -45,6 +45,8 @@
Everything
Windows Index
Direct Enumeration
+ File Editor Path
+ Folder Editor Path
Content Search Engine
Directory Recursive Search Engine
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/pt-pt.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/pt-pt.xaml
index 560078ab1..564e9850d 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/pt-pt.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/pt-pt.xaml
@@ -45,6 +45,8 @@
Everything
Índice do Windows
Enumeração direta
+ File Editor Path
+ Folder Editor Path
Mecanismo de pesquisa para conteúdo
Mecanismo de pesquisa recursiva de diretórios
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/ru.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/ru.xaml
index 45f63fcba..2afd0a8ab 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/ru.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/ru.xaml
@@ -45,6 +45,8 @@
Everything
Windows Index
Direct Enumeration
+ Путь к редактору файлов
+ Путь к редактору папки
Content Search Engine
Directory Recursive Search Engine
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/sk.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/sk.xaml
index aa51a07a2..7198bc2f3 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/sk.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/sk.xaml
@@ -45,6 +45,8 @@
Everything
Index Windowsu
Zoznam priečinkov
+ Cesta editora súborov
+ Cesta editora priečinkov
Vyhľadávač obsahu
Priečinkový rekurzívny vyhľadávač
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/sr.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/sr.xaml
index 629dbd18c..dc14c9b59 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/sr.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/sr.xaml
@@ -45,6 +45,8 @@
Everything
Windows Index
Direct Enumeration
+ File Editor Path
+ Folder Editor Path
Content Search Engine
Directory Recursive Search Engine
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/tr.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/tr.xaml
index 28b7712fa..dd797f68a 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/tr.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/tr.xaml
@@ -45,6 +45,8 @@
Everything
Windows Index
Direct Enumeration
+ Düzenleyici Konumu
+ Folder Editor Path
Content Search Engine
Directory Recursive Search Engine
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/uk-UA.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/uk-UA.xaml
index 11a778fab..3f5d97e4b 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/uk-UA.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/uk-UA.xaml
@@ -45,6 +45,8 @@
Everything
Windows Index
Direct Enumeration
+ Шлях редактора файлів
+ Шлях редактора папок
Content Search Engine
Directory Recursive Search Engine
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/zh-cn.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/zh-cn.xaml
index 63783d108..1c40ef008 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/zh-cn.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/zh-cn.xaml
@@ -45,6 +45,8 @@
Everything
Windows 索引
直接枚举
+ 文件编辑器路径
+ 文件夹编辑器路径
文件内容搜索引擎
目录递归搜索引擎
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/zh-tw.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/zh-tw.xaml
index 499f659f4..c125664f0 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/zh-tw.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/zh-tw.xaml
@@ -45,6 +45,8 @@
Everything
Windows Index
Direct Enumeration
+ 文件編輯器路徑
+ 文件夾編輯器路徑
Content Search Engine
Directory Recursive Search Engine
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Settings.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Settings.cs
index 67c4061d4..97bd67f2e 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Settings.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Settings.cs
@@ -1,4 +1,4 @@
-using Flow.Launcher.Plugin.Everything.Everything;
+using Flow.Launcher.Plugin.Everything.Everything;
using Flow.Launcher.Plugin.Explorer.Search;
using Flow.Launcher.Plugin.Explorer.Search.Everything;
using Flow.Launcher.Plugin.Explorer.Search.QuickAccessLinks;
@@ -23,6 +23,8 @@ namespace Flow.Launcher.Plugin.Explorer
public string EditorPath { get; set; } = "";
+ public string FolderEditorPath { get; set; } = "";
+
public string ShellPath { get; set; } = "cmd";
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/SettingsViewModel.cs b/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/SettingsViewModel.cs
index 5975d3f16..bc026d095 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/SettingsViewModel.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/SettingsViewModel.cs
@@ -315,15 +315,26 @@ namespace Flow.Launcher.Plugin.Explorer.ViewModels
Process.Start(psi);
}
- private ICommand? _openEditorPathCommand;
+ private ICommand? _openFileEditorPathCommand;
- public ICommand OpenEditorPath => _openEditorPathCommand ??= new RelayCommand(_ =>
+ public ICommand OpenFileEditorPath => _openFileEditorPathCommand ??= new RelayCommand(_ =>
{
var path = PromptUserSelectPath(ResultType.File, Settings.EditorPath != null ? Path.GetDirectoryName(Settings.EditorPath) : null);
if (path is null)
return;
- EditorPath = path;
+ FileEditorPath = path;
+ });
+
+ private ICommand? _openFolderEditorPathCommand;
+
+ public ICommand OpenFolderEditorPath => _openFolderEditorPathCommand ??= new RelayCommand(_ =>
+ {
+ var path = PromptUserSelectPath(ResultType.File, Settings.FolderEditorPath != null ? Path.GetDirectoryName(Settings.FolderEditorPath) : null);
+ if (path is null)
+ return;
+
+ FolderEditorPath = path;
});
private ICommand? _openShellPathCommand;
@@ -338,7 +349,7 @@ namespace Flow.Launcher.Plugin.Explorer.ViewModels
});
- public string EditorPath
+ public string FileEditorPath
{
get => Settings.EditorPath;
set
@@ -348,6 +359,16 @@ namespace Flow.Launcher.Plugin.Explorer.ViewModels
}
}
+ public string FolderEditorPath
+ {
+ get => Settings.FolderEditorPath;
+ set
+ {
+ Settings.FolderEditorPath = value;
+ OnPropertyChanged();
+ }
+ }
+
public string ShellPath
{
get => Settings.ShellPath;
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
index 6b2877bf5..4a7baa566 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
@@ -175,7 +175,8 @@
-
+
+
+
+
+
+
+
+
Date: Mon, 19 Dec 2022 22:06:11 +0000
Subject: [PATCH 08/53] Bump nunit from 3.13.2 to 3.13.3
Bumps [nunit](https://github.com/nunit/nunit) from 3.13.2 to 3.13.3.
- [Release notes](https://github.com/nunit/nunit/releases)
- [Changelog](https://github.com/nunit/nunit/blob/v3.13.3/CHANGES.md)
- [Commits](https://github.com/nunit/nunit/compare/v3.13.2...v3.13.3)
---
updated-dependencies:
- dependency-name: nunit
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot]
---
Flow.Launcher.Test/Flow.Launcher.Test.csproj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Flow.Launcher.Test/Flow.Launcher.Test.csproj b/Flow.Launcher.Test/Flow.Launcher.Test.csproj
index c4341288f..c67a5cf22 100644
--- a/Flow.Launcher.Test/Flow.Launcher.Test.csproj
+++ b/Flow.Launcher.Test/Flow.Launcher.Test.csproj
@@ -49,7 +49,7 @@
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
From 5cc4a36762de2a726cde2dbb231f63b77fa73b8d Mon Sep 17 00:00:00 2001
From: DB p
Date: Tue, 20 Dec 2022 13:35:20 +0900
Subject: [PATCH 09/53] Add StartEn Setting
---
.../UserSettings/Settings.cs | 1 +
Flow.Launcher/Languages/en.xaml | 2 ++
Flow.Launcher/MainWindow.xaml | 1 +
Flow.Launcher/MainWindow.xaml.cs | 21 +++++++++++++
Flow.Launcher/SettingWindow.xaml | 31 ++++++++++++++++---
5 files changed, 52 insertions(+), 4 deletions(-)
diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
index 09fad990b..9ae1748da 100644
--- a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
+++ b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
@@ -147,6 +147,7 @@ namespace Flow.Launcher.Infrastructure.UserSettings
///
public bool ShouldUsePinyin { get; set; } = false;
public bool AlwaysPreview { get; set; } = false;
+ public bool AlwaysStartEn { get; set; } = false;
[JsonInclude, JsonConverter(typeof(JsonStringEnumConverter))]
public SearchPrecisionScore QuerySearchPrecision { get; private set; } = SearchPrecisionScore.Regular;
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index d0bdfee9b..c1fafa8db 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -55,6 +55,8 @@
Select the file manager to use when opening the folder.
Default Web Browser
Setting for New Tab, New Window, Private Mode.
+ Always Start in English Layout
+ If you are using both native language and English keyboard layouts, start the flow in English layout state.
Python Directory
Auto Update
Select
diff --git a/Flow.Launcher/MainWindow.xaml b/Flow.Launcher/MainWindow.xaml
index 9f8d523e0..3941c5e0a 100644
--- a/Flow.Launcher/MainWindow.xaml
+++ b/Flow.Launcher/MainWindow.xaml
@@ -244,6 +244,7 @@
+
-
@@ -943,13 +945,34 @@
Text="{Binding Settings.PluginSettings.PythonDirectory, TargetNullValue='No Setting'}" />
+
+
+
+
+
+
+
+
+
+
+
+
+
From d0b5a5a37b44573ee2f4f069532ec691d457ad1c Mon Sep 17 00:00:00 2001
From: Jeremy Wu
Date: Tue, 20 Dec 2022 21:05:00 +1100
Subject: [PATCH 10/53] version bump Program plugin
---
Plugins/Flow.Launcher.Plugin.Program/plugin.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Plugins/Flow.Launcher.Plugin.Program/plugin.json b/Plugins/Flow.Launcher.Plugin.Program/plugin.json
index 3c719e28b..c904c2e7d 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/plugin.json
+++ b/Plugins/Flow.Launcher.Plugin.Program/plugin.json
@@ -4,7 +4,7 @@
"Name": "Program",
"Description": "Search programs in Flow.Launcher",
"Author": "qianlifeng",
- "Version": "2.0.0",
+ "Version": "2.0.1",
"Language": "csharp",
"Website": "https://github.com/Flow-Launcher/Flow.Launcher",
"ExecuteFileName": "Flow.Launcher.Plugin.Program.dll",
From ac1658fe040d4016ee55bbdb77caaa8fe9efb264 Mon Sep 17 00:00:00 2001
From: Jeremy Wu
Date: Tue, 20 Dec 2022 21:15:30 +1100
Subject: [PATCH 11/53] add comment
---
Flow.Launcher/ViewModel/SettingWindowViewModel.cs | 1 +
1 file changed, 1 insertion(+)
diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
index f160c2e04..c7c1aaa40 100644
--- a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
+++ b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
@@ -775,6 +775,7 @@ namespace Flow.Launcher.ViewModel
var shortcutSettingWindow = new CustomShortcutSetting(item.Key, item.Value, this);
if (shortcutSettingWindow.ShowDialog() == true)
{
+ // Fix un-selectable shortcut item after the first selection
// https://stackoverflow.com/questions/16789360/wpf-listbox-items-with-changing-hashcode
SelectedCustomShortcut = null;
item.Key = shortcutSettingWindow.Key;
From 0d00734de3694041022889c38a6753f49c5b9815 Mon Sep 17 00:00:00 2001
From: Vic <10308169+VictoriousRaptor@users.noreply.github.com>
Date: Tue, 20 Dec 2022 19:00:52 +0800
Subject: [PATCH 12/53] Update wording
---
Flow.Launcher/Languages/en.xaml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index c1fafa8db..8442e675a 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -55,8 +55,8 @@
Select the file manager to use when opening the folder.
Default Web Browser
Setting for New Tab, New Window, Private Mode.
- Always Start in English Layout
- If you are using both native language and English keyboard layouts, start the flow in English layout state.
+ Always Start Typing in English Mode
+ Automatically change your input method to English mode when activating Flow.
Python Directory
Auto Update
Select
From 179f28767a972913d22b94e288a22c9ab9d74cdc Mon Sep 17 00:00:00 2001
From: DB p
Date: Tue, 20 Dec 2022 20:29:00 +0900
Subject: [PATCH 13/53] Adjust Pinyin Item Position in General Tab
---
Flow.Launcher/SettingWindow.xaml | 36 ++++++++++++++++----------------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index aeebf9ddd..0a786d89e 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -749,24 +749,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -973,6 +955,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
From b92181f6c68ff6cb81f1d6c0a8105267e9d2e22f Mon Sep 17 00:00:00 2001
From: Vic <10308169+VictoriousRaptor@users.noreply.github.com>
Date: Tue, 20 Dec 2022 19:48:10 +0800
Subject: [PATCH 14/53] Remove logic that modifies settings
---
Plugins/Flow.Launcher.Plugin.Program/Programs/UWP.cs | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Programs/UWP.cs b/Plugins/Flow.Launcher.Plugin.Program/Programs/UWP.cs
index 35f0814a7..d0070f833 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Programs/UWP.cs
+++ b/Plugins/Flow.Launcher.Plugin.Program/Programs/UWP.cs
@@ -202,11 +202,7 @@ namespace Flow.Launcher.Plugin.Program.Programs
public static Application[] All(Settings settings)
{
var support = SupportUWP();
- if (!support && settings.EnableUWP)
- {
- settings.EnableUWP = false;
- }
- if (settings.EnableUWP)
+ if (support && settings.EnableUWP)
{
var applications = CurrentUserPackages().AsParallel().SelectMany(p =>
{
From 3dac240a4015e5e14611913348545b1ebbef13ca Mon Sep 17 00:00:00 2001
From: Vic <10308169+VictoriousRaptor@users.noreply.github.com>
Date: Tue, 20 Dec 2022 20:16:17 +0800
Subject: [PATCH 15/53] Add open with shell context menu for non-Windows
indexed folders
---
Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs b/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs
index 4733e09e9..979b4cd8c 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs
@@ -42,11 +42,15 @@ namespace Flow.Launcher.Plugin.Explorer
if (record.Type == ResultType.File && !string.IsNullOrEmpty(Settings.EditorPath))
contextMenus.Add(CreateOpenWithEditorResult(record));
- if (record.Type == ResultType.Folder && record.WindowsIndexed)
+ if (record.Type == ResultType.Folder)
{
- contextMenus.Add(CreateAddToIndexSearchExclusionListResult(record));
contextMenus.Add(CreateOpenWithShellResult(record));
+ if (record.WindowsIndexed)
+ {
+ contextMenus.Add(CreateAddToIndexSearchExclusionListResult(record));
+ }
}
+
contextMenus.Add(CreateOpenContainingFolderResult(record));
if (record.WindowsIndexed)
From 8625fb985b4c64f47f3d0dd5156cffdd4de87039 Mon Sep 17 00:00:00 2001
From: Vic <10308169+VictoriousRaptor@users.noreply.github.com>
Date: Tue, 20 Dec 2022 20:57:05 +0800
Subject: [PATCH 16/53] Use case-insensitive path comparison
---
Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs b/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs
index 979b4cd8c..8f9cc9524 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs
@@ -98,7 +98,7 @@ namespace Flow.Launcher.Plugin.Explorer
SubTitle = string.Format(Context.API.GetTranslation("plugin_explorer_remove_from_quickaccess_subtitle"), fileOrFolder),
Action = (context) =>
{
- Settings.QuickAccessLinks.Remove(Settings.QuickAccessLinks.FirstOrDefault(x => x.Path == record.FullPath));
+ Settings.QuickAccessLinks.Remove(Settings.QuickAccessLinks.FirstOrDefault(x => string.Equals(x.Path, record.FullPath, StringComparison.OrdinalIgnoreCase)));
Context.API.ShowMsg(Context.API.GetTranslation("plugin_explorer_removefilefoldersuccess"),
string.Format(
@@ -256,7 +256,7 @@ namespace Flow.Launcher.Plugin.Explorer
},
});
}
-
+ "" == ""
if (record.Type == ResultType.File && CanRunAsDifferentUser(record.FullPath))
contextMenus.Add(new Result
{
@@ -386,7 +386,7 @@ namespace Flow.Launcher.Plugin.Explorer
SubTitle = Context.API.GetTranslation("plugin_explorer_path") + " " + record.FullPath,
Action = _ =>
{
- if (!Settings.IndexSearchExcludedSubdirectoryPaths.Any(x => x.Path == record.FullPath))
+ if (!Settings.IndexSearchExcludedSubdirectoryPaths.Any(x => string.Equals(x.Path, record.FullPath, StringComparison.OrdinalIgnoreCase)))
Settings.IndexSearchExcludedSubdirectoryPaths.Add(new AccessLink
{
Path = record.FullPath
From c6e82cc7c376e0d46afb85bcbb0e2abde8cadd24 Mon Sep 17 00:00:00 2001
From: Vic <10308169+VictoriousRaptor@users.noreply.github.com>
Date: Tue, 20 Dec 2022 21:02:07 +0800
Subject: [PATCH 17/53] Update wording
---
Flow.Launcher/Languages/en.xaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 8442e675a..3350a4499 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -56,7 +56,7 @@
Default Web Browser
Setting for New Tab, New Window, Private Mode.
Always Start Typing in English Mode
- Automatically change your input method to English mode when activating Flow.
+ Temporarily change your input method to English mode when activating Flow.
Python Directory
Auto Update
Select
From ce303156fb89bda9fadbe4c23dfd310187849195 Mon Sep 17 00:00:00 2001
From: Vic <10308169+VictoriousRaptor@users.noreply.github.com>
Date: Tue, 20 Dec 2022 22:35:07 +0800
Subject: [PATCH 18/53] Use binding for ime conversion mode
---
.../BoolToIMEConversionModeConverter.cs | 31 +++++++++++++++++++
Flow.Launcher/MainWindow.xaml | 3 ++
Flow.Launcher/MainWindow.xaml.cs | 31 -------------------
Flow.Launcher/ViewModel/MainViewModel.cs | 5 +++
4 files changed, 39 insertions(+), 31 deletions(-)
create mode 100644 Flow.Launcher/Converters/BoolToIMEConversionModeConverter.cs
diff --git a/Flow.Launcher/Converters/BoolToIMEConversionModeConverter.cs b/Flow.Launcher/Converters/BoolToIMEConversionModeConverter.cs
new file mode 100644
index 000000000..f3771e6d9
--- /dev/null
+++ b/Flow.Launcher/Converters/BoolToIMEConversionModeConverter.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Globalization;
+using System.Windows.Data;
+using System.Windows.Input;
+
+namespace Flow.Launcher.Converters
+{
+ internal class BoolToIMEConversionModeConverter : IValueConverter
+ {
+ public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+ {
+ if (value is bool v)
+ {
+ if (v)
+ {
+ return ImeConversionModeValues.Alphanumeric;
+ }
+ else
+ {
+ return ImeConversionModeValues.DoNotCare;
+ }
+ }
+ return ImeConversionModeValues.DoNotCare;
+ }
+
+ public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+ {
+ throw new NotImplementedException();
+ }
+ }
+}
diff --git a/Flow.Launcher/MainWindow.xaml b/Flow.Launcher/MainWindow.xaml
index 3941c5e0a..eca9fcdca 100644
--- a/Flow.Launcher/MainWindow.xaml
+++ b/Flow.Launcher/MainWindow.xaml
@@ -9,6 +9,7 @@
xmlns:svgc="http://sharpvectors.codeplex.com/svgc/"
xmlns:ui="http://schemas.modernwpf.com/2019"
xmlns:vm="clr-namespace:Flow.Launcher.ViewModel"
+ d:DataContext="{d:DesignInstance Type=vm:MainViewModel}"
Name="FlowMainWindow"
Title="Flow Launcher"
MinWidth="{Binding MainWindowWidth, Mode=OneWay}"
@@ -37,6 +38,7 @@
+
@@ -204,6 +206,7 @@
PreviewKeyUp="QueryTextBox_KeyUp"
Style="{DynamicResource QueryBoxStyle}"
Text="{Binding QueryText, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+ InputMethod.PreferredImeConversionMode="{Binding StartWithEnglishMode, Converter={StaticResource BoolToIMEConversionModeConverter}}"
Visibility="Visible">
diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index e639b668c..a645a702c 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -20,22 +20,9 @@ using Flow.Launcher.Infrastructure;
using System.Windows.Media;
using Flow.Launcher.Infrastructure.Hotkey;
using Flow.Launcher.Plugin.SharedCommands;
-using System.Text;
-using DataObject = System.Windows.DataObject;
-using System.Diagnostics;
-using Microsoft.AspNetCore.Http;
-using System.IO;
using System.Windows.Threading;
using System.Windows.Data;
using ModernWpf.Controls;
-using System.Drawing;
-using System.Windows.Forms.Design.Behavior;
-using System.Security.Cryptography;
-using System.Runtime.CompilerServices;
-using Microsoft.VisualBasic.Devices;
-using Microsoft.FSharp.Data.UnitSystems.SI.UnitNames;
-using NLog.Targets;
-using YamlDotNet.Core.Tokens;
using Key = System.Windows.Input.Key;
namespace Flow.Launcher
@@ -131,7 +118,6 @@ namespace Flow.Launcher
UpdatePosition();
PreviewReset();
Activate();
- QueryTextBox_StartEn();
QueryTextBox.Focus();
_settings.ActivateTimes++;
if (!_viewModel.LastQuerySelected)
@@ -195,9 +181,6 @@ namespace Flow.Launcher
case nameof(Settings.Language):
UpdateNotifyIconText();
break;
- case nameof(Settings.AlwaysStartEn):
- QueryTextBox_StartEn();
- break;
case nameof(Settings.Hotkey):
UpdateNotifyIconText();
break;
@@ -703,19 +686,5 @@ namespace Flow.Launcher
be.UpdateSource();
}
}
-
- private void QueryTextBox_StartEn()
- {
- if (_settings.AlwaysStartEn)
- {
- QueryTextBox.SetValue(InputMethod.PreferredImeConversionModeProperty, ImeConversionModeValues.Alphanumeric);
- QueryTextBox.SetValue(InputMethod.PreferredImeStateProperty, InputMethodState.Off);
- }
- else
- {
- QueryTextBox.ClearValue(InputMethod.PreferredImeConversionModeProperty);
- QueryTextBox.ClearValue(InputMethod.PreferredImeStateProperty);
- }
- }
}
}
diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs
index e05e47041..09bba6e5c 100644
--- a/Flow.Launcher/ViewModel/MainViewModel.cs
+++ b/Flow.Launcher/ViewModel/MainViewModel.cs
@@ -71,6 +71,9 @@ namespace Flow.Launcher.ViewModel
case nameof(Settings.WindowSize):
OnPropertyChanged(nameof(MainWindowWidth));
break;
+ case nameof(Settings.AlwaysStartEn):
+ OnPropertyChanged(nameof(StartWithEnglishMode));
+ break;
}
};
@@ -514,6 +517,8 @@ namespace Flow.Launcher.ViewModel
public string Image => Constant.QueryTextBoxIconImagePath;
+ public bool StartWithEnglishMode => Settings.AlwaysStartEn;
+
#endregion
public void Query()
From 9d59933a08677717176ac9266f2122a5d986a2eb Mon Sep 17 00:00:00 2001
From: Vic <10308169+VictoriousRaptor@users.noreply.github.com>
Date: Tue, 20 Dec 2022 23:13:15 +0800
Subject: [PATCH 19/53] Add IME state
---
.../BoolToIMEConversionModeConverter.cs | 24 +++++++++++++++++++
Flow.Launcher/MainWindow.xaml | 2 ++
2 files changed, 26 insertions(+)
diff --git a/Flow.Launcher/Converters/BoolToIMEConversionModeConverter.cs b/Flow.Launcher/Converters/BoolToIMEConversionModeConverter.cs
index f3771e6d9..0bff23fe1 100644
--- a/Flow.Launcher/Converters/BoolToIMEConversionModeConverter.cs
+++ b/Flow.Launcher/Converters/BoolToIMEConversionModeConverter.cs
@@ -28,4 +28,28 @@ namespace Flow.Launcher.Converters
throw new NotImplementedException();
}
}
+
+ internal class BoolToIMEStateConverter : IValueConverter
+ {
+ public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+ {
+ if (value is bool v)
+ {
+ if (v)
+ {
+ return InputMethodState.Off;
+ }
+ else
+ {
+ return InputMethodState.DoNotCare;
+ }
+ }
+ return InputMethodState.DoNotCare;
+ }
+
+ public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+ {
+ throw new NotImplementedException();
+ }
+ }
}
diff --git a/Flow.Launcher/MainWindow.xaml b/Flow.Launcher/MainWindow.xaml
index eca9fcdca..095382e76 100644
--- a/Flow.Launcher/MainWindow.xaml
+++ b/Flow.Launcher/MainWindow.xaml
@@ -39,6 +39,7 @@
+
@@ -207,6 +208,7 @@
Style="{DynamicResource QueryBoxStyle}"
Text="{Binding QueryText, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
InputMethod.PreferredImeConversionMode="{Binding StartWithEnglishMode, Converter={StaticResource BoolToIMEConversionModeConverter}}"
+ InputMethod.PreferredImeState="{Binding StartWithEnglishMode, Converter={StaticResource BoolToIMEStateConverter}}"
Visibility="Visible">
From 3b6c8b882bd42bb7524e684eed1901a26c6e936c Mon Sep 17 00:00:00 2001
From: Vic <10308169+VictoriousRaptor@users.noreply.github.com>
Date: Wed, 21 Dec 2022 13:30:49 +0800
Subject: [PATCH 20/53] Add translatble text
---
Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml | 2 ++
Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
index d44c67bf0..bd950a2aa 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
@@ -120,5 +120,7 @@
Failed to automatically install Everything service. Please manually install it from https://www.voidtools.com
Click here to start it
Unable to find an Everything installation, would you like to manually select a location?{0}{0}Click no and Everything will be automatically installed for you
+ Do you want to enable content search for Everything?
+ "It can be very slow without index (which is only supported in Everything v1.5+)"
\ No newline at end of file
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs
index fc4186cb3..3634de792 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs
@@ -145,8 +145,8 @@ namespace Flow.Launcher.Plugin.Explorer.Search
{
new()
{
- Title = "Do you want to enable content search for Everything?",
- SubTitle = "It can be very slow without index (which is only supported in Everything v1.5+)",
+ Title = Context.API.GetTranslation("flowlauncher_plugin_everything_enable_content_search"),
+ SubTitle = Context.API.GetTranslation("flowlauncher_plugin_everything_enable_content_search_tips"),
IcoPath = "Images/index_error.png",
Action = c =>
{
From 8fbf3a3f925b7f8f2ee506733acb8c5d40c9edfa Mon Sep 17 00:00:00 2001
From: Vic <10308169+VictoriousRaptor@users.noreply.github.com>
Date: Wed, 21 Dec 2022 14:01:09 +0800
Subject: [PATCH 21/53] make file/folder translatble
---
.../ContextMenu.cs | 36 +++++++++----------
.../Languages/en.xaml | 22 ++++++++----
2 files changed, 32 insertions(+), 26 deletions(-)
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs b/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs
index 8f9cc9524..af5439d04 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs
@@ -59,14 +59,14 @@ namespace Flow.Launcher.Plugin.Explorer
}
var icoPath = (record.Type == ResultType.File) ? Constants.FileImagePath : Constants.FolderImagePath;
- var fileOrFolder = (record.Type == ResultType.File) ? "file" : "folder";
+ bool isFile = record.Type == ResultType.File;
if (Settings.QuickAccessLinks.All(x => !x.Path.Equals(record.FullPath, StringComparison.OrdinalIgnoreCase)))
{
contextMenus.Add(new Result
{
Title = Context.API.GetTranslation("plugin_explorer_add_to_quickaccess_title"),
- SubTitle = string.Format(Context.API.GetTranslation("plugin_explorer_add_to_quickaccess_subtitle"), fileOrFolder),
+ SubTitle = Context.API.GetTranslation("plugin_explorer_add_to_quickaccess_subtitle"),
Action = (context) =>
{
Settings.QuickAccessLinks.Add(new AccessLink
@@ -75,10 +75,8 @@ namespace Flow.Launcher.Plugin.Explorer
});
Context.API.ShowMsg(Context.API.GetTranslation("plugin_explorer_addfilefoldersuccess"),
- string.Format(
Context.API.GetTranslation("plugin_explorer_addfilefoldersuccess_detail"),
- fileOrFolder),
- Constants.ExplorerIconImageFullPath);
+ Constants.ExplorerIconImageFullPath);
ViewModel.Save();
@@ -95,16 +93,14 @@ namespace Flow.Launcher.Plugin.Explorer
contextMenus.Add(new Result
{
Title = Context.API.GetTranslation("plugin_explorer_remove_from_quickaccess_title"),
- SubTitle = string.Format(Context.API.GetTranslation("plugin_explorer_remove_from_quickaccess_subtitle"), fileOrFolder),
+ SubTitle = Context.API.GetTranslation("plugin_explorer_remove_from_quickaccess_subtitle"),
Action = (context) =>
{
Settings.QuickAccessLinks.Remove(Settings.QuickAccessLinks.FirstOrDefault(x => string.Equals(x.Path, record.FullPath, StringComparison.OrdinalIgnoreCase)));
Context.API.ShowMsg(Context.API.GetTranslation("plugin_explorer_removefilefoldersuccess"),
- string.Format(
Context.API.GetTranslation("plugin_explorer_removefilefoldersuccess_detail"),
- fileOrFolder),
- Constants.ExplorerIconImageFullPath);
+ Constants.ExplorerIconImageFullPath);
ViewModel.Save();
@@ -120,7 +116,7 @@ namespace Flow.Launcher.Plugin.Explorer
contextMenus.Add(new Result
{
Title = Context.API.GetTranslation("plugin_explorer_copypath"),
- SubTitle = $"Copy the current {fileOrFolder} path to clipboard",
+ SubTitle = Context.API.GetTranslation("plugin_explorer_copypath_subtitle"),
Action = _ =>
{
try
@@ -142,8 +138,8 @@ namespace Flow.Launcher.Plugin.Explorer
contextMenus.Add(new Result
{
- Title = Context.API.GetTranslation("plugin_explorer_copyfilefolder") + $" {fileOrFolder}",
- SubTitle = $"Copy the {fileOrFolder} to clipboard",
+ Title = isFile ? Context.API.GetTranslation("plugin_explorer_copyfile") : Context.API.GetTranslation("plugin_explorer_copyfolder"),
+ SubTitle = isFile ? Context.API.GetTranslation("plugin_explorer_copyfile_subtitle") : Context.API.GetTranslation("plugin_explorer_copyfolder_subtitle"),
Action = _ =>
{
try
@@ -156,7 +152,7 @@ namespace Flow.Launcher.Plugin.Explorer
}
catch (Exception e)
{
- var message = $"Fail to set {fileOrFolder} in clipboard";
+ var message = $"Fail to set file/folder in clipboard";
LogException(message, e);
Context.API.ShowMsg(message);
return false;
@@ -171,21 +167,21 @@ namespace Flow.Launcher.Plugin.Explorer
if (record.Type is ResultType.File or ResultType.Folder)
contextMenus.Add(new Result
{
- Title = Context.API.GetTranslation("plugin_explorer_deletefilefolder") + $" {fileOrFolder}",
- SubTitle = Context.API.GetTranslation("plugin_explorer_deletefilefolder_subtitle") + $" {fileOrFolder}",
+ Title = isFile ? Context.API.GetTranslation("plugin_explorer_deletefile") : Context.API.GetTranslation("plugin_explorer_deletefolder"),
+ SubTitle = isFile ? Context.API.GetTranslation("plugin_explorer_deletefile_subtitle") : Context.API.GetTranslation("plugin_explorer_deletefolder_subtitle"),
Action = (context) =>
{
try
{
if (MessageBox.Show(
- string.Format(Context.API.GetTranslation("plugin_explorer_deletefilefolderconfirm"), fileOrFolder),
+ Context.API.GetTranslation("plugin_explorer_deletefilefolderconfirm"),
string.Empty,
MessageBoxButton.YesNo,
MessageBoxIcon.Warning)
== DialogResult.No)
return false;
- if (record.Type == ResultType.File)
+ if (isFile)
File.Delete(record.FullPath);
else
Directory.Delete(record.FullPath, true);
@@ -193,13 +189,13 @@ namespace Flow.Launcher.Plugin.Explorer
_ = Task.Run(() =>
{
Context.API.ShowMsg(Context.API.GetTranslation("plugin_explorer_deletefilefoldersuccess"),
- string.Format(Context.API.GetTranslation("plugin_explorer_deletefilefoldersuccess_detail"), fileOrFolder),
+ string.Format(Context.API.GetTranslation("plugin_explorer_deletefilefoldersuccess_detail"), record.FullPath),
Constants.ExplorerIconImageFullPath);
});
}
catch (Exception e)
{
- var message = $"Fail to delete {fileOrFolder} at {record.FullPath}";
+ var message = $"Fail to delete {record.FullPath}";
LogException(message, e);
Context.API.ShowMsgError(message);
return false;
@@ -256,7 +252,7 @@ namespace Flow.Launcher.Plugin.Explorer
},
});
}
- "" == ""
+
if (record.Type == ResultType.File && CanRunAsDifferentUser(record.FullPath))
contextMenus.Add(new Result
{
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
index bd950a2aa..3aa9e9271 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
@@ -6,9 +6,10 @@
Please make a selection first
Please select a folder link
Are you sure you want to delete {0}?
- Are you sure you want to permanently delete this {0}?
+ Are you sure you want to permanently delete this folder?
+ Are you sure you want to permanently delete this file?
Deletion successful
- Successfully deleted the {0}
+ Successfully deleted {0}
Assigning the global action keyword could bring up too many results during search. Please choose a specific action keyword
Quick Access can not be set to the global action keyword when enabled. Please choose a specific action keyword
The required service for Windows Index Search does not appear to be running
@@ -62,8 +63,17 @@
Copy path
+ Copy path of current result to clipboard
Copy
+ Copy file
+ Copy current file to clipboard
+ Copy folder
+ Copy current folder to clipboard
Delete
+ Delete file
+ Permanently delete current file
+ Delete folder
+ Permanently delete current folder
Path:
Delete the selected
Run as different user
@@ -80,7 +90,7 @@
Manage indexed files and folders
Failed to open Windows Indexing Options
Add to Quick Access
- Add the current {0} to Quick Access
+ Add current result to Quick Access
Successfully Added
Successfully added to Quick Access
Successfully Removed
@@ -88,11 +98,11 @@
Add to Quick Access so it can be opened with Explorer's Search Activation action keyword
Remove from Quick Access
Remove from Quick Access
- Remove the current {0} from Quick Access
+ Remove current result from Quick Access
Show Windows Context Menu
-
+
- Everything SDK Loaded Fail
+ Failed to load Everything SDK
Warning: Everything service is not running
Error while querying Everything
Sort By
From 7c5c1e874008487c64f04729630dc3fbba3e02f1 Mon Sep 17 00:00:00 2001
From: Vic <10308169+VictoriousRaptor@users.noreply.github.com>
Date: Wed, 21 Dec 2022 14:08:32 +0800
Subject: [PATCH 22/53] remove redundant texts
---
Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs | 4 ++--
Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml | 4 ----
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs b/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs
index af5439d04..dd5bd0c6c 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs
@@ -138,7 +138,7 @@ namespace Flow.Launcher.Plugin.Explorer
contextMenus.Add(new Result
{
- Title = isFile ? Context.API.GetTranslation("plugin_explorer_copyfile") : Context.API.GetTranslation("plugin_explorer_copyfolder"),
+ Title = Context.API.GetTranslation("plugin_explorer_copyfilefolder"),
SubTitle = isFile ? Context.API.GetTranslation("plugin_explorer_copyfile_subtitle") : Context.API.GetTranslation("plugin_explorer_copyfolder_subtitle"),
Action = _ =>
{
@@ -167,7 +167,7 @@ namespace Flow.Launcher.Plugin.Explorer
if (record.Type is ResultType.File or ResultType.Folder)
contextMenus.Add(new Result
{
- Title = isFile ? Context.API.GetTranslation("plugin_explorer_deletefile") : Context.API.GetTranslation("plugin_explorer_deletefolder"),
+ Title = Context.API.GetTranslation("plugin_explorer_deletefilefolder"),
SubTitle = isFile ? Context.API.GetTranslation("plugin_explorer_deletefile_subtitle") : Context.API.GetTranslation("plugin_explorer_deletefolder_subtitle"),
Action = (context) =>
{
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
index 3aa9e9271..3c9511771 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
@@ -65,14 +65,10 @@
Copy path
Copy path of current result to clipboard
Copy
- Copy file
Copy current file to clipboard
- Copy folder
Copy current folder to clipboard
Delete
- Delete file
Permanently delete current file
- Delete folder
Permanently delete current folder
Path:
Delete the selected
From 5696caf0e5c5eadab1c6cbfb610096fc47672279 Mon Sep 17 00:00:00 2001
From: Vic <10308169+VictoriousRaptor@users.noreply.github.com>
Date: Wed, 21 Dec 2022 15:02:10 +0800
Subject: [PATCH 23/53] update wording
---
Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
index 3c9511771..4e7c06557 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
@@ -32,7 +32,7 @@
Editor Path
Shell Path
Index Search Excluded Paths
- Use search result's location as executable working directory
+ Use search result's location as the working directory of the excutable
Use Index Search For Path Search
Indexing Options
Search:
From 812a9200585e7b7a51b4eef450df24d77d6677be Mon Sep 17 00:00:00 2001
From: DB p
Date: Wed, 21 Dec 2022 16:15:26 +0900
Subject: [PATCH 24/53] Adjust Little String / Add Korean Translations
---
.../Languages/en.xaml | 5 +-
.../Languages/ko.xaml | 112 ++++++++++--------
2 files changed, 64 insertions(+), 53 deletions(-)
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
index 3c9511771..da4dbf913 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
@@ -1,4 +1,5 @@
-
@@ -75,7 +76,7 @@
Run as different user
Run the selected using a different user account
Open containing folder
- Opens the location that contains the file or folder
+ Opens the location that contains the item
Open With Editor:
Failed to open file at {0} with Editor {1} at {2}
Open With Shell:
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/ko.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/ko.xaml
index 30cc5e1c7..152c19f0c 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/ko.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/ko.xaml
@@ -1,13 +1,16 @@
-
-
+
- Please make a selection first
+ 항목을 먼저 선택하세요
폴더 링크를 선택하세요
Are you sure you want to delete {0}?
- Are you sure you want to permanently delete this {0}?
+ Are you sure you want to permanently delete this folder?
+ Are you sure you want to permanently delete this file?
Deletion successful
- Successfully deleted the {0}
+ Successfully deleted {0}
Assigning the global action keyword could bring up too many results during search. Please choose a specific action keyword
Quick Access can not be set to the global action keyword when enabled. Please choose a specific action keyword
The required service for Windows Index Search does not appear to be running
@@ -20,84 +23,89 @@
삭제
편집
추가
- General Setting
+ 일반 설정
사용자 지정 액션 키워드
- Quick Access Links
- Everything Setting
- Sort Option:
- Everything Path:
+ 빠른 실행 항목
+ Everything 설정
+ 정렬:
+ Everything 경로:
Launch Hidden
- Editor Path
- Shell Path
- Index Search Excluded Paths
+ 에디터 경로
+ 쉘 경로
+ 색인 제외 경로
Use search result's location as executable working directory
Use Index Search For Path Search
- 색인 옵션
+ Indexing Options
검색:
경로 검색:
파일 내용 검색:
- 색인 검색:
- Quick Access:
- Current Action Keyword
+ Index Search:
+ 빠른 실행:
+ 현재 액션 키워드
완료
- 켬
+ 활성
When disabled Flow will not execute this search option, and will additionally revert back to '*' to free up the action keyword
Everything
- Windows Index
- Direct Enumeration
+ 윈도우 색인
+ Flow Launcher
- Content Search Engine
- Directory Recursive Search Engine
- Index Search Engine
- Open Windows Index Option
+ 내용 검색 엔진
+ 경로 재귀 검색 엔진
+ 색인 검색 엔진
+ 윈도우 색인 설정 열기
탐색기
- Window Index Search를 사용하여 파일과 폴더를 검색 및 관리합니다
+ 윈도우 색인 또는 Everything을 사용하여 파일과 폴더를 검색 및 관리합니다
- Ctrl + Enter to open the directory
- Ctrl + Enter to open the containing folder
+ Ctrl + Enter으로 폴더 열기
+ Ctrl + Enter으로 포함된 폴더 열기
경로 복사
+ 이 항목의 경로를 클립보드에 복사
복사하기
+ 이 파일을 클립보드에 복사
+ 이 폴더를 클립보드에 복사
삭제
+ 이 파일을 영구적으로 삭제
+ 이 폴더를 영구적으로 삭제
경로:
- Delete the selected
+ 선택 항목을 삭제
다른 유저 권한으로 실행
- Run the selected using a different user account
+ 선택한 다른 사용자 계정으로 실행
포함된 폴더 열기
- Opens the location that contains the file or folder
- 편집기에서 열기:
+ 이 항목이 포함된 위치를 열기
+ 에디터로 열기:
Failed to open file at {0} with Editor {1} at {2}
- Open With Shell:
+ 쉘로 열기:
Failed to open folder {0} with Shell {1} at {2}
Exclude current and sub-directories from Index Search
Excluded from Index Search
- 윈도우 인덱싱 옵션 열기
- Manage indexed files and folders
- 윈도우 인덱싱 옵션 열기에 실패했습니다
- Add to Quick Access
- Add the current {0} to Quick Access
- 성공적으로 추가되었습니다
- Successfully added to Quick Access
- 성공적으로 제거했습니다
- Successfully removed from Quick Access
+ 윈도우 색인 설정 열기
+ 폴더 및 파일의 색인 관리
+ 윈도우 색인 설정을 여는데 실패했습니다
+ 빠른 실행에 추가
+ 빠른 실행에 이 항목을 추가
+ 추가 완료
+ 빠른 실행에 추가했습니다
+ 제거 완료
+ 빠른 실행에서 제거했습니다
Add to Quick Access so it can be opened with Explorer's Search Activation action keyword
Remove from Quick Access
- Remove from Quick Access
- Remove the current {0} from Quick Access
- Show Windows Context Menu
-
+ 빠른 실행에서 제거
+ 이 항목을 빠른 실행에서 제거
+ 우클릭 메뉴 보기
+
- Everything SDK Loaded Fail
- Warning: Everything service is not running
+ Everything SDK를 불러오는데 실패했습니다
+ 주의: Everything 서비스가 실행 중이 아닙니다
Error while querying Everything
Sort By
Name
Path
- 크기
+ Size
Extension
Type Name
Date Created
@@ -108,8 +116,8 @@
Date Recently Changed
Date Accessed
Date Run
- ↑
- ↓
+ ↑
+ ↓
Warning: This is not a Fast Sort option, searches may be slow
Click to Launch or Install Everything
@@ -119,5 +127,7 @@
Failed to automatically install Everything service. Please manually install it from https://www.voidtools.com
Click here to start it
Unable to find an Everything installation, would you like to manually select a location?{0}{0}Click no and Everything will be automatically installed for you
+ Do you want to enable content search for Everything?
+ "It can be very slow without index (which is only supported in Everything v1.5+)"
-
+
\ No newline at end of file
From 43e3b1f43048b7c39c4eb51d99af824a2ef41b73 Mon Sep 17 00:00:00 2001
From: DB p
Date: Wed, 21 Dec 2022 16:19:51 +0900
Subject: [PATCH 25/53] Adjust Korean Texts
---
.../Languages/ko.xaml | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/ko.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/ko.xaml
index 152c19f0c..b2f6c54c1 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/ko.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/ko.xaml
@@ -25,7 +25,7 @@
추가
일반 설정
사용자 지정 액션 키워드
- 빠른 실행 항목
+ 빠른 접근 항목
Everything 설정
정렬:
Everything 경로:
@@ -40,7 +40,7 @@
경로 검색:
파일 내용 검색:
Index Search:
- 빠른 실행:
+ 빠른 접근:
현재 액션 키워드
완료
활성
@@ -86,21 +86,21 @@
윈도우 색인 설정 열기
폴더 및 파일의 색인 관리
윈도우 색인 설정을 여는데 실패했습니다
- 빠른 실행에 추가
- 빠른 실행에 이 항목을 추가
+ 빠른 접근에 추가
+ 빠른 접근에 이 항목을 추가
추가 완료
- 빠른 실행에 추가했습니다
+ 빠른 접근에 추가했습니다
제거 완료
- 빠른 실행에서 제거했습니다
+ 빠른 접근에서 제거했습니다
Add to Quick Access so it can be opened with Explorer's Search Activation action keyword
Remove from Quick Access
- 빠른 실행에서 제거
- 이 항목을 빠른 실행에서 제거
+ 빠른 접근에서 제거
+ 이 항목을 빠른 접근에서 제거
우클릭 메뉴 보기
Everything SDK를 불러오는데 실패했습니다
- 주의: Everything 서비스가 실행 중이 아닙니다
+ 경고: Everything 서비스가 실행 중이 아닙니다
Error while querying Everything
Sort By
Name
From 3b95b90f1c3dd07820ee8014b113cb0e37f61178 Mon Sep 17 00:00:00 2001
From: Vic <10308169+VictoriousRaptor@users.noreply.github.com>
Date: Wed, 21 Dec 2022 15:50:41 +0800
Subject: [PATCH 26/53] Move TranslationConverter to Core
---
.../Resource}/TranslationConverter.cs | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
rename {Flow.Launcher/Converters => Flow.Launcher.Core/Resource}/TranslationConverter.cs (81%)
diff --git a/Flow.Launcher/Converters/TranslationConverter.cs b/Flow.Launcher.Core/Resource/TranslationConverter.cs
similarity index 81%
rename from Flow.Launcher/Converters/TranslationConverter.cs
rename to Flow.Launcher.Core/Resource/TranslationConverter.cs
index e1e8a58e3..ebab99e5b 100644
--- a/Flow.Launcher/Converters/TranslationConverter.cs
+++ b/Flow.Launcher.Core/Resource/TranslationConverter.cs
@@ -1,11 +1,10 @@
using System;
using System.Globalization;
using System.Windows.Data;
-using Flow.Launcher.Core.Resource;
-namespace Flow.Launcher.Converters
+namespace Flow.Launcher.Core.Resource
{
- public class TranlationConverter : IValueConverter
+ public class TranslationConverter : IValueConverter
{
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
From b30ace993aacb4db467e1944fb129d7c13f62780 Mon Sep 17 00:00:00 2001
From: Vic <10308169+VictoriousRaptor@users.noreply.github.com>
Date: Wed, 21 Dec 2022 15:51:17 +0800
Subject: [PATCH 27/53] Fix namespace of LocalizationConverter
---
Flow.Launcher.Core/Resource/LocalizationConverter.cs | 2 +-
.../Resource/LocalizedDescriptionAttribute.cs | 3 +--
.../DecimalSeparator.cs | 12 +++---------
.../Views/CalculatorSettings.xaml | 2 +-
4 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/Flow.Launcher.Core/Resource/LocalizationConverter.cs b/Flow.Launcher.Core/Resource/LocalizationConverter.cs
index 1d835a831..81600e023 100644
--- a/Flow.Launcher.Core/Resource/LocalizationConverter.cs
+++ b/Flow.Launcher.Core/Resource/LocalizationConverter.cs
@@ -4,7 +4,7 @@ using System.Globalization;
using System.Reflection;
using System.Windows.Data;
-namespace Flow.Launcher.Core
+namespace Flow.Launcher.Core.Resource
{
public class LocalizationConverter : IValueConverter
{
diff --git a/Flow.Launcher.Core/Resource/LocalizedDescriptionAttribute.cs b/Flow.Launcher.Core/Resource/LocalizedDescriptionAttribute.cs
index af8b23136..52a232334 100644
--- a/Flow.Launcher.Core/Resource/LocalizedDescriptionAttribute.cs
+++ b/Flow.Launcher.Core/Resource/LocalizedDescriptionAttribute.cs
@@ -1,7 +1,6 @@
using System.ComponentModel;
-using Flow.Launcher.Core.Resource;
-namespace Flow.Launcher.Core
+namespace Flow.Launcher.Core.Resource
{
public class LocalizedDescriptionAttribute : DescriptionAttribute
{
diff --git a/Plugins/Flow.Launcher.Plugin.Calculator/DecimalSeparator.cs b/Plugins/Flow.Launcher.Plugin.Calculator/DecimalSeparator.cs
index b4f3c3c58..ac0da1c6f 100644
--- a/Plugins/Flow.Launcher.Plugin.Calculator/DecimalSeparator.cs
+++ b/Plugins/Flow.Launcher.Plugin.Calculator/DecimalSeparator.cs
@@ -1,11 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Flow.Launcher.Core;
+using System.ComponentModel;
+using Flow.Launcher.Core.Resource;
namespace Flow.Launcher.Plugin.Caculator
{
@@ -21,4 +15,4 @@ namespace Flow.Launcher.Plugin.Caculator
[LocalizedDescription("flowlauncher_plugin_calculator_decimal_seperator_comma")]
Comma
}
-}
\ No newline at end of file
+}
diff --git a/Plugins/Flow.Launcher.Plugin.Calculator/Views/CalculatorSettings.xaml b/Plugins/Flow.Launcher.Plugin.Calculator/Views/CalculatorSettings.xaml
index c0621a2d9..9fd4bb17c 100644
--- a/Plugins/Flow.Launcher.Plugin.Calculator/Views/CalculatorSettings.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Calculator/Views/CalculatorSettings.xaml
@@ -3,7 +3,7 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:calculator="clr-namespace:Flow.Launcher.Plugin.Caculator"
- xmlns:core="clr-namespace:Flow.Launcher.Core;assembly=Flow.Launcher.Core"
+ xmlns:core="clr-namespace:Flow.Launcher.Core.Resource;assembly=Flow.Launcher.Core"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:ui="clr-namespace:Flow.Launcher.Infrastructure.UI;assembly=Flow.Launcher.Infrastructure"
From 230e4fbcbbcae1d2025f361fb2d354dd17452396 Mon Sep 17 00:00:00 2001
From: Vic <10308169+VictoriousRaptor@users.noreply.github.com>
Date: Wed, 21 Dec 2022 15:51:53 +0800
Subject: [PATCH 28/53] Fix translation of action keywords
---
Flow.Launcher/SettingWindow.xaml | 3 ++-
.../ViewModels/SettingsViewModel.cs | 10 +++++-----
.../Views/ExplorerSettings.xaml | 4 +++-
3 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 0a786d89e..ebca70462 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -5,6 +5,7 @@
xmlns:converters="clr-namespace:Flow.Launcher.Converters"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:flowlauncher="clr-namespace:Flow.Launcher"
+ xmlns:core="clr-namespace:Flow.Launcher.Core.Resource;assembly=Flow.Launcher.Core"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:scm="clr-namespace:System.ComponentModel;assembly=WindowsBase"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
@@ -42,7 +43,7 @@
-
+
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/SettingsViewModel.cs b/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/SettingsViewModel.cs
index 5975d3f16..67bf8d928 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/SettingsViewModel.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/SettingsViewModel.cs
@@ -112,15 +112,15 @@ namespace Flow.Launcher.Plugin.Explorer.ViewModels
ActionKeywordsModels = new List
{
new(Settings.ActionKeyword.SearchActionKeyword,
- Context.API.GetTranslation("plugin_explorer_actionkeywordview_search")),
+ "plugin_explorer_actionkeywordview_search"),
new(Settings.ActionKeyword.FileContentSearchActionKeyword,
- Context.API.GetTranslation("plugin_explorer_actionkeywordview_filecontentsearch")),
+ "plugin_explorer_actionkeywordview_filecontentsearch"),
new(Settings.ActionKeyword.PathSearchActionKeyword,
- Context.API.GetTranslation("plugin_explorer_actionkeywordview_pathsearch")),
+ "plugin_explorer_actionkeywordview_pathsearch"),
new(Settings.ActionKeyword.IndexSearchActionKeyword,
- Context.API.GetTranslation("plugin_explorer_actionkeywordview_indexsearch")),
+ "plugin_explorer_actionkeywordview_indexsearch"),
new(Settings.ActionKeyword.QuickAccessActionKeyword,
- Context.API.GetTranslation("plugin_explorer_actionkeywordview_quickaccess"))
+ "plugin_explorer_actionkeywordview_quickaccess")
};
}
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
index 6b2877bf5..ab0b01d30 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
@@ -3,6 +3,7 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:converters="clr-namespace:Flow.Launcher.Plugin.Explorer.Views.Converters"
+ xmlns:core="clr-namespace:Flow.Launcher.Core.Resource;assembly=Flow.Launcher.Core"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:qa="clr-namespace:Flow.Launcher.Plugin.Explorer.Search.QuickAccessLinks"
@@ -106,12 +107,13 @@
+
+ Text="{Binding Description, Mode=OneTime, Converter={StaticResource TranslationConverter}}">
-
+
+
+
+
+
@@ -3252,4 +3284,6 @@
+
+
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index ebca70462..f10964fe0 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -3,9 +3,9 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:converters="clr-namespace:Flow.Launcher.Converters"
+ xmlns:core="clr-namespace:Flow.Launcher.Core.Resource;assembly=Flow.Launcher.Core"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:flowlauncher="clr-namespace:Flow.Launcher"
- xmlns:core="clr-namespace:Flow.Launcher.Core.Resource;assembly=Flow.Launcher.Core"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:scm="clr-namespace:System.ComponentModel;assembly=WindowsBase"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
@@ -1039,6 +1039,7 @@
Height="34"
Margin="0,5,26,0"
HorizontalAlignment="Right"
+ ContextMenu="{StaticResource TextBoxContextMenu}"
DockPanel.Dock="Right"
FontSize="14"
KeyDown="PluginFilterTxb_OnKeyDown"
@@ -1430,6 +1431,7 @@
Height="34"
Margin="0,0,26,0"
HorizontalAlignment="Right"
+ ContextMenu="{StaticResource TextBoxContextMenu}"
DockPanel.Dock="Right"
FontSize="14"
KeyDown="PluginStoreFilterTxb_OnKeyDown"
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/ko.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/ko.xaml
index b2f6c54c1..f2f7d3a4d 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/ko.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/ko.xaml
@@ -39,11 +39,11 @@
검색:
경로 검색:
파일 내용 검색:
- Index Search:
+ 색인 검색:
빠른 접근:
현재 액션 키워드
완료
- 활성
+ 사용
When disabled Flow will not execute this search option, and will additionally revert back to '*' to free up the action keyword
Everything
윈도우 색인
From b74a8d03624b66f7510eb78139c26594c4ad7b64 Mon Sep 17 00:00:00 2001
From: DB p
Date: Wed, 21 Dec 2022 19:25:03 +0900
Subject: [PATCH 30/53] Adjust Korean
---
.../Languages/ko.xaml | 46 +++++++++----------
1 file changed, 23 insertions(+), 23 deletions(-)
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/ko.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/ko.xaml
index f2f7d3a4d..db1002c1c 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/ko.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/ko.xaml
@@ -6,16 +6,16 @@
항목을 먼저 선택하세요
폴더 링크를 선택하세요
- Are you sure you want to delete {0}?
- Are you sure you want to permanently delete this folder?
- Are you sure you want to permanently delete this file?
- Deletion successful
- Successfully deleted {0}
- Assigning the global action keyword could bring up too many results during search. Please choose a specific action keyword
- Quick Access can not be set to the global action keyword when enabled. Please choose a specific action keyword
- The required service for Windows Index Search does not appear to be running
- To fix this, start the Windows Search service. Select here to remove this warning
- The warning message has been switched off. As an alternative for searching files and folders, would you like to install Everything plugin?{0}{0}Select 'Yes' to install Everything plugin, or 'No' to return
+ {0} - 삭제하시겠습니까?
+ 이 폴더를 영구적으로 삭제하시겠습니까?
+ 이 파일을 영구적으로 삭제하시겠습니까?
+ 삭제 완료
+ {0} - 성공적으로 삭제했습니다.
+ 글로벌 액션 키워드는 너무 많은 결과를 불러오게 될 수 있습니다. 특정한 액션 키워드를 선택하세요.
+ 빠른 접근은 글로벌 액션키워드로 사용할 수 없습니다. 특정한 액션 키워드를 선택하세요.
+ 윈도우색인 검색에 필요한 서비스가 실행되어 있지 않습니다.
+ 이 문제를 해결하려면 Windows Search Service를 시작하세요. 이 경고를 제거하려면 여기를 선택하세요.
+ 경고 메시지가 꺼졌습니다. 파일 및 폴더 검색을 위한 대안으로 Everything 플러그인을 설치하시겠습니까?{0}{0}Everything 플러그인을 설치하려면 '예'를 선택하고, 반환하려면 '아니오'를 선택하십시오
Explorer Alternative
Error occurred during search: {0}
@@ -33,7 +33,7 @@
에디터 경로
쉘 경로
색인 제외 경로
- Use search result's location as executable working directory
+ 검색 결과위치를 실행 가능한 작업 디렉토리(Working Directory)로 사용
Use Index Search For Path Search
Indexing Options
검색:
@@ -44,7 +44,7 @@
현재 액션 키워드
완료
사용
- When disabled Flow will not execute this search option, and will additionally revert back to '*' to free up the action keyword
+ 비활성화하면 Flow가 이 검색 옵션을 실행하지 않고 추가로 '*'로 되돌아가 액션 키워드를 해제합니다.
Everything
윈도우 색인
Flow Launcher
@@ -81,8 +81,8 @@
Failed to open file at {0} with Editor {1} at {2}
쉘로 열기:
Failed to open folder {0} with Shell {1} at {2}
- Exclude current and sub-directories from Index Search
- Excluded from Index Search
+ 현재 폴더 및 하위폴더를 색인 검색에서 제외
+ 색인 검색에서 제외했습니다
윈도우 색인 설정 열기
폴더 및 파일의 색인 관리
윈도우 색인 설정을 여는데 실패했습니다
@@ -120,14 +120,14 @@
↓
Warning: This is not a Fast Sort option, searches may be slow
- Click to Launch or Install Everything
- Everything Installation
- Installing Everything service. Please wait...
- Successfully installed Everything service
- Failed to automatically install Everything service. Please manually install it from https://www.voidtools.com
- Click here to start it
- Unable to find an Everything installation, would you like to manually select a location?{0}{0}Click no and Everything will be automatically installed for you
- Do you want to enable content search for Everything?
- "It can be very slow without index (which is only supported in Everything v1.5+)"
+ Everything을 실행 또는 설치하려면 클릭하세요
+ Everything 설치
+ Everything 서비스 설치 중. 잠시 기다려주세요...
+ Everything 설치 완료
+ Everything 서비스 자동 설치에 실패했습니다. https://www.voidtools.com를 방문하여 직접 설치해주세요.
+ 여기를 클릭하여 시작
+ 설치된 Everything 찾을 수 없습니다. 위치를 수동으로 선택하시겠습니까?{0}{0}아니오를 클릭하면 모든 항목이 자동으로 설치됩니다.
+ Eveyrhing으로 내용 검색을 활성화하시겠습니까?
+ "인덱스가 없으면 매우 느릴 수 있습니다.(Everything v1.5+에서만 지원)"
\ No newline at end of file
From 5ad0e79577f060f5000b8b7bb7ee8c55c43ae2f6 Mon Sep 17 00:00:00 2001
From: DB p
Date: Wed, 21 Dec 2022 20:25:45 +0900
Subject: [PATCH 31/53] - Change Status Label to Enabled - Adjust Korean
Language
---
.../Flow.Launcher.Plugin.Program/Languages/ko.xaml | 13 ++++++++-----
.../Languages/ko.xaml | 12 ++++++++----
.../SearchSourceSetting.xaml | 2 +-
3 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Languages/ko.xaml b/Plugins/Flow.Launcher.Plugin.Program/Languages/ko.xaml
index deee2e461..f5e9aebb9 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Languages/ko.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Program/Languages/ko.xaml
@@ -1,5 +1,8 @@
-
-
+
+
기본값으로 되돌리기
@@ -8,11 +11,11 @@
추가
이름
활성화
- 켬
+ 사용
비활성화
- Status
+ 상태
켬
- Disabled
+ 끔
위치
모든 프로그램
파일 형식
diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/Languages/ko.xaml b/Plugins/Flow.Launcher.Plugin.WebSearch/Languages/ko.xaml
index 2b34775c5..b8d273ed5 100644
--- a/Plugins/Flow.Launcher.Plugin.WebSearch/Languages/ko.xaml
+++ b/Plugins/Flow.Launcher.Plugin.WebSearch/Languages/ko.xaml
@@ -1,5 +1,8 @@
-
-
+
+
검색 출처 설정
Open search in:
@@ -9,7 +12,8 @@
Choose
삭제
편집
- 추
+ 추가
+ 사용
켬
Disabled
확인
@@ -32,7 +36,7 @@
이름
- Status
+ 상태
아이콘 선택
아이콘
취소
diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/SearchSourceSetting.xaml b/Plugins/Flow.Launcher.Plugin.WebSearch/SearchSourceSetting.xaml
index 92d3b43bd..8e41540e1 100644
--- a/Plugins/Flow.Launcher.Plugin.WebSearch/SearchSourceSetting.xaml
+++ b/Plugins/Flow.Launcher.Plugin.WebSearch/SearchSourceSetting.xaml
@@ -179,7 +179,7 @@
HorizontalAlignment="Left"
VerticalAlignment="Center"
FontSize="14"
- Text="{DynamicResource flowlauncher_plugin_websearch_enable}" />
+ Text="{DynamicResource flowlauncher_plugin_websearch_enabled}" />
Date: Wed, 21 Dec 2022 18:55:23 +0100
Subject: [PATCH 32/53] Adds option to display open with code for Volume
results
---
Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs b/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs
index 684a10f59..2675d857e 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs
@@ -42,7 +42,7 @@ namespace Flow.Launcher.Plugin.Explorer
if (record.Type == ResultType.File && !string.IsNullOrEmpty(Settings.EditorPath))
contextMenus.Add(CreateOpenWithEditorResult(record, Settings.EditorPath));
- if (record.Type == ResultType.Folder && !string.IsNullOrEmpty(Settings.FolderEditorPath))
+ if ((record.Type == ResultType.Folder || record.Type == ResultType.Volume) && !string.IsNullOrEmpty(Settings.FolderEditorPath))
contextMenus.Add(CreateOpenWithEditorResult(record, Settings.FolderEditorPath));
if (record.Type == ResultType.Folder)
From e4c9e1c36c030543290a722834577666dbd48cee Mon Sep 17 00:00:00 2001
From: Kevin Zhang <45326534+taooceros@users.noreply.github.com>
Date: Wed, 21 Dec 2022 13:14:17 -0600
Subject: [PATCH 33/53] fix a typo
---
Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
index 4a3e5dd2f..94b46b230 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
@@ -33,7 +33,7 @@
Editor Path
Shell Path
Index Search Excluded Paths
- Use search result's location as the working directory of the excutable
+ Use search result's location as the working directory of the executable
Use Index Search For Path Search
Indexing Options
Search:
@@ -132,4 +132,4 @@
Do you want to enable content search for Everything?
"It can be very slow without index (which is only supported in Everything v1.5+)"
-
\ No newline at end of file
+
From 9ae5d9b7160fd0fea08e12b9114deeb6c4563221 Mon Sep 17 00:00:00 2001
From: Jeremy Wu
Date: Thu, 22 Dec 2022 13:16:10 +1100
Subject: [PATCH 34/53] Fix search source typo
---
Plugins/Flow.Launcher.Plugin.WebSearch/Languages/ko.xaml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/Languages/ko.xaml b/Plugins/Flow.Launcher.Plugin.WebSearch/Languages/ko.xaml
index b8d273ed5..8de75fe70 100644
--- a/Plugins/Flow.Launcher.Plugin.WebSearch/Languages/ko.xaml
+++ b/Plugins/Flow.Launcher.Plugin.WebSearch/Languages/ko.xaml
@@ -36,7 +36,8 @@
이름
- 상태
+ 상태
+
아이콘 선택
아이콘
취소
From f0b7898f8971b89617c66d0716e5ed0627cae2dc Mon Sep 17 00:00:00 2001
From: Jeremy
Date: Thu, 22 Dec 2022 22:04:39 +1100
Subject: [PATCH 35/53] fix quick access path search and autocomplete text
---
.../Search/ResultManager.cs | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs
index 88bfecc14..6669cbf76 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs
@@ -49,12 +49,20 @@ namespace Flow.Launcher.Plugin.Explorer.Search
internal static Result CreateFolderResult(string title, string subtitle, string path, Query query, int score = 0, bool windowsIndexed = false)
{
+ var pathSearchActionKeyword = Settings.PathSearchKeywordEnabled && !Settings.SearchActionKeywordEnabled
+ ? Settings.PathSearchActionKeyword
+ : Settings.SearchActionKeyword == Query.GlobalPluginWildcardSign
+ ? string.Empty
+ : Settings.SearchActionKeyword;
+
return new Result
{
Title = title,
IcoPath = path,
SubTitle = Path.GetDirectoryName(path),
- AutoCompleteText = GetPathWithActionKeyword(path, ResultType.Folder, query.ActionKeyword),
+ AutoCompleteText = !Settings.PathSearchKeywordEnabled && !Settings.SearchActionKeywordEnabled
+ ? $"{query.ActionKeyword} {title}" // Only Quick Access action keyword is used in this scenario
+ : GetPathWithActionKeyword(path, ResultType.Folder, pathSearchActionKeyword),
TitleHighlightData = StringMatcher.FuzzySearch(query.Search, title).MatchData,
CopyText = path,
Action = c =>
@@ -73,7 +81,7 @@ namespace Flow.Launcher.Plugin.Explorer.Search
}
}
- Context.API.ChangeQuery(GetPathWithActionKeyword(path, ResultType.Folder, query.ActionKeyword));
+ Context.API.ChangeQuery(GetPathWithActionKeyword(path, ResultType.Folder, pathSearchActionKeyword));
return false;
},
From 5c1cc79751be790e8cddf02b93e787ce747faef6 Mon Sep 17 00:00:00 2001
From: Jeremy
Date: Thu, 22 Dec 2022 22:39:24 +1100
Subject: [PATCH 36/53] update GetPathWithActionKeyword
---
.../Search/ResultManager.cs | 25 ++++++++-----------
1 file changed, 11 insertions(+), 14 deletions(-)
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs
index 6669cbf76..224deb417 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs
@@ -21,10 +21,13 @@ namespace Flow.Launcher.Plugin.Explorer.Search
Settings = settings;
}
- private static string GetPathWithActionKeyword(string path, ResultType type, string actionKeyword)
+ private static string GetPathWithActionKeyword(string path, ResultType type)
{
- // Query.ActionKeyword is string.Empty when Global Action Keyword ('*') is used
- var keyword = actionKeyword != string.Empty ? actionKeyword + " " : string.Empty;
+ var keyword = Settings.PathSearchKeywordEnabled && !Settings.SearchActionKeywordEnabled
+ ? $"{Settings.PathSearchActionKeyword} "
+ : Settings.SearchActionKeyword == Query.GlobalPluginWildcardSign
+ ? string.Empty // Query.ActionKeyword is string.Empty when Global Action Keyword ('*') is used
+ : $"{Settings.SearchActionKeyword} ";
var formatted_path = path;
@@ -49,12 +52,6 @@ namespace Flow.Launcher.Plugin.Explorer.Search
internal static Result CreateFolderResult(string title, string subtitle, string path, Query query, int score = 0, bool windowsIndexed = false)
{
- var pathSearchActionKeyword = Settings.PathSearchKeywordEnabled && !Settings.SearchActionKeywordEnabled
- ? Settings.PathSearchActionKeyword
- : Settings.SearchActionKeyword == Query.GlobalPluginWildcardSign
- ? string.Empty
- : Settings.SearchActionKeyword;
-
return new Result
{
Title = title,
@@ -62,7 +59,7 @@ namespace Flow.Launcher.Plugin.Explorer.Search
SubTitle = Path.GetDirectoryName(path),
AutoCompleteText = !Settings.PathSearchKeywordEnabled && !Settings.SearchActionKeywordEnabled
? $"{query.ActionKeyword} {title}" // Only Quick Access action keyword is used in this scenario
- : GetPathWithActionKeyword(path, ResultType.Folder, pathSearchActionKeyword),
+ : GetPathWithActionKeyword(path, ResultType.Folder),
TitleHighlightData = StringMatcher.FuzzySearch(query.Search, title).MatchData,
CopyText = path,
Action = c =>
@@ -81,7 +78,7 @@ namespace Flow.Launcher.Plugin.Explorer.Search
}
}
- Context.API.ChangeQuery(GetPathWithActionKeyword(path, ResultType.Folder, pathSearchActionKeyword));
+ Context.API.ChangeQuery(GetPathWithActionKeyword(path, ResultType.Folder));
return false;
},
@@ -116,7 +113,7 @@ namespace Flow.Launcher.Plugin.Explorer.Search
{
Title = title,
SubTitle = subtitle,
- AutoCompleteText = GetPathWithActionKeyword(path, ResultType.Folder, actionKeyword),
+ AutoCompleteText = GetPathWithActionKeyword(path, ResultType.Folder),
IcoPath = path,
Score = 500,
ProgressBar = progressValue,
@@ -197,7 +194,7 @@ namespace Flow.Launcher.Plugin.Explorer.Search
Title = title,
SubTitle = $"Use > to search within {subtitleFolderName}, " +
$"* to search for file extensions or >* to combine both searches.",
- AutoCompleteText = GetPathWithActionKeyword(folderPath, ResultType.Folder, actionKeyword),
+ AutoCompleteText = GetPathWithActionKeyword(folderPath, ResultType.Folder),
IcoPath = folderPath,
Score = 500,
CopyText = folderPath,
@@ -228,7 +225,7 @@ namespace Flow.Launcher.Plugin.Explorer.Search
SubTitle = Path.GetDirectoryName(filePath),
IcoPath = filePath,
Preview = preview,
- AutoCompleteText = GetPathWithActionKeyword(filePath, ResultType.File, query.ActionKeyword),
+ AutoCompleteText = GetPathWithActionKeyword(filePath, ResultType.File),
TitleHighlightData = StringMatcher.FuzzySearch(query.Search, Path.GetFileName(filePath)).MatchData,
Score = score,
CopyText = filePath,
From fc9805f29ed18efb7b52fc327d891e548e08cc95 Mon Sep 17 00:00:00 2001
From: Jeremy
Date: Thu, 22 Dec 2022 22:57:37 +1100
Subject: [PATCH 37/53] add GetAutoCompleteText method
---
.../Search/ResultManager.cs | 21 ++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs
index 224deb417..53e1de767 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs
@@ -1,4 +1,4 @@
-using Flow.Launcher.Core.Resource;
+using Flow.Launcher.Core.Resource;
using Flow.Launcher.Infrastructure;
using Flow.Launcher.Plugin.SharedCommands;
using System;
@@ -38,6 +38,13 @@ namespace Flow.Launcher.Plugin.Explorer.Search
return $"{keyword}{formatted_path}";
}
+ private static string GetAutoCompleteText(string title, Query query, string path, ResultType resultType)
+ {
+ return !Settings.PathSearchKeywordEnabled && !Settings.SearchActionKeywordEnabled
+ ? $"{query.ActionKeyword} {title}" // Only Quick Access action keyword is used in this scenario
+ : GetPathWithActionKeyword(path, resultType);
+ }
+
public static Result CreateResult(Query query, SearchResult result)
{
return result.Type switch
@@ -57,9 +64,7 @@ namespace Flow.Launcher.Plugin.Explorer.Search
Title = title,
IcoPath = path,
SubTitle = Path.GetDirectoryName(path),
- AutoCompleteText = !Settings.PathSearchKeywordEnabled && !Settings.SearchActionKeywordEnabled
- ? $"{query.ActionKeyword} {title}" // Only Quick Access action keyword is used in this scenario
- : GetPathWithActionKeyword(path, ResultType.Folder),
+ AutoCompleteText = GetAutoCompleteText(title, query, path, ResultType.Folder),
TitleHighlightData = StringMatcher.FuzzySearch(query.Search, title).MatchData,
CopyText = path,
Action = c =>
@@ -219,14 +224,16 @@ namespace Flow.Launcher.Plugin.Explorer.Search
PreviewImagePath = filePath,
} : Result.PreviewInfo.Default;
+ var title = Path.GetFileName(filePath);
+
var result = new Result
{
- Title = Path.GetFileName(filePath),
+ Title = title,
SubTitle = Path.GetDirectoryName(filePath),
IcoPath = filePath,
Preview = preview,
- AutoCompleteText = GetPathWithActionKeyword(filePath, ResultType.File),
- TitleHighlightData = StringMatcher.FuzzySearch(query.Search, Path.GetFileName(filePath)).MatchData,
+ AutoCompleteText = GetAutoCompleteText(title, query, filePath, ResultType.File),
+ TitleHighlightData = StringMatcher.FuzzySearch(query.Search, title).MatchData,
Score = score,
CopyText = filePath,
Action = c =>
From 2174fc24cee3e6826d8affc0e02a222a105ec336 Mon Sep 17 00:00:00 2001
From: Jeremy
Date: Thu, 22 Dec 2022 23:20:37 +1100
Subject: [PATCH 38/53] update directory navigation with same action keyword
---
.../Search/ResultManager.cs | 21 +++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs
index 53e1de767..69df2764d 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs
@@ -21,13 +21,22 @@ namespace Flow.Launcher.Plugin.Explorer.Search
Settings = settings;
}
- private static string GetPathWithActionKeyword(string path, ResultType type)
+ private static string GetPathWithActionKeyword(string path, ResultType type, string actionKeyword)
{
- var keyword = Settings.PathSearchKeywordEnabled && !Settings.SearchActionKeywordEnabled
+ string keyword;
+ // Using Quick Access or Index Search action keywords to then navigate to directory
+ if (actionKeyword == Settings.PathSearchActionKeyword || actionKeyword == Settings.SearchActionKeyword)
+ {
+ keyword = actionKeyword == Settings.PathSearchActionKeyword ? $"{actionKeyword} " : string.Empty;
+ }
+ else
+ {
+ keyword = Settings.PathSearchKeywordEnabled && !Settings.SearchActionKeywordEnabled
? $"{Settings.PathSearchActionKeyword} "
: Settings.SearchActionKeyword == Query.GlobalPluginWildcardSign
? string.Empty // Query.ActionKeyword is string.Empty when Global Action Keyword ('*') is used
: $"{Settings.SearchActionKeyword} ";
+ }
var formatted_path = path;
@@ -42,7 +51,7 @@ namespace Flow.Launcher.Plugin.Explorer.Search
{
return !Settings.PathSearchKeywordEnabled && !Settings.SearchActionKeywordEnabled
? $"{query.ActionKeyword} {title}" // Only Quick Access action keyword is used in this scenario
- : GetPathWithActionKeyword(path, resultType);
+ : GetPathWithActionKeyword(path, resultType, query.ActionKeyword);
}
public static Result CreateResult(Query query, SearchResult result)
@@ -83,7 +92,7 @@ namespace Flow.Launcher.Plugin.Explorer.Search
}
}
- Context.API.ChangeQuery(GetPathWithActionKeyword(path, ResultType.Folder));
+ Context.API.ChangeQuery(GetPathWithActionKeyword(path, ResultType.Folder, query.ActionKeyword));
return false;
},
@@ -118,7 +127,7 @@ namespace Flow.Launcher.Plugin.Explorer.Search
{
Title = title,
SubTitle = subtitle,
- AutoCompleteText = GetPathWithActionKeyword(path, ResultType.Folder),
+ AutoCompleteText = GetPathWithActionKeyword(path, ResultType.Folder, actionKeyword),
IcoPath = path,
Score = 500,
ProgressBar = progressValue,
@@ -199,7 +208,7 @@ namespace Flow.Launcher.Plugin.Explorer.Search
Title = title,
SubTitle = $"Use > to search within {subtitleFolderName}, " +
$"* to search for file extensions or >* to combine both searches.",
- AutoCompleteText = GetPathWithActionKeyword(folderPath, ResultType.Folder),
+ AutoCompleteText = GetPathWithActionKeyword(folderPath, ResultType.Folder, actionKeyword),
IcoPath = folderPath,
Score = 500,
CopyText = folderPath,
From 14216a4ac08643c49907f5134311484e75575ba7 Mon Sep 17 00:00:00 2001
From: Vic <10308169+VictoriousRaptor@users.noreply.github.com>
Date: Thu, 22 Dec 2022 22:57:15 +0800
Subject: [PATCH 39/53] Remove redundant default value
---
Flow.Launcher/ViewModel/MainViewModel.cs | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs
index 09bba6e5c..3deb15740 100644
--- a/Flow.Launcher/ViewModel/MainViewModel.cs
+++ b/Flow.Launcher/ViewModel/MainViewModel.cs
@@ -32,8 +32,6 @@ namespace Flow.Launcher.ViewModel
{
#region Private Fields
- private const string DefaultOpenResultModifiers = "Alt";
-
private bool _isQueryRunning;
private Query _lastQuery;
private string _queryTextBeforeLeaveResults;
@@ -103,8 +101,6 @@ namespace Flow.Launcher.ViewModel
RegisterViewUpdate();
RegisterResultsUpdatedEvent();
RegisterClockAndDateUpdateAsync();
-
- SetOpenResultModifiers();
}
private void RegisterViewUpdate()
@@ -513,7 +509,7 @@ namespace Flow.Launcher.ViewModel
public string PluginIconPath { get; set; } = null;
- public string OpenResultCommandModifiers { get; private set; }
+ public string OpenResultCommandModifiers => Settings.OpenResultModifiers;
public string Image => Constant.QueryTextBoxIconImagePath;
@@ -876,11 +872,6 @@ namespace Flow.Launcher.ViewModel
#region Hotkey
- private void SetOpenResultModifiers()
- {
- OpenResultCommandModifiers = Settings.OpenResultModifiers ?? DefaultOpenResultModifiers;
- }
-
public void ToggleFlowLauncher()
{
if (!MainWindowVisibilityStatus)
From 5de74c4676f6b9c88389469fb1f4eaa4efd07f64 Mon Sep 17 00:00:00 2001
From: Vic <10308169+VictoriousRaptor@users.noreply.github.com>
Date: Fri, 23 Dec 2022 01:08:06 +0800
Subject: [PATCH 40/53] Fix changing OpenResultModifiers in settings won't
reflect to main window
---
Flow.Launcher/ViewModel/MainViewModel.cs | 3 +++
1 file changed, 3 insertions(+)
diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs
index 3deb15740..4153c02e2 100644
--- a/Flow.Launcher/ViewModel/MainViewModel.cs
+++ b/Flow.Launcher/ViewModel/MainViewModel.cs
@@ -72,6 +72,9 @@ namespace Flow.Launcher.ViewModel
case nameof(Settings.AlwaysStartEn):
OnPropertyChanged(nameof(StartWithEnglishMode));
break;
+ case nameof(Settings.OpenResultModifiers):
+ OnPropertyChanged(nameof(OpenResultCommandModifiers));
+ break;
}
};
From e11c7a7c12fb8a7df42c33221451b051468a5fab Mon Sep 17 00:00:00 2001
From: DB p
Date: Fri, 23 Dec 2022 13:22:41 +0900
Subject: [PATCH 41/53] Remove Duplicated Key
---
Plugins/Flow.Launcher.Plugin.WebSearch/Languages/ko.xaml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/Languages/ko.xaml b/Plugins/Flow.Launcher.Plugin.WebSearch/Languages/ko.xaml
index 8de75fe70..0ca2a9315 100644
--- a/Plugins/Flow.Launcher.Plugin.WebSearch/Languages/ko.xaml
+++ b/Plugins/Flow.Launcher.Plugin.WebSearch/Languages/ko.xaml
@@ -13,7 +13,6 @@
삭제
편집
추가
- 사용
켬
Disabled
확인
@@ -36,7 +35,7 @@
이름
- 상태
+ 사용
아이콘 선택
아이콘
From f97c9fe249368a15da1be06e71d20bb0302252b3 Mon Sep 17 00:00:00 2001
From: Vic <10308169+VictoriousRaptor@users.noreply.github.com>
Date: Fri, 23 Dec 2022 13:14:54 +0800
Subject: [PATCH 42/53] Update wording for consistency
---
Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
index 94b46b230..5678a3177 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
@@ -66,7 +66,7 @@
Copy path
- Copy path of current result to clipboard
+ Copy path of current item to clipboard
Copy
Copy current file to clipboard
Copy current folder to clipboard
@@ -78,7 +78,7 @@
Run as different user
Run the selected using a different user account
Open containing folder
- Opens the location that contains the item
+ Opens the location that contains current item
Open With Editor:
Failed to open file at {0} with Editor {1} at {2}
Open With Shell:
@@ -89,7 +89,7 @@
Manage indexed files and folders
Failed to open Windows Indexing Options
Add to Quick Access
- Add current result to Quick Access
+ Add current item to Quick Access
Successfully Added
Successfully added to Quick Access
Successfully Removed
@@ -97,7 +97,7 @@
Add to Quick Access so it can be opened with Explorer's Search Activation action keyword
Remove from Quick Access
Remove from Quick Access
- Remove current result from Quick Access
+ Remove current item from Quick Access
Show Windows Context Menu
From 599bdc42facad14f093ff593dc8c073b80ee0569 Mon Sep 17 00:00:00 2001
From: Vic <10308169+VictoriousRaptor@users.noreply.github.com>
Date: Fri, 23 Dec 2022 13:20:10 +0800
Subject: [PATCH 43/53] Remove quotation marks
---
Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
index 5678a3177..acdb21471 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
@@ -130,6 +130,6 @@
Click here to start it
Unable to find an Everything installation, would you like to manually select a location?{0}{0}Click no and Everything will be automatically installed for you
Do you want to enable content search for Everything?
- "It can be very slow without index (which is only supported in Everything v1.5+)"
+ It can be very slow without index (which is only supported in Everything v1.5+)
From b1eb1910444a389eb7fbc8314d99791acebc3f2b Mon Sep 17 00:00:00 2001
From: Vic <10308169+VictoriousRaptor@users.noreply.github.com>
Date: Fri, 23 Dec 2022 11:46:12 +0800
Subject: [PATCH 44/53] Formatting
---
Flow.Launcher/MainWindow.xaml | 4 ----
Flow.Launcher/MainWindow.xaml.cs | 8 +++++++-
Flow.Launcher/ViewModel/MainViewModel.cs | 20 ++++++++++++++------
3 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/Flow.Launcher/MainWindow.xaml b/Flow.Launcher/MainWindow.xaml
index 095382e76..36a45da74 100644
--- a/Flow.Launcher/MainWindow.xaml
+++ b/Flow.Launcher/MainWindow.xaml
@@ -86,14 +86,10 @@
Key="O"
Command="{Binding LoadContextMenuCommand}"
Modifiers="Ctrl" />
-
-
-
-
/// Checks if Flow Launcher should ignore any hotkeys
///
@@ -939,7 +947,7 @@ namespace Flow.Launcher.ViewModel
return Settings.IgnoreHotkeysOnFullscreen && WindowsInteropHelper.IsWindowFullscreen();
}
-
+ #endregion
#region Public Methods
From b18f5f4c02a0024a06a4c02cd8b90d2494d2ef45 Mon Sep 17 00:00:00 2001
From: Vic <10308169+VictoriousRaptor@users.noreply.github.com>
Date: Fri, 23 Dec 2022 11:51:34 +0800
Subject: [PATCH 45/53] remove unused using
---
Flow.Launcher/ViewModel/MainViewModel.cs | 2 --
1 file changed, 2 deletions(-)
diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs
index d4b989eea..9940ab0be 100644
--- a/Flow.Launcher/ViewModel/MainViewModel.cs
+++ b/Flow.Launcher/ViewModel/MainViewModel.cs
@@ -4,7 +4,6 @@ using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using System.Windows;
-using System.Windows.Input;
using Flow.Launcher.Core.Plugin;
using Flow.Launcher.Core.Resource;
using Flow.Launcher.Helper;
@@ -24,7 +23,6 @@ using System.IO;
using System.Collections.Specialized;
using CommunityToolkit.Mvvm.Input;
using System.Globalization;
-using System.Windows.Threading;
namespace Flow.Launcher.ViewModel
{
From 33615d1d46dfe9f8ecfc850db97fba4596601dee Mon Sep 17 00:00:00 2001
From: Vic <10308169+VictoriousRaptor@users.noreply.github.com>
Date: Fri, 23 Dec 2022 11:47:06 +0800
Subject: [PATCH 46/53] Neutralize warning
---
Flow.Launcher/ViewModel/MainViewModel.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs
index 9940ab0be..26ad89fff 100644
--- a/Flow.Launcher/ViewModel/MainViewModel.cs
+++ b/Flow.Launcher/ViewModel/MainViewModel.cs
@@ -101,7 +101,7 @@ namespace Flow.Launcher.ViewModel
RegisterViewUpdate();
RegisterResultsUpdatedEvent();
- RegisterClockAndDateUpdateAsync();
+ _ = RegisterClockAndDateUpdateAsync();
}
private void RegisterViewUpdate()
From 47d109cbe1bc1d5fdae4079b02c970e267553d77 Mon Sep 17 00:00:00 2001
From: Vic <10308169+VictoriousRaptor@users.noreply.github.com>
Date: Fri, 23 Dec 2022 14:14:53 +0800
Subject: [PATCH 47/53] Refactor toggle game mode logic
---
Flow.Launcher/Helper/HotKeyMapper.cs | 6 ++---
Flow.Launcher/MainWindow.xaml | 4 ++++
Flow.Launcher/MainWindow.xaml.cs | 28 +++++-------------------
Flow.Launcher/ViewModel/MainViewModel.cs | 11 +++++++---
4 files changed, 21 insertions(+), 28 deletions(-)
diff --git a/Flow.Launcher/Helper/HotKeyMapper.cs b/Flow.Launcher/Helper/HotKeyMapper.cs
index b9ac6afb3..27c044c66 100644
--- a/Flow.Launcher/Helper/HotKeyMapper.cs
+++ b/Flow.Launcher/Helper/HotKeyMapper.cs
@@ -1,4 +1,4 @@
-using Flow.Launcher.Infrastructure.Hotkey;
+using Flow.Launcher.Infrastructure.Hotkey;
using Flow.Launcher.Infrastructure.UserSettings;
using System;
using NHotkey;
@@ -25,7 +25,7 @@ namespace Flow.Launcher.Helper
internal static void OnToggleHotkey(object sender, HotkeyEventArgs args)
{
- if (!mainViewModel.ShouldIgnoreHotkeys() && !mainViewModel.GameModeStatus)
+ if (!mainViewModel.ShouldIgnoreHotkeys())
mainViewModel.ToggleFlowLauncher();
}
@@ -74,7 +74,7 @@ namespace Flow.Launcher.Helper
{
SetHotkey(hotkey.Hotkey, (s, e) =>
{
- if (mainViewModel.ShouldIgnoreHotkeys() || mainViewModel.GameModeStatus)
+ if (mainViewModel.ShouldIgnoreHotkeys())
return;
mainViewModel.Show();
diff --git a/Flow.Launcher/MainWindow.xaml b/Flow.Launcher/MainWindow.xaml
index 36a45da74..5ed9ba802 100644
--- a/Flow.Launcher/MainWindow.xaml
+++ b/Flow.Launcher/MainWindow.xaml
@@ -177,6 +177,10 @@
Command="{Binding OpenResultCommand}"
CommandParameter="9"
Modifiers="{Binding OpenResultCommandModifiers}" />
+
diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index 05e01a3f7..544958284 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -101,6 +101,7 @@ namespace Flow.Launcher
// since the default main window visibility is visible
// so we need set focus during startup
QueryTextBox.Focus();
+
_viewModel.PropertyChanged += (o, e) =>
{
switch (e.PropertyName)
@@ -169,9 +170,12 @@ namespace Flow.Launcher
_viewModel.QueryTextCursorMovedToEnd = false;
}
break;
-
+ case nameof(MainViewModel.GameModeStatus):
+ _notifyIcon.Icon = _viewModel.GameModeStatus ? Properties.Resources.gamemode : Properties.Resources.app;
+ break;
}
};
+
_settings.PropertyChanged += (o, e) =>
{
switch (e.PropertyName)
@@ -286,7 +290,7 @@ namespace Flow.Launcher
};
open.Click += (o, e) => _viewModel.ToggleFlowLauncher();
- gamemode.Click += (o, e) => ToggleGameMode();
+ gamemode.Click += (o, e) => _viewModel.ToggleGameMode();
positionreset.Click += (o, e) => PositionReset();
settings.Click += (o, e) => App.API.OpenSettingDialog();
exit.Click += (o, e) => Close();
@@ -332,20 +336,6 @@ namespace Flow.Launcher
WelcomeWindow.Show();
}
- private void ToggleGameMode()
- {
- if (_viewModel.GameModeStatus)
- {
- _notifyIcon.Icon = Properties.Resources.app;
- _viewModel.GameModeStatus = false;
- }
- else
- {
- _notifyIcon.Icon = Properties.Resources.gamemode;
- _viewModel.GameModeStatus = true;
- }
- }
-
private async void PositionReset()
{
_viewModel.Show();
@@ -601,12 +591,6 @@ namespace Flow.Launcher
e.Handled = true;
}
break;
- case Key.F12:
- if (specialKeyState.CtrlPressed)
- {
- ToggleGameMode();
- }
- break;
case Key.Back:
if (specialKeyState.CtrlPressed)
{
diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs
index 26ad89fff..c474e2a15 100644
--- a/Flow.Launcher/ViewModel/MainViewModel.cs
+++ b/Flow.Launcher/ViewModel/MainViewModel.cs
@@ -337,6 +337,12 @@ namespace Flow.Launcher.ViewModel
}
}
+ [RelayCommand]
+ public void ToggleGameMode()
+ {
+ GameModeStatus = !GameModeStatus;
+ }
+
#endregion
#region ViewModel Properties
@@ -365,7 +371,7 @@ namespace Flow.Launcher.ViewModel
public ResultsViewModel History { get; private set; }
- public bool GameModeStatus { get; set; }
+ public bool GameModeStatus { get; set; } = false;
private string _queryText;
public string QueryText
@@ -379,7 +385,6 @@ namespace Flow.Launcher.ViewModel
}
}
-
[RelayCommand]
private void IncreaseWidth()
{
@@ -942,7 +947,7 @@ namespace Flow.Launcher.ViewModel
///
public bool ShouldIgnoreHotkeys()
{
- return Settings.IgnoreHotkeysOnFullscreen && WindowsInteropHelper.IsWindowFullscreen();
+ return Settings.IgnoreHotkeysOnFullscreen && WindowsInteropHelper.IsWindowFullscreen() || GameModeStatus;
}
#endregion
From 87597625d59b9d4fad70c1687c7ddcec42148f3b Mon Sep 17 00:00:00 2001
From: Vic <10308169+VictoriousRaptor@users.noreply.github.com>
Date: Fri, 23 Dec 2022 14:58:13 +0800
Subject: [PATCH 48/53] Remove Segoe UI to fix Chinese font
---
Flow.Launcher/CustomShortcutSetting.xaml | 1 -
1 file changed, 1 deletion(-)
diff --git a/Flow.Launcher/CustomShortcutSetting.xaml b/Flow.Launcher/CustomShortcutSetting.xaml
index bbf6ff9f2..5a40a77b1 100644
--- a/Flow.Launcher/CustomShortcutSetting.xaml
+++ b/Flow.Launcher/CustomShortcutSetting.xaml
@@ -64,7 +64,6 @@
Date: Fri, 23 Dec 2022 15:15:11 +0800
Subject: [PATCH 49/53] Fix hardcoded strings
---
.../Languages/en.xaml | 5 +++++
.../Search/ResultManager.cs | 22 +++++--------------
2 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
index 94b46b230..265b26296 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
@@ -99,6 +99,11 @@
Remove from Quick Access
Remove current result from Quick Access
Show Windows Context Menu
+
+
+ {0} free of {1}
+ Open in Default File Manager
+ Use '>' to search in this directory, '*' to search for file extensions or '>*' to combine both searches.
Failed to load Everything SDK
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs
index 88bfecc14..214a779e4 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs
@@ -96,7 +96,9 @@ namespace Flow.Launcher.Plugin.Explorer.Search
var driveLetter = path[..1].ToUpper();
var driveName = driveLetter + ":\\";
DriveInfo drv = new DriveInfo(driveLetter);
- var subtitle = ToReadableSize(drv.AvailableFreeSpace, 2) + " free of " + ToReadableSize(drv.TotalSize, 2);
+ var freespace = ToReadableSize(drv.AvailableFreeSpace, 2);
+ var totalspace = ToReadableSize(drv.TotalSize, 2);
+ var subtitle = string.Format(Context.API.GetTranslation("plugin_explorer_diskfreespace"), freespace, totalspace);
double usingSize = (Convert.ToDouble(drv.TotalSize) - Convert.ToDouble(drv.AvailableFreeSpace)) / Convert.ToDouble(drv.TotalSize) * 100;
int? progressValue = Convert.ToInt32(usingSize);
@@ -170,25 +172,11 @@ namespace Flow.Launcher.Plugin.Explorer.Search
// Path passed from PathSearchAsync ends with Constants.DirectorySeperator ('\'), need to remove the seperator
// so it's consistent with folder results returned by index search which does not end with one
var folderPath = path.TrimEnd(Constants.DirectorySeperator);
-
- var folderName = folderPath.TrimEnd(Constants.DirectorySeperator).Split(new[]
- {
- Path.DirectorySeparatorChar
- }, StringSplitOptions.None).Last();
-
- var title = $"Open {folderName}";
-
- var subtitleFolderName = folderName;
-
- // ie. max characters can be displayed without subtitle cutting off: "Program Files (x86)"
- if (folderName.Length > 19)
- subtitleFolderName = "the directory";
return new Result
{
- Title = title,
- SubTitle = $"Use > to search within {subtitleFolderName}, " +
- $"* to search for file extensions or >* to combine both searches.",
+ Title = Context.API.GetTranslation("plugin_explorer_openresultfolder"),
+ SubTitle = Context.API.GetTranslation("plugin_explorer_openresultfolder_subtitle"),
AutoCompleteText = GetPathWithActionKeyword(folderPath, ResultType.Folder, actionKeyword),
IcoPath = folderPath,
Score = 500,
From fac24285e04147c54873f950055582fcdffc65e8 Mon Sep 17 00:00:00 2001
From: Jeremy
Date: Sat, 24 Dec 2022 22:50:50 +1100
Subject: [PATCH 50/53] add folder and file get path unit tests
---
Flow.Launcher.Test/Plugins/ExplorerTest.cs | 60 ++++++++++++++++++++++
1 file changed, 60 insertions(+)
diff --git a/Flow.Launcher.Test/Plugins/ExplorerTest.cs b/Flow.Launcher.Test/Plugins/ExplorerTest.cs
index e0cc9b4c2..94ee85b69 100644
--- a/Flow.Launcher.Test/Plugins/ExplorerTest.cs
+++ b/Flow.Launcher.Test/Plugins/ExplorerTest.cs
@@ -269,5 +269,65 @@ namespace Flow.Launcher.Test.Plugins
// Then
Assert.AreEqual(expectedString, resultString);
}
+
+ [TestCase("c:\\somefolder\\someotherfolder", ResultType.Folder, "irrelevant", false, true, "c:\\somefolder\\someotherfolder\\")]
+ [TestCase("c:\\somefolder\\someotherfolder\\", ResultType.Folder, "irrelevant", true, true, "c:\\somefolder\\someotherfolder\\")]
+ [TestCase("c:\\somefolder\\someotherfolder", ResultType.Folder, "irrelevant", true, false, "p c:\\somefolder\\someotherfolder\\")]
+ [TestCase("c:\\somefolder\\someotherfolder\\", ResultType.Folder, "irrelevant", false, false, "c:\\somefolder\\someotherfolder\\")]
+ [TestCase("c:\\somefolder\\someotherfolder", ResultType.Folder, "p", true, false, "p c:\\somefolder\\someotherfolder\\")]
+ [TestCase("c:\\somefolder\\someotherfolder", ResultType.Folder, "", true, true, "c:\\somefolder\\someotherfolder\\")]
+ public void GivenFolderResult_WhenGetPath_ThenPathShouldBeExpectedString(
+ string path,
+ ResultType type,
+ string actionKeyword,
+ bool pathSearchKeywordEnabled,
+ bool searchActionKeywordEnabled,
+ string expectedResult)
+ {
+ // Given
+ var settings = new Settings()
+ {
+ PathSearchKeywordEnabled = pathSearchKeywordEnabled,
+ PathSearchActionKeyword = "p",
+ SearchActionKeywordEnabled = searchActionKeywordEnabled,
+ SearchActionKeyword = Query.GlobalPluginWildcardSign
+ };
+ ResultManager.Init(new PluginInitContext(), settings);
+
+ // When
+ var result = ResultManager.GetPathWithActionKeyword(path, type, actionKeyword);
+
+ // Then
+ Assert.AreEqual(result, expectedResult);
+ }
+
+ [TestCase("c:\\somefolder\\somefile", ResultType.File, "irrelevant", false, true, "e c:\\somefolder\\somefile")]
+ [TestCase("c:\\somefolder\\somefile", ResultType.File, "p", true, false, "p c:\\somefolder\\somefile")]
+ [TestCase("c:\\somefolder\\somefile", ResultType.File, "e", true, true, "e c:\\somefolder\\somefile")]
+ [TestCase("c:\\somefolder\\somefile", ResultType.File, "irrelevant", false, false, "e c:\\somefolder\\somefile")]
+ public void GivenFileResult_WhenGetPath_ThenPathShouldBeExpectedString(
+ string path,
+ ResultType type,
+ string actionKeyword,
+ bool pathSearchKeywordEnabled,
+ bool searchActionKeywordEnabled,
+ string expectedResult)
+ {
+ // Given
+ var settings = new Settings()
+ {
+ PathSearchKeywordEnabled = pathSearchKeywordEnabled,
+ PathSearchActionKeyword = "p",
+ SearchActionKeywordEnabled = searchActionKeywordEnabled,
+ SearchActionKeyword = "e"
+ };
+ ResultManager.Init(new PluginInitContext(), settings);
+
+ // When
+ var result = ResultManager.GetPathWithActionKeyword(path, type, actionKeyword);
+
+ // Then
+ Assert.AreEqual(result, expectedResult);
+ }
}
}
From f64ebdca957013f0950b3ac61b1b5e95dd7dad68 Mon Sep 17 00:00:00 2001
From: Jeremy
Date: Sat, 24 Dec 2022 22:51:09 +1100
Subject: [PATCH 51/53] simplify get path method
---
.../Search/ResultManager.cs | 31 +++++++++----------
1 file changed, 15 insertions(+), 16 deletions(-)
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs
index 69df2764d..1d3a57996 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs
@@ -1,4 +1,4 @@
-using Flow.Launcher.Core.Resource;
+using Flow.Launcher.Core.Resource;
using Flow.Launcher.Infrastructure;
using Flow.Launcher.Plugin.SharedCommands;
using System;
@@ -21,23 +21,22 @@ namespace Flow.Launcher.Plugin.Explorer.Search
Settings = settings;
}
- private static string GetPathWithActionKeyword(string path, ResultType type, string actionKeyword)
+ public static string GetPathWithActionKeyword(string path, ResultType type, string actionKeyword)
{
- string keyword;
- // Using Quick Access or Index Search action keywords to then navigate to directory
- if (actionKeyword == Settings.PathSearchActionKeyword || actionKeyword == Settings.SearchActionKeyword)
- {
- keyword = actionKeyword == Settings.PathSearchActionKeyword ? $"{actionKeyword} " : string.Empty;
- }
- else
- {
- keyword = Settings.PathSearchKeywordEnabled && !Settings.SearchActionKeywordEnabled
- ? $"{Settings.PathSearchActionKeyword} "
- : Settings.SearchActionKeyword == Query.GlobalPluginWildcardSign
- ? string.Empty // Query.ActionKeyword is string.Empty when Global Action Keyword ('*') is used
- : $"{Settings.SearchActionKeyword} ";
- }
+ // actionKeyword will be empty string if using global, query.ActionKeyword is ""
+ var usePathSearchActionKeyword = Settings.PathSearchKeywordEnabled && !Settings.SearchActionKeywordEnabled;
+
+ var pathSearchActionKeyword = Settings.PathSearchActionKeyword == Query.GlobalPluginWildcardSign
+ ? string.Empty
+ : $"{Settings.PathSearchActionKeyword} ";
+
+ var searchActionKeyword = Settings.SearchActionKeyword == Query.GlobalPluginWildcardSign
+ ? string.Empty
+ : $"{Settings.SearchActionKeyword} ";
+
+ var keyword = usePathSearchActionKeyword ? pathSearchActionKeyword : searchActionKeyword;
+
var formatted_path = path;
if (type == ResultType.Folder)
From 3f2b741dccb8eafcd58c712484ea6b6623d02c67 Mon Sep 17 00:00:00 2001
From: Jeremy
Date: Sun, 25 Dec 2022 04:58:37 +1100
Subject: [PATCH 52/53] add unit tests for get autocomplete result
---
Flow.Launcher.Test/Plugins/ExplorerTest.cs | 64 +++++++++++++++++++
.../Search/ResultManager.cs | 2 +-
2 files changed, 65 insertions(+), 1 deletion(-)
diff --git a/Flow.Launcher.Test/Plugins/ExplorerTest.cs b/Flow.Launcher.Test/Plugins/ExplorerTest.cs
index 94ee85b69..36f0294a9 100644
--- a/Flow.Launcher.Test/Plugins/ExplorerTest.cs
+++ b/Flow.Launcher.Test/Plugins/ExplorerTest.cs
@@ -329,5 +329,69 @@ namespace Flow.Launcher.Test.Plugins
// Then
Assert.AreEqual(result, expectedResult);
}
+
+ [TestCase("somefolder", "c:\\somefolder\\", ResultType.Folder, "q", false, false, "q somefolder")]
+ [TestCase("somefolder", "c:\\somefolder\\", ResultType.Folder, "i", true, false, "p c:\\somefolder\\")]
+ [TestCase("somefolder", "c:\\somefolder\\", ResultType.Folder, "irrelevant", true, true, "c:\\somefolder\\")]
+ public void GivenQueryWithFolderTypeResult_WhenGetAutoComplete_ThenResultShouldBeExpectedString(
+ string title,
+ string path,
+ ResultType resultType,
+ string actionKeyword,
+ bool pathSearchKeywordEnabled,
+ bool searchActionKeywordEnabled,
+ string expectedResult)
+ {
+ // Given
+ var query = new Query() { ActionKeyword = actionKeyword };
+ var settings = new Settings()
+ {
+ PathSearchKeywordEnabled = pathSearchKeywordEnabled,
+ PathSearchActionKeyword = "p",
+ SearchActionKeywordEnabled = searchActionKeywordEnabled,
+ SearchActionKeyword = Query.GlobalPluginWildcardSign,
+ QuickAccessActionKeyword = "q",
+ IndexSearchActionKeyword = "i"
+ };
+ ResultManager.Init(new PluginInitContext(), settings);
+
+ // When
+ var result = ResultManager.GetAutoCompleteText(title, query, path, resultType);
+
+ // Then
+ Assert.AreEqual(result, expectedResult);
+ }
+
+ [TestCase("somefile", "c:\\somefolder\\somefile", ResultType.File, "q", false, false, "q somefile")]
+ [TestCase("somefile", "c:\\somefolder\\somefile", ResultType.File, "i", true, false, "p c:\\somefolder\\somefile")]
+ [TestCase("somefile", "c:\\somefolder\\somefile", ResultType.File, "irrelevant", true, true, "c:\\somefolder\\somefile")]
+ public void GivenQueryWithFileTypeResult_WhenGetAutoComplete_ThenResultShouldBeExpectedString(
+ string title,
+ string path,
+ ResultType resultType,
+ string actionKeyword,
+ bool pathSearchKeywordEnabled,
+ bool searchActionKeywordEnabled,
+ string expectedResult)
+ {
+ // Given
+ var query = new Query() { ActionKeyword = actionKeyword };
+ var settings = new Settings()
+ {
+ QuickAccessActionKeyword = "q",
+ IndexSearchActionKeyword = "i",
+ PathSearchActionKeyword = "p",
+ PathSearchKeywordEnabled = pathSearchKeywordEnabled,
+ SearchActionKeywordEnabled = searchActionKeywordEnabled,
+ SearchActionKeyword = Query.GlobalPluginWildcardSign
+ };
+ ResultManager.Init(new PluginInitContext(), settings);
+
+ // When
+ var result = ResultManager.GetAutoCompleteText(title, query, path, resultType);
+
+ // Then
+ Assert.AreEqual(result, expectedResult);
+ }
}
}
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs
index 1d3a57996..1e35b7873 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs
@@ -46,7 +46,7 @@ namespace Flow.Launcher.Plugin.Explorer.Search
return $"{keyword}{formatted_path}";
}
- private static string GetAutoCompleteText(string title, Query query, string path, ResultType resultType)
+ public static string GetAutoCompleteText(string title, Query query, string path, ResultType resultType)
{
return !Settings.PathSearchKeywordEnabled && !Settings.SearchActionKeywordEnabled
? $"{query.ActionKeyword} {title}" // Only Quick Access action keyword is used in this scenario
From ae8f2d2ee84e24f972d7d31e3f6b725324203aa3 Mon Sep 17 00:00:00 2001
From: Jeremy
Date: Sun, 25 Dec 2022 06:01:17 +1100
Subject: [PATCH 53/53] fix wrong Everything service warning displayed when not
available
---
Plugins/Flow.Launcher.Plugin.Explorer/Languages/da.xaml | 2 +-
Plugins/Flow.Launcher.Plugin.Explorer/Languages/de.xaml | 2 +-
Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml | 2 +-
Plugins/Flow.Launcher.Plugin.Explorer/Languages/es-419.xaml | 2 +-
Plugins/Flow.Launcher.Plugin.Explorer/Languages/fr.xaml | 2 +-
Plugins/Flow.Launcher.Plugin.Explorer/Languages/it.xaml | 2 +-
Plugins/Flow.Launcher.Plugin.Explorer/Languages/ja.xaml | 2 +-
Plugins/Flow.Launcher.Plugin.Explorer/Languages/nb.xaml | 2 +-
Plugins/Flow.Launcher.Plugin.Explorer/Languages/nl.xaml | 2 +-
Plugins/Flow.Launcher.Plugin.Explorer/Languages/pl.xaml | 2 +-
Plugins/Flow.Launcher.Plugin.Explorer/Languages/pt-br.xaml | 2 +-
Plugins/Flow.Launcher.Plugin.Explorer/Languages/ru.xaml | 2 +-
Plugins/Flow.Launcher.Plugin.Explorer/Languages/sr.xaml | 2 +-
Plugins/Flow.Launcher.Plugin.Explorer/Languages/tr.xaml | 2 +-
Plugins/Flow.Launcher.Plugin.Explorer/Languages/uk-UA.xaml | 2 +-
Plugins/Flow.Launcher.Plugin.Explorer/Languages/zh-tw.xaml | 2 +-
Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs | 3 +++
17 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/da.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/da.xaml
index 331a21742..05e65442b 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/da.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/da.xaml
@@ -114,7 +114,7 @@
↓
Warning: This is not a Fast Sort option, searches may be slow
- Click to Launch or Install Everything
+ Click to launch or install Everything
Everything Installation
Installing Everything service. Please wait...
Successfully installed Everything service
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/de.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/de.xaml
index 0f345f2ce..68695210b 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/de.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/de.xaml
@@ -114,7 +114,7 @@
↓
Warning: This is not a Fast Sort option, searches may be slow
- Click to Launch or Install Everything
+ Click to launch or install Everything
Everything Installation
Installing Everything service. Please wait...
Successfully installed Everything service
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
index 87b897d73..2e83a86d8 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
@@ -127,7 +127,7 @@
↓
Warning: This is not a Fast Sort option, searches may be slow
- Click to Launch or Install Everything
+ Click to launch or install Everything
Everything Installation
Installing Everything service. Please wait...
Successfully installed Everything service
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/es-419.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/es-419.xaml
index 047ecac39..3d2247ff3 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/es-419.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/es-419.xaml
@@ -114,7 +114,7 @@
↓
Advertencia: No es una opción de orden rápido, las búsquedas pueden ser lentas
- Click to Launch or Install Everything
+ Click to launch or install Everything
Instalación de Everything
Instalando el servicio de Everything. Por favor, espere...
Servicio de Everything instalado correctamente
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/fr.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/fr.xaml
index d6ed3f049..9cf3c7eca 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/fr.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/fr.xaml
@@ -114,7 +114,7 @@
↓
Warning: This is not a Fast Sort option, searches may be slow
- Click to Launch or Install Everything
+ Click to launch or install Everything
Everything Installation
Installing Everything service. Please wait...
Successfully installed Everything service
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/it.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/it.xaml
index 84cd85a01..dc8e1f329 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/it.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/it.xaml
@@ -114,7 +114,7 @@
↓
Attenzione: Questa non è un'opzione di ordinamento rapido, le ricerche potrebbero essere lente
- Click to Launch or Install Everything
+ Click to launch or install Everything
Installazione di Everything
Installazione di everything. Si prega di attendere...
Everything è stato installato con successo
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/ja.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/ja.xaml
index 51bdd0259..16be25bfa 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/ja.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/ja.xaml
@@ -114,7 +114,7 @@
↓
Warning: This is not a Fast Sort option, searches may be slow
- Click to Launch or Install Everything
+ Click to launch or install Everything
Everything Installation
Installing Everything service. Please wait...
Successfully installed Everything service
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/nb.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/nb.xaml
index 0d0786447..1a15d52c8 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/nb.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/nb.xaml
@@ -114,7 +114,7 @@
↓
Warning: This is not a Fast Sort option, searches may be slow
- Click to Launch or Install Everything
+ Click to launch or install Everything
Everything Installation
Installing Everything service. Please wait...
Successfully installed Everything service
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/nl.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/nl.xaml
index 05c08606c..2a1ea35d8 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/nl.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/nl.xaml
@@ -114,7 +114,7 @@
↓
Warning: This is not a Fast Sort option, searches may be slow
- Click to Launch or Install Everything
+ Click to launch or install Everything
Everything Installation
Installing Everything service. Please wait...
Successfully installed Everything service
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/pl.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/pl.xaml
index 6ba8b2c9d..7ff7d2bdb 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/pl.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/pl.xaml
@@ -114,7 +114,7 @@
↓
Warning: This is not a Fast Sort option, searches may be slow
- Click to Launch or Install Everything
+ Click to launch or install Everything
Everything Installation
Installing Everything service. Please wait...
Successfully installed Everything service
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/pt-br.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/pt-br.xaml
index 7f5253104..3db217cb0 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/pt-br.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/pt-br.xaml
@@ -114,7 +114,7 @@
↓
Warning: This is not a Fast Sort option, searches may be slow
- Click to Launch or Install Everything
+ Click to launch or install Everything
Everything Installation
Installing Everything service. Please wait...
Successfully installed Everything service
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/ru.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/ru.xaml
index 2afd0a8ab..28a1a7c70 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/ru.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/ru.xaml
@@ -114,7 +114,7 @@
↓
Warning: This is not a Fast Sort option, searches may be slow
- Click to Launch or Install Everything
+ Click to launch or install Everything
Everything Installation
Installing Everything service. Please wait...
Successfully installed Everything service
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/sr.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/sr.xaml
index dc14c9b59..53cf015bb 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/sr.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/sr.xaml
@@ -114,7 +114,7 @@
↓
Warning: This is not a Fast Sort option, searches may be slow
- Click to Launch or Install Everything
+ Click to launch or install Everything
Everything Installation
Installing Everything service. Please wait...
Successfully installed Everything service
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/tr.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/tr.xaml
index dd797f68a..da6c2a30d 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/tr.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/tr.xaml
@@ -114,7 +114,7 @@
↓
Warning: This is not a Fast Sort option, searches may be slow
- Click to Launch or Install Everything
+ Click to launch or install Everything
Everything Installation
Installing Everything service. Please wait...
Successfully installed Everything service
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/uk-UA.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/uk-UA.xaml
index 3f5d97e4b..2aab5994e 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/uk-UA.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/uk-UA.xaml
@@ -114,7 +114,7 @@
↓
Warning: This is not a Fast Sort option, searches may be slow
- Click to Launch or Install Everything
+ Click to launch or install Everything
Everything Installation
Installing Everything service. Please wait...
Successfully installed Everything service
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/zh-tw.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/zh-tw.xaml
index c125664f0..003cf42d5 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/zh-tw.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/zh-tw.xaml
@@ -114,7 +114,7 @@
↓
Warning: This is not a Fast Sort option, searches may be slow
- Click to Launch or Install Everything
+ Click to launch or install Everything
Everything 安裝程序
正在安裝 Everything 服務，請稍後...
成功安裝 Everything 服務
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs
index 3634de792..93a81f947 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs
@@ -110,6 +110,9 @@ namespace Flow.Launcher.Plugin.Explorer.Search
if (e is OperationCanceledException)
return results.ToList();
+ if (e is EngineNotAvailableException)
+ throw;
+
throw new SearchException(engineName, e.Message, e);
}