[RELEASE] Notepad++ 6.7.8.2 release

jigeng-cui · May 23, 2015 · b85fc02 · b85fc02
1 parent d3c7ade
commit b85fc02
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 9 deletions.
diff --git a/PowerEditor/bin/change.log b/PowerEditor/bin/change.log
@@ -1,3 +1,8 @@
+Notepad++ v6.7.8.2 bug-fixes:
+
+1.  Disable Notepad++ updater (WinGup) under XP.
+
+
 Notepad++ v6.7.8.1 bug-fixes:
 
 1.  Fix "Missing msvcr120.dll" message error (of WinGup).

diff --git a/PowerEditor/bin/updater/GUP.exe b/PowerEditor/bin/updater/GUP.exe
diff --git a/PowerEditor/bin/updater/libcurl.dll b/PowerEditor/bin/updater/libcurl.dll
diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi
@@ -36,10 +36,10 @@
 ; Define the application name
 !define APPNAME "Notepad++"
 
-!define APPVERSION "6.7.8.1"
+!define APPVERSION "6.7.8.2"
 !define APPNAMEANDVERSION "${APPNAME} v${APPVERSION}"
 !define VERSION_MAJOR 6
-!define VERSION_MINOR 781
+!define VERSION_MINOR 782
 
 !define APPWEBSITE "http://notepad-plus-plus.org/"
 
@@ -619,6 +619,11 @@ Section -"Notepad++" mainSection
 		Rename "$INSTDIR\plugins\AutoSaveU.dll" "$INSTDIR\plugins\disabled\AutoSaveU.dll"
 		Delete "$INSTDIR\plugins\AutoSaveU.dll"
 
+	IfFileExists "$INSTDIR\plugins\NppQCP.dll" 0 +4
+		MessageBox MB_OK "Due to the stability issue,$\nNppQCP.dll will be moved to the directory $\"disabled$\"" /SD IDOK
+		Rename "$INSTDIR\plugins\NppQCP.dll" "$INSTDIR\plugins\disabled\NppQCP.dll"
+		Delete "$INSTDIR\plugins\NppQCP.dll"
+
     ; Context Menu Management : removing old version of Context Menu module
 	IfFileExists "$INSTDIR\nppcm.dll" 0 +3
 		Exec 'regsvr32 /u /s "$INSTDIR\nppcm.dll"'

diff --git a/PowerEditor/installer/packageAll.bat b/PowerEditor/installer/packageAll.bat
@@ -56,7 +56,6 @@ mkdir .\zipped.package.release
 mkdir .\zipped.package.release\updater
 mkdir .\zipped.package.release\localization
 mkdir .\zipped.package.release\themes
-mkdir .\zipped.package.release\user.manual
 mkdir .\zipped.package.release\plugins
 mkdir .\zipped.package.release\plugins\APIs
 mkdir .\zipped.package.release\plugins\Config

diff --git a/PowerEditor/src/NppCommands.cpp b/PowerEditor/src/NppCommands.cpp
@@ -2208,7 +2208,7 @@ void Notepad_plus::command(int id)
 
 		case IDM_ONLINEHELP:
 		{
-			::ShellExecute(NULL, TEXT("open"), TEXT("http://npp-community.tuxfamily.org/"), NULL, NULL, SW_SHOWNORMAL);
+			::ShellExecute(NULL, TEXT("open"), TEXT("http://docs.notepad-plus-plus.org/"), NULL, NULL, SW_SHOWNORMAL);
 			break;
 		}
 
@@ -2226,7 +2226,7 @@ void Notepad_plus::command(int id)
 
 		case IDM_PLUGINSHOME:
 		{
-			::ShellExecute(NULL, TEXT("open"), TEXT("http://sourceforge.net/apps/mediawiki/notepad-plus/index.php?title=Plugin_Central"), NULL, NULL, SW_SHOWNORMAL);
+			::ShellExecute(NULL, TEXT("open"), TEXT("http://docs.notepad-plus-plus.org/index.php/Plugin_Central"), NULL, NULL, SW_SHOWNORMAL);
 			break;
 		}
 
@@ -2237,7 +2237,7 @@ void Notepad_plus::command(int id)
 			winVer ver = NppParameters::getInstance()->getWinVersion();
 			if (ver <= WV_XP)
 			{
-				long res = ::MessageBox(NULL, TEXT("Notepad++ updater is not compatible with XP due to its obsolet security layer.\rDo you want to go to Notepad++ page to download it?"), TEXT("Notepad++ Updater"), MB_OK);
+				long res = ::MessageBox(NULL, TEXT("Notepad++ updater is not compatible with XP due to the obsolet security layer under XP.\rDo you want to go to Notepad++ page to download the latest version?"), TEXT("Notepad++ Updater"), MB_YESNO);
 				if (res == IDYES)
 				{
 					::ShellExecute(NULL, TEXT("open"), TEXT("https://notepad-plus-plus.org/download/"), NULL, NULL, SW_SHOWNORMAL);

diff --git 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.8.1")
+#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v6.7.8.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("6.781\0")
-#define VERSION_DIGITALVALUE 6, 7, 8, 1
+#define VERSION_VALUE TEXT("6.782\0")
+#define VERSION_DIGITALVALUE 6, 7, 8, 2
 
 #ifndef IDC_STATIC
 #define IDC_STATIC	-1