From 44913da6f2515959526d65e6040b598374a3318a Mon Sep 17 00:00:00 2001 From: Don Ho Date: Thu, 3 Dec 2009 02:11:05 +0000 Subject: [PATCH] [NEW] Add find result commands in the menu. [NEW] Add DOS CodePage : CP437, CP737, CP850, CP852, CP855, CP857, CP858, CP860, CP861, CP863, CP865, CP866 and CP869. git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@580 f5eea248-9336-0410-98b8-ebc06183d4e3 --- PowerEditor/bin/change.log | 10 ++ PowerEditor/src/EncodingMapper.cpp | 40 +++++--- PowerEditor/src/Notepad_plus.cpp | 56 ++++++----- PowerEditor/src/Notepad_plus.rc | 147 ++++++++++++++++++++++------- PowerEditor/src/Parameters.cpp | 52 ++++++---- PowerEditor/src/menuCmdID.h | 60 +++++++----- PowerEditor/src/resource.h | 6 +- 7 files changed, 259 insertions(+), 112 deletions(-) diff --git a/PowerEditor/bin/change.log b/PowerEditor/bin/change.log index d26e6b64..4ad7e880 100644 --- a/PowerEditor/bin/change.log +++ b/PowerEditor/bin/change.log @@ -1,3 +1,13 @@ +Notepad++ v5.6.1 new features and fixed bugs (from v5.6) : + +1. Fix brace highlighting breaking issue and related performance problem. +2. Add new encodings in the shortcuts map. +3. Remove annoying encoding issue warning dialogs. +4. Enhance Html encoding auto-detection. +5. Fix case-insensitive searching bug for non-ascii characters (for example some characters in French and Cyrillic letters). +6. Add find result commands in the menu. +7. Add DOS CodePage : CP437, CP737, CP850, CP852, CP855, CP857, CP858, CP860, CP861, CP863, CP865, CP866 and CP869 + Notepad++ v5.6 new features and fixed bugs (from v5.5.1) : 1. Add languages encoding - Chinese traditional (BIG5), Chinese Simplified (GB2312), Japanese (Shift JIS), Korean (EUC), Thai (TIS-620), Hebrew (iso-8859-8), Hebrew (1255), Central European (1250), Cyrillic (1251), Cyrillic (KOI8-U), Cyrillic (KOI8-R), Cyrillic (Mac), Western European(1252), Greek (1253), Turkish(1254), Arabic (1256), Baltic (1257), Vietnamese (1258), ISO_8859-1 to ISO_8859-16 and a lot of more. diff --git a/PowerEditor/src/EncodingMapper.cpp b/PowerEditor/src/EncodingMapper.cpp index c0617599..14acfb89 100644 --- a/PowerEditor/src/EncodingMapper.cpp +++ b/PowerEditor/src/EncodingMapper.cpp @@ -20,15 +20,15 @@ // Don't change the order EncodingUnit encodings[] = { - {1250, "windows-1250"}, //IDM_FORMAT_WIN1250 - {1251, "windows-1251"}, //IDM_FORMAT_WIN1251 - {1252, "windows-1252"}, //IDM_FORMAT_WIN1252 - {1253, "windows-1253"}, //IDM_FORMAT_WIN1253 - {1254, "windows-1254"}, //IDM_FORMAT_WIN1254 - {1255, "windows-1255"}, //IDM_FORMAT_WIN1255 - {1256, "windows-1256"}, //IDM_FORMAT_WIN1256 - {1257, "windows-1257"}, //IDM_FORMAT_WIN1257 - {1258, "windows-1258"}, //IDM_FORMAT_WIN1258 + {1250, "windows-1250"}, //IDM_FORMAT_WIN_1250 + {1251, "windows-1251"}, //IDM_FORMAT_WIN_1251 + {1252, "windows-1252"}, //IDM_FORMAT_WIN_1252 + {1253, "windows-1253"}, //IDM_FORMAT_WIN_1253 + {1254, "windows-1254"}, //IDM_FORMAT_WIN_1254 + {1255, "windows-1255"}, //IDM_FORMAT_WIN_1255 + {1256, "windows-1256"}, //IDM_FORMAT_WIN_1256 + {1257, "windows-1257"}, //IDM_FORMAT_WIN_1257 + {1258, "windows-1258"}, //IDM_FORMAT_WIN_1258 {28591, "latin1 ISO_8859-1 ISO-8859-1 CP819 IBM819 csISOLatin1 iso-ir-100 l1"}, //IDM_FORMAT_ISO_8859_1 {28592, "latin2 ISO_8859-2 ISO-8859-2 csISOLatin2 iso-ir-101 l2"}, //IDM_FORMAT_ISO_8859_2 {28593, "latin3 ISO_8859-3 ISO-8859-3 csISOLatin3 iso-ir-109 l3"}, //IDM_FORMAT_ISO_8859_3 @@ -44,18 +44,32 @@ EncodingUnit encodings[] = { {28604, "iso-celtic latin8 ISO_8859-14 ISO-8859-14 18 iso-ir-199"}, //IDM_FORMAT_ISO_8859_14 {28605, "Latin-9 ISO_8859-15 ISO-8859-15"}, //IDM_FORMAT_ISO_8859_15 {28606, "latin10 ISO_8859-16 ISO-8859-16 110 iso-ir-226"}, //IDM_FORMAT_ISO_8859_16 + {437, "IBM437 cp437 437 csPC8CodePage437"}, //IDM_FORMAT_DOS_437 + {720, "IBM720 cp720 oem720 720"}, //IDM_FORMAT_DOS_720 + {737, "IBM737 cp737 oem737 737"}, //IDM_FORMAT_DOS_737 + {775, "IBM775 cp775 oem775 775"}, //IDM_FORMAT_DOS_775 + {850, "IBM850 cp850 oem850 850"}, //IDM_FORMAT_DOS_850 + {852, "IBM852 cp852 oem852 852"}, //IDM_FORMAT_DOS_852 + {855, "IBM855 cp855 oem855 855 csIBM855"}, //IDM_FORMAT_DOS_855 + {857, "IBM857 cp857 oem857 857"}, //IDM_FORMAT_DOS_857 + {858, "IBM858 cp858 oem858 858"}, //IDM_FORMAT_DOS_858 + {860, "IBM860 cp860 oem860 860"}, //IDM_FORMAT_DOS_860 + {861, "IBM861 cp861 oem861 861"}, //IDM_FORMAT_DOS_861 + {862, "IBM862 cp862 oem862 862"}, //IDM_FORMAT_DOS_862 + {863, "IBM863 cp863 oem863 863"}, //IDM_FORMAT_DOS_863 + {865, "IBM865 cp865 oem865 865"}, //IDM_FORMAT_DOS_865 + {866, "IBM866 cp866 oem866 866"}, //IDM_FORMAT_DOS_866 + {869, "IBM869 cp869 oem869 869"}, //IDM_FORMAT_DOS_869 {950, "big5 csBig5"}, //IDM_FORMAT_BIG5 {936, "gb2312 gbk csGB2312"}, //IDM_FORMAT_GB2312 {932, "Shift_JIS MS_Kanji csShiftJIS csWindows31J"}, //IDM_FORMAT_SHIFT_JIS {949, "windows-949 korean"}, //IDM_FORMAT_KOREAN_WIN {51949, "euc-kr csEUCKR"}, //IDM_FORMAT_EUC_KR {874, "tis-620"}, //IDM_FORMAT_TIS_620 - {855, "IBM855 cp855 855 csIBM855"}, //IDM_FORMAT_CP855 {10007, "x-mac-cyrillic xmaccyrillic"}, //IDM_FORMAT_MAC_CYRILLIC {21866, "koi8_u"}, //IDM_FORMAT_KOI8U_CYRILLIC - {20866, "koi8_r csKOI8R"}, //IDM_FORMAT_KOI8R_CYRILLIC - {437, "IBM437, cp437 437 csPC8CodePage437"}, //IDM_FORMAT_DOS437 - {367, "ASCII US-ASCII us ISO646-US csASCII cp367 IBM367"} //IDM_FORMAT_US_ASCII + {20866, "koi8_r csKOI8R"} //IDM_FORMAT_KOI8R_CYRILLIC + }; EncodingMapper * EncodingMapper::_pSelf = new EncodingMapper; diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp index 430e0b4b..26dfb0ca 100644 --- a/PowerEditor/src/Notepad_plus.cpp +++ b/PowerEditor/src/Notepad_plus.cpp @@ -3880,17 +3880,17 @@ void Notepad_plus::command(int id) } break; - case NPPM_INTERNAL_SEARCH_GOTONEXTFOUND: + case IDM_SEARCH_GOTONEXTFOUND: { _findReplaceDlg.gotoNextFoundResult(); break; } - case NPPM_INTERNAL_SEARCH_GOTOPREVFOUND: + case IDM_SEARCH_GOTOPREVFOUND: { _findReplaceDlg.gotoNextFoundResult(-1); break; } - case NPPM_INTERNAL_FOCUS_ON_FOUND_RESULTS: + case IDM_FOCUS_ON_FOUND_RESULTS: { if (GetFocus() == _findReplaceDlg.getHFindResults()) // focus already on found results, switch to current edit view @@ -3899,6 +3899,7 @@ void Notepad_plus::command(int id) _findReplaceDlg.focusOnFinder(); break; } + case IDM_SEARCH_VOLATILE_FINDNEXT : case IDM_SEARCH_VOLATILE_FINDPREV : { @@ -4630,15 +4631,15 @@ void Notepad_plus::command(int id) break; } - case IDM_FORMAT_WIN1250 : - case IDM_FORMAT_WIN1251 : - case IDM_FORMAT_WIN1252 : - case IDM_FORMAT_WIN1253 : - case IDM_FORMAT_WIN1254 : - case IDM_FORMAT_WIN1255 : - case IDM_FORMAT_WIN1256 : - case IDM_FORMAT_WIN1257 : - case IDM_FORMAT_WIN1258 : + case IDM_FORMAT_WIN_1250 : + case IDM_FORMAT_WIN_1251 : + case IDM_FORMAT_WIN_1252 : + case IDM_FORMAT_WIN_1253 : + case IDM_FORMAT_WIN_1254 : + case IDM_FORMAT_WIN_1255 : + case IDM_FORMAT_WIN_1256 : + case IDM_FORMAT_WIN_1257 : + case IDM_FORMAT_WIN_1258 : case IDM_FORMAT_ISO_8859_1 : case IDM_FORMAT_ISO_8859_2 : case IDM_FORMAT_ISO_8859_3 : @@ -4654,19 +4655,32 @@ void Notepad_plus::command(int id) case IDM_FORMAT_ISO_8859_14 : case IDM_FORMAT_ISO_8859_15 : case IDM_FORMAT_ISO_8859_16 : + case IDM_FORMAT_DOS_437 : + case IDM_FORMAT_DOS_720 : + case IDM_FORMAT_DOS_737 : + case IDM_FORMAT_DOS_775 : + case IDM_FORMAT_DOS_850 : + case IDM_FORMAT_DOS_852 : + case IDM_FORMAT_DOS_855 : + case IDM_FORMAT_DOS_857 : + case IDM_FORMAT_DOS_858 : + case IDM_FORMAT_DOS_860 : + case IDM_FORMAT_DOS_861 : + case IDM_FORMAT_DOS_862 : + case IDM_FORMAT_DOS_863 : + case IDM_FORMAT_DOS_865 : + case IDM_FORMAT_DOS_866 : + case IDM_FORMAT_DOS_869 : case IDM_FORMAT_BIG5 : case IDM_FORMAT_GB2312 : case IDM_FORMAT_SHIFT_JIS : case IDM_FORMAT_KOREAN_WIN : case IDM_FORMAT_EUC_KR : case IDM_FORMAT_TIS_620 : - case IDM_FORMAT_CP855 : case IDM_FORMAT_MAC_CYRILLIC : - case IDM_FORMAT_KIO8U_CYRILLIC : - case IDM_FORMAT_KIO8R_CYRILLIC : - case IDM_FORMAT_DOS437 : - case IDM_FORMAT_US_ASCII : - { + case IDM_FORMAT_KOI8U_CYRILLIC : + case IDM_FORMAT_KOI8R_CYRILLIC : + { int index = id - IDM_FORMAT_ENCODE; EncodingMapper *em = EncodingMapper::getInstance(); @@ -8117,10 +8131,10 @@ LRESULT Notepad_plus::runProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lPa //--Status Bar Section--// bool willBeShown = nppGUI._statusBarShow; _statusBar.init(_hInst, hwnd, 6); - _statusBar.setPartWidth(STATUSBAR_DOC_SIZE, 200); - _statusBar.setPartWidth(STATUSBAR_CUR_POS, 250); + _statusBar.setPartWidth(STATUSBAR_DOC_SIZE, 250); + _statusBar.setPartWidth(STATUSBAR_CUR_POS, 300); _statusBar.setPartWidth(STATUSBAR_EOF_FORMAT, 80); - _statusBar.setPartWidth(STATUSBAR_UNICODE_TYPE, 150); + _statusBar.setPartWidth(STATUSBAR_UNICODE_TYPE, 80); _statusBar.setPartWidth(STATUSBAR_TYPING_MODE, 30); _statusBar.display(willBeShown); diff --git a/PowerEditor/src/Notepad_plus.rc b/PowerEditor/src/Notepad_plus.rc index 80c628ea..24bb1b9c 100644 --- a/PowerEditor/src/Notepad_plus.rc +++ b/PowerEditor/src/Notepad_plus.rc @@ -271,6 +271,9 @@ BEGIN MENUITEM "Find (Volatile) Previous", IDM_SEARCH_VOLATILE_FINDPREV MENUITEM "&Replace...", IDM_SEARCH_REPLACE MENUITEM "&Incremental Search", IDM_SEARCH_FINDINCREMENT + MENUITEM "Found Results Window", IDM_FOCUS_ON_FOUND_RESULTS + MENUITEM "Next Found Result", IDM_SEARCH_GOTONEXTFOUND + MENUITEM "Previous Found Result", IDM_SEARCH_GOTOPREVFOUND MENUITEM "&Go to...", IDM_SEARCH_GOTOLINE MENUITEM "Go to Matching Brace", IDM_SEARCH_GOTOMATCHINGBRACE MENUITEM SEPARATOR @@ -400,40 +403,115 @@ BEGIN MENUITEM "Encode in UCS-2 Little Endian", IDM_FORMAT_UCS_2LE POPUP "Character sets" BEGIN - MENUITEM "Arabic(ISO)", IDM_FORMAT_ISO_8859_6 - MENUITEM "Arabic(Windows)", IDM_FORMAT_WIN1256 - MENUITEM "Baltic Rim(ISO)", IDM_FORMAT_ISO_8859_13 - MENUITEM "Baltic(Windows)", IDM_FORMAT_WIN1257 - MENUITEM "Celtic(ISO)", IDM_FORMAT_ISO_8859_14 - MENUITEM "Cyrillic(DOS)", IDM_FORMAT_CP855 - MENUITEM "Cyrillic(ISO)", IDM_FORMAT_ISO_8859_5 - MENUITEM "Cyrillic(Macintosh)", IDM_FORMAT_MAC_CYRILLIC - MENUITEM "Cyrillic(KOI8-R)", IDM_FORMAT_KIO8R_CYRILLIC - MENUITEM "Cyrillic(KOI8-U)", IDM_FORMAT_KIO8U_CYRILLIC - MENUITEM "Cyrillic(Windows)", IDM_FORMAT_WIN1251 - MENUITEM "Central European(Windows)", IDM_FORMAT_WIN1250 - MENUITEM "Chinese Traditional(Big5)", IDM_FORMAT_BIG5 - MENUITEM "Chinese Simplified(GB)", IDM_FORMAT_GB2312 - MENUITEM "DOS ASCII", IDM_FORMAT_DOS437 - MENUITEM "Eastern European(ISO)", IDM_FORMAT_ISO_8859_2 - MENUITEM "Greek(ISO)", IDM_FORMAT_ISO_8859_7 - MENUITEM "Greek(Windows)", IDM_FORMAT_WIN1253 - MENUITEM "Hebrew(iso8859-8)", IDM_FORMAT_ISO_8859_8 - MENUITEM "Hebrew(Windows)", IDM_FORMAT_WIN1255 - MENUITEM "Japanese(Shift-JIS)", IDM_FORMAT_SHIFT_JIS - MENUITEM "Korean(EUC)", IDM_FORMAT_EUC_KR - MENUITEM "Latin-6(ISO)", IDM_FORMAT_ISO_8859_10 - MENUITEM "Latin-15(ISO)", IDM_FORMAT_ISO_8859_15 - MENUITEM "North European(ISO)", IDM_FORMAT_ISO_8859_4 - MENUITEM "South-Eastern European(ISO)", IDM_FORMAT_ISO_8859_16 - MENUITEM "South European(ISO)", IDM_FORMAT_ISO_8859_3 - MENUITEM "Thai(ISO)", IDM_FORMAT_ISO_8859_11 - MENUITEM "Thai(Windows)", IDM_FORMAT_TIS_620 - MENUITEM "Turkish(Windows)", IDM_FORMAT_ISO_8859_9 - MENUITEM "Turkish(Windows)", IDM_FORMAT_WIN1254 - MENUITEM "Western European(Windows)", IDM_FORMAT_WIN1252 - MENUITEM "Western European(ISO)", IDM_FORMAT_ISO_8859_1 - MENUITEM "Vietnamese(Windows)", IDM_FORMAT_WIN1258 + POPUP "Arabic" + BEGIN + MENUITEM "ISO 8859-6", IDM_FORMAT_ISO_8859_6 + MENUITEM "OEM 720", IDM_FORMAT_DOS_720 + MENUITEM "Windows-1256", IDM_FORMAT_WIN_1256 + END + + POPUP "Baltic" + BEGIN + MENUITEM "ISO 8859-4", IDM_FORMAT_ISO_8859_4 + MENUITEM "ISO 8859-13", IDM_FORMAT_ISO_8859_13 + MENUITEM "OEM 775", IDM_FORMAT_DOS_775 + MENUITEM "Windows-1257", IDM_FORMAT_WIN_1257 + END + POPUP "Celtic" + BEGIN + MENUITEM "(ISO)", IDM_FORMAT_ISO_8859_14 + END + POPUP "Cyrillic" + BEGIN + MENUITEM "ISO 8859-5", IDM_FORMAT_ISO_8859_5 + MENUITEM "KOI8-R", IDM_FORMAT_KOI8R_CYRILLIC + MENUITEM "KOI8-U", IDM_FORMAT_KOI8U_CYRILLIC + MENUITEM "Macintosh", IDM_FORMAT_MAC_CYRILLIC + MENUITEM "OEM 855", IDM_FORMAT_DOS_855 + MENUITEM "OEM 866", IDM_FORMAT_DOS_866 + MENUITEM "Windows-1251", IDM_FORMAT_WIN_1251 + END + + POPUP "Central European" + BEGIN + MENUITEM "ISO 8859-16", IDM_FORMAT_ISO_8859_16 + MENUITEM "OEM 852", IDM_FORMAT_DOS_852 + MENUITEM "Windows-1250", IDM_FORMAT_WIN_1250 + END + + POPUP "Chinese" + BEGIN + MENUITEM "Big5 (Traditional)", IDM_FORMAT_BIG5 + MENUITEM "GB (Simplified)", IDM_FORMAT_GB2312 + END + + POPUP "Eastern European" + BEGIN + MENUITEM "ISO 8859-2", IDM_FORMAT_ISO_8859_2 + END + + POPUP "Greek" + BEGIN + MENUITEM "ISO 8859-7", IDM_FORMAT_ISO_8859_7 + MENUITEM "OEM 737", IDM_FORMAT_DOS_737 + MENUITEM "OEM 869", IDM_FORMAT_DOS_869 + MENUITEM "Windows-1253", IDM_FORMAT_WIN_1253 + END + + POPUP "Hebrew" + BEGIN + MENUITEM "ISO 8859-8", IDM_FORMAT_ISO_8859_8 + MENUITEM "OEM 862", IDM_FORMAT_DOS_862 + MENUITEM "Windows-1255", IDM_FORMAT_WIN_1255 + END + + POPUP "Japanese" + BEGIN + MENUITEM "Shift-JIS", IDM_FORMAT_SHIFT_JIS + END + + POPUP "Korean" + BEGIN + MENUITEM "EUC-KR", IDM_FORMAT_EUC_KR + END + + POPUP "North European" + BEGIN + MENUITEM "OEM 861 : Icelandic", IDM_FORMAT_DOS_861 + MENUITEM "OEM 865 : Nordic", IDM_FORMAT_DOS_865 + END + + POPUP "Thai" + BEGIN + MENUITEM "ISO 8859-11", IDM_FORMAT_ISO_8859_11 + MENUITEM "TIS-620", IDM_FORMAT_TIS_620 + END + + POPUP "Turkish" + BEGIN + MENUITEM "ISO 8859-3", IDM_FORMAT_ISO_8859_3 + MENUITEM "ISO 8859-9", IDM_FORMAT_ISO_8859_9 + MENUITEM "OEM 857", IDM_FORMAT_DOS_857 + MENUITEM "Windows-1254", IDM_FORMAT_WIN_1254 + END + + POPUP "Western European" + BEGIN + MENUITEM "ISO 8859-1", IDM_FORMAT_ISO_8859_1 + MENUITEM "ISO 8859-10", IDM_FORMAT_ISO_8859_10 + MENUITEM "ISO 8859-15", IDM_FORMAT_ISO_8859_15 + MENUITEM "OEM 850", IDM_FORMAT_DOS_850 + MENUITEM "OEM 858", IDM_FORMAT_DOS_858 + MENUITEM "OEM 860 : Portuguese", IDM_FORMAT_DOS_860 + MENUITEM "OEM 863 : French", IDM_FORMAT_DOS_863 + MENUITEM "OEM-US", IDM_FORMAT_DOS_437 + MENUITEM "Windows-1252", IDM_FORMAT_WIN_1252 + END + + POPUP "Vietnamese" + BEGIN + MENUITEM "Windows-1258", IDM_FORMAT_WIN_1258 + END END MENUITEM SEPARATOR MENUITEM "Convert to ANSI", IDM_FORMAT_CONV2_ANSI @@ -445,7 +523,6 @@ BEGIN POPUP "&Language" BEGIN - MENUITEM "Ada", IDM_LANG_ADA MENUITEM "ASP", IDM_LANG_ASP MENUITEM "Assembly", IDM_LANG_ASM diff --git a/PowerEditor/src/Parameters.cpp b/PowerEditor/src/Parameters.cpp index 00511de6..20b19d1b 100644 --- a/PowerEditor/src/Parameters.cpp +++ b/PowerEditor/src/Parameters.cpp @@ -105,8 +105,9 @@ WinMenuKeyDefinition winKeyDefs[] = { {VK_F3, IDM_SEARCH_FINDPREV, false, false, true, NULL}, {VK_F3, IDM_SEARCH_VOLATILE_FINDNEXT, true, false, false, NULL}, {VK_F3, IDM_SEARCH_VOLATILE_FINDPREV, true, false, true, NULL}, - {VK_F4, NPPM_INTERNAL_SEARCH_GOTONEXTFOUND, false, false, false, TEXT("Goto next found result")}, - {VK_F4, NPPM_INTERNAL_SEARCH_GOTOPREVFOUND, false, false, true, TEXT("Goto previous found result")}, + {VK_F4, IDM_SEARCH_GOTONEXTFOUND, false, false, false, NULL}, + {VK_F4, IDM_SEARCH_GOTOPREVFOUND, false, false, true, NULL}, + {VK_F7, IDM_FOCUS_ON_FOUND_RESULTS, false, false, false, NULL}, {VK_H, IDM_SEARCH_REPLACE, true, false, false, NULL}, {VK_I, IDM_SEARCH_FINDINCREMENT, true, true, false, NULL}, {VK_G, IDM_SEARCH_GOTOLINE, true, false, false, NULL}, @@ -137,8 +138,6 @@ WinMenuKeyDefinition winKeyDefs[] = { {VK_5, IDM_SEARCH_GOPREVMARKER5, true, false, true, NULL}, {VK_0, IDM_SEARCH_GOPREVMARKER_DEF, true, false, true, NULL}, - {VK_F7, NPPM_INTERNAL_FOCUS_ON_FOUND_RESULTS,false, false, false, TEXT("Switch to found results window")}, - {VK_F11, IDM_VIEW_FULLSCREENTOGGLE, false, false, false, NULL}, {VK_NULL, IDM_VIEW_ALWAYSONTOP, false, false, false, NULL}, {VK_F12, IDM_VIEW_POSTIT, false, false, false, NULL}, @@ -193,25 +192,39 @@ WinMenuKeyDefinition winKeyDefs[] = { {VK_NULL, IDM_FORMAT_CONV2_UCS_2BE, false, false, false, NULL}, {VK_NULL, IDM_FORMAT_CONV2_UCS_2LE, false, false, false, NULL}, {VK_NULL, IDM_FORMAT_ISO_8859_6, false, false, false, NULL}, - {VK_NULL, IDM_FORMAT_WIN1256, false, false, false, NULL}, + {VK_NULL, IDM_FORMAT_WIN_1256, false, false, false, NULL}, {VK_NULL, IDM_FORMAT_ISO_8859_13, false, false, false, NULL}, - {VK_NULL, IDM_FORMAT_WIN1257, false, false, false, NULL}, + {VK_NULL, IDM_FORMAT_WIN_1257, false, false, false, NULL}, {VK_NULL, IDM_FORMAT_ISO_8859_14, false, false, false, NULL}, - {VK_NULL, IDM_FORMAT_CP855, false, false, false, NULL}, {VK_NULL, IDM_FORMAT_ISO_8859_5, false, false, false, NULL}, {VK_NULL, IDM_FORMAT_MAC_CYRILLIC, false, false, false, NULL}, - {VK_NULL, IDM_FORMAT_KIO8R_CYRILLIC, false, false, false, NULL}, - {VK_NULL, IDM_FORMAT_KIO8U_CYRILLIC, false, false, false, NULL}, - {VK_NULL, IDM_FORMAT_WIN1251, false, false, false, NULL}, - {VK_NULL, IDM_FORMAT_WIN1250, false, false, false, NULL}, + {VK_NULL, IDM_FORMAT_KOI8R_CYRILLIC, false, false, false, NULL}, + {VK_NULL, IDM_FORMAT_KOI8U_CYRILLIC, false, false, false, NULL}, + {VK_NULL, IDM_FORMAT_WIN_1251, false, false, false, NULL}, + {VK_NULL, IDM_FORMAT_WIN_1250, false, false, false, NULL}, + {VK_NULL, IDM_FORMAT_DOS_437, false, false, false, NULL}, + {VK_NULL, IDM_FORMAT_DOS_720, false, false, false, NULL}, + {VK_NULL, IDM_FORMAT_DOS_737, false, false, false, NULL}, + {VK_NULL, IDM_FORMAT_DOS_775, false, false, false, NULL}, + {VK_NULL, IDM_FORMAT_DOS_850, false, false, false, NULL}, + {VK_NULL, IDM_FORMAT_DOS_852, false, false, false, NULL}, + {VK_NULL, IDM_FORMAT_DOS_855, false, false, false, NULL}, + {VK_NULL, IDM_FORMAT_DOS_857, false, false, false, NULL}, + {VK_NULL, IDM_FORMAT_DOS_858, false, false, false, NULL}, + {VK_NULL, IDM_FORMAT_DOS_860, false, false, false, NULL}, + {VK_NULL, IDM_FORMAT_DOS_861, false, false, false, NULL}, + {VK_NULL, IDM_FORMAT_DOS_862, false, false, false, NULL}, + {VK_NULL, IDM_FORMAT_DOS_863, false, false, false, NULL}, + {VK_NULL, IDM_FORMAT_DOS_865, false, false, false, NULL}, + {VK_NULL, IDM_FORMAT_DOS_866, false, false, false, NULL}, + {VK_NULL, IDM_FORMAT_DOS_869, false, false, false, NULL}, {VK_NULL, IDM_FORMAT_BIG5, false, false, false, NULL}, {VK_NULL, IDM_FORMAT_GB2312, false, false, false, NULL}, - {VK_NULL, IDM_FORMAT_DOS437, false, false, false, NULL}, {VK_NULL, IDM_FORMAT_ISO_8859_2, false, false, false, NULL}, {VK_NULL, IDM_FORMAT_ISO_8859_7, false, false, false, NULL}, - {VK_NULL, IDM_FORMAT_WIN1253, false, false, false, NULL}, + {VK_NULL, IDM_FORMAT_WIN_1253, false, false, false, NULL}, {VK_NULL, IDM_FORMAT_ISO_8859_8, false, false, false, NULL}, - {VK_NULL, IDM_FORMAT_WIN1255, false, false, false, NULL}, + {VK_NULL, IDM_FORMAT_WIN_1255, false, false, false, NULL}, {VK_NULL, IDM_FORMAT_SHIFT_JIS, false, false, false, NULL}, {VK_NULL, IDM_FORMAT_EUC_KR, false, false, false, NULL}, {VK_NULL, IDM_FORMAT_ISO_8859_10, false, false, false, NULL}, @@ -222,10 +235,10 @@ WinMenuKeyDefinition winKeyDefs[] = { {VK_NULL, IDM_FORMAT_ISO_8859_11, false, false, false, NULL}, {VK_NULL, IDM_FORMAT_TIS_620, false, false, false, NULL}, {VK_NULL, IDM_FORMAT_ISO_8859_9, false, false, false, NULL}, - {VK_NULL, IDM_FORMAT_WIN1254, false, false, false, NULL}, - {VK_NULL, IDM_FORMAT_WIN1252, false, false, false, NULL}, + {VK_NULL, IDM_FORMAT_WIN_1254, false, false, false, NULL}, + {VK_NULL, IDM_FORMAT_WIN_1252, false, false, false, NULL}, {VK_NULL, IDM_FORMAT_ISO_8859_1, false, false, false, NULL}, - {VK_NULL, IDM_FORMAT_WIN1258, false, false, false, NULL}, + {VK_NULL, IDM_FORMAT_WIN_1258, false, false, false, NULL}, {VK_NULL, IDM_SETTING_PREFERECE, false, false, false, NULL}, {VK_NULL, IDM_LANGSTYLE_CONFIG_DLG, false, false, false, NULL}, @@ -360,7 +373,10 @@ ScintillaKeyDefinition scintKeyDefs[] = { //array of accelerator keys for all po {TEXT("SCI_LINECOPY"), SCI_LINECOPY, true, false, true, VK_T, 0}, {TEXT("SCI_LINETRANSPOSE"), SCI_LINETRANSPOSE, true, false, false, VK_T, 0}, {TEXT("SCI_LINEDUPLICATE"), SCI_LINEDUPLICATE, false, false, false, 0, 0}, - {TEXT("SCI_CANCEL"), SCI_CANCEL, false, false, false, VK_ESCAPE, 0} + {TEXT("SCI_CANCEL"), SCI_CANCEL, false, false, false, VK_ESCAPE, 0}, + {TEXT("SCI_SWAPMAINANCHORCARET"), SCI_SWAPMAINANCHORCARET, false, false, false, 0, 0}, + {TEXT("SCI_ROTATESELECTION"), SCI_ROTATESELECTION, false, false, false, 0, 0} + //{TEXT("SCI_EMPTYUNDOBUFFER"), SCI_EMPTYUNDOBUFFER, false, false, false, 0, 0}, //{TEXT("SCI_TOGGLECARETSTICKY"), SCI_TOGGLECARETSTICKY, false, false, false, 0, 0}, //{TEXT("SCI_CALLTIPCANCEL"), SCI_CALLTIPCANCEL, false, false, false, 0, 0}, diff --git a/PowerEditor/src/menuCmdID.h b/PowerEditor/src/menuCmdID.h index ed092a2b..4d885b7e 100644 --- a/PowerEditor/src/menuCmdID.h +++ b/PowerEditor/src/menuCmdID.h @@ -147,6 +147,9 @@ #define IDM_SEARCH_GONEXTMARKER5 (IDM_SEARCH + 43) #define IDM_SEARCH_GONEXTMARKER_DEF (IDM_SEARCH + 44) + #define IDM_FOCUS_ON_FOUND_RESULTS (IDM_SEARCH + 45) + #define IDM_SEARCH_GOTONEXTFOUND (IDM_SEARCH + 46) + #define IDM_SEARCH_GOTOPREVFOUND (IDM_SEARCH + 47) #define IDM_VIEW (IDM + 4000) @@ -239,15 +242,15 @@ #define IDM_FORMAT_CONV2_UCS_2LE (IDM_FORMAT + 13) #define IDM_FORMAT_ENCODE (IDM_FORMAT + 20) - #define IDM_FORMAT_WIN1250 (IDM_FORMAT_ENCODE + 0) - #define IDM_FORMAT_WIN1251 (IDM_FORMAT_ENCODE + 1) - #define IDM_FORMAT_WIN1252 (IDM_FORMAT_ENCODE + 2) - #define IDM_FORMAT_WIN1253 (IDM_FORMAT_ENCODE + 3) - #define IDM_FORMAT_WIN1254 (IDM_FORMAT_ENCODE + 4) - #define IDM_FORMAT_WIN1255 (IDM_FORMAT_ENCODE + 5) - #define IDM_FORMAT_WIN1256 (IDM_FORMAT_ENCODE + 6) - #define IDM_FORMAT_WIN1257 (IDM_FORMAT_ENCODE + 7) - #define IDM_FORMAT_WIN1258 (IDM_FORMAT_ENCODE + 8) + #define IDM_FORMAT_WIN_1250 (IDM_FORMAT_ENCODE + 0) + #define IDM_FORMAT_WIN_1251 (IDM_FORMAT_ENCODE + 1) + #define IDM_FORMAT_WIN_1252 (IDM_FORMAT_ENCODE + 2) + #define IDM_FORMAT_WIN_1253 (IDM_FORMAT_ENCODE + 3) + #define IDM_FORMAT_WIN_1254 (IDM_FORMAT_ENCODE + 4) + #define IDM_FORMAT_WIN_1255 (IDM_FORMAT_ENCODE + 5) + #define IDM_FORMAT_WIN_1256 (IDM_FORMAT_ENCODE + 6) + #define IDM_FORMAT_WIN_1257 (IDM_FORMAT_ENCODE + 7) + #define IDM_FORMAT_WIN_1258 (IDM_FORMAT_ENCODE + 8) #define IDM_FORMAT_ISO_8859_1 (IDM_FORMAT_ENCODE + 9) #define IDM_FORMAT_ISO_8859_2 (IDM_FORMAT_ENCODE + 10) #define IDM_FORMAT_ISO_8859_3 (IDM_FORMAT_ENCODE + 11) @@ -263,19 +266,32 @@ #define IDM_FORMAT_ISO_8859_14 (IDM_FORMAT_ENCODE + 21) #define IDM_FORMAT_ISO_8859_15 (IDM_FORMAT_ENCODE + 22) #define IDM_FORMAT_ISO_8859_16 (IDM_FORMAT_ENCODE + 23) - #define IDM_FORMAT_BIG5 (IDM_FORMAT_ENCODE + 24) - #define IDM_FORMAT_GB2312 (IDM_FORMAT_ENCODE + 25) - #define IDM_FORMAT_SHIFT_JIS (IDM_FORMAT_ENCODE + 26) - #define IDM_FORMAT_KOREAN_WIN (IDM_FORMAT_ENCODE + 27) - #define IDM_FORMAT_EUC_KR (IDM_FORMAT_ENCODE + 28) - #define IDM_FORMAT_TIS_620 (IDM_FORMAT_ENCODE + 29) - #define IDM_FORMAT_CP855 (IDM_FORMAT_ENCODE + 30) - #define IDM_FORMAT_MAC_CYRILLIC (IDM_FORMAT_ENCODE + 31) - #define IDM_FORMAT_KIO8U_CYRILLIC (IDM_FORMAT_ENCODE + 32) - #define IDM_FORMAT_KIO8R_CYRILLIC (IDM_FORMAT_ENCODE + 33) - #define IDM_FORMAT_DOS437 (IDM_FORMAT_ENCODE + 34) - #define IDM_FORMAT_US_ASCII (IDM_FORMAT_ENCODE + 35) - #define IDM_FORMAT_ENCODE_END IDM_FORMAT_US_ASCII + #define IDM_FORMAT_DOS_437 (IDM_FORMAT_ENCODE + 24) + #define IDM_FORMAT_DOS_720 (IDM_FORMAT_ENCODE + 25) + #define IDM_FORMAT_DOS_737 (IDM_FORMAT_ENCODE + 26) + #define IDM_FORMAT_DOS_775 (IDM_FORMAT_ENCODE + 27) + #define IDM_FORMAT_DOS_850 (IDM_FORMAT_ENCODE + 28) + #define IDM_FORMAT_DOS_852 (IDM_FORMAT_ENCODE + 29) + #define IDM_FORMAT_DOS_855 (IDM_FORMAT_ENCODE + 30) + #define IDM_FORMAT_DOS_857 (IDM_FORMAT_ENCODE + 31) + #define IDM_FORMAT_DOS_858 (IDM_FORMAT_ENCODE + 32) + #define IDM_FORMAT_DOS_860 (IDM_FORMAT_ENCODE + 33) + #define IDM_FORMAT_DOS_861 (IDM_FORMAT_ENCODE + 34) + #define IDM_FORMAT_DOS_862 (IDM_FORMAT_ENCODE + 35) + #define IDM_FORMAT_DOS_863 (IDM_FORMAT_ENCODE + 36) + #define IDM_FORMAT_DOS_865 (IDM_FORMAT_ENCODE + 37) + #define IDM_FORMAT_DOS_866 (IDM_FORMAT_ENCODE + 38) + #define IDM_FORMAT_DOS_869 (IDM_FORMAT_ENCODE + 39) + #define IDM_FORMAT_BIG5 (IDM_FORMAT_ENCODE + 40) + #define IDM_FORMAT_GB2312 (IDM_FORMAT_ENCODE + 41) + #define IDM_FORMAT_SHIFT_JIS (IDM_FORMAT_ENCODE + 42) + #define IDM_FORMAT_KOREAN_WIN (IDM_FORMAT_ENCODE + 43) + #define IDM_FORMAT_EUC_KR (IDM_FORMAT_ENCODE + 44) + #define IDM_FORMAT_TIS_620 (IDM_FORMAT_ENCODE + 45) + #define IDM_FORMAT_MAC_CYRILLIC (IDM_FORMAT_ENCODE + 46) + #define IDM_FORMAT_KOI8U_CYRILLIC (IDM_FORMAT_ENCODE + 47) + #define IDM_FORMAT_KOI8R_CYRILLIC (IDM_FORMAT_ENCODE + 48) + #define IDM_FORMAT_ENCODE_END IDM_FORMAT_KOI8R_CYRILLIC #define IDM_LANG (IDM + 6000) #define IDM_LANGSTYLE_CONFIG_DLG (IDM_LANG + 1) diff --git a/PowerEditor/src/resource.h b/PowerEditor/src/resource.h index 33b79c9f..6b8c5898 100644 --- a/PowerEditor/src/resource.h +++ b/PowerEditor/src/resource.h @@ -313,9 +313,9 @@ #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_SEARCH_GOTONEXTFOUND (NOTEPADPLUS_USER_INTERNAL + 28) - #define NPPM_INTERNAL_SEARCH_GOTOPREVFOUND (NOTEPADPLUS_USER_INTERNAL + 29) - #define NPPM_INTERNAL_FOCUS_ON_FOUND_RESULTS (NOTEPADPLUS_USER_INTERNAL + 30) + //#define NPPM_INTERNAL_SEARCH_GOTONEXTFOUND (NOTEPADPLUS_USER_INTERNAL + 28) + //#define NPPM_INTERNAL_SEARCH_GOTOPREVFOUND (NOTEPADPLUS_USER_INTERNAL + 29) + //#define NPPM_INTERNAL_FOCUS_ON_FOUND_RESULTS (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)