Merge pull request #1691 from fihorvat/folder-editor

taooceros · web-flow · commit 2d00e985547b · 2022-12-21T13:06:33.000-06:00
Improve folder editor experience
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs b/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs
@@ -40,7 +40,10 @@ public List<Result> LoadContextMenus(Result selectedResult)
             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 || record.Type == ResultType.Volume) && !string.IsNullOrEmpty(Settings.FolderEditorPath))
+                    contextMenus.Add(CreateOpenWithEditorResult(record, Settings.FolderEditorPath));
 
                 if (record.Type == ResultType.Folder)
                 {
@@ -309,10 +312,8 @@ private Result CreateOpenContainingFolderResult(SearchResult record)
 
 
 
-        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
@@ -45,6 +45,8 @@
     <system:String x:Key="plugin_explorer_engine_everything">Everything</system:String>
     <system:String x:Key="plugin_explorer_engine_windows_index">Windows Index</system:String>
     <system:String x:Key="plugin_explorer_path_enumeration_engine_none">Direct Enumeration</system:String>
+    <system:String x:Key="plugin_explorer_file_editor_path">Filredigeringssti</system:String>
+    <system:String x:Key="plugin_explorer_folder_editor_path">Mapperedigeringssti</system:String>
 
     <system:String x:Key="plugin_explorer_Content_Search_Engine">Content Search Engine</system:String>
     <system:String x:Key="plugin_explorer_Directory_Recursive_Search_Engine">Directory Recursive Search Engine</system:String>
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/de.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/de.xaml
@@ -45,6 +45,8 @@
     <system:String x:Key="plugin_explorer_engine_everything">Everything</system:String>
     <system:String x:Key="plugin_explorer_engine_windows_index">Windows Index</system:String>
     <system:String x:Key="plugin_explorer_path_enumeration_engine_none">Direct Enumeration</system:String>
+    <system:String x:Key="plugin_explorer_file_editor_path">Datei-Editor-Pfad</system:String>
+    <system:String x:Key="plugin_explorer_folder_editor_path">Ordner-Editor-Pfad</system:String>
 
     <system:String x:Key="plugin_explorer_Content_Search_Engine">Content Search Engine</system:String>
     <system:String x:Key="plugin_explorer_Directory_Recursive_Search_Engine">Directory Recursive Search Engine</system:String>
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
@@ -48,6 +48,8 @@
     <system:String x:Key="plugin_explorer_engine_everything">Everything</system:String>
     <system:String x:Key="plugin_explorer_engine_windows_index">Windows Index</system:String>
     <system:String x:Key="plugin_explorer_path_enumeration_engine_none">Direct Enumeration</system:String>
+    <system:String x:Key="plugin_explorer_file_editor_path">File Editor Path</system:String>
+    <system:String x:Key="plugin_explorer_folder_editor_path">Folder Editor Path</system:String>
 
     <system:String x:Key="plugin_explorer_Content_Search_Engine">Content Search Engine</system:String>
     <system:String x:Key="plugin_explorer_Directory_Recursive_Search_Engine">Directory Recursive Search Engine</system:String>
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/es-419.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/es-419.xaml
@@ -45,6 +45,8 @@
     <system:String x:Key="plugin_explorer_engine_everything">Everything</system:String>
     <system:String x:Key="plugin_explorer_engine_windows_index">Windows Index</system:String>
     <system:String x:Key="plugin_explorer_path_enumeration_engine_none">Direct Enumeration</system:String>
+    <system:String x:Key="plugin_explorer_file_editor_path">Ruta del editor</system:String>
+    <system:String x:Key="plugin_explorer_folder_editor_path">Folder Editor Path</system:String>
 
     <system:String x:Key="plugin_explorer_Content_Search_Engine">Content Search Engine</system:String>
     <system:String x:Key="plugin_explorer_Directory_Recursive_Search_Engine">Directory Recursive Search Engine</system:String>
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/es.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/es.xaml
@@ -45,6 +45,8 @@
     <system:String x:Key="plugin_explorer_engine_everything">Everything</system:String>
     <system:String x:Key="plugin_explorer_engine_windows_index">Índice de Windows</system:String>
     <system:String x:Key="plugin_explorer_path_enumeration_engine_none">Enumeración directa</system:String>
+    <system:String x:Key="plugin_explorer_file_editor_path">Ruta del editor</system:String>
+    <system:String x:Key="plugin_explorer_folder_editor_path">Ruta del editor de carpetas</system:String>
 
     <system:String x:Key="plugin_explorer_Content_Search_Engine">Motor de búsqueda de contenido</system:String>
     <system:String x:Key="plugin_explorer_Directory_Recursive_Search_Engine">Motor de búsqueda recursiva de directorio</system:String>
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/fr.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/fr.xaml
@@ -45,6 +45,8 @@
     <system:String x:Key="plugin_explorer_engine_everything">Everything</system:String>
     <system:String x:Key="plugin_explorer_engine_windows_index">Windows Index</system:String>
     <system:String x:Key="plugin_explorer_path_enumeration_engine_none">Direct Enumeration</system:String>
+    <system:String x:Key="plugin_explorer_file_editor_path">Chemin de l'éditeur de fichiers</system:String>
+    <system:String x:Key="plugin_explorer_folder_editor_path">Chemin de l'éditeur de dossier</system:String>
 
     <system:String x:Key="plugin_explorer_Content_Search_Engine">Content Search Engine</system:String>
     <system:String x:Key="plugin_explorer_Directory_Recursive_Search_Engine">Directory Recursive Search Engine</system:String>
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/it.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/it.xaml
@@ -45,6 +45,8 @@
     <system:String x:Key="plugin_explorer_engine_everything">Tutto</system:String>
     <system:String x:Key="plugin_explorer_engine_windows_index">Windows Index</system:String>
     <system:String x:Key="plugin_explorer_path_enumeration_engine_none">Direct Enumeration</system:String>
+    <system:String x:Key="plugin_explorer_file_editor_path">Percorso dell'editor di file</system:String>
+    <system:String x:Key="plugin_explorer_folder_editor_path">Percorso dell'editor delle cartelle</system:String>
 
     <system:String x:Key="plugin_explorer_Content_Search_Engine">Content Search Engine</system:String>
     <system:String x:Key="plugin_explorer_Directory_Recursive_Search_Engine">Directory Recursive Search Engine</system:String>
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/ja.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/ja.xaml
@@ -45,6 +45,8 @@
     <system:String x:Key="plugin_explorer_engine_everything">Everything</system:String>
     <system:String x:Key="plugin_explorer_engine_windows_index">Windows Index</system:String>
     <system:String x:Key="plugin_explorer_path_enumeration_engine_none">Direct Enumeration</system:String>
+    <system:String x:Key="plugin_explorer_file_editor_path">ファイル エディターのパス</system:String>
+    <system:String x:Key="plugin_explorer_folder_editor_path">フォルダー エディターのパス</system:String>
 
     <system:String x:Key="plugin_explorer_Content_Search_Engine">Content Search Engine</system:String>
     <system:String x:Key="plugin_explorer_Directory_Recursive_Search_Engine">Directory Recursive Search Engine</system:String>
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/ko.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/ko.xaml
@@ -48,7 +48,8 @@
     <system:String x:Key="plugin_explorer_engine_everything">Everything</system:String>
     <system:String x:Key="plugin_explorer_engine_windows_index">윈도우 색인</system:String>
     <system:String x:Key="plugin_explorer_path_enumeration_engine_none">Flow Launcher</system:String>
-
+    <system:String x:Key="plugin_explorer_file_editor_path">파일 편집기 경로</system:String>
+    <system:String x:Key="plugin_explorer_folder_editor_path">폴더 편집기 경로</system:String>
     <system:String x:Key="plugin_explorer_Content_Search_Engine">내용 검색 엔진</system:String>
     <system:String x:Key="plugin_explorer_Directory_Recursive_Search_Engine">경로 재귀 검색 엔진</system:String>
     <system:String x:Key="plugin_explorer_Index_Search_Engine">색인 검색 엔진</system:String>
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/nb.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/nb.xaml
@@ -45,6 +45,8 @@
     <system:String x:Key="plugin_explorer_engine_everything">Everything</system:String>
     <system:String x:Key="plugin_explorer_engine_windows_index">Windows Index</system:String>
     <system:String x:Key="plugin_explorer_path_enumeration_engine_none">Direct Enumeration</system:String>
+    <system:String x:Key="plugin_explorer_file_editor_path">Filredigeringsbane</system:String>
+    <system:String x:Key="plugin_explorer_folder_editor_path">Mapperedigeringsbane</system:String>
 
     <system:String x:Key="plugin_explorer_Content_Search_Engine">Content Search Engine</system:String>
     <system:String x:Key="plugin_explorer_Directory_Recursive_Search_Engine">Directory Recursive Search Engine</system:String>
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/nl.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/nl.xaml
@@ -45,6 +45,8 @@
     <system:String x:Key="plugin_explorer_engine_everything">Everything</system:String>
     <system:String x:Key="plugin_explorer_engine_windows_index">Windows Index</system:String>
     <system:String x:Key="plugin_explorer_path_enumeration_engine_none">Direct Enumeration</system:String>
+    <system:String x:Key="plugin_explorer_file_editor_path">Bestandseditor pad</system:String>
+    <system:String x:Key="plugin_explorer_folder_editor_path">Pad naar mapeditor</system:String>
 
     <system:String x:Key="plugin_explorer_Content_Search_Engine">Content Search Engine</system:String>
     <system:String x:Key="plugin_explorer_Directory_Recursive_Search_Engine">Directory Recursive Search Engine</system:String>
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/pl.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/pl.xaml
@@ -45,6 +45,8 @@
     <system:String x:Key="plugin_explorer_engine_everything">Everything</system:String>
     <system:String x:Key="plugin_explorer_engine_windows_index">Windows Index</system:String>
     <system:String x:Key="plugin_explorer_path_enumeration_engine_none">Direct Enumeration</system:String>
+    <system:String x:Key="plugin_explorer_file_editor_path">Ścieżka edytora plików</system:String>
+    <system:String x:Key="plugin_explorer_folder_editor_path">Ścieżka edytora folderów</system:String>
 
     <system:String x:Key="plugin_explorer_Content_Search_Engine">Content Search Engine</system:String>
     <system:String x:Key="plugin_explorer_Directory_Recursive_Search_Engine">Directory Recursive Search Engine</system:String>
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/pt-br.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/pt-br.xaml
@@ -45,6 +45,8 @@
     <system:String x:Key="plugin_explorer_engine_everything">Everything</system:String>
     <system:String x:Key="plugin_explorer_engine_windows_index">Windows Index</system:String>
     <system:String x:Key="plugin_explorer_path_enumeration_engine_none">Direct Enumeration</system:String>
+    <system:String x:Key="plugin_explorer_file_editor_path">File Editor Path</system:String>
+    <system:String x:Key="plugin_explorer_folder_editor_path">Folder Editor Path</system:String>
 
     <system:String x:Key="plugin_explorer_Content_Search_Engine">Content Search Engine</system:String>
     <system:String x:Key="plugin_explorer_Directory_Recursive_Search_Engine">Directory Recursive Search Engine</system:String>
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/pt-pt.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/pt-pt.xaml
@@ -45,6 +45,8 @@
     <system:String x:Key="plugin_explorer_engine_everything">Everything</system:String>
     <system:String x:Key="plugin_explorer_engine_windows_index">Índice do Windows</system:String>
     <system:String x:Key="plugin_explorer_path_enumeration_engine_none">Enumeração direta</system:String>
+    <system:String x:Key="plugin_explorer_file_editor_path">File Editor Path</system:String>
+    <system:String x:Key="plugin_explorer_folder_editor_path">Folder Editor Path</system:String>
 
     <system:String x:Key="plugin_explorer_Content_Search_Engine">Mecanismo de pesquisa para conteúdo</system:String>
     <system:String x:Key="plugin_explorer_Directory_Recursive_Search_Engine">Mecanismo de pesquisa recursiva de diretórios</system:String>
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/ru.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/ru.xaml
@@ -45,6 +45,8 @@
     <system:String x:Key="plugin_explorer_engine_everything">Everything</system:String>
     <system:String x:Key="plugin_explorer_engine_windows_index">Windows Index</system:String>
     <system:String x:Key="plugin_explorer_path_enumeration_engine_none">Direct Enumeration</system:String>
+    <system:String x:Key="plugin_explorer_file_editor_path">Путь к редактору файлов</system:String>
+    <system:String x:Key="plugin_explorer_folder_editor_path">Путь к редактору папки</system:String>
 
     <system:String x:Key="plugin_explorer_Content_Search_Engine">Content Search Engine</system:String>
     <system:String x:Key="plugin_explorer_Directory_Recursive_Search_Engine">Directory Recursive Search Engine</system:String>
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/sk.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/sk.xaml
@@ -45,6 +45,8 @@
     <system:String x:Key="plugin_explorer_engine_everything">Everything</system:String>
     <system:String x:Key="plugin_explorer_engine_windows_index">Index Windowsu</system:String>
     <system:String x:Key="plugin_explorer_path_enumeration_engine_none">Zoznam priečinkov</system:String>
+    <system:String x:Key="plugin_explorer_file_editor_path">Cesta editora súborov</system:String>
+    <system:String x:Key="plugin_explorer_folder_editor_path">Cesta editora priečinkov</system:String>
 
     <system:String x:Key="plugin_explorer_Content_Search_Engine">Vyhľadávač obsahu</system:String>
     <system:String x:Key="plugin_explorer_Directory_Recursive_Search_Engine">Priečinkový rekurzívny vyhľadávač</system:String>
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/sr.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/sr.xaml
@@ -45,6 +45,8 @@
     <system:String x:Key="plugin_explorer_engine_everything">Everything</system:String>
     <system:String x:Key="plugin_explorer_engine_windows_index">Windows Index</system:String>
     <system:String x:Key="plugin_explorer_path_enumeration_engine_none">Direct Enumeration</system:String>
+    <system:String x:Key="plugin_explorer_file_editor_path">File Editor Path</system:String>
+    <system:String x:Key="plugin_explorer_folder_editor_path">Folder Editor Path</system:String>
 
     <system:String x:Key="plugin_explorer_Content_Search_Engine">Content Search Engine</system:String>
     <system:String x:Key="plugin_explorer_Directory_Recursive_Search_Engine">Directory Recursive Search Engine</system:String>
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/tr.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/tr.xaml
@@ -45,6 +45,8 @@
     <system:String x:Key="plugin_explorer_engine_everything">Everything</system:String>
     <system:String x:Key="plugin_explorer_engine_windows_index">Windows Index</system:String>
     <system:String x:Key="plugin_explorer_path_enumeration_engine_none">Direct Enumeration</system:String>
+    <system:String x:Key="plugin_explorer_file_editor_path">Düzenleyici Konumu</system:String>
+    <system:String x:Key="plugin_explorer_folder_editor_path">Folder Editor Path</system:String>
 
     <system:String x:Key="plugin_explorer_Content_Search_Engine">Content Search Engine</system:String>
     <system:String x:Key="plugin_explorer_Directory_Recursive_Search_Engine">Directory Recursive Search Engine</system:String>
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/uk-UA.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/uk-UA.xaml
@@ -45,6 +45,8 @@
     <system:String x:Key="plugin_explorer_engine_everything">Everything</system:String>
     <system:String x:Key="plugin_explorer_engine_windows_index">Windows Index</system:String>
     <system:String x:Key="plugin_explorer_path_enumeration_engine_none">Direct Enumeration</system:String>
+    <system:String x:Key="plugin_explorer_file_editor_path">Шлях редактора файлів</system:String>
+    <system:String x:Key="plugin_explorer_folder_editor_path">Шлях редактора папок</system:String>
 
     <system:String x:Key="plugin_explorer_Content_Search_Engine">Content Search Engine</system:String>
     <system:String x:Key="plugin_explorer_Directory_Recursive_Search_Engine">Directory Recursive Search Engine</system:String>
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/zh-cn.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/zh-cn.xaml
@@ -45,6 +45,8 @@
     <system:String x:Key="plugin_explorer_engine_everything">Everything</system:String>
     <system:String x:Key="plugin_explorer_engine_windows_index">Windows 索引</system:String>
     <system:String x:Key="plugin_explorer_path_enumeration_engine_none">直接枚举</system:String>
+    <system:String x:Key="plugin_explorer_file_editor_path">文件编辑器路径</system:String>
+    <system:String x:Key="plugin_explorer_folder_editor_path">文件夹编辑器路径</system:String>
 
     <system:String x:Key="plugin_explorer_Content_Search_Engine">文件内容搜索引擎</system:String>
     <system:String x:Key="plugin_explorer_Directory_Recursive_Search_Engine">目录递归搜索引擎</system:String>
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/zh-tw.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/zh-tw.xaml
@@ -45,6 +45,8 @@
     <system:String x:Key="plugin_explorer_engine_everything">Everything</system:String>
     <system:String x:Key="plugin_explorer_engine_windows_index">Windows Index</system:String>
     <system:String x:Key="plugin_explorer_path_enumeration_engine_none">Direct Enumeration</system:String>
+	<system:String x:Key="plugin_explorer_file_editor_path">文件編輯器路徑</system:String>
+	<system:String x:Key="plugin_explorer_folder_editor_path">文件夾編輯器路徑</system:String>
 
     <system:String x:Key="plugin_explorer_Content_Search_Engine">Content Search Engine</system:String>
     <system:String x:Key="plugin_explorer_Directory_Recursive_Search_Engine">Directory Recursive Search Engine</system:String>
diff --git 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 @@ public class Settings
 
         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
@@ -315,15 +315,26 @@ internal static void OpenWindowsIndexingOptions()
             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 @@ internal static void OpenWindowsIndexingOptions()
         });
 
 
