diff --git a/PowerEditor/bin/NppShell.dll b/PowerEditor/bin/NppShell.dll index 7658189f6..2529a9182 100644 Binary files a/PowerEditor/bin/NppShell.dll and b/PowerEditor/bin/NppShell.dll differ diff --git a/PowerEditor/bin/NppShell64.dll b/PowerEditor/bin/NppShell64.dll index 1461fdbca..6cf394c53 100644 Binary files a/PowerEditor/bin/NppShell64.dll and b/PowerEditor/bin/NppShell64.dll differ diff --git a/PowerEditor/bin/change.log b/PowerEditor/bin/change.log index 7cb1420a6..38da288c7 100644 --- a/PowerEditor/bin/change.log +++ b/PowerEditor/bin/change.log @@ -1,3 +1,16 @@ +Notepad++ v5.8.4 new features and fixed bugs (from v5.8.3) : + +1. Fix memory leak problem while switching tab. +2. Fix User Defined Language dialog docking problem under Windows 7. +3. Fix backwards search with Asian codepage problem. +4. Add a new capacity in context menu: the menu item and folder item can be renamed (and in whichever language). +5. All the supported encoding charsets can be set as default in "New Document Settings". +6. Remove Calltip restriction from plugins side. +7. Add "-alwaysOnTop" command line argument. +8. Fix icon display glitch in shell extension context menu. + + + Notepad++ v5.8.3 new features and fixed bugs (from v5.8.2) : 1. A new application icon. diff --git a/PowerEditor/bin/npp.pdb b/PowerEditor/bin/npp.pdb index f8858b013..d84424fbb 100644 Binary files a/PowerEditor/bin/npp.pdb and b/PowerEditor/bin/npp.pdb differ diff --git a/PowerEditor/installer/nativeLang/chineseSimplified.xml b/PowerEditor/installer/nativeLang/chineseSimplified.xml index 2b1106084..4c3d12c41 100644 --- a/PowerEditor/installer/nativeLang/chineseSimplified.xml +++ b/PowerEditor/installer/nativeLang/chineseSimplified.xml @@ -1,549 +1,588 @@ - + - +
- - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + +
- - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + - - - - - + + + + + - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + - - - - - + + + + + + - - - - - - - - - - + + + - - - - - - + + + + + + + + + + + + + + - - - + + + + + + + + + - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - + + + - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + - - - - - - - + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + - + \ No newline at end of file diff --git a/PowerEditor/installer/nativeLang/danish.xml b/PowerEditor/installer/nativeLang/danish.xml index d7efb4ec0..1690357a7 100644 --- a/PowerEditor/installer/nativeLang/danish.xml +++ b/PowerEditor/installer/nativeLang/danish.xml @@ -1,7 +1,7 @@ - +
@@ -59,7 +59,6 @@ - @@ -229,6 +228,8 @@ + + diff --git a/PowerEditor/installer/nativeLang/swedish.xml b/PowerEditor/installer/nativeLang/swedish.xml index 8d89c4805..a627f9857 100644 --- a/PowerEditor/installer/nativeLang/swedish.xml +++ b/PowerEditor/installer/nativeLang/swedish.xml @@ -51,6 +51,7 @@ Comments: Added new strings and deleted old strings. Sorted strings in accordanc + @@ -68,7 +69,7 @@ Comments: Added new strings and deleted old strings. Sorted strings in accordanc - + @@ -89,6 +90,7 @@ Comments: Added new strings and deleted old strings. Sorted strings in accordanc + @@ -108,6 +110,7 @@ Comments: Added new strings and deleted old strings. Sorted strings in accordanc + @@ -141,6 +144,7 @@ Comments: Added new strings and deleted old strings. Sorted strings in accordanc + @@ -150,37 +154,17 @@ Comments: Added new strings and deleted old strings. Sorted strings in accordanc - + - - + + - - - - - - - - - - - - - - - - - - - - @@ -210,6 +194,27 @@ Comments: Added new strings and deleted old strings. Sorted strings in accordanc + + + + + + + + + + + + + + + + + + + + + @@ -223,16 +228,18 @@ Comments: Added new strings and deleted old strings. Sorted strings in accordanc + - + + + - @@ -242,9 +249,11 @@ Comments: Added new strings and deleted old strings. Sorted strings in accordanc + + @@ -253,7 +262,9 @@ Comments: Added new strings and deleted old strings. Sorted strings in accordanc
- + + + @@ -273,6 +284,7 @@ Comments: Added new strings and deleted old strings. Sorted strings in accordanc + @@ -323,12 +335,14 @@ Comments: Added new strings and deleted old strings. Sorted strings in accordanc + + @@ -357,7 +371,9 @@ Comments: Added new strings and deleted old strings. Sorted strings in accordanc + + @@ -421,6 +437,7 @@ Comments: Added new strings and deleted old strings. Sorted strings in accordanc + @@ -430,7 +447,7 @@ Comments: Added new strings and deleted old strings. Sorted strings in accordanc - + @@ -450,10 +467,12 @@ Comments: Added new strings and deleted old strings. Sorted strings in accordanc + + @@ -548,6 +567,7 @@ Comments: Added new strings and deleted old strings. Sorted strings in accordanc + @@ -597,4 +617,4 @@ Comments: Added new strings and deleted old strings. Sorted strings in accordanc - \ No newline at end of file + diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi index f4d536357..334fe6d43 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.8.3" -!define APPNAMEANDVERSION "Notepad++ v5.8.3" +!define APPVERSION "5.8.4" +!define APPNAMEANDVERSION "Notepad++ v5.8.4" !define VERSION_MAJOR 5 -!define VERSION_MINOR 83 +!define VERSION_MINOR 84 -!define APPWEBSITE "http://notepad-plus.sourceforge.net/" +!define APPWEBSITE "http://notepad-plus-plus.org/" ; Main Install settings Name "${APPNAMEANDVERSION}" InstallDir "$PROGRAMFILES\Notepad++" InstallDirRegKey HKLM "Software\${APPNAME}" "" -OutFile ".\build\npp.5.8.3.Installer.exe" +OutFile ".\build\npp.5.8.4.Installer.exe" ; GetWindowsVersion ; @@ -46,9 +46,8 @@ OutFile ".\build\npp.5.8.3.Installer.exe" ; Call GetWindowsVersion ; Pop $R0 ; ; at this point $R0 is "NT 4.0" or whatnot - + Function GetWindowsVersion - Push $R0 Push $R1 @@ -189,12 +188,12 @@ FunctionEnd !insertmacro MUI_LANGUAGE "Catalan" !insertmacro MUI_LANGUAGE "Arabic" !insertmacro MUI_LANGUAGE "Lithuanian" - !insertmacro MUI_LANGUAGE "Finnish" - !insertmacro MUI_LANGUAGE "Greek" - !insertmacro MUI_LANGUAGE "Romanian" - !insertmacro MUI_LANGUAGE "Korean" - !insertmacro MUI_LANGUAGE "Hebrew" - !insertmacro MUI_LANGUAGE "Portuguese" + !insertmacro MUI_LANGUAGE "Finnish" + !insertmacro MUI_LANGUAGE "Greek" + !insertmacro MUI_LANGUAGE "Romanian" + !insertmacro MUI_LANGUAGE "Korean" + !insertmacro MUI_LANGUAGE "Hebrew" + !insertmacro MUI_LANGUAGE "Portuguese" !insertmacro MUI_LANGUAGE "Farsi" !insertmacro MUI_LANGUAGE "Bulgarian" !insertmacro MUI_LANGUAGE "Indonesian" @@ -215,7 +214,7 @@ FunctionEnd !insertmacro MUI_LANGUAGE "Latvian" ;!insertmacro MUI_LANGUAGE "Estonian" - ; !insertmacro MUI_LANGUAGE "Mongolian" + ;!insertmacro MUI_LANGUAGE "Mongolian" ;!insertmacro MUI_LANGUAGE "Breton" ;!insertmacro MUI_LANGUAGE "Icelandic" ;!insertmacro MUI_LANGUAGE "Bosnian" @@ -485,6 +484,9 @@ GLOBAL_INST: Exec 'regsvr32 /u /s "$INSTDIR\NppShell_01.dll"' Delete "$INSTDIR\NppShell_01.dll" + IfFileExists "$INSTDIR\NppShell_02.dll" 0 +3 + Exec 'regsvr32 /u /s "$INSTDIR\NppShell_02.dll"' + Delete "$INSTDIR\NppShell_02.dll" ; detect the right of UserInfo::GetAccountType @@ -497,6 +499,7 @@ GLOBAL_INST: CreateShortCut "$SMPROGRAMS\Notepad++\Notepad++.lnk" "$INSTDIR\notepad++.exe" ;CreateShortCut "$SMPROGRAMS\Notepad++\readme.lnk" "$INSTDIR\readme.txt" SetShellVarContext current + WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\notepad++.exe" "" "$INSTDIR\notepad++.exe" SectionEnd @@ -504,12 +507,12 @@ Section "Context Menu Entry" explorerContextMenu SetOverwrite try SetOutPath "$INSTDIR\" ${If} ${RunningX64} - File /oname=$INSTDIR\NppShell_02.dll "..\bin\NppShell64_02.dll" + File /oname=$INSTDIR\NppShell_03.dll "..\bin\NppShell64_03.dll" ${Else} - File "..\bin\NppShell_02.dll" + File "..\bin\NppShell_03.dll" ${EndIf} - Exec 'regsvr32 /s "$INSTDIR\NppShell_02.dll"' + Exec 'regsvr32 /s "$INSTDIR\NppShell_03.dll"' SectionEnd SubSection "Auto-completion Files" autoCompletionComponent @@ -1161,8 +1164,10 @@ SectionEnd Section un.explorerContextMenu Exec 'regsvr32 /u /s "$INSTDIR\NppShell_01.dll"' Exec 'regsvr32 /u /s "$INSTDIR\NppShell_02.dll"' + Exec 'regsvr32 /u /s "$INSTDIR\NppShell_03.dll"' Delete "$INSTDIR\NppShell_01.dll" Delete "$INSTDIR\NppShell_02.dll" + Delete "$INSTDIR\NppShell_03.dll" SectionEnd Section Uninstall diff --git a/PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp b/PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp index fddf12276..d42a5ae8e 100644 --- a/PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp +++ b/PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp @@ -17,6 +17,7 @@ #include "precompiledHeaders.h" #include "PluginsManager.h" +#include "resource.h" const TCHAR * USERMSG = TEXT("This plugin is not compatible with current version of Notepad++.\n\n\ Do you want to remove this plugin from plugins directory to prevent this message from the next launch time?"); @@ -346,7 +347,7 @@ HMENU PluginsManager::setMenu(HMENU hMenu, const TCHAR *menuName) if (!_hPluginsMenu) { _hPluginsMenu = ::CreateMenu(); - ::InsertMenu(hMenu, 9, MF_BYPOSITION | MF_POPUP, (UINT_PTR)_hPluginsMenu, nom_menu); + ::InsertMenu(hMenu, MENUINDEX_PLUGINS, MF_BYPOSITION | MF_POPUP, (UINT_PTR)_hPluginsMenu, nom_menu); } size_t i = 0; diff --git a/PowerEditor/src/Parameters.cpp b/PowerEditor/src/Parameters.cpp index 1d92fa31a..aee53e176 100644 --- a/PowerEditor/src/Parameters.cpp +++ b/PowerEditor/src/Parameters.cpp @@ -1366,11 +1366,13 @@ bool NppParameters::getContextMenuFromXmlTree(HMENU mainMenuHadle, HMENU plugins if (!root) return false; +#ifdef UNICODE WcharMbcsConvertor *wmc = WcharMbcsConvertor::getInstance(); - +#endif + TiXmlNodeA *contextMenuRoot = root->FirstChildElement("ScintillaContextMenu"); if (contextMenuRoot) - {//printInt(int(mainMenuHadle));printInt(int(pluginsMenu)); + { for (TiXmlNodeA *childNode = contextMenuRoot->FirstChildElement("Item"); childNode ; childNode = childNode->NextSibling("Item") ) diff --git a/PowerEditor/src/langs.model.xml b/PowerEditor/src/langs.model.xml index d0a9cef2c..7982fe744 100644 --- a/PowerEditor/src/langs.model.xml +++ b/PowerEditor/src/langs.model.xml @@ -96,7 +96,7 @@ code components custommessages dirs files icons ini installdelete langoptions languages messages registry run setup types tasks uninstalldelete uninstallrun _istool - allowcancelduringinstall allownoicons allowrootdirectory allowuncpath alwaysrestart alwaysshowcomponentslist alwaysshowdironreadypage alwaysshowgrouponreadypage alwaysusepersonalgroup appcomments appcontact appcopyright appenddefaultdirname appenddefaultgroupname appid appmodifypath appmutex appname apppublisher apppublisherurl appreadmefile appsupporturl appupdatesurl appvername appversion architecturesallowed architecturesinstallin64bitmode backcolor backcolor2 backcolordirection backsolid changesassociations changesenvironment compression copyrightfontname copyrightfontsize createappdir createuninstallregkey defaultdirname defaultgroupname defaultuserinfoname defaultuserinfoorg defaultuserinfoserial dialogfontname dialogfontsize direxistswarning disabledirpage disablefinishedpage disableprogramgrouppage disablereadymemo disablereadypage disablestartupprompt diskclustersize diskslicesize diskspanning enablesdirdoesntexistwarning encryption extradiskspacerequired flatcomponentslist infoafterfile infobeforefile internalcompresslevel languagedetectionmethod languagecodepage languageid languagename licensefile mergeduplicatefiles minversion onlybelowversion outputbasefilename outputdir outputmanifestfile password privilegesrequired reservebytes restartifneededbyrun setupiconfile showcomponentsizes showlanguagedialog showtaskstreelines slicesperdisk solidcompression sourcedir timestamprounding timestampsinutc titlefontname titlefontsize touchdate touchtime uninstallable uninstalldisplayicon uninstalldisplayname uninstallfilesdir uninstalllogmode uninstallrestartcomputer updateuninstalllogappname usepreviousappdir usepreviousgroup useprevioussetuptype useprevioustasks useprevioususerinfo userinfopage usesetupldr versioninfocompany versioninfocopyright versioninfodescription versioninfotextversion versioninfoversion welcomefontname welcomefontsize windowshowcaption windowstartmaximized windowresizable windowvisible wizardimagebackcolor wizardimagefile wizardimagestretch wizardsmallimagefile + allowcancelduringinstall allownoicons allowrootdirectory allowuncpath alwaysrestart alwaysshowcomponentslist alwaysshowdironreadypage alwaysshowgrouponreadypage alwaysusepersonalgroup appcomments appcontact appcopyright appenddefaultdirname appenddefaultgroupname appid appmodifypath appmutex appname apppublisher apppublisherurl appreadmefile appsupporturl appupdatesurl appvername appversion architecturesallowed architecturesinstallin64bitmode backcolor backcolor2 backcolordirection backsolid changesassociations changesenvironment compression copyrightfontname copyrightfontsize createappdir createuninstallregkey defaultdirname defaultgroupname defaultuserinfoname defaultuserinfoorg defaultuserinfoserial dialogfontname dialogfontsize direxistswarning disabledirpage disablefinishedpage disableprogramgrouppage disablereadymemo disablereadypage disablestartupprompt diskclustersize diskslicesize diskspanning enablesdirdoesntexistwarning encryption extradiskspacerequired flatcomponentslist infoafterfile infobeforefile internalcompresslevel languagedetectionmethod languagecodepage languageid languagename licensefile lzmanumfastbytes mergeduplicatefiles minversion onlybelowversion outputbasefilename outputdir outputmanifestfile password privilegesrequired reservebytes restartifneededbyrun setupiconfile showcomponentsizes showlanguagedialog showtaskstreelines slicesperdisk solidcompression sourcedir timestamprounding timestampsinutc titlefontname titlefontsize touchdate touchtime uninstallable uninstalldisplayicon uninstalldisplayname uninstallfilesdir uninstalllogmode uninstallrestartcomputer updateuninstalllogappname usepreviousappdir usepreviousgroup useprevioussetuptype useprevioustasks useprevioususerinfo userinfopage usesetupldr versioninfocompany versioninfocopyright versioninfodescription versioninfotextversion versioninfoversion welcomefontname welcomefontsize windowshowcaption windowstartmaximized windowresizable windowvisible wizardimagebackcolor wizardimagefile wizardimagestretch wizardsmallimagefile afterinstall attribs beforeinstall check comment components copymode description destdir destname excludes extradiskspacerequired filename flags fontinstall groupdescription hotkey infoafterfile infobeforefile iconfilename iconindex key languages licensefile messagesfile minversion name onlybelowversion parameters permissions root runonceid section source statusmsg string subkey tasks type types valuedata valuename valuetype workingdir append define dim else emit endif endsub error expr file for if ifdef ifexist ifndef ifnexist include insert pragma sub undef begin break case const continue do downto else end except finally for function if of procedure repeat then to try until uses var while with diff --git a/PowerEditor/src/resource.h b/PowerEditor/src/resource.h index d426ffe91..7b45cc6f9 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.8.3") +#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v5.8.4") // 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.83\0") -#define VERSION_DIGITALVALUE 5, 8, 3, 0 +#define VERSION_VALUE TEXT("5.84\0") +#define VERSION_DIGITALVALUE 5, 8, 4, 0 #ifdef UNICODE #define UNICODE_ANSI_MODE TEXT("(UNICODE)") diff --git a/PowerEditor/visual.net/notepadPlus.vcproj b/PowerEditor/visual.net/notepadPlus.vcproj index 7a1c24d01..24eaff219 100644 --- a/PowerEditor/visual.net/notepadPlus.vcproj +++ b/PowerEditor/visual.net/notepadPlus.vcproj @@ -895,10 +895,6 @@ RelativePath="..\src\MISC\RegExt\regExtDlgRc.h" > - -