Add "Copy selected text" and rename "Copy" cmd in Search Results Pane

"Copy selected text" is named "Copy" and old "Copy" command is renamed to "Copy Selected Line(s)".

Close #9151
This commit is contained in:
Don HO 2020-11-14 15:24:06 +01:00
parent daa31c1a9a
commit 9f8932b375
No known key found for this signature in database
GPG Key ID: 6C429F1D8D84F46E
4 changed files with 70 additions and 58 deletions

View File

@ -1296,7 +1296,8 @@ Rechercher dans tous les fichiers sauf exe, obj && log:
<finder-close-this value="Fermer le dialogue des résultats"/> <finder-close-this value="Fermer le dialogue des résultats"/>
<finder-collapse-all value="Replier tout"/> <finder-collapse-all value="Replier tout"/>
<finder-uncollapse-all value="Déplier tout"/> <finder-uncollapse-all value="Déplier tout"/>
<finder-copy value="Copier"/> <finder-copy value="Copier la(les) ligne(s) selectionnée(s)"/>
<finder-copy-verbatim value="Copier"/>
<finder-select-all value="Sélectionner tout"/> <finder-select-all value="Sélectionner tout"/>
<finder-clear-all value="Effacer tout"/> <finder-clear-all value="Effacer tout"/>
<finder-open-all value="Ouvrir tout"/> <finder-open-all value="Ouvrir tout"/>

View File

@ -1282,7 +1282,8 @@
<finder-close-this value="關閉這個搜尋結果"/> <finder-close-this value="關閉這個搜尋結果"/>
<finder-collapse-all value="層數全部收折"/> <finder-collapse-all value="層數全部收折"/>
<finder-uncollapse-all value="層數全部展開"/> <finder-uncollapse-all value="層數全部展開"/>
<finder-copy value="複製"/> <finder-copy value="複製全行"/>
<finder-copy-verbatim value="複製"/>
<finder-select-all value="全部選取"/> <finder-select-all value="全部選取"/>
<finder-clear-all value="全部清除"/> <finder-clear-all value="全部清除"/>
<finder-open-all value="全部開啟"/> <finder-open-all value="全部開啟"/>

View File