-        public string EditorPath
+        public string FileEditorPath
         {
             get => Settings.EditorPath;
             set
@@ -348,6 +359,16 @@ public string EditorPath
             }
         }
 
+        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

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,10 @@ public List<Result> LoadContextMenus(Result selectedResult)`
`40`	`40`	`if (selectedResult.ContextData is SearchResult record)`
`41`	`41`	`{`
`42`	`42`	`if (record.Type == ResultType.File && !string.IsNullOrEmpty(Settings.EditorPath))`
`43`		`- contextMenus.Add(CreateOpenWithEditorResult(record));`
	`43`	`+ contextMenus.Add(CreateOpenWithEditorResult(record, Settings.EditorPath));`
	`44`	`+`
	`45`	`+ if ((record.Type == ResultType.Folder \|\| record.Type == ResultType.Volume) && !string.IsNullOrEmpty(Settings.FolderEditorPath))`
	`46`	`+ contextMenus.Add(CreateOpenWithEditorResult(record, Settings.FolderEditorPath));`
`44`	`47`
`45`	`48`	`if (record.Type == ResultType.Folder)`
`46`	`49`	`{`
`@@ -309,10 +312,8 @@ private Result CreateOpenContainingFolderResult(SearchResult record)`
`309`	`312`
`310`	`313`
`311`	`314`
`312`		`- private Result CreateOpenWithEditorResult(SearchResult record)`
	`315`	`+ private Result CreateOpenWithEditorResult(SearchResult record, string editorPath)`
`313`	`316`	`{`
`314`		`- string editorPath = Settings.EditorPath;`
`315`		`-`
`316`	`317`	`var name = $"{Context.API.GetTranslation("plugin_explorer_openwitheditor")} {Path.GetFileNameWithoutExtension(editorPath)}";`
`317`	`318`
`318`	`319`	`return new Result`