github
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add "Multi-Select Next Occurrence" into menu 

Update localization files
pull/5441/head
Don HO 2019-03-19 02:52:13 +01:00
parent 455fcb2da4
commit a7c59e1776
No known key found for this signature in database
GPG Key ID: 6C429F1D8D84F46E
7 changed files with 36 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PowerEditor/installer/nativeLang/chinese.xml
View File

@ -65,7 +65,7 @@
<Item subMenuId="encoding-vietnamese" name="越南文"/>
<Item subMenuId="settings-import" name="匯入"/>
<Item subMenuId="tools-md5" name="MD5"/>
<Item subMenuId="tools-sha256" name="SHA-256"/>
<Item subMenuId="tools-sha256" name="SHA-256"/>
</SubEntries>
<!-- All Menu Items -->
@ -105,6 +105,7 @@
<Item id="42008" name="增加縮排"/>
<Item id="42009" name="減少縮排"/>
<Item id="42010" name="重複此行"/>
<Item id="42077" name="刪除連續的重複行"/>
<Item id="42011" name="調換此行"/>
<Item id="42012" name="分割此行"/>
<Item id="42013" name="合併選取行"/>
@ -143,6 +144,7 @@
<Item id="42050" name="貼上 Binary 內容（包含 NULL 字元）"/>
<Item id="42037" name="多欄選取..."/>
<Item id="42034" name="多欄插入..."/>
<Item id="42078" name="多選下一個字串"/>
<Item id="42051" name="顯示 ASCII 插入面板"/>
<Item id="42052" name="剪貼簿記錄"/>
<Item id="42025" name="儲存巨集"/>
@ -435,7 +437,7 @@
<Item id="1934" name="複製到剪貼簿"/>
<Item id="2" name="關閉"/>
</SHA256FromTextDlg>
<PluginsAdminDlg title="外掛模組管理" titleAvailable = "可安裝" titleUpdates = "更新" titleInstalled = "已安裝">
<ColumnPlugin name="外掛模組"/>
<ColumnVersion name="版本"/>

2
PowerEditor/installer/nativeLang/english.xml
View File

@ -105,6 +105,7 @@
<Item id="42008" name="Increase Line Indent"/>
<Item id="42009" name="Decrease Line Indent"/>
<Item id="42010" name="Duplicate Current Line"/>
<Item id="42077" name="Remove Consecutive Duplicate Lines"/>
<Item id="42012" name="Split Lines"/>
<Item id="42013" name="Join Lines"/>
<Item id="42014" name="Move Up Current Line"/>
@ -150,6 +151,7 @@
<Item id="42050" name="Paste Binary Content"/>
<Item id="42037" name="Column Mode..."/>
<Item id="42034" name="Column Editor..."/>
<Item id="42078" name="Multi-Select Next Occurenc"/>
<Item id="42051" name="Character Panel"/>
<Item id="42052" name="Clipboard History"/>
<Item id="42025" name="&amp;Save Currently Recorded Macro..."/>

6
PowerEditor/installer/nativeLang/french.xml
View File

@ -38,7 +38,7 @@
<Item subMenuId="search-jumpUp" name="Aller vers le haut"/>
<Item subMenuId="search-jumpDown" name="Aller vers le bas"/>
<Item subMenuId="search-bookmark" name="Signet"/>
<Item subMenuId="view-currentFileIn" name="Afficher le fichier dans"/>
<Item subMenuId="view-currentFileIn" name="Afficher le fichier dans"/>
<Item subMenuId="view-showSymbol" name="Symboles spéciaux"/>
<Item subMenuId="view-zoom" name="Zoom"/>
<Item subMenuId="view-moveCloneDocument" name="Déplacer/Cloner le document actuel"/>
@ -65,7 +65,7 @@
<Item subMenuId="encoding-vietnamese" name="Vietnamien"/>
<Item subMenuId="settings-import" name="Importer"/>
<Item subMenuId="tools-md5" name="MD5"/>
<Item subMenuId="tools-sha256" name="SHA-256"/>
<Item subMenuId="tools-sha256" name="SHA-256"/>
</SubEntries>
<!-- all menu item -->
@ -109,6 +109,7 @@
<Item id="42008" name="Augmenter l’indentation"/>
<Item id="42009" name="Réduire l’indentation"/>
<Item id="42010" name="Dupliquer la ligne actuelle"/>
<Item id="42077" name="Supprimer la ligne en double consécutives"/>
<Item id="42012" name="Séparer en plusieurs lignes"/>
<Item id="42013" name="Joindre plusieurs lignes"/>
<Item id="42014" name="Déplacer la ligne actuelle vers le haut"/>
@ -143,6 +144,7 @@
<Item id="42033" name="Enlever l'attribut de lecture seule du fichier"/>
<Item id="42034" name="Édition en mode colonnes..."/>
<Item id="42035" name="Commenter (mode ligne)"/>
<Item id="42078" name="Multi-Selectionner Occurrence Suivante"/>
<Item id="42036" name="Décommenter (mode ligne)"/>
<Item id="42055" name="Enlever les lignes vides"/>
<Item id="42056" name="Enlever les lignes vides (contenant les blancs aussi)"/>

