[RELEASE] v5.1.4 release.

Add NppHelp entry.

git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository@394 f5eea248-9336-0410-98b8-ebc06183d4e3

PowerEditor/bin/change.log

@@ -1,3 +1,15 @@
+Notepad++ v5.1.4 new feature and fixed bugs (from v5.1.3) :
+
+1.  Add localization on run time feature : Change language on the run time for Unicode version (via preferences dialog).
+2.  Add the ability to force opened ANSI document as UTF-8 w/o BOM.
+3.  Fix verbose backup bug (while the backup dir is not set).
+4.  Fix bug that external lexer doesn't work with Unicode version.
+5.  Fix recent files list bug.
+6.  Include a help content file.
+7.  Add new plugin notification message NPPN_WORDSTYLESUPDATED.
+8.  Add 2 plugin messages for shortcut feature : NPPN_SHORTCUTREMAPPED notification and NPPM_GETSHORTCUTBYCMDID message. 
+
+
 Notepad++ v5.1.3 new feature and fixed bugs (from v5.1.2) :
 
 1.  Add PostIt feature (F12 to toggle it).

PowerEditor/installer/nppSetup.nsi

@@ -17,16 +17,16 @@
 
 ; Define the application name
 !define APPNAME "Notepad++"
-!define APPNAMEANDVERSION "Notepad++ v5.1.3"
+!define APPNAMEANDVERSION "Notepad++ v5.1.4"
 
 !define VERSION_MAJOR 5
-!define VERSION_MINOR 13
+!define VERSION_MINOR 14
 
 ; Main Install settings
 Name "${APPNAMEANDVERSION}"
 InstallDir "$PROGRAMFILES\Notepad++"
 InstallDirRegKey HKLM "Software\${APPNAME}" ""
-OutFile "..\bin\npp.5.1.3.Installer.exe"
+OutFile "..\bin\npp.5.1.4.Installer.exe"
 
 ; GetWindowsVersion
  ;
@@ -205,12 +205,12 @@ FunctionEnd
   !insertmacro MUI_LANGUAGE "Malay"
   !insertmacro MUI_LANGUAGE "Galician"
   !insertmacro MUI_LANGUAGE "Basque"
+  !insertmacro MUI_LANGUAGE "Luxembourgish"
   
   ;!insertmacro MUI_LANGUAGE "Latvian"
   ;!insertmacro MUI_LANGUAGE "Macedonian"
   ;!insertmacro MUI_LANGUAGE "Estonian"
   ; !insertmacro MUI_LANGUAGE "Mongolian"
-  ;!insertmacro MUI_LANGUAGE "Luxembourgish"
   ;!insertmacro MUI_LANGUAGE "Breton"
   ;!insertmacro MUI_LANGUAGE "Icelandic"
   ;!insertmacro MUI_LANGUAGE "Bosnian"
@@ -298,6 +298,7 @@ LangString langFileName ${LANG_ALBANIAN} "albanian.xml"
 LangString langFileName ${LANG_MALAY} "malay.xml"
 LangString langFileName ${LANG_GALICIAN} "galician.xml"
 LangString langFileName ${LANG_BASQUE} "basque.xml"
+LangString langFileName ${LANG_LUXEMBOURGISH} "luxembourgish.xml"
 
 
 ;--------------------------------
@@ -371,108 +372,10 @@ GLOBAL_INST:
 	File "..\bin\change.log"
 	File "..\bin\notepad++.exe"
 	File "..\bin\readme.txt"
+	File "..\bin\NppHelp.chm"
 	
