From 4005bf4182de992f5d6235a69424f9afedcf9d9c Mon Sep 17 00:00:00 2001
From: Don HO <don.h@free.fr>
Date: Thu, 23 Nov 2017 22:44:22 +0100
Subject: [PATCH] Add DSpellCheck plugin into distribution

---
 .../nsisInclude/binariesComponents.nsh        |  4 +-
 PowerEditor/installer/packageAll.bat          | 40 +++++++++----------
 PowerEditor/src/NppCommands.cpp               |  4 +-
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/PowerEditor/installer/nsisInclude/binariesComponents.nsh b/PowerEditor/installer/nsisInclude/binariesComponents.nsh
index f10bc9c5a..b66d12282 100644
--- a/PowerEditor/installer/nsisInclude/binariesComponents.nsh
+++ b/PowerEditor/installer/nsisInclude/binariesComponents.nsh
@@ -77,7 +77,7 @@ SectionGroup "Plugins" Plugins
 		File "..\bin\plugins\NppConverter.dll"
 !endif
 	${MementoSectionEnd}
-	/*
+
 	${MementoSection} "Decent Spell-Checking" DSpellCheck
 		Delete "$INSTDIR\plugins\DSpellCheck.dll"
 		SetOutPath "$INSTDIR\plugins"
@@ -91,7 +91,7 @@ SectionGroup "Plugins" Plugins
 		File "..\bin\plugins\Config\Hunspell\en_US.dic"
 !endif
 	${MementoSectionEnd}
-	*/
+
 SectionGroupEnd
 
 ${MementoSection} "Auto-Updater" AutoUpdater
diff --git a/PowerEditor/installer/packageAll.bat b/PowerEditor/installer/packageAll.bat
index 9247cb004..cca73b033 100644
--- a/PowerEditor/installer/packageAll.bat
+++ b/PowerEditor/installer/packageAll.bat
@@ -51,10 +51,10 @@ If ErrorLevel 1 goto End
 signtool.exe sign /f %NPP_CERT% /p %NPP_CERT_PWD% /d "Notepad++" /du https://notepad-plus-plus.org/ /t http://timestamp.digicert.com/ ..\bin\plugins\NppConverter.dll
 signtool.exe sign /f %NPP_CERT% /p %NPP_CERT_PWD% /d "Notepad++" /du https://notepad-plus-plus.org/ /t http://timestamp.digicert.com/ ..\bin64\plugins\NppConverter.dll
 If ErrorLevel 1 goto End
-REM signtool.exe sign /f %NPP_CERT% /p %NPP_CERT_PWD% /d "Notepad++" /du https://notepad-plus-plus.org/ /t http://timestamp.digicert.com/ ..\bin\plugins\DSpellCheck.dll
-REM If ErrorLevel 1 goto End
-REM signtool.exe sign /f %NPP_CERT% /p %NPP_CERT_PWD% /d "Notepad++" /du https://notepad-plus-plus.org/ /t http://timestamp.digicert.com/ ..\bin64\plugins\DSpellCheck.dll
-REM If ErrorLevel 1 goto End
+signtool.exe sign /f %NPP_CERT% /p %NPP_CERT_PWD% /d "Notepad++" /du https://notepad-plus-plus.org/ /t http://timestamp.digicert.com/ ..\bin\plugins\DSpellCheck.dll
+If ErrorLevel 1 goto End
+signtool.exe sign /f %NPP_CERT% /p %NPP_CERT_PWD% /d "Notepad++" /du https://notepad-plus-plus.org/ /t http://timestamp.digicert.com/ ..\bin64\plugins\DSpellCheck.dll
+If ErrorLevel 1 goto End
 
 :NoSign
 
@@ -191,27 +191,27 @@ copy /Y "..\bin\plugins\mimeTools.dll" .\zipped.package.release\plugins\
 If ErrorLevel 1 goto End
 copy /Y "..\bin\plugins\NppConverter.dll" .\zipped.package.release\plugins\
 If ErrorLevel 1 goto End