12
PowerEditor/src/MISC/RegExt/regExtDlg.cpp
View File

@ -306,12 +306,12 @@ void RegExtDlg::getRegisteredExts()
{
//TCHAR valName[extNameLen];
TCHAR valData[extNameLen];
int valDataLen = extNameLen * sizeof(TCHAR);
DWORD valDataLen = extNameLen * sizeof(TCHAR);
DWORD valType;
HKEY hKey2Check;
extNameActualLen = extNameLen;
::RegOpenKeyEx(HKEY_CLASSES_ROOT, extName, 0, KEY_ALL_ACCESS, &hKey2Check);
::RegQueryValueEx(hKey2Check, TEXT(""), nullptr, &valType, reinterpret_cast<LPBYTE>(valData), reinterpret_cast<LPDWORD>(&valDataLen));
::RegQueryValueEx(hKey2Check, TEXT(""), nullptr, &valType, reinterpret_cast<LPBYTE>(valData), &valDataLen);
if ((valType == REG_SZ) && (!lstrcmp(valData, nppName)))
::SendDlgItemMessage(_hSelf, IDC_REGEXT_REGISTEREDEXTS_LIST, LB_ADDSTRING, 0, reinterpret_cast<LPARAM>(extName));
@ -339,11 +339,11 @@ void RegExtDlg::addExt(TCHAR *ext)
if (nRet == ERROR_SUCCESS)
{
TCHAR valData[MAX_PATH];
int valDataLen = MAX_PATH * sizeof(TCHAR);
DWORD valDataLen = MAX_PATH * sizeof(TCHAR);
if (dwDisp == REG_OPENED_EXISTING_KEY)
{
int res = ::RegQueryValueEx(hKey, TEXT(""), nullptr, nullptr, reinterpret_cast<LPBYTE>(valData), reinterpret_cast<LPDWORD>(&valDataLen));
int res = ::RegQueryValueEx(hKey, TEXT(""), nullptr, nullptr, reinterpret_cast<LPBYTE>(valData), &valDataLen);
if (res == ERROR_SUCCESS)
::RegSetValueEx(hKey, nppBackup, 0, REG_SZ, reinterpret_cast<LPBYTE>(valData), valDataLen);
}
@ -371,9 +371,9 @@ bool RegExtDlg::deleteExts(const TCHAR *ext2Delete)
else
{
TCHAR valData[extNameLen];
int valDataLen = extNameLen*sizeof(TCHAR);
DWORD valDataLen = extNameLen*sizeof(TCHAR);
DWORD valType;
int res = ::RegQueryValueEx(hKey, nppBackup, nullptr, &valType, (LPBYTE)valData, (LPDWORD)&valDataLen);
int res = ::RegQueryValueEx(hKey, nppBackup, nullptr, &valType, (LPBYTE)valData, &valDataLen);
if (res == ERROR_SUCCESS)
{

1
PowerEditor/src/Notepad_plus.rc
View File

@ -371,6 +371,7 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "Column Mode...", IDM_EDIT_COLUMNMODETIP
MENUITEM "Column Editor...", IDM_EDIT_COLUMNMODE
MENUITEM "Multi-Select Next Occurrence", IDM_EDIT_SELECTNEXTOCCURENCE
MENUITEM "Character Panel", IDM_EDIT_CHAR_PANEL
MENUITEM "Clipboard History", IDM_EDIT_CLIPBOARDHISTORY_PANEL
MENUITEM SEPARATOR

4
PowerEditor/src/NppCommands.cpp
View File

@ -1900,13 +1900,13 @@ void Notepad_plus::command(int id)
}
TCHAR valData[MAX_PATH] = {'\0'};
int valDataLen = MAX_PATH * sizeof(TCHAR);
DWORD valDataLen = MAX_PATH * sizeof(TCHAR);
DWORD valType;
HKEY hKey2Check = nullptr;
generic_string appEntry = TEXT("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\");
appEntry += appName;
::RegOpenKeyEx(HKEY_LOCAL_MACHINE, appEntry.c_str(), 0, KEY_READ, &hKey2Check);
::RegQueryValueEx(hKey2Check, TEXT(""), nullptr, &valType, reinterpret_cast<LPBYTE>(valData), reinterpret_cast<LPDWORD>(&valDataLen));
::RegQueryValueEx(hKey2Check, TEXT(""), nullptr, &valType, reinterpret_cast<LPBYTE>(valData), &valDataLen);
generic_string fullCurrentPath = TEXT("\"");

34
PowerEditor/src/resource.h
View File

@ -391,42 +391,42 @@
#define NPPM_INTERNAL_MACROLIST_MODIFIED (NOTEPADPLUS_USER_INTERNAL + 3)
#define NPPM_INTERNAL_PLUGINCMDLIST_MODIFIED (NOTEPADPLUS_USER_INTERNAL + 4)
#define NPPM_INTERNAL_CLEARSCINTILLAKEY (NOTEPADPLUS_USER_INTERNAL + 5)
#define NPPM_INTERNAL_BINDSCINTILLAKEY (NOTEPADPLUS_USER_INTERNAL + 6)
#define NPPM_INTERNAL_BINDSCINTILLAKEY (NOTEPADPLUS_USER_INTERNAL + 6)
#define NPPM_INTERNAL_SCINTILLAKEYMODIFIED (NOTEPADPLUS_USER_INTERNAL + 7)
#define NPPM_INTERNAL_SCINTILLAFINFERCOLLAPSE (NOTEPADPLUS_USER_INTERNAL + 8)
#define NPPM_INTERNAL_SCINTILLAFINFERUNCOLLAPSE (NOTEPADPLUS_USER_INTERNAL + 9)
#define NPPM_INTERNAL_DISABLEAUTOUPDATE (NOTEPADPLUS_USER_INTERNAL + 10)
#define NPPM_INTERNAL_SETTING_HISTORY_SIZE (NOTEPADPLUS_USER_INTERNAL + 11)
#define NPPM_INTERNAL_ISTABBARREDUCED (NOTEPADPLUS_USER_INTERNAL + 12)
#define NPPM_INTERNAL_ISFOCUSEDTAB (NOTEPADPLUS_USER_INTERNAL + 13)
#define NPPM_INTERNAL_GETMENU (NOTEPADPLUS_USER_INTERNAL + 14)
#define NPPM_INTERNAL_DISABLEAUTOUPDATE (NOTEPADPLUS_USER_INTERNAL + 10)
#define NPPM_INTERNAL_SETTING_HISTORY_SIZE (NOTEPADPLUS_USER_INTERNAL + 11)
#define NPPM_INTERNAL_ISTABBARREDUCED (NOTEPADPLUS_USER_INTERNAL + 12)
#define NPPM_INTERNAL_ISFOCUSEDTAB (NOTEPADPLUS_USER_INTERNAL + 13)
#define NPPM_INTERNAL_GETMENU (NOTEPADPLUS_USER_INTERNAL + 14)
#define NPPM_INTERNAL_CLEARINDICATOR (NOTEPADPLUS_USER_INTERNAL + 15)
#define NPPM_INTERNAL_SCINTILLAFINFERCOPY (NOTEPADPLUS_USER_INTERNAL + 16)
#define NPPM_INTERNAL_SCINTILLAFINFERSELECTALL (NOTEPADPLUS_USER_INTERNAL + 17)
#define NPPM_INTERNAL_SETCARETWIDTH (NOTEPADPLUS_USER_INTERNAL + 18)
#define NPPM_INTERNAL_SETCARETBLINKRATE (NOTEPADPLUS_USER_INTERNAL + 19)
#define NPPM_INTERNAL_CLEARINDICATORTAGMATCH (NOTEPADPLUS_USER_INTERNAL + 20)
#define NPPM_INTERNAL_CLEARINDICATORTAGATTR (NOTEPADPLUS_USER_INTERNAL + 21)
#define NPPM_INTERNAL_CLEARINDICATORTAGATTR (NOTEPADPLUS_USER_INTERNAL + 21)
#define NPPM_INTERNAL_SWITCHVIEWFROMHWND (NOTEPADPLUS_USER_INTERNAL + 22)
#define NPPM_INTERNAL_UPDATETITLEBAR (NOTEPADPLUS_USER_INTERNAL + 23)
#define NPPM_INTERNAL_CANCEL_FIND_IN_FILES (NOTEPADPLUS_USER_INTERNAL + 24)
#define NPPM_INTERNAL_RELOADNATIVELANG (NOTEPADPLUS_USER_INTERNAL + 25)
#define NPPM_INTERNAL_CANCEL_FIND_IN_FILES (NOTEPADPLUS_USER_INTERNAL + 24)
#define NPPM_INTERNAL_RELOADNATIVELANG (NOTEPADPLUS_USER_INTERNAL + 25)
#define NPPM_INTERNAL_PLUGINSHORTCUTMOTIFIED (NOTEPADPLUS_USER_INTERNAL + 26)
#define NPPM_INTERNAL_SCINTILLAFINFERCLEARALL (NOTEPADPLUS_USER_INTERNAL + 27)
#define NPPM_INTERNAL_SETTING_EDGE_SIZE (NOTEPADPLUS_USER_INTERNAL + 28)
#define NPPM_INTERNAL_SETTING_TAB_REPLCESPACE (NOTEPADPLUS_USER_INTERNAL + 29)
#define NPPM_INTERNAL_SETTING_TAB_SIZE (NOTEPADPLUS_USER_INTERNAL + 30)
#define NPPM_INTERNAL_RELOADSTYLERS (NOTEPADPLUS_USER_INTERNAL + 31)
#define NPPM_INTERNAL_DOCORDERCHANGED (NOTEPADPLUS_USER_INTERNAL + 32)
#define NPPM_INTERNAL_SCINTILLAFINFERCLEARALL (NOTEPADPLUS_USER_INTERNAL + 27)
#define NPPM_INTERNAL_SETTING_EDGE_SIZE (NOTEPADPLUS_USER_INTERNAL + 28)
#define NPPM_INTERNAL_SETTING_TAB_REPLCESPACE (NOTEPADPLUS_USER_INTERNAL + 29)
#define NPPM_INTERNAL_SETTING_TAB_SIZE (NOTEPADPLUS_USER_INTERNAL + 30)
#define NPPM_INTERNAL_RELOADSTYLERS (NOTEPADPLUS_USER_INTERNAL + 31)
#define NPPM_INTERNAL_DOCORDERCHANGED (NOTEPADPLUS_USER_INTERNAL + 32)
#define NPPM_INTERNAL_SETMULTISELCTION (NOTEPADPLUS_USER_INTERNAL + 33)
#define NPPM_INTERNAL_SCINTILLAFINFEROPENALL (NOTEPADPLUS_USER_INTERNAL + 34)
#define NPPM_INTERNAL_SCINTILLAFINFEROPENALL (NOTEPADPLUS_USER_INTERNAL + 34)
#define NPPM_INTERNAL_RECENTFILELIST_UPDATE (NOTEPADPLUS_USER_INTERNAL + 35)
#define NPPM_INTERNAL_RECENTFILELIST_SWITCH (NOTEPADPLUS_USER_INTERNAL + 36)
#define NPPM_INTERNAL_GETSCINTEDTVIEW (NOTEPADPLUS_USER_INTERNAL + 37)
#define NPPM_INTERNAL_ENABLESNAPSHOT (NOTEPADPLUS_USER_INTERNAL + 38)
#define NPPM_INTERNAL_SAVECURRENTSESSION (NOTEPADPLUS_USER_INTERNAL + 39)
#define NPPM_INTERNAL_FINDINFINDERDLG (NOTEPADPLUS_USER_INTERNAL + 40)
#define NPPM_INTERNAL_REMOVEFINDER (NOTEPADPLUS_USER_INTERNAL + 41)
#define NPPM_INTERNAL_REMOVEFINDER (NOTEPADPLUS_USER_INTERNAL + 41)
#define NPPM_INTERNAL_RELOADSCROLLTOEND (NOTEPADPLUS_USER_INTERNAL + 42) // Used by Monitoring feature
#define NPPM_INTERNAL_FINDKEYCONFLICTS (NOTEPADPLUS_USER_INTERNAL + 43)
#define NPPM_INTERNAL_SCROLLBEYONDLASTLINE (NOTEPADPLUS_USER_INTERNAL + 44)