-	StrCmp $LANGUAGE ${LANG_ENGLISH} noLang 0
+	SetOutPath "$INSTDIR\localization\"
-	StrCmp $LANGUAGE ${LANG_FRENCH} 0 +3
+	File ".\nativeLang\"
-		File ".\nativeLang\french.xml"
-		Goto finLang
-	StrCmp $LANGUAGE ${LANG_TRADCHINESE} 0 +3
-		File ".\nativeLang\chinese.xml"
-		Goto finLang
-	StrCmp $LANGUAGE ${LANG_SPANISH} 0 +3
-		File ".\nativeLang\spanish.xml"
-		Goto finLang
-	StrCmp $LANGUAGE ${LANG_HUNGARIAN} 0 +3
-		File ".\nativeLang\hungarian.xml"
-		Goto finLang
-	StrCmp $LANGUAGE ${LANG_RUSSIAN} 0 +3
-		File ".\nativeLang\russian.xml"
-		Goto finLang
-	StrCmp $LANGUAGE ${LANG_GERMAN} 0 +3
-		File ".\nativeLang\german.xml"
-		Goto finLang
-	StrCmp $LANGUAGE ${LANG_DUTCH} 0 +3
-		File ".\nativeLang\dutch.xml"
-		Goto finLang
-	StrCmp $LANGUAGE ${LANG_SIMPCHINESE} 0 +3
-		File ".\nativeLang\chineseSimplified.xml"
-		Goto finLang
-	StrCmp $LANGUAGE ${LANG_ITALIAN} 0 +3
-		File ".\nativeLang\italian.xml"
-		Goto finLang
-	StrCmp $LANGUAGE ${LANG_DANISH} 0 +3
-		File ".\nativeLang\danish.xml"
-		Goto finLang
-	StrCmp $LANGUAGE ${LANG_POLISH} 0 +3
-		File ".\nativeLang\polish.xml"
-		Goto finLang
-	StrCmp $LANGUAGE ${LANG_CZECH} 0 +3
-		File ".\nativeLang\czech.xml"
-		Goto finLang
-	StrCmp $LANGUAGE ${LANG_SLOVENIAN} 0 +3
-		File ".\nativeLang\slovenian.xml"
-		Goto finLang
-	StrCmp $LANGUAGE ${LANG_SLOVAK} 0 +3
-		File ".\nativeLang\slovak.xml"
-		Goto finLang
-	StrCmp $LANGUAGE ${LANG_SWEDISH} 0 +3
-		File ".\nativeLang\swedish.xml"
-		Goto finLang
-	StrCmp $LANGUAGE ${LANG_NORWEGIAN} 0 +3
-		File ".\nativeLang\norwegian.xml"
-		Goto finLang
-	StrCmp $LANGUAGE ${LANG_PORTUGUESEBR} 0 +3
-		File ".\nativeLang\brazilian_portuguese.xml"
-		Goto finLang
-	StrCmp $LANGUAGE ${LANG_UKRAINIAN} 0 +3
-		File ".\nativeLang\ukrainian.xml"
-		Goto finLang
-	StrCmp $LANGUAGE ${LANG_TURKISH} 0 +3
-		File ".\nativeLang\turkish.xml"
-		Goto finLang
-	StrCmp $LANGUAGE ${LANG_CATALAN} 0 +3
-		File ".\nativeLang\catalan.xml"
-		Goto finLang
-	StrCmp $LANGUAGE ${LANG_ARABIC} 0 +3
-		File ".\nativeLang\arabic.xml"
-		Goto finLang
-	StrCmp $LANGUAGE ${LANG_LITHUANIAN} 0 +3
-		File ".\nativeLang\lithuanian.xml"
-		Goto finLang
-	StrCmp $LANGUAGE ${LANG_FINNISH} 0 +3
-		File ".\nativeLang\finnish.xml"
-		Goto finLang
-	StrCmp $LANGUAGE ${LANG_GREEK} 0 +3
-		File ".\nativeLang\greek.xml"
-		Goto finLang
-	StrCmp $LANGUAGE ${LANG_ROMANIAN} 0 +3
-		File ".\nativeLang\romanian.xml"
-		Goto finLang
-	StrCmp $LANGUAGE ${LANG_KOREAN} 0 +3
-		File ".\nativeLang\korean.xml"
-		Goto finLang
-	StrCmp $LANGUAGE ${LANG_HEBREW} 0 +3
-		File ".\nativeLang\hebrew.xml"
-		Goto finLang
-	StrCmp $LANGUAGE ${LANG_PORTUGUESE} 0 +3
-		File ".\nativeLang\portuguese.xml"
-		Goto finLang
-	StrCmp $LANGUAGE ${LANG_FARSI} 0 +3
-		File ".\nativeLang\farsi.xml"
-		Goto finLang
-	StrCmp $LANGUAGE ${LANG_BULGARIAN} 0 +3
-		File ".\nativeLang\bulgarian.xml"
-		Goto finLang
-	StrCmp $LANGUAGE ${LANG_INDONESIAN} 0 +3
-		File ".\nativeLang\indonesian.xml"
-		Goto finLang
-	StrCmp $LANGUAGE ${LANG_JAPANESE} 0 +3
-		File ".\nativeLang\japanese.xml"
-		Goto finLang
-	StrCmp $LANGUAGE ${LANG_CROATIAN} 0 +3
-		File ".\nativeLang\croatian.xml"
-		Goto finLang
-	finLang:
 
 	IfFileExists "$UPDATE_PATH\nativeLang.xml" 0 +2
 		Delete "$UPDATE_PATH\nativeLang.xml"
@@ -480,14 +383,8 @@ GLOBAL_INST:
 	IfFileExists "$INSTDIR\nativeLang.xml" 0 +2
 		Delete "$INSTDIR\nativeLang.xml"
 
