diff --git a/PowerEditor/bin/change.log b/PowerEditor/bin/change.log index 49622ba97..a1dbfba5e 100644 --- a/PowerEditor/bin/change.log +++ b/PowerEditor/bin/change.log @@ -1,4 +1,15 @@ -Notepad++ v6.7 new feature and bug fixes: +Notepad++ v6.7.1 new feature and bug fixes: + +1. Fix crash issue on GotoLine. +2. Fix a random crash issue while typing random characters. +3. Fix the bug of auto-insert skipping feature that ] and } don't be skipped if "auto-insert ()" is disabled. +4. Add new feature: auto-insert skipping character feature works for "" and '' now. +5. Fix reloaded file on dirty status issue. +6. Add "Mark..." menu command. +7. Fix a regression (broken with compare plugin) due to a new feature of MRU in v6.7 (the feature is removed). + + +Notepad++ v6.7 new features and bug fixes: 1. Add Smart Indent feature for php/javascript/c/c++/java/c#/Objective-C. 2. Enhance Auto-insert feature for {} [] (): typing and skipping }, ] and ). diff --git a/PowerEditor/bin/npp.pdb b/PowerEditor/bin/npp.pdb index 1cfdf37a6..5ef96da55 100644 Binary files a/PowerEditor/bin/npp.pdb and b/PowerEditor/bin/npp.pdb differ diff --git a/PowerEditor/installer/nativeLang/latvian.xml b/PowerEditor/installer/nativeLang/latvian.xml index d2a447f58..7ea3148a5 100644 --- a/PowerEditor/installer/nativeLang/latvian.xml +++ b/PowerEditor/installer/nativeLang/latvian.xml @@ -1,6 +1,6 @@ - + @@ -8,7 +8,7 @@ - + @@ -253,10 +253,11 @@ - + + @@ -286,27 +287,27 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + @@ -380,7 +381,7 @@ - + @@ -393,6 +394,7 @@ + @@ -609,8 +611,9 @@ + - + @@ -634,7 +637,9 @@ - + + @@ -724,12 +729,18 @@ - - - - - - + + + + + + + + + + + + @@ -737,7 +748,8 @@ - + + @@ -765,7 +777,16 @@ - + + + + + + + + + + @@ -785,9 +806,11 @@ - + + + @@ -840,7 +863,7 @@ - + diff --git a/PowerEditor/installer/nativeLang/russian.xml b/PowerEditor/installer/nativeLang/russian.xml index e5af8e73e..80d00d468 100644 --- a/PowerEditor/installer/nativeLang/russian.xml +++ b/PowerEditor/installer/nativeLang/russian.xml @@ -329,7 +329,7 @@ - + @@ -339,7 +339,7 @@ - + diff --git a/PowerEditor/installer/nativeLang/spanish.xml b/PowerEditor/installer/nativeLang/spanish.xml index a4ee9963e..ccb44aaa3 100644 --- a/PowerEditor/installer/nativeLang/spanish.xml +++ b/PowerEditor/installer/nativeLang/spanish.xml @@ -1,6 +1,9 @@ + - +
diff --git a/PowerEditor/installer/nativeLang/turkish.xml b/PowerEditor/installer/nativeLang/turkish.xml index a05df541d..b2e5c9ea7 100644 --- a/PowerEditor/installer/nativeLang/turkish.xml +++ b/PowerEditor/installer/nativeLang/turkish.xml @@ -1,6 +1,6 @@ - +
@@ -15,7 +15,7 @@ - + @@ -123,9 +123,9 @@ - + - + @@ -146,7 +146,7 @@ - + @@ -159,7 +159,7 @@ - + @@ -224,7 +224,7 @@ - + @@ -234,17 +234,17 @@ - + - - + + - - + + @@ -295,7 +295,7 @@ - + @@ -592,7 +592,7 @@ - + @@ -638,13 +638,13 @@ - + - - + + @@ -663,7 +663,7 @@ - + @@ -677,8 +677,8 @@ - - + + @@ -689,15 +689,15 @@ - - - + + + - - - + + + @@ -783,7 +783,7 @@ - + diff --git a/PowerEditor/installer/nativeLang/welsh.xml b/PowerEditor/installer/nativeLang/welsh.xml new file mode 100644 index 000000000..3cb475fc9 --- /dev/null +++ b/PowerEditor/installer/nativeLang/welsh.xml @@ -0,0 +1,916 @@ + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi index 7d710f8ee..86bf5590b 100644 --- a/PowerEditor/installer/nppSetup.nsi +++ b/PowerEditor/installer/nppSetup.nsi @@ -28,10 +28,10 @@ ; Define the application name !define APPNAME "Notepad++" -!define APPVERSION "6.7" +!define APPVERSION "6.7.1" !define APPNAMEANDVERSION "${APPNAME} v${APPVERSION}" !define VERSION_MAJOR 6 -!define VERSION_MINOR 70 +!define VERSION_MINOR 71 !define APPWEBSITE "http://notepad-plus-plus.org/" @@ -1072,6 +1072,9 @@ SectionGroup "Localization" localization Section /o "Vietnamese" vietnamese CopyFiles "$TEMP\nppLocalization\vietnamese.xml" "$INSTDIR\localization\vietnamese.xml" SectionEnd + Section /o "Welsh" welsh + CopyFiles "$TEMP\nppLocalization\welsh.xml" "$INSTDIR\localization\welsh.xml" + SectionEnd SectionGroupEnd SectionGroup "Themes" Themes @@ -1792,7 +1795,9 @@ SectionGroup un.localization Section un.vietnamese Delete "$INSTDIR\localization\vietnamese.xml" SectionEnd - + Section un.welsh + Delete "$INSTDIR\localization\welsh.xml" + SectionEnd SectionGroupEnd diff --git a/PowerEditor/installer/themes/Bespin.xml b/PowerEditor/installer/themes/Bespin.xml index 3a0b83bae..8bdb92fb5 100644 --- a/PowerEditor/installer/themes/Bespin.xml +++ b/PowerEditor/installer/themes/Bespin.xml @@ -269,10 +269,10 @@ Credits: - - - - + + + + diff --git a/PowerEditor/src/Notepad_plus.rc b/PowerEditor/src/Notepad_plus.rc index 0c6d1b9fe..eba667995 100644 --- a/PowerEditor/src/Notepad_plus.rc +++ b/PowerEditor/src/Notepad_plus.rc @@ -353,6 +353,7 @@ BEGIN MENUITEM "&Go to...", IDM_SEARCH_GOTOLINE MENUITEM "Go to Matching Brace", IDM_SEARCH_GOTOMATCHINGBRACE MENUITEM "Select All Between Matching Braces" IDM_SEARCH_SELECTMATCHINGBRACES + MENUITEM "Mar&k..." IDM_SEARCH_MARK MENUITEM SEPARATOR POPUP "Mark All" diff --git a/PowerEditor/src/NppBigSwitch.cpp b/PowerEditor/src/NppBigSwitch.cpp index 4be8006ae..d2041bfa6 100644 --- a/PowerEditor/src/NppBigSwitch.cpp +++ b/PowerEditor/src/NppBigSwitch.cpp @@ -214,6 +214,7 @@ LRESULT Notepad_plus::process(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lPa } case NPPM_LAUNCHFINDINFILESDLG : { +/* const int strSize = FINDREPLACE_MAXLENGTH; TCHAR str[strSize]; @@ -227,6 +228,9 @@ LRESULT Notepad_plus::process(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lPa _findReplaceDlg.launchFindInFilesDlg(); setFindReplaceFolderFilter((const TCHAR*) wParam, (const TCHAR*) lParam); return TRUE; +*/ + return ::SendMessage(_pPublicInterface->getHSelf(), WM_COMMAND, IDM_SEARCH_FINDINFILES, 0); + } case NPPM_DOOPEN: diff --git a/PowerEditor/src/NppCommands.cpp b/PowerEditor/src/NppCommands.cpp index 43b201bcb..6825224d6 100644 --- a/PowerEditor/src/NppCommands.cpp +++ b/PowerEditor/src/NppCommands.cpp @@ -612,13 +612,22 @@ void Notepad_plus::command(int id) case IDM_SEARCH_FIND : case IDM_SEARCH_REPLACE : + case IDM_SEARCH_FINDINFILES: + case IDM_SEARCH_MARK : { const int strSize = FINDREPLACE_MAXLENGTH; TCHAR str[strSize]; bool isFirstTime = !_findReplaceDlg.isCreated(); - - _findReplaceDlg.doDialog((id == IDM_SEARCH_FIND)?FIND_DLG:REPLACE_DLG, _nativeLangSpeaker.isRTL()); + + DIALOG_TYPE dlgID = FIND_DLG; + if (id == IDM_SEARCH_REPLACE) + dlgID = REPLACE_DLG; + else if (id == IDM_SEARCH_FINDINFILES) + dlgID = FINDINFILES_DLG; + else if (id == IDM_SEARCH_MARK) + dlgID = MARK_DLG; + _findReplaceDlg.doDialog(dlgID, _nativeLangSpeaker.isRTL()); _pEditView->getGenericSelectedText(str, strSize); _findReplaceDlg.setSearchText(str); @@ -629,19 +638,21 @@ void Notepad_plus::command(int id) break; } - case IDM_SEARCH_FINDINFILES : + /* + case IDM_SEARCH_FINDINFILES: { ::SendMessage(_pPublicInterface->getHSelf(), NPPM_LAUNCHFINDINFILESDLG, 0, 0); break; } + */ case IDM_SEARCH_FINDINCREMENT : { const int strSize = FINDREPLACE_MAXLENGTH; TCHAR str[strSize]; _pEditView->getGenericSelectedText(str, strSize, false); - if (0!=str[0]) // the selected text is not empty, then use it - _incrementFindDlg.setSearchText(str, _pEditView->getCurrentBuffer()->getUnicodeMode() != uni8Bit); + if (0 != str[0]) // the selected text is not empty, then use it + _incrementFindDlg.setSearchText(str, _pEditView->getCurrentBuffer()->getUnicodeMode() != uni8Bit); _incrementFindDlg.display(); } diff --git a/PowerEditor/src/Parameters.cpp b/PowerEditor/src/Parameters.cpp index 5a07a6a6e..324ac6784 100644 --- a/PowerEditor/src/Parameters.cpp +++ b/PowerEditor/src/Parameters.cpp @@ -153,6 +153,7 @@ WinMenuKeyDefinition winKeyDefs[] = { {VK_NULL, IDM_SEARCH_COPYMARKEDLINES, false, false, false, NULL}, {VK_NULL, IDM_SEARCH_PASTEMARKEDLINES, false, false, false, NULL}, {VK_NULL, IDM_SEARCH_DELETEMARKEDLINES, false, false, false, NULL}, + {VK_NULL, IDM_SEARCH_MARK, false, false, false, NULL}, {VK_NULL, IDM_SEARCH_MARKALLEXT1, false, false, false, NULL}, {VK_NULL, IDM_SEARCH_MARKALLEXT2, false, false, false, NULL}, {VK_NULL, IDM_SEARCH_MARKALLEXT3, false, false, false, NULL}, diff --git a/PowerEditor/src/localizationString.h b/PowerEditor/src/localizationString.h index c757f4567..b75843cd8 100644 Binary files a/PowerEditor/src/localizationString.h and b/PowerEditor/src/localizationString.h differ diff --git a/PowerEditor/src/menuCmdID.h b/PowerEditor/src/menuCmdID.h index a7b2d3ce3..6196e27f3 100644 --- a/PowerEditor/src/menuCmdID.h +++ b/PowerEditor/src/menuCmdID.h @@ -222,6 +222,7 @@ #define IDM_SEARCH_DELETEUNMARKEDLINES (IDM_SEARCH + 51) #define IDM_SEARCH_FINDCHARINRANGE (IDM_SEARCH + 52) #define IDM_SEARCH_SELECTMATCHINGBRACES (IDM_SEARCH + 53) + #define IDM_SEARCH_MARK (IDM_SEARCH + 54) #define IDM_MISC (IDM + 3500) #define IDM_FILESWITCHER_FILESCLOSE (IDM_MISC + 1) diff --git a/PowerEditor/src/resource.h b/PowerEditor/src/resource.h index 688d89222..4998e928e 100644 --- a/PowerEditor/src/resource.h +++ b/PowerEditor/src/resource.h @@ -29,12 +29,12 @@ #ifndef RESOURCE_H #define RESOURCE_H -#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v6.7") +#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v6.7.1") // should be X.Y : ie. if VERSION_DIGITALVALUE == 4, 7, 1, 0 , then X = 4, Y = 71 // ex : #define VERSION_VALUE TEXT("5.63\0") -#define VERSION_VALUE TEXT("6.7\0") -#define VERSION_DIGITALVALUE 6, 7, 0, 0 +#define VERSION_VALUE TEXT("6.71\0") +#define VERSION_DIGITALVALUE 6, 7, 1, 0 #ifndef IDC_STATIC #define IDC_STATIC -1