diff --git a/PowerEditor/bin/NppShell.dll b/PowerEditor/bin/NppShell.dll new file mode 100644 index 00000000..e4a7549d Binary files /dev/null and b/PowerEditor/bin/NppShell.dll differ diff --git a/PowerEditor/bin/NppShell64.dll b/PowerEditor/bin/NppShell64.dll new file mode 100644 index 00000000..582ed4ac Binary files /dev/null and b/PowerEditor/bin/NppShell64.dll differ diff --git a/PowerEditor/bin/change.log b/PowerEditor/bin/change.log index 4057753e..cae2cecd 100644 --- a/PowerEditor/bin/change.log +++ b/PowerEditor/bin/change.log @@ -1,3 +1,9 @@ +Notepad++ v5.6.6 new features and fixed bugs (from v5.6.5) : + +1. Fixed Search bug with Chinese/Japanese/Korean characters. + + + Notepad++ v5.6.5 new features and fixed bugs (from v5.6.4) : 1. Fix loading encoding file making file corrupted (after saving). @@ -70,9 +76,8 @@ Included plugins (Unicode): 2. Spell Checker v1.3.3 3. MIME Tools v1.6 4. NppExport v0.2.8 -5. NppNetNote v0.1 -6. Compare Plugin 1.5.5 -7. Plugin Manager 0.9.3.0 +5. Compare Plugin 1.5.5 +6. Plugin Manager 0.9.3.0 Included plugins (ANSI): @@ -83,7 +88,7 @@ Included plugins (ANSI): 4. MIME Tools v1.6 5. NppExport v0.2.8 6. Light Explorer v1.6 -7. NppNetNote v0.1 -8. Compare Plugin 1.5.5 -9. Plugin Manager 0.9.3.0 +7. Compare Plugin 1.5.5 +8. Plugin Manager 0.9.3.0 + diff --git a/PowerEditor/bin/doLocalConf.xml b/PowerEditor/bin/doLocalConf.xml new file mode 100644 index 00000000..e69de29b diff --git a/PowerEditor/bin/npp.pdb b/PowerEditor/bin/npp.pdb index 0d99731b..af527fc4 100644 Binary files a/PowerEditor/bin/npp.pdb and b/PowerEditor/bin/npp.pdb differ diff --git a/PowerEditor/bin/nppIExplorerShell.exe b/PowerEditor/bin/nppIExplorerShell.exe new file mode 100644 index 00000000..d14630ea Binary files /dev/null and b/PowerEditor/bin/nppIExplorerShell.exe differ diff --git a/PowerEditor/installer/build/dummy b/PowerEditor/installer/build/dummy new file mode 100644 index 00000000..e69de29b diff --git a/PowerEditor/installer/nativeLang/danish.xml b/PowerEditor/installer/nativeLang/danish.xml index b5aa3373..a2f123f2 100644 --- a/PowerEditor/installer/nativeLang/danish.xml +++ b/PowerEditor/installer/nativeLang/danish.xml @@ -1,7 +1,7 @@ - +
@@ -28,10 +28,10 @@ - - - - + + + + @@ -160,6 +160,8 @@ + ++ @@ -297,7 +299,7 @@ - + diff --git a/PowerEditor/installer/nativeLang/german.xml b/PowerEditor/installer/nativeLang/german.xml index f56a97dd..ab21d475 100644 --- a/PowerEditor/installer/nativeLang/german.xml +++ b/PowerEditor/installer/nativeLang/german.xml @@ -1,11 +1,11 @@ - +
@@ -31,10 +31,10 @@ - - - - + + + + @@ -158,6 +158,8 @@ + + diff --git a/PowerEditor/installer/nativeLang/slovenian.xml b/PowerEditor/installer/nativeLang/slovenian.xml index 2aadccdd..2450bc95 100644 --- a/PowerEditor/installer/nativeLang/slovenian.xml +++ b/PowerEditor/installer/nativeLang/slovenian.xml @@ -1,490 +1,578 @@ - +
- - - - - - - - - - - + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + +
- - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - + + + + + - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - + + + + + - - - - - - + + + + + + - - + + + - - - - + + + + + + + + + + + + + - - - + + + + - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - + diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi index 6dd0e503..038c6534 100644 --- a/PowerEditor/installer/nppSetup.nsi +++ b/PowerEditor/installer/nppSetup.nsi @@ -18,10 +18,10 @@ ; Define the application name !define APPNAME "Notepad++" -!define APPVERSION "5.6.5" -!define APPNAMEANDVERSION "Notepad++ v5.6.5" +!define APPVERSION "5.6.6" +!define APPNAMEANDVERSION "Notepad++ v5.6.6" !define VERSION_MAJOR 5 -!define VERSION_MINOR 65 +!define VERSION_MINOR 66 !define APPWEBSITE "http://notepad-plus.sourceforge.net/" @@ -29,7 +29,7 @@ Name "${APPNAMEANDVERSION}" InstallDir "$PROGRAMFILES\Notepad++" InstallDirRegKey HKLM "Software\${APPNAME}" "" -OutFile ".\build\npp.5.6.5.Installer.exe" +OutFile ".\build\npp.5.6.6.Installer.exe" ; GetWindowsVersion ; @@ -489,10 +489,6 @@ GLOBAL_INST: Exec 'regsvr32 /u /s "$INSTDIR\NppShell.dll"' Delete "$INSTDIR\NppShell.dll" - - - - ; detect the right of UserInfo::GetAccountType @@ -644,13 +640,13 @@ SubSection "Plugins" Plugins File "..\bin\plugins\doc\NPPTextFXdemo.TXT" SectionEnd - +/* Work, but it's not used by many people Section "NppNetNote" NppNetNote Delete "$INSTDIR\plugins\NppNetNote.dll" SetOutPath "$INSTDIR\plugins" File "..\bin\plugins\NppNetNote.dll" SectionEnd - +*/ Section "Spell-Checker" SpellChecker Delete "$INSTDIR\plugins\SpellChecker.dll" @@ -793,6 +789,7 @@ SubSection "Themes" Themes SubSectionEnd Section /o "As default html viewer" htmlViewer + SetOverwrite on SetOutPath "$INSTDIR\" File "..\bin\nppIExplorerShell.exe" WriteRegStr HKLM "SOFTWARE\Microsoft\Internet Explorer\View Source Editor\Editor Name" "" "$INSTDIR\nppIExplorerShell.exe" @@ -801,6 +798,7 @@ SectionEnd InstType "o" Section "Auto-Updater" AutoUpdater + SetOverwrite on SetOutPath "$INSTDIR\updater" File "..\bin\updater\GUP.exe" File "..\bin\updater\libcurl.dll" @@ -808,7 +806,6 @@ Section "Auto-Updater" AutoUpdater File "..\bin\updater\License.txt" File "..\bin\updater\gpl.txt" File "..\bin\updater\readme.txt" - File "..\bin\updater\getDownLoadUrl.php" SectionEnd ;-------------------------------- diff --git a/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp b/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp index d2f1844f..224748a0 100644 --- a/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp +++ b/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp @@ -1742,7 +1742,9 @@ int ScintillaEditView::searchInTarget(const TCHAR * text2Find, int lenOfText2Fin WcharMbcsConvertor *wmc = WcharMbcsConvertor::getInstance(); unsigned int cp = execute(SCI_GETCODEPAGE); const char *text2FindA = wmc->wchar2char(text2Find, cp); - int targetFound = execute(SCI_SEARCHINTARGET, (WPARAM)lenOfText2Find, (LPARAM)text2FindA); + size_t text2FindALen = strlen(text2FindA); + int len = (lenOfText2Find > (int)text2FindALen)?lenOfText2Find:text2FindALen; + int targetFound = execute(SCI_SEARCHINTARGET, (WPARAM)len, (LPARAM)text2FindA); return targetFound; #else return execute(SCI_SEARCHINTARGET, (WPARAM)lenOfText2Find, (LPARAM)text2Find); diff --git a/PowerEditor/src/resource.h b/PowerEditor/src/resource.h index 2d2c00a3..a03d7966 100644 --- a/PowerEditor/src/resource.h +++ b/PowerEditor/src/resource.h @@ -18,12 +18,12 @@ #ifndef RESOURCE_H #define RESOURCE_H -#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v5.6.5") +#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v5.6.6") // 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("5.65\0") -#define VERSION_DIGITALVALUE 5, 6, 5, 0 +#define VERSION_VALUE TEXT("5.66\0") +#define VERSION_DIGITALVALUE 5, 6, 6, 0 #ifdef UNICODE #define UNICODE_ANSI_MODE TEXT("(UNICODE)")