-	Rename "$INSTDIR\$(langFileName)" "$INSTDIR\nativeLang.xml"
+	StrCmp $LANGUAGE ${LANG_ENGLISH} +2 0
-	Goto commun
+	CopyFiles "$INSTDIR\localization\$(langFileName)" "$INSTDIR\nativeLang.xml"
-
-noLang:
-	IfFileExists "$UPDATE_PATH\nativeLang.xml" 0 +2
-		Delete "$UPDATE_PATH\nativeLang.xml"
-		
-commun:
 
 	; remove all the npp shortcuts from current user
 	Delete "$DESKTOP\Notepad++.lnk"

PowerEditor/installer/packageAll.bat

@@ -1,8 +1,10 @@
+copy /Y ".\localization\*.*" ..\bin\localization
 cd ..\bin\
 
 del /F /S /Q .\zipped.package.release\unicode\*.*
 copy /Y license.txt .\zipped.package.release\unicode\
 copy /Y readme.txt .\zipped.package.release\unicode\
+copy /Y NppHelp.chm .\zipped.package.release\unicode\
 copy /Y change.log .\zipped.package.release\unicode\
 copy /Y config.model.xml .\zipped.package.release\unicode\
 copy /Y langs.model.xml .\zipped.package.release\unicode\
@@ -17,6 +19,7 @@ copy /Y ".\plugins\*.*" .\zipped.package.release\unicode\plugins\
 copy /Y ".\plugins\APIs\*.xml" .\zipped.package.release\unicode\plugins\APIs
 copy /Y ".\plugins\doc\*.*" .\zipped.package.release\unicode\plugins\doc
 copy /Y ".\plugins\Config\tidy\*.*" .\zipped.package.release\unicode\plugins\Config\tidy
+copy /Y ".\localization\*.*" .\zipped.package.release\unicode\localization
 
 
 del /F /S /Q .\zipped.package.release\ansi\config.xml
@@ -26,6 +29,7 @@ del /F /S /Q .\zipped.package.release\ansi\session.xml
 del /F /S /Q .\zipped.package.release\ansi\plugins\Config\*.*
 copy /Y license.txt .\zipped.package.release\ansi\
 copy /Y readme.txt .\zipped.package.release\ansi\
+copy /Y NppHelp.chm .\zipped.package.release\ansi\
 copy /Y change.log .\zipped.package.release\ansi\
 copy /Y config.model.xml .\zipped.package.release\ansi\
 copy /Y langs.model.xml .\zipped.package.release\ansi\
@@ -39,5 +43,5 @@ copy /Y ".\plugins\Config\tidy\*.*" .\zipped.package.release\ansi\plugins\Config
 "C:\Program Files\7-Zip\7z.exe" a -tzip -r npp.bin.zip .\zipped.package.release\*
 "C:\Program Files\NSIS\makensis.exe" ..\installer\nppSetup.nsi
 
-
+cd ..\installer\
 

PowerEditor/src/Notepad_plus.cpp

@@ -3880,6 +3880,25 @@ void Notepad_plus::command(int id)
 			break;
 		}
 
