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 01/13] 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 4733e09e9d2..979b4cd8cc8 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs +++ b/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs @@ -42,11 +42,15 @@ public List LoadContextMenus(Result selectedResult) 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 02/13] 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 979b4cd8cc8..8f9cc952412 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs +++ b/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs @@ -98,7 +98,7 @@ public List LoadContextMenus(Result selectedResult) 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 @@ public List LoadContextMenus(Result selectedResult) }, }); } - + "" == "" if (record.Type == ResultType.File && CanRunAsDifferentUser(record.FullPath)) contextMenus.Add(new Result { @@ -386,7 +386,7 @@ private Result CreateAddToIndexSearchExclusionListResult(SearchResult record) 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 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 03/13] 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 d44c67bf017..bd950a2aa02 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 fc4186cb3f9..3634de792c7 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs +++ b/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs @@ -145,8 +145,8 @@ private static List EverythingContentSearchResult(Query query) { 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 04/13] 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 8f9cc952412..af5439d04e0 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs +++ b/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs @@ -59,14 +59,14 @@ public List LoadContextMenus(Result selectedResult) } 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 @@ public List LoadContextMenus(Result selectedResult) }); 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 @@ public List LoadContextMenus(Result selectedResult) 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 @@ public List LoadContextMenus(Result selectedResult) 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 @@ public List LoadContextMenus(Result selectedResult) 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 @@ public List LoadContextMenus(Result selectedResult) } 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 @@ public List LoadContextMenus(Result selectedResult) 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 @@ public List LoadContextMenus(Result selectedResult) _ = 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 @@ public List LoadContextMenus(Result selectedResult) }, }); } - "" == "" + 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 bd950a2aa02..3aa9e927186 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 05/13] 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 af5439d04e0..dd5bd0c6c7a 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs +++ b/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs @@ -138,7 +138,7 @@ public List LoadContextMenus(Result selectedResult) 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 @@ public List LoadContextMenus(Result selectedResult) 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 3aa9e927186..3c9511771b8 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 06/13] 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 3c9511771b8..4e7c06557a8 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 07/13] 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 3c9511771b8..da4dbf913a9 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 30cc5e1c73a..152c19f0c58 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 08/13] 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 152c19f0c58..b2f6c54c1bf 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 09/13] 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 e1e8a58e368..ebab99e5b81 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 10/13] 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 1d835a8317a..81600e023e1 100644 --- a/Flow.Launcher.Core/Resource/LocalizationConverter.cs +++ b/Flow.Launcher.Core/Resource/LocalizationConverter.cs @@ -4,7 +4,7 @@ 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 af8b23136af..52a23233441 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 b4f3c3c582f..ac0da1c6f65 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 @@ public enum DecimalSeparator [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 c0621a2d9b1..9fd4bb17c90 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 11/13] 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 0a786d89eb2..ebca70462b5 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 5975d3f16e1..67bf8d92811 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/SettingsViewModel.cs +++ b/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/SettingsViewModel.cs @@ -112,15 +112,15 @@ private void InitializeActionKeywordModels() 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 6b2877bf5e7..ab0b01d30ac 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}}"> - + + + + diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml index ebca70462b5..f10964fe0d9 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 b2f6c54c1bf..f2f7d3a4d94 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 13/13] 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 f2f7d3a4d94..db1002c1cd2 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