@ -3806,6 +3806,13 @@ INT_PTR CALLBACK Finder::run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam)
return TRUE; return TRUE;
} }
case NPPM_INTERNAL_SCINTILLAFINFERCOPYVERBATIM:
{
_scintView.execute(SCI_COPY);
return TRUE;
}
case NPPM_INTERNAL_SCINTILLAFINFERSELECTALL : case NPPM_INTERNAL_SCINTILLAFINFERSELECTALL :
{ {
_scintView.execute(SCI_SELECTALL); _scintView.execute(SCI_SELECTALL);
@ -3852,7 +3859,8 @@ INT_PTR CALLBACK Finder::run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam)
generic_string closeThis = pNativeSpeaker->getLocalizedStrFromID("finder-close-this", TEXT("Close these search results")); generic_string closeThis = pNativeSpeaker->getLocalizedStrFromID("finder-close-this", TEXT("Close these search results"));
generic_string collapseAll = pNativeSpeaker->getLocalizedStrFromID("finder-collapse-all", TEXT("Collapse all")); generic_string collapseAll = pNativeSpeaker->getLocalizedStrFromID("finder-collapse-all", TEXT("Collapse all"));
generic_string uncollapseAll = pNativeSpeaker->getLocalizedStrFromID("finder-uncollapse-all", TEXT("Uncollapse all")); generic_string uncollapseAll = pNativeSpeaker->getLocalizedStrFromID("finder-uncollapse-all", TEXT("Uncollapse all"));
generic_string copy = pNativeSpeaker->getLocalizedStrFromID("finder-copy", TEXT("Copy")); generic_string copyLines = pNativeSpeaker->getLocalizedStrFromID("finder-copy", TEXT("Copy Selected Line(s)"));
generic_string copyVerbatim = pNativeSpeaker->getLocalizedStrFromID("finder-copy-verbatim", TEXT("Copy"));
generic_string selectAll = pNativeSpeaker->getLocalizedStrFromID("finder-select-all", TEXT("Select all")); generic_string selectAll = pNativeSpeaker->getLocalizedStrFromID("finder-select-all", TEXT("Select all"));
generic_string clearAll = pNativeSpeaker->getLocalizedStrFromID("finder-clear-all", TEXT("Clear all")); generic_string clearAll = pNativeSpeaker->getLocalizedStrFromID("finder-clear-all", TEXT("Clear all"));
generic_string openAll = pNativeSpeaker->getLocalizedStrFromID("finder-open-all", TEXT("Open all")); generic_string openAll = pNativeSpeaker->getLocalizedStrFromID("finder-open-all", TEXT("Open all"));
@ -3865,7 +3873,8 @@ INT_PTR CALLBACK Finder::run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam)
tmp.push_back(MenuItemUnit(NPPM_INTERNAL_SCINTILLAFINFERCOLLAPSE, collapseAll)); tmp.push_back(MenuItemUnit(NPPM_INTERNAL_SCINTILLAFINFERCOLLAPSE, collapseAll));
tmp.push_back(MenuItemUnit(NPPM_INTERNAL_SCINTILLAFINFERUNCOLLAPSE, uncollapseAll)); tmp.push_back(MenuItemUnit(NPPM_INTERNAL_SCINTILLAFINFERUNCOLLAPSE, uncollapseAll));
tmp.push_back(MenuItemUnit(0, TEXT("Separator"))); tmp.push_back(MenuItemUnit(0, TEXT("Separator")));
tmp.push_back(MenuItemUnit(NPPM_INTERNAL_SCINTILLAFINFERCOPY, copy)); tmp.push_back(MenuItemUnit(NPPM_INTERNAL_SCINTILLAFINFERCOPYVERBATIM, copyVerbatim));
tmp.push_back(MenuItemUnit(NPPM_INTERNAL_SCINTILLAFINFERCOPY, copyLines));
tmp.push_back(MenuItemUnit(NPPM_INTERNAL_SCINTILLAFINFERSELECTALL, selectAll)); tmp.push_back(MenuItemUnit(NPPM_INTERNAL_SCINTILLAFINFERSELECTALL, selectAll));
tmp.push_back(MenuItemUnit(NPPM_INTERNAL_SCINTILLAFINFERCLEARALL, clearAll)); tmp.push_back(MenuItemUnit(NPPM_INTERNAL_SCINTILLAFINFERCLEARALL, clearAll));
tmp.push_back(MenuItemUnit(0, TEXT("Separator"))); tmp.push_back(MenuItemUnit(0, TEXT("Separator")));

View File

@ -451,6 +451,7 @@
#define NPPM_INTERNAL_UPDATECLICKABLELINKS (NOTEPADPLUS_USER_INTERNAL + 52) #define NPPM_INTERNAL_UPDATECLICKABLELINKS (NOTEPADPLUS_USER_INTERNAL + 52)
#define NPPM_INTERNAL_SCINTILLAFINDERWRAP (NOTEPADPLUS_USER_INTERNAL + 53) #define NPPM_INTERNAL_SCINTILLAFINDERWRAP (NOTEPADPLUS_USER_INTERNAL + 53)
#define NPPM_INTERNAL_MINIMIZED_TRAY (NOTEPADPLUS_USER_INTERNAL + 54) #define NPPM_INTERNAL_MINIMIZED_TRAY (NOTEPADPLUS_USER_INTERNAL + 54)
#define NPPM_INTERNAL_SCINTILLAFINFERCOPYVERBATIM (NOTEPADPLUS_USER_INTERNAL + 55)
// See Notepad_plus_msgs.h // See Notepad_plus_msgs.h
//#define NOTEPADPLUS_USER (WM_USER + 1000) //#define NOTEPADPLUS_USER (WM_USER + 1000)