+		case IDM_HELP :
+		{
+			TCHAR tmp[MAX_PATH];
+			lstrcpy(tmp, _nppPath);
+			::PathRemoveFileSpec(tmp);
+
+			generic_string nppHelpPath = tmp;
+			nppHelpPath += TEXT("\\NppHelp.chm");
+			if (::PathFileExists(nppHelpPath.c_str()))
+				::ShellExecute(NULL, TEXT("open"), nppHelpPath.c_str(), NULL, NULL, SW_SHOWNORMAL);
+			else
+			{
+				generic_string msg = nppHelpPath;
+				msg += TEXT("\rdoesn't exist. Please download it on Notepad++ site.");
+				::MessageBox(_hSelf, msg.c_str(), TEXT("File does not exist"), MB_OK);
+			}
+		}
+		break;
+
 		case IDM_HOMESWEETHOME :
 		{
 			::ShellExecute(NULL, TEXT("open"), TEXT("http://notepad-plus.sourceforge.net/"), NULL, NULL, SW_SHOWNORMAL);

PowerEditor/src/Notepad_plus.rc

@@ -426,6 +426,8 @@ BEGIN
 
     POPUP "&?"
     BEGIN
+        MENUITEM "Help content",              IDM_HELP
+        MENUITEM SEPARATOR
         MENUITEM "Notepad++ Home",            IDM_HOMESWEETHOME
         MENUITEM "Notepad++ Project Page",    IDM_PROJECTPAGE
         MENUITEM "Online help",               IDM_ONLINEHELP

PowerEditor/src/Parameters.cpp

@@ -188,6 +188,7 @@ WinMenuKeyDefinition winKeyDefs[] = {	//array of accelerator keys for all std me
 	{VK_NULL,	IDM_FORUM, 							false, false, false, NULL},
 	{VK_NULL,	IDM_PLUGINSHOME, 					false, false, false, NULL},
 	{VK_F1,		IDM_ABOUT, 							false, false, false, NULL},
+	{VK_F1,		IDM_HELP, 							false, false, true, NULL},
 
 	{VK_TAB,	IDC_PREV_DOC,						true,  false, true, TEXT("Switch to previous document")},
 	{VK_TAB,	IDC_NEXT_DOC,						true,  false, false, TEXT("Switch to next document")},

PowerEditor/src/langs.model.xml

@@ -75,7 +75,7 @@
 			<Keywords name="instre1">as case class data default deriving do else hiding if import in infix infixl infixr instance let module newtype of proc qualified rec then type where _</Keywords>
 		</Language>
         <Language name="html" ext="html htm shtml shtm xhtml" commentLine="" commentStart="&lt;!--" commentEnd="--&gt;">
-            <Keywords name="instre1">!doctype a abbr accept-charset accept accesskey acronym action address align alink alt applet archive area axis b background base basefont bdo bgcolor big blockquote body border br button caption cellpadding cellspacing center char charoff charset checkbox checked cite class classid clear code codebase codetype col colgroup color cols colspan compact content coords data datafld dataformatas datapagesize datasrc datetime dd declare defer del dfn dir disabled div dl dt em enctype event face fieldset file font for form frame frameborder frameset h1 h2 h3 h4 h5 h6 head headers height hidden hr href hreflang hspace html http-equiv i id iframe image img input ins isindex ismap kbd label lang language leftmargin legend li link longdesc map marginwidth marginheight maxlength media menu meta method multiple name noframes nohref noresize noscript noshade nowrap object ol onblur onchange onclick ondblclick onfocus onkeydown onkeypress onkeyup onload onmousedown onmousemove onmouseover onmouseout onmouseup optgroup option onreset onselect onsubmit onunload p param password profile pre prompt public q radio readonly rel reset rev rows rowspan rules s samp scheme scope script select selected shape size small span src standby start strike strong style sub submit summary sup tabindex table target tbody td text textarea tfoot th thead title topmargin tr tt type u ul usemap valign value valuetype var version vlink vspace width xml xmlns</Keywords>
+            <Keywords name="instre1">!doctype a abbr accept-charset accept accesskey acronym action address align alink alt applet archive area axis b background base basefont bdo bgcolor big blockquote body border br button caption cellpadding cellspacing center char charoff charset checkbox checked cite class classid clear code codebase codetype col colgroup color cols colspan compact content coords data datafld dataformatas datapagesize datasrc datetime dd declare defer del dfn dir disabled div dl dt em enctype event face fieldset file font for form frame frameborder frameset h1 h2 h3 h4 h5 h6 head headers height hidden hr href hreflang hspace html http-equiv i id iframe image img input ins isindex ismap kbd label lang language leftmargin legend li link longdesc map marginwidth marginheight maxlength media menu meta method multiple name noframes nohref noresize noscript noshade nowrap object ol onblur onchange onclick ondblclick onfocus onkeydown onkeypress onkeyup onload onmousedown onmousemove onmouseover onmouseout onmouseup optgroup option onreset onselect onsubmit onunload p param password profile pre prompt public q radio readonly rel reset rev rows rowspan rules s samp scheme scope script scrolling select selected shape size small span src standby start strike strong style sub submit summary sup tabindex table target tbody td text textarea tfoot th thead title topmargin tr tt type u ul usemap valign value valuetype var version vlink vspace width xml xmlns</Keywords>
         </Language>
 		<Language name="ini" ext="ini inf reg url" commentLine=";">
         </Language>

PowerEditor/src/menuCmdID.h

@@ -267,6 +267,7 @@
 	#define	IDM_PLUGINSHOME		(IDM_ABOUT  + 5)
 	#define	IDM_UPDATE_NPP		(IDM_ABOUT  + 6)
 	#define	IDM_WIKIFAQ			(IDM_ABOUT  + 7)
+	#define	IDM_HELP			(IDM_ABOUT  + 8)
 
 
 #define	IDM_SETTING    (IDM + 8000)

PowerEditor/src/resource.h

@@ -18,9 +18,9 @@
 #ifndef RESOURCE_H
 #define RESOURCE_H
 
-#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v5.1.3")
+#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v5.1.4")
-#define VERSION_VALUE TEXT("5.13\0")  // should be X.Y : ie. if VERSION_DIGITALVALUE == 4, 7, 1, 0 , then X = 4, Y = 71 
+#define VERSION_VALUE TEXT("5.14\0")  // should be X.Y : ie. if VERSION_DIGITALVALUE == 4, 7, 1, 0 , then X = 4, Y = 71 
-#define VERSION_DIGITALVALUE 5, 1, 3, 0
+#define VERSION_DIGITALVALUE 5, 1, 4, 0
 
 #ifdef UNICODE
 #define UNICODE_ANSI_MODE TEXT("(UNICODE)")