-REM copy /Y "..\bin\plugins\DSpellCheck.dll" .\zipped.package.release\plugins\
-REM If ErrorLevel 1 goto End
-REM mkdir .\zipped.package.release\plugins\Config\Hunspell
-REM If ErrorLevel 1 goto End
-REM copy /Y "..\bin\plugins\Config\Hunspell\en_US.aff" .\zipped.package.release\plugins\Config\Hunspell\
-REM If ErrorLevel 1 goto End
-REM copy /Y "..\bin\plugins\Config\Hunspell\en_US.dic" .\zipped.package.release\plugins\Config\Hunspell\
-REM If ErrorLevel 1 goto End
+copy /Y "..\bin\plugins\DSpellCheck.dll" .\zipped.package.release\plugins\
+If ErrorLevel 1 goto End
+mkdir .\zipped.package.release\plugins\Config\Hunspell
+If ErrorLevel 1 goto End
+copy /Y "..\bin\plugins\Config\Hunspell\en_US.aff" .\zipped.package.release\plugins\Config\Hunspell\
+If ErrorLevel 1 goto End
+copy /Y "..\bin\plugins\Config\Hunspell\en_US.dic" .\zipped.package.release\plugins\Config\Hunspell\
+If ErrorLevel 1 goto End
 
 copy /Y "..\bin64\plugins\mimeTools.dll" .\zipped.package.release64\plugins\
 If ErrorLevel 1 goto End
 copy /Y "..\bin64\plugins\NppConverter.dll" .\zipped.package.release64\plugins\
 If ErrorLevel 1 goto End
-REM copy /Y "..\bin64\plugins\DSpellCheck.dll" .\zipped.package.release64\plugins\
-REM If ErrorLevel 1 goto End
-REM mkdir .\zipped.package.release64\plugins\Config\Hunspell
-REM If ErrorLevel 1 goto End
-REM copy /Y "..\bin64\plugins\Config\Hunspell\en_US.aff" .\zipped.package.release64\plugins\Config\Hunspell\
-REM If ErrorLevel 1 goto End
-REM copy /Y "..\bin64\plugins\Config\Hunspell\en_US.dic" .\zipped.package.release64\plugins\Config\Hunspell\
-REM If ErrorLevel 1 goto End
+copy /Y "..\bin64\plugins\DSpellCheck.dll" .\zipped.package.release64\plugins\
+If ErrorLevel 1 goto End
+mkdir .\zipped.package.release64\plugins\Config\Hunspell
+If ErrorLevel 1 goto End
+copy /Y "..\bin64\plugins\Config\Hunspell\en_US.aff" .\zipped.package.release64\plugins\Config\Hunspell\
+If ErrorLevel 1 goto End
+copy /Y "..\bin64\plugins\Config\Hunspell\en_US.dic" .\zipped.package.release64\plugins\Config\Hunspell\
+If ErrorLevel 1 goto End
 
 
 rem localizations
diff --git a/PowerEditor/src/NppCommands.cpp b/PowerEditor/src/NppCommands.cpp
index 8baae384d..c1aaf6e8b 100644
--- a/PowerEditor/src/NppCommands.cpp
+++ b/PowerEditor/src/NppCommands.cpp
@@ -71,7 +71,7 @@ void Notepad_plus::command(int id)
 		{
 			fileNew();
 
-			/*
+			///*
 			bool isFirstTime = ! _pluginsAdminDlg.isCreated();
 			_pluginsAdminDlg.setPluginsManager(&_pluginsManager);
 			_pluginsAdminDlg.doDialog(_nativeLangSpeaker.isRTL());
@@ -80,7 +80,7 @@ void Notepad_plus::command(int id)
 				_nativeLangSpeaker.changeConfigLang(_pluginsAdminDlg.getHSelf());
 				_pluginsAdminDlg.updateListAndLoadFromJson();
 			}
-			*/
+			//*/
 		}
 		break;