diff --git a/PowerEditor/bin/change.log b/PowerEditor/bin/change.log index c39c8b226..b0bec153c 100644 --- a/PowerEditor/bin/change.log +++ b/PowerEditor/bin/change.log @@ -1,4 +1,11 @@ -Notepad++ v5.9.1 new features and fixed bug (from v5.9): +Notepad++ v5.9.2 fixed bug (from v5.9.1): + +1. Fix the Clipboard History crash issue while no data in Clipboard. +2. Fix the local directory installation option ignored issue in Installer. +3. Reduce the recent file history width to 32 characters. + + +Notepad++ v5.9.1 new features (from v5.9): 1. Add Character Insertion Panel. 2. Add Clipboard History feature. diff --git a/PowerEditor/bin/npp.pdb b/PowerEditor/bin/npp.pdb index 9fc8e84b0..de9492df9 100644 Binary files a/PowerEditor/bin/npp.pdb and b/PowerEditor/bin/npp.pdb differ diff --git a/PowerEditor/installer/nativeLang/danish.xml b/PowerEditor/installer/nativeLang/danish.xml index 8f2ca5cf2..f95d22c71 100644 --- a/PowerEditor/installer/nativeLang/danish.xml +++ b/PowerEditor/installer/nativeLang/danish.xml @@ -1,7 +1,7 @@ - +
@@ -32,8 +32,8 @@ - - + + @@ -125,9 +125,11 @@ + + - + @@ -178,6 +180,7 @@ + @@ -368,6 +371,18 @@ + + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/german.xml b/PowerEditor/installer/nativeLang/german.xml index 24a2045ec..5e2156c94 100644 --- a/PowerEditor/installer/nativeLang/german.xml +++ b/PowerEditor/installer/nativeLang/german.xml @@ -1,7 +1,7 @@ @@ -32,6 +32,7 @@ + @@ -63,6 +64,11 @@ + + + + + @@ -72,7 +78,6 @@ - @@ -114,6 +119,9 @@ + + + @@ -122,6 +130,12 @@ + + + + + + @@ -169,6 +183,7 @@ + @@ -204,10 +219,6 @@ - - - - @@ -260,11 +271,13 @@ - + + + @@ -272,11 +285,8 @@ + - - - - @@ -295,6 +305,7 @@ + @@ -313,6 +324,17 @@ + + + + + + + + + + + @@ -476,13 +498,13 @@ + + + - - - diff --git a/PowerEditor/installer/nativeLang/italian.xml b/PowerEditor/installer/nativeLang/italian.xml index 344f33c9e..ddeb3be30 100644 --- a/PowerEditor/installer/nativeLang/italian.xml +++ b/PowerEditor/installer/nativeLang/italian.xml @@ -1,7 +1,7 @@ @@ -33,6 +33,7 @@ + @@ -115,6 +116,9 @@ + + + @@ -123,6 +127,11 @@ + + + + + @@ -172,6 +181,8 @@ + + @@ -192,7 +203,7 @@ - + @@ -259,7 +270,7 @@
- + > @@ -299,6 +310,17 @@ + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/korean.xml b/PowerEditor/installer/nativeLang/korean.xml index 816a03133..828683394 100644 --- a/PowerEditor/installer/nativeLang/korean.xml +++ b/PowerEditor/installer/nativeLang/korean.xml @@ -31,6 +31,11 @@ name= "Kim JunHo" mail= "syonsi@live.com" /> + --> @@ -124,8 +129,8 @@ - - + + @@ -194,7 +199,7 @@ - + @@ -217,23 +222,23 @@ - + - - - - - - - - + + + + + + + + - - + + @@ -266,7 +271,7 @@ - + @@ -274,7 +279,7 @@ - + @@ -288,24 +293,24 @@ - + - + - + - + - - + + @@ -313,7 +318,7 @@ - + @@ -321,7 +326,7 @@ - + @@ -481,21 +486,21 @@ - - - + + + - + - + @@ -524,13 +529,13 @@ - + - + diff --git a/PowerEditor/installer/nativeLang/russian.xml b/PowerEditor/installer/nativeLang/russian.xml index 3f25a56c5..9d6b2f19d 100644 --- a/PowerEditor/installer/nativeLang/russian.xml +++ b/PowerEditor/installer/nativeLang/russian.xml @@ -123,6 +123,8 @@ + + @@ -173,6 +175,7 @@ + @@ -310,9 +313,9 @@ - - - + + + @@ -583,17 +586,28 @@ - - - + + + - + - + + + + + + + + + + + + diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi index 1e213d66c..622925e3f 100644 --- a/PowerEditor/installer/nppSetup.nsi +++ b/PowerEditor/installer/nppSetup.nsi @@ -18,18 +18,18 @@ ; Define the application name !define APPNAME "Notepad++" -!define APPVERSION "5.9.1" -!define APPNAMEANDVERSION "Notepad++ v5.9.1" +!define APPVERSION "5.9.2" +!define APPNAMEANDVERSION "${APPNAME} v${APPVERSION}" !define VERSION_MAJOR 5 -!define VERSION_MINOR 91 +!define VERSION_MINOR 92 !define APPWEBSITE "http://notepad-plus-plus.org/" ; Main Install settings Name "${APPNAMEANDVERSION}" -InstallDir "$PROGRAMFILES\Notepad++" +InstallDir "$PROGRAMFILES\${APPNAME}" InstallDirRegKey HKLM "Software\${APPNAME}" "" -OutFile ".\build\npp.5.9.1.Installer.exe" +OutFile ".\build\npp.${APPVERSION}.Installer.exe" ; GetWindowsVersion ; @@ -164,7 +164,7 @@ page Custom ExtraOptions ; Set languages (first is default language) ;!insertmacro MUI_LANGUAGE "English" - +!define MUI_LANGDLL_ALLLANGUAGES ;Languages !insertmacro MUI_LANGUAGE "English" @@ -288,7 +288,7 @@ Function .onInit StrCmp $R0 "ME" 0 +3 MessageBox MB_OK "This version of Notepad++ does not support your OS.$\nPlease download zipped package of version 5.9 and use ANSI version. You can find v5.9 here:$\nhttp://notepad-plus-plus.org/release/5.9" Abort - + !insertmacro MUI_LANGDLL_DISPLAY # the plugins dir is automatically deleted when the installer exits ;InitPluginsDir @@ -353,16 +353,6 @@ LangString langFileName ${LANG_MACEDONIAN} "macedonian.xml" LangString langFileName ${LANG_LATVIAN} "Latvian.xml" LangString langFileName ${LANG_BOSNIAN} "bosnian.xml" -/* -;-------------------------------- -;Variables - Var IS_LOCAL -;-------------------------------- - -Section /o "Don't use %APPDATA%" makeLocal - StrCpy $IS_LOCAL "1" -SectionEnd -*/ Var UPDATE_PATH @@ -376,25 +366,16 @@ Section -"Notepad++" mainSection File /oname=$TEMP\xmlUpdater.exe ".\bin\xmlUpdater.exe" SetOutPath "$INSTDIR\" -/* - ; if isLocal -> copy file "doLocalConf.xml" - StrCmp $IS_LOCAL "1" 0 IS_NOT_LOCAL - File "..\bin\doLocalConf.xml" - goto GLOBAL_INST -*/ + ${If} $noUserDataChecked == ${BST_CHECKED} - goto IS_NOT_LOCAL + File "..\bin\doLocalConf.xml" ${ELSE} - goto GLOBAL_INST - ${EndIf} -IS_NOT_LOCAL: - IfFileExists $INSTDIR\doLocalConf.xml 0 +2 + IfFileExists $INSTDIR\doLocalConf.xml 0 +2 Delete $INSTDIR\doLocalConf.xml - - StrCpy $UPDATE_PATH "$APPDATA\Notepad++" - CreateDirectory $UPDATE_PATH\plugins\config - -GLOBAL_INST: + StrCpy $UPDATE_PATH "$APPDATA\Notepad++" + CreateDirectory $UPDATE_PATH\plugins\config + ${EndIf} + SetOutPath "$TEMP\" File "langsModel.xml" File "configModel.xml" diff --git a/PowerEditor/installer/packageAll.bat b/PowerEditor/installer/packageAll.bat index e9bf3e482..2f2d69002 100644 --- a/PowerEditor/installer/packageAll.bat +++ b/PowerEditor/installer/packageAll.bat @@ -195,7 +195,7 @@ If ErrorLevel 1 PAUSE If ErrorLevel 1 PAUSE "C:\Program Files\7-Zip\7z.exe" a -r .\build\npp.bin.7z .\zipped.package.release\* If ErrorLevel 1 PAUSE -"C:\Program Files (x86)\NSIS\makensis.exe" nppSetup.nsi +"C:\Program Files (x86)\NSIS\Unicode\makensis.exe" nppSetup.nsi @echo off diff --git a/PowerEditor/src/lastRecentFileList.cpp b/PowerEditor/src/lastRecentFileList.cpp index 8616e8934..fc78b1ea0 100644 --- a/PowerEditor/src/lastRecentFileList.cpp +++ b/PowerEditor/src/lastRecentFileList.cpp @@ -69,7 +69,7 @@ void LastRecentFileList::updateMenu() { //Then readd them, so everything stays in sync TCHAR buffer[MAX_PATH]; for(int j = 0; j < _size; j++) { - BuildMenuFileName(buffer, 100, j, _lrfl.at(j)._name.c_str()); + BuildMenuFileName(buffer, 32, j, _lrfl.at(j)._name.c_str()); ::InsertMenu(_hMenu, _posBase + j, MF_BYPOSITION, _lrfl.at(j)._id, buffer); } } diff --git a/PowerEditor/src/resource.h b/PowerEditor/src/resource.h index 3038bdeed..622f9b15a 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.9.1") +#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v5.9.2") // 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.91\0") -#define VERSION_DIGITALVALUE 5, 9, 1, 0 +#define VERSION_VALUE TEXT("5.92\0") +#define VERSION_DIGITALVALUE 5, 9, 2, 0 #ifdef UNICODE #define UNICODE_ANSI_MODE TEXT("(UNICODE)")