[RELEASE_47] 4.7 release.

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

PowerEditor/installer/nppSetup.nsi

@@ -650,9 +650,9 @@ SubSection "Plugins" Plugins
 	SectionEnd
 */
 	Section "File Browser" FileBrowser
-		Delete "$INSTDIR\plugins\LightExplorer.dll"
+		Delete "$INSTDIR\plugins\Explorer.dll"
 		SetOutPath "$INSTDIR\plugins"
-		File "..\bin\plugins\LightExplorer.dll"
+		File "..\bin\plugins\Explorer.dll"
 	SectionEnd
 	
 	Section "Hex Editor" HexEditor
@@ -676,13 +676,13 @@ SubSection "Plugins" Plugins
 		File "..\bin\ConvertExt.lng"
 	SectionEnd
 */
-/*
+
 	Section "Spell-Checker" SpellChecker
 		Delete "$INSTDIR\plugins\SpellChecker.dll"
 		SetOutPath "$INSTDIR\plugins"
 		File "..\bin\plugins\SpellChecker.dll"
 	SectionEnd
-*/
+
 	Section "NppExec" NppExec
 		Delete "$INSTDIR\plugins\NppExec.dll"
 		SetOutPath "$INSTDIR\plugins"
@@ -708,6 +708,18 @@ SubSection "Plugins" Plugins
 		File "..\bin\plugins\NppTools.dll"
 	SectionEnd
 	
+	Section "FTP synchronize" FTP_synchronize
+		Delete "$INSTDIR\plugins\FTP_synchronizeA.dll"
+		SetOutPath "$INSTDIR\plugins"
+		File "..\bin\plugins\FTP_synchronizeA.dll"
+	SectionEnd
+	
+	Section "NppExport" NppExport
+		Delete "$INSTDIR\plugins\NppExport.dll"
+		SetOutPath "$INSTDIR\plugins"
+		File "..\bin\plugins\NppExport.dll"
+	SectionEnd
+	
 SubSectionEnd
 
 Section /o "As default html viewer" htmlViewer
@@ -859,8 +871,8 @@ SubSection un.Plugins
 	SectionEnd
 */
 	Section un.FileBrowser
-		Delete "$INSTDIR\plugins\LightExplorer.dll"
+		Delete "$INSTDIR\plugins\Explorer.dll"
-		Delete "$INSTDIR\lightExplorer.ini"
+		Delete "$INSTDIR\Explorer.ini"
 		RMDir "$INSTDIR\plugins\"
 	SectionEnd
 	
@@ -882,12 +894,12 @@ SubSection un.Plugins
 		RMDir "$INSTDIR\plugins\"
 	SectionEnd
 */
-/*
+
 	Section un.SpellChecker
 		Delete "$INSTDIR\plugins\SpellChecker.dll"
 		RMDir "$INSTDIR\plugins\"
 	SectionEnd
-*/
+
 	Section un.NppExec
 		Delete "$INSTDIR\plugins\NppExec.dll"
 		Delete "$INSTDIR\plugins\doc\NppExec.txt"
@@ -908,6 +920,15 @@ SubSection un.Plugins
 		RMDir "$INSTDIR\plugins\"
 	SectionEnd
 	
+	Section un.FTP_synchronize
+		Delete "$INSTDIR\plugins\FTP_synchronizeA.dll"
+		RMDir "$INSTDIR\plugins\"
+	SectionEnd
+	
+	Section un.NppExport
+		Delete "$INSTDIR\plugins\NppExport.dll"
+		RMDir "$INSTDIR\plugins\"
+	SectionEnd
 SubSectionEnd
 
 Section un.htmlViewer

PowerEditor/src/Notepad_plus.cpp

@@ -7144,8 +7144,8 @@ LRESULT Notepad_plus::runProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lPa
 			bool oldVal = _mainDocTab.setHideTabBarStatus(hide);
 			_subDocTab.setHideTabBarStatus(hide);
 			::SendMessage(_hSelf, WM_SIZE, 0, 0);
-			::ShowWindow(_mainDocTab.getHSelf(), hide?SW_HIDE:SW_SHOW);
+			::ShowWindow(_mainDocTab.getHSelf(), hide?SW_FORCEMINIMIZE:SW_SHOW);
-			::ShowWindow(_subDocTab.getHSelf(), hide?SW_HIDE:SW_SHOW);
+			::ShowWindow(_subDocTab.getHSelf(), hide?SW_FORCEMINIMIZE:SW_SHOW);
 			return oldVal;
 		}
 

PowerEditor/src/Notepad_plus.h

@@ -131,10 +131,10 @@ public:
 	void getTaskListInfo(TaskListInfo *tli);
 
 	// For filtering the modeless Dialog message
-	bool isDlgsMsg(MSG *msg) const {
+	bool isDlgsMsg(MSG *msg, bool unicodeSupported) const {
 		for (size_t i = 0; i < _hModelessDlgs.size(); i++)
 		{
-			if (::IsDialogMessageW(_hModelessDlgs[i], msg))
+			if (unicodeSupported?(::IsDialogMessageW(_hModelessDlgs[i], msg)):(::IsDialogMessageA(_hModelessDlgs[i], msg)))
 				return true;
 		}
 

PowerEditor/src/Parameters.cpp

@@ -717,24 +717,22 @@ bool NppParameters::getSessionFromXmlTree(TiXmlDocument *pSessionDoc, Session *p
 			childNode ;
 			childNode = childNode->NextSibling("File") )
 		{
-			TiXmlNode *fnNode = childNode->FirstChild();
+			const char *fileName = (childNode->ToElement())->Attribute("filename");
-			if (fnNode)
-			{
-				const char *fileName = fnNode->Value();
-
 			if (fileName)
 			{
+
 				Position position;
 				(childNode->ToElement())->Attribute("firstVisibleLine", &position._firstVisibleLine);
 				(childNode->ToElement())->Attribute("xOffset", &position._xOffset);
 				(childNode->ToElement())->Attribute("startPos", &position._startPos);
 				(childNode->ToElement())->Attribute("endPos", &position._endPos);
 				(childNode->ToElement())->Attribute("selMode", &position._selMode);
+
 				const char *langName;
 				langName = (childNode->ToElement())->Attribute( "lang" );
 				sessionFileInfo sfi( fileName, langName, position );
 
-					for (TiXmlNode *markNode = fnNode->NextSibling("Mark");
+				for (TiXmlNode *markNode = childNode->NextSibling("Mark");
 					markNode ;
 					markNode = markNode->NextSibling("Mark") )
 				{
@@ -749,7 +747,6 @@ bool NppParameters::getSessionFromXmlTree(TiXmlDocument *pSessionDoc, Session *p
 			}
 		}
 	}
-	}
 
 	
 	return true;
@@ -1162,8 +1159,7 @@ void NppParameters::writeSession(const Session & session, const char *fileName)
 			(fileNameNode->ToElement())->SetAttribute("selMode", session._subViewFiles[i]._selMode);
 			(fileNameNode->ToElement())->SetAttribute("lang", session._subViewFiles[i]._langName.c_str());
 
-			TiXmlText fileNameFullPath(session._subViewFiles[i]._fileName.c_str());
+			(fileNameNode->ToElement())->SetAttribute("filename", session._mainViewFiles[i]._fileName.c_str());
-			fileNameNode->InsertEndChild(fileNameFullPath);
 			for (size_t j = 0 ; j < session._subViewFiles[i].marks.size() ; j++)
 			{
 				size_t markLine = session._subViewFiles[i].marks[j];

PowerEditor/src/WinControls/TabBar/TabBar.cpp

@@ -67,34 +67,6 @@ void TabBar::init(HINSTANCE hInst, HWND parent, bool isVertical, bool isTraditio
 		systemMessage("System Err");
 		throw int(69);
 	}
-	/*
-	if (!_isTraditional)
-    {
-		if (!_hwndArray[_nbCtrl])
-		{
-			_hwndArray[_nbCtrl] = _hSelf;
-			_ctrlID = _nbCtrl;
-		}
-		else 
-		{
-			int i = 0;
-			bool found = false;
-			for ( ; i < nbCtrlMax && !found ; i++)
-				if (!_hwndArray[i])
-					found = true;
-			if (!found)
-			{
-				_ctrlID = -1;
-				::MessageBox(NULL, "The nb of Tab Control is over its limit", "Tab Control err", MB_OK);
-				destroy();
-				throw int(96);
-			}
-			_hwndArray[i] = _hSelf;
-			_ctrlID = i;
-		}
-		_nbCtrl++;
-    }
-	*/
 }
 
 int TabBar::insertAtEnd(const char *subTabName)

PowerEditor/src/winmain.cpp

@@ -251,16 +251,24 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE, LPSTR lpszCmdLine, int nCmdSh
         }
 		notepad_plus_plus.init(hInstance, NULL, pPathNames, &cmdLineParams);
 
-		while (::GetMessageW(&msg, NULL, 0, 0))
+		bool unicodeSupported = notepad_plus_plus.getWinVersion() >= WV_NT;
+		bool going = true;
+		while (going)
+		{
+			going = unicodeSupported?(::GetMessageW(&msg, NULL, 0, 0)):(::GetMessageA(&msg, NULL, 0, 0));
+			if (going)
 			{
 				// if the message doesn't belong to the notepad_plus_plus's dialog
-			if (!notepad_plus_plus.isDlgsMsg(&msg))
+				if (!notepad_plus_plus.isDlgsMsg(&msg, unicodeSupported))
 				{
 					if (::TranslateAccelerator(notepad_plus_plus.getHSelf(), notepad_plus_plus.getAccTable(), &msg) == 0)
 					{
 						try {
 							::TranslateMessage(&msg);
+							if (unicodeSupported)
 								::DispatchMessageW(&msg);
+							else
+								::DispatchMessage(&msg);
 						} catch(std::exception ex) {
 							::MessageBox(NULL, ex.what(), "Exception", MB_OK);
 						} catch(...) {
@@ -269,6 +277,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE, LPSTR lpszCmdLine, int nCmdSh
 					}	
 				}
 			}
+		}
 	} catch(int i) {
 		if (i == 106901)
 			::MessageBox(NULL, "Scintilla.init is failed!", "106901", MB_OK);

PowerEditor/visual.net/notepadPlus.7.0.vcproj

@@ -50,11 +50,16 @@
 				Name="VCMIDLTool"/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="copy ..\src\config.xml ..\bin\config.xml
+				CommandLine="IF NOT EXIST ..\bin\config.xml COPY ..\src\config.model.xml ..\bin\config.xml
-copy ..\src\langs.xml ..\bin\langs.xml
+IF NOT EXIST ..\bin\config.model.xml COPY ..\src\config.model.xml ..\bin\config.model.xml
-copy ..\src\stylers.xml ..\bin\stylers.xml
+IF NOT EXIST ..\bin\langs.xml COPY ..\src\langs.model.xml ..\bin\langs.xml
-copy ..\src\font\LINEDRAW.TTF ..\bin\LINEDRAW.TTF
+IF NOT EXIST ..\bin\langs.model.xml COPY ..\src\langs.model.xml ..\bin\langs.model.xml
-"/>
+IF NOT EXIST ..\bin\stylers.xml COPY ..\src\stylers.model.xml ..\bin\stylers.xml
+IF NOT EXIST ..\bin\stylers.model.xml COPY ..\src\stylers.model.xml ..\bin\stylers.model.xml
+IF NOT EXIST ..\bin\LINEDRAW.TTF COPY ..\src\font\LINEDRAW.TTF ..\bin\LINEDRAW.TTF
+IF NOT EXIST ..\bin\contextMenu.xml COPY ..\src\contextMenu.xml ..\bin\contextMenu.xml 
+IF NOT EXIST ..\bin\shortcuts.xml COPY ..\src\shortcuts.xml ..\bin\shortcuts.xml 
+IF NOT EXIST ..\bin\userDefineLang.xml COPY ..\src\userDefineLang.xml ..\bin\userDefineLang.xml "/>
 			<Tool
 				Name="VCPreBuildEventTool"/>
 			<Tool
@@ -117,11 +122,16 @@ copy ..\src\font\LINEDRAW.TTF ..\bin\LINEDRAW.TTF
 				Name="VCMIDLTool"/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="copy ..\src\config.xml ..\bin\config.xml
+				CommandLine="IF NOT EXIST ..\bin\config.xml COPY ..\src\config.model.xml ..\bin\config.xml
-copy ..\src\langs.xml ..\bin\langs.xml
+IF NOT EXIST ..\bin\config.model.xml COPY ..\src\config.model.xml ..\bin\config.model.xml
-copy ..\src\stylers.xml ..\bin\stylers.xml
+IF NOT EXIST ..\bin\langs.xml COPY ..\src\langs.model.xml ..\bin\langs.xml
-copy ..\src\font\LINEDRAW.TTF ..\bin\LINEDRAW.TTF
+IF NOT EXIST ..\bin\langs.model.xml COPY ..\src\langs.model.xml ..\bin\langs.model.xml
-"/>
+IF NOT EXIST ..\bin\stylers.xml COPY ..\src\stylers.model.xml ..\bin\stylers.xml
+IF NOT EXIST ..\bin\stylers.model.xml COPY ..\src\stylers.model.xml ..\bin\stylers.model.xml
+IF NOT EXIST ..\bin\LINEDRAW.TTF COPY ..\src\font\LINEDRAW.TTF ..\bin\LINEDRAW.TTF
+IF NOT EXIST ..\bin\contextMenu.xml COPY ..\src\contextMenu.xml ..\bin\contextMenu.xml 
+IF NOT EXIST ..\bin\shortcuts.xml COPY ..\src\shortcuts.xml ..\bin\shortcuts.xml 
+IF NOT EXIST ..\bin\userDefineLang.xml COPY ..\src\userDefineLang.xml ..\bin\userDefineLang.xml "/>
 			<Tool
 				Name="VCPreBuildEventTool"/>
 			<Tool
@@ -146,6 +156,84 @@ copy ..\src\font\LINEDRAW.TTF ..\bin\LINEDRAW.TTF
 		<Filter
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
+			<File
+				RelativePath="..\src\Notepad_plus.cpp">
+			</File>
+			<File
+				RelativePath="..\src\Parameters.cpp">
+			</File>
+			<File
+				RelativePath="..\src\UniConversion.cpp">
+			</File>
+			<File
+				RelativePath="..\src\Utf8_16.cpp">
+			</File>
+			<File
+				RelativePath="..\src\winmain.cpp">
+			</File>
+			<Filter
+				Name="MISC"
+				Filter="">
+				<File
+					RelativePath="..\src\MISC\PluginsManager\PluginsManager.cpp">
+				</File>
+				<File
+					RelativePath="..\src\MISC\Process\Process.cpp">
+				</File>
+				<File
+					RelativePath="..\src\MISC\RegExt\regExtDlg.cpp">
+				</File>
+				<File
+					RelativePath="..\src\MISC\SysMsg\SysMsg.cpp">
+				</File>
+			</Filter>
+			<Filter
+				Name="ScintillaComponent"
+				Filter="">
+				<File
+					RelativePath="..\src\ScitillaComponent\Buffer.cpp">
+				</File>
+				<File
+					RelativePath="..\src\ScitillaComponent\columnEditor.cpp">
+				</File>
+				<File
+					RelativePath="..\src\ScitillaComponent\DocTabView.cpp">
+				</File>
+				<File
+					RelativePath="..\src\ScitillaComponent\FindReplaceDlg.cpp">
+				</File>
+				<File
+					RelativePath="..\src\ScitillaComponent\GoToLineDlg.cpp">
+				</File>
+				<File
+					RelativePath="..\src\ScitillaComponent\Printer.cpp">
+				</File>
+				<File
+					RelativePath="..\src\ScitillaComponent\ScintillaEditView.cpp">
+				</File>
+				<File
+					RelativePath="..\src\ScitillaComponent\UserDefineDialog.cpp">
+				</File>
+			</Filter>
+			<Filter
+				Name="TinyXML"
+				Filter="">
+				<File
+					RelativePath="..\src\TinyXml\tinystr.cpp">
+				</File>
+				<File
+					RelativePath="..\src\TinyXml\tinyxml.cpp">
+				</File>
+				<File
+					RelativePath="..\src\TinyXml\tinyxmlerror.cpp">
+				</File>
+				<File
+					RelativePath="..\src\TinyXml\tinyxmlparser.cpp">
+				</File>
+			</Filter>
+			<Filter
+				Name="WinControls"
+				Filter="">
 				<File
 					RelativePath="..\src\WinControls\AboutDlg\AboutDlg.cpp">
 				</File>
@@ -155,9 +243,6 @@ copy ..\src\font\LINEDRAW.TTF ..\bin\LINEDRAW.TTF
 				<File
 					RelativePath="..\src\WinControls\Grid\BabyGridWrapper.cpp">
 				</File>
-			<File
-				RelativePath="..\src\ScitillaComponent\Buffer.cpp">
-			</File>
 				<File
 					RelativePath="..\src\WinControls\ColourPicker\ColourPicker.cpp">
 				</File>
@@ -179,54 +264,24 @@ copy ..\src\font\LINEDRAW.TTF ..\bin\LINEDRAW.TTF
 				<File
 					RelativePath="..\src\WinControls\DockingWnd\DockingSplitter.cpp">
 				</File>
-			<File
-				RelativePath="..\src\ScitillaComponent\DocTabView.cpp">
-			</File>
 				<File
 					RelativePath="..\src\WinControls\OpenSaveFileDialog\FileDialog.cpp">
 				</File>
-			<File
-				RelativePath="..\src\ScitillaComponent\FindReplaceDlg.cpp">
-			</File>
-			<File
-				RelativePath="..\src\ScitillaComponent\GoToLineDlg.cpp">
-			</File>
 				<File
 					RelativePath="..\src\WinControls\DockingWnd\Gripper.cpp">
 				</File>
 				<File
 					RelativePath="..\src\WinControls\ImageListSet\ImageListSet.cpp">
 				</File>
-			<File
-				RelativePath="..\src\Notepad_plus.cpp">
-			</File>
-			<File
-				RelativePath="..\src\Parameters.cpp">
-			</File>
-			<File
-				RelativePath="..\src\Misc\PluginsManager\PluginsManager.cpp">
-			</File>
 				<File
 					RelativePath="..\src\WinControls\Preference\preferenceDlg.cpp">
 				</File>
-			<File
-				RelativePath="..\src\ScitillaComponent\Printer.cpp">
-			</File>
-			<File
-				RelativePath="..\src\MISC\Process\Process.cpp">
-			</File>
-			<File
-				RelativePath="..\src\MISC\RegExt\regExtDlg.cpp">
-			</File>
 				<File
 					RelativePath="..\src\WinControls\StaticDialog\RunDlg\RunDlg.cpp">
 				</File>
 				<File
 					RelativePath="..\src\WinControls\shortcut\RunMacroDlg.cpp">
 				</File>
-			<File
-				RelativePath="..\src\ScitillaComponent\ScintillaEditView.cpp">
-			</File>
 				<File
 					RelativePath="..\src\WinControls\shortcut\shortcut.cpp">
 				</File>
@@ -248,51 +303,24 @@ copy ..\src\font\LINEDRAW.TTF ..\bin\LINEDRAW.TTF
 				<File
 					RelativePath="..\src\WinControls\StatusBar\StatusBar.cpp">
 				</File>
-			<File
-				RelativePath="..\src\MISC\SysMsg\SysMsg.cpp">
-			</File>
 				<File
 					RelativePath="..\src\WinControls\TabBar\TabBar.cpp">
 				</File>
 				<File
 					RelativePath="..\src\WinControls\TaskList\TaskList.cpp">
 				</File>
-			<File
-				RelativePath="..\src\TinyXml\tinystr.cpp">
-			</File>
-			<File
-				RelativePath="..\src\TinyXml\tinyxml.cpp">
-			</File>
-			<File
-				RelativePath="..\src\TinyXml\tinyxmlerror.cpp">
-			</File>
-			<File
-				RelativePath="..\src\TinyXml\tinyxmlparser.cpp">
-			</File>
 				<File
 					RelativePath="..\src\WinControls\ToolBar\ToolBar.cpp">
 				</File>
 				<File
 					RelativePath="..\src\WinControls\TrayIcon\trayIconControler.cpp">
 				</File>
-			<File
-				RelativePath="..\src\UniConversion.cpp">
-			</File>
 				<File
 					RelativePath="..\src\WinControls\AboutDlg\URLCtrl.cpp">
 				</File>
-			<File
-				RelativePath="..\src\ScitillaComponent\UserDefineDialog.cpp">
-			</File>
-			<File
-				RelativePath="..\src\Utf8_16.cpp">
-			</File>
 				<File
 					RelativePath="..\src\WinControls\WindowsDlg\WindowsDlg.cpp">
 				</File>
-			<File
-				RelativePath="..\src\winmain.cpp">
-			</File>
 				<File
 					RelativePath="..\src\WinControls\WindowsDlg\WinMgr.cpp">
 				</File>
@@ -303,9 +331,118 @@ copy ..\src\font\LINEDRAW.TTF ..\bin\LINEDRAW.TTF
 					RelativePath="..\src\WinControls\ColourPicker\WordStyleDlg.cpp">
 				</File>
 			</Filter>
+		</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl;inc">
+			<File
+				RelativePath="..\src\constant.h">
+			</File>
+			<File
+				RelativePath="..\src\keys.h">
+			</File>
+			<File
+				RelativePath="..\src\lastRecentFileList.h">
+			</File>
+			<File
+				RelativePath="..\src\lesDlgs.h">
+			</File>
+			<File
+				RelativePath="..\src\Notepad_plus.h">
+			</File>
+			<File
+				RelativePath="..\src\Parameters.h">
+			</File>
+			<File
+				RelativePath="..\src\WinControls\Grid\resource.h">
+			</File>
+			<File
+				RelativePath="..\src\resource.h">
+			</File>
+			<File
+				RelativePath="..\src\UniConversion.h">
+			</File>
+			<File
+				RelativePath="..\src\Utf8_16.h">
+			</File>
+			<Filter
+				Name="MISC"
+				Filter="">
+				<File
+					RelativePath="..\src\MISC\FileNameStringSplitter.h">
+				</File>
+				<File
+					RelativePath="..\src\MISC\PluginsManager\Notepad_plus_msgs.h">
+				</File>
+				<File
+					RelativePath="..\src\MISC\PluginsManager\PluginInterface.h">
+				</File>
+				<File
+					RelativePath="..\src\MISC\PluginsManager\PluginsManager.h">
+				</File>
+				<File
+					RelativePath="..\src\MISC\Process\Process.h">
+				</File>
+				<File
+					RelativePath="..\src\MISC\RegExt\regExtDlg.h">
+				</File>
+				<File
+					RelativePath="..\src\MISC\RegExt\regExtDlgRc.h">
+				</File>
+				<File
+					RelativePath="..\src\MISC\SysMsg\SysMsg.h">
+				</File>
+			</Filter>
+			<Filter
+				Name="ScintillaComponent"
+				Filter="">
+				<File
+					RelativePath="..\src\ScitillaComponent\Buffer.h">
+				</File>
+				<File
+					RelativePath="..\src\ScitillaComponent\colors.h">
+				</File>
+				<File
+					RelativePath="..\src\ScitillaComponent\columnEditor.h">
+				</File>
+				<File
+					RelativePath="..\src\ScitillaComponent\DocTabView.h">
+				</File>
+				<File
+					RelativePath="..\src\ScitillaComponent\FindReplaceDlg.h">
+				</File>
+				<File
+					RelativePath="..\src\ScitillaComponent\GoToLineDlg.h">
+				</File>
+				<File
+					RelativePath="..\src\ScitillaComponent\Printer.h">
+				</File>
+				<File
+					RelativePath="..\src\ScitillaComponent\ScintillaEditView.h">
+				</File>
+				<File
+					RelativePath="..\src\ScitillaComponent\UserDefineDialog.h">
+				</File>
+				<File
+					RelativePath="..\src\ScitillaComponent\UserDefineLangReference.h">
+				</File>
+				<File
+					RelativePath="..\src\ScitillaComponent\UserDefineResource.h">
+				</File>
+			</Filter>
+			<Filter
+				Name="TinyXML"
+				Filter="">
+				<File
+					RelativePath="..\src\TinyXml\tinystr.h">
+				</File>
+				<File
+					RelativePath="..\src\TinyXml\tinyxml.h">
+				</File>
+			</Filter>
+			<Filter
+				Name="WinControls"
+				Filter="">
 				<File
 					RelativePath="..\src\WinControls\AboutDlg\AboutDlg.h">
 				</File>
@@ -315,12 +452,6 @@ copy ..\src\font\LINEDRAW.TTF ..\bin\LINEDRAW.TTF
 				<File
 					RelativePath="..\src\WinControls\Grid\BabyGridWrapper.h">
 				</File>
-			<File
-				RelativePath="..\src\ScitillaComponent\Buffer.h">
-			</File>
-			<File
-				RelativePath="..\src\ScitillaComponent\colors.h">
-			</File>
 				<File
 					RelativePath="..\src\WinControls\ColourPicker\ColourPicker.h">
 				</File>
@@ -330,9 +461,6 @@ copy ..\src\font\LINEDRAW.TTF ..\bin\LINEDRAW.TTF
 				<File
 					RelativePath="..\src\WinControls\DockingWnd\common_func.h">
 				</File>
-			<File
-				RelativePath="..\src\constant.h">
-			</File>
 				<File
 					RelativePath="..\src\WinControls\ContextMenu\ContextMenu.h">
 				</File>
@@ -357,69 +485,21 @@ copy ..\src\font\LINEDRAW.TTF ..\bin\LINEDRAW.TTF
 				<File
 					RelativePath="..\src\WinControls\DockingWnd\DockingSplitter.h">
 				</File>
-			<File
-				RelativePath="..\src\ScitillaComponent\DocTabView.h">
-			</File>
 				<File
 					RelativePath="..\src\WinControls\OpenSaveFileDialog\FileDialog.h">
 				</File>
-			<File
-				RelativePath="..\src\MISC\FileNameStringSplitter.h">
-			</File>
-			<File
-				RelativePath="..\src\ScitillaComponent\FindReplaceDlg.h">
-			</File>
-			<File
-				RelativePath="..\src\ScitillaComponent\GoToLineDlg.h">
-			</File>
 				<File
 					RelativePath="..\src\WinControls\DockingWnd\Gripper.h">
 				</File>
 				<File
 					RelativePath="..\src\WinControls\ImageListSet\ImageListSet.h">
 				</File>
-			<File
-				RelativePath="..\src\lastRecentFileList.h">
-			</File>
-			<File
-				RelativePath="..\src\lesDlgs.h">
-			</File>
-			<File
-				RelativePath="..\src\Notepad_plus.h">
-			</File>
-			<File
-				RelativePath="..\src\Misc\PluginsManager\Notepad_plus_msgs.h">
-			</File>
-			<File
-				RelativePath="..\src\Parameters.h">
-			</File>
-			<File
-				RelativePath="..\src\Misc\PluginsManager\PluginInterface.h">
-			</File>
-			<File
-				RelativePath="..\src\Misc\PluginsManager\PluginsManager.h">
-			</File>
 				<File
 					RelativePath="..\src\WinControls\Preference\preferenceDlg.h">
 				</File>
-			<File
-				RelativePath="..\src\ScitillaComponent\Printer.h">
-			</File>
-			<File
-				RelativePath="..\src\MISC\Process\Process.h">
-			</File>
-			<File
-				RelativePath="..\src\MISC\RegExt\regExtDlg.h">
-			</File>
-			<File
-				RelativePath="..\src\MISC\RegExt\regExtDlgRc.h">
-			</File>
 				<File
 					RelativePath="..\src\WinControls\shortcut\resource.h">
 				</File>
-			<File
-				RelativePath="..\src\resource.h">
-			</File>
 				<File
 					RelativePath="..\src\WinControls\Preference\resource.h">
 				</File>
@@ -432,9 +512,6 @@ copy ..\src\font\LINEDRAW.TTF ..\bin\LINEDRAW.TTF
 				<File
 					RelativePath="..\src\WinControls\shortcut\RunMacroDlg_rc.h">
 				</File>
-			<File
-				RelativePath="..\src\ScitillaComponent\ScintillaEditView.h">
-			</File>
 				<File
 					RelativePath="..\src\WinControls\shortcut\shortcut.h">
 				</File>
@@ -459,9 +536,6 @@ copy ..\src\font\LINEDRAW.TTF ..\bin\LINEDRAW.TTF
 				<File
 					RelativePath="..\src\WinControls\StatusBar\StatusBar.h">
 				</File>
-			<File
-				RelativePath="..\src\MISC\SysMsg\SysMsg.h">
-			</File>
 				<File
 					RelativePath="..\src\WinControls\TabBar\TabBar.h">
 				</File>
@@ -474,36 +548,15 @@ copy ..\src\font\LINEDRAW.TTF ..\bin\LINEDRAW.TTF
 				<File
 					RelativePath="..\src\WinControls\TaskList\TaskListDlg_rc.h">
 				</File>
-			<File
-				RelativePath="..\src\TinyXml\tinystr.h">
-			</File>
-			<File
-				RelativePath="..\src\TinyXml\tinyxml.h">
-			</File>
 				<File
 					RelativePath="..\src\WinControls\ToolBar\ToolBar.h">
 				</File>
 				<File
 					RelativePath="..\src\WinControls\TrayIcon\trayIconControler.h">
 				</File>
-			<File
-				RelativePath="..\src\UniConversion.h">
-			</File>
 				<File
 					RelativePath="..\src\WinControls\AboutDlg\URLCtrl.h">
 				</File>
-			<File
-				RelativePath="..\src\ScitillaComponent\UserDefineDialog.h">
-			</File>
-			<File
-				RelativePath="..\src\ScitillaComponent\UserDefineLangReference.h">
-			</File>
-			<File
-				RelativePath="..\src\ScitillaComponent\UserDefineResource.h">
-			</File>
-			<File
-				RelativePath="..\src\Utf8_16.h">
-			</File>
 				<File
 					RelativePath="..\src\WinControls\Window.h">
 				</File>
@@ -523,25 +576,23 @@ copy ..\src\font\LINEDRAW.TTF ..\bin\LINEDRAW.TTF
 					RelativePath="..\src\WinControls\ColourPicker\WordStyleDlg.h">
 				</File>
 			</Filter>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
 			UniqueIdentifier="1">
+			<File
+				RelativePath="..\src\notepad++.exe.manifest">
+			</File>
+			<Filter
+				Name="Icons"
+				Filter="">
 				<File
 					RelativePath="..\src\icons\allChars_off.ico">
 				</File>
 				<File
 					RelativePath="..\src\icons\allChars_on.ico">
 				</File>
-			<File
-				RelativePath="..\src\icons\closeAll.bmp">
-			</File>
-			<File
-				RelativePath="..\src\icons\closefile.bmp">
-			</File>
-			<File
-				RelativePath="..\src\WinControls\ColourPicker\ColourPopup.rc">
-			</File>
 				<File
 					RelativePath="..\src\icons\cut_dis.ico">
 				</File>
@@ -560,18 +611,6 @@ copy ..\src\font\LINEDRAW.TTF ..\bin\LINEDRAW.TTF
 				<File
 					RelativePath="..\src\default_open.ico">
 				</File>
-			<File
-				RelativePath="..\src\WinControls\DockingWnd\DockingGUIWidget.rc">
-			</File>
-			<File
-				RelativePath="..\src\cursors\drag.cur">
-			</File>
-			<File
-				RelativePath="..\src\cursors\drag_interdit.cur">
-			</File>
-			<File
-				RelativePath="..\src\cursors\drag_plus.cur">
-			</File>
 				<File
 					RelativePath="..\src\icons\dupli_dis.ico">
 				</File>
@@ -581,9 +620,6 @@ copy ..\src\font\LINEDRAW.TTF ..\bin\LINEDRAW.TTF
 				<File
 					RelativePath="..\src\icons\dupli_on.ico">
 				</File>
-			<File
-				RelativePath="..\src\icons\find.bmp">
-			</File>
 				<File
 					RelativePath="..\src\icons\find_off.ico">
 				</File>
@@ -596,12 +632,6 @@ copy ..\src\font\LINEDRAW.TTF ..\bin\LINEDRAW.TTF
 				<File
 					RelativePath="..\src\icons\findrep_on.ico">
 				</File>
-			<File
-				RelativePath="..\src\icons\findReplace.bmp">
-			</File>
-			<File
-				RelativePath="..\src\ScitillaComponent\FindReplaceDlg.rc">
-			</File>
 				<File
 					RelativePath="..\src\hot_close.ico">
 				</File>
@@ -623,27 +653,18 @@ copy ..\src\font\LINEDRAW.TTF ..\bin\LINEDRAW.TTF
 				<File
 					RelativePath="..\src\icons\imprim_on.ico">
 				</File>
-			<File
-				RelativePath="..\src\icons\indentGuide.bmp">
-			</File>
 				<File
 					RelativePath="..\src\icons\indentGuide_off.ico">
 				</File>
 				<File
 					RelativePath="..\src\icons\indentGuide_on.ico">
 				</File>
-			<File
-				RelativePath="..\src\icons\invisibleChar.bmp">
-			</File>
 				<File
 					RelativePath="..\src\icons\new_off.ico">
 				</File>
 				<File
 					RelativePath="..\src\icons\new_on.ico">
 				</File>
-			<File
-				RelativePath="..\src\Notepad_plus.rc">
-			</File>
 				<File
 					RelativePath="..\src\icons\npp.ico">
 				</File>
@@ -662,9 +683,6 @@ copy ..\src\font\LINEDRAW.TTF ..\bin\LINEDRAW.TTF
 				<File
 					RelativePath="..\src\icons\paste_on.ico">
 				</File>
-			<File
-				RelativePath="..\src\WinControls\Preference\preference.rc">
-			</File>
 				<File
 					RelativePath="..\src\icons\readonly.ico">
 				</File>
@@ -677,18 +695,6 @@ copy ..\src\font\LINEDRAW.TTF ..\bin\LINEDRAW.TTF
 				<File
 					RelativePath="..\src\icons\redo_on.ico">
 				</File>
-			<File
-				RelativePath="..\src\MISC\RegExt\regExtDlg.rc">
-			</File>
-			<File
-				RelativePath="..\src\WinControls\ColourPicker\rt_manif.bin">
-			</File>
-			<File
-				RelativePath="..\src\WinControls\StaticDialog\RunDlg\RunDlg.rc">
-			</File>
-			<File
-				RelativePath="..\src\WinControls\shortcut\RunMacroDlg.rc">
-			</File>
 				<File
 					RelativePath="..\src\icons\save_dis.ico">
 				</File>
@@ -698,9 +704,6 @@ copy ..\src\font\LINEDRAW.TTF ..\bin\LINEDRAW.TTF
 				<File
 					RelativePath="..\src\icons\save_on.ico">
 				</File>
-			<File
-				RelativePath="..\src\icons\saveAll.bmp">
-			</File>
 				<File
 					RelativePath="..\src\icons\saveall_dis.ico">
 				</File>
@@ -713,15 +716,6 @@ copy ..\src\font\LINEDRAW.TTF ..\bin\LINEDRAW.TTF
 				<File
 					RelativePath="..\src\icons\saved.ico">
 				</File>
-			<File
-				RelativePath="..\src\WinControls\shortcut\shortcut.rc">
-			</File>
-			<File
-				RelativePath="..\src\WinControls\Grid\ShortcutMapper.rc">
-			</File>
-			<File
-				RelativePath="..\src\icons\showPannel.bmp">
-			</File>
 				<File
 					RelativePath="..\src\icons\supp_off.ico">
 				</File>
@@ -734,9 +728,6 @@ copy ..\src\font\LINEDRAW.TTF ..\bin\LINEDRAW.TTF
 				<File
 					RelativePath="..\src\icons\suppall_on.ico">
 				</File>
-			<File
-				RelativePath="..\src\WinControls\TaskList\TaskListDlg.rc">
-			</File>
 				<File
 					RelativePath="..\src\icons\undo_dis.ico">
 				</File>
@@ -749,45 +740,24 @@ copy ..\src\font\LINEDRAW.TTF ..\bin\LINEDRAW.TTF
 				<File
 					RelativePath="..\src\icons\unsaved.ico">
 				</File>
-			<File
-				RelativePath="..\src\cursors\up.cur">
-			</File>
-			<File
-				RelativePath="..\src\ScitillaComponent\UserDefineDialog.rc">
-			</File>
 				<File
 					RelativePath="..\src\icons\userDefineDlg_off.ico">
 				</File>
 				<File
 					RelativePath="..\src\icons\userDefineDlg_on.ico">
 				</File>
-			<File
-				RelativePath="..\src\WinControls\WindowsDlg\WindowsDlg.rc">
-			</File>
-			<File
-				RelativePath="..\src\WinControls\ColourPicker\WordStyleDlg.rc">
-			</File>
-			<File
-				RelativePath="..\src\icons\wrap.bmp">
-			</File>
 				<File
 					RelativePath="..\src\icons\wrap_off.ico">
 				</File>
 				<File
 					RelativePath="..\src\icons\wrap_on.ico">
 				</File>
-			<File
-				RelativePath="..\src\icons\zoomIn.bmp">
-			</File>
 				<File
 					RelativePath="..\src\icons\zoomIn_off.ico">
 				</File>
 				<File
 					RelativePath="..\src\icons\zoomIn_on.ico">
 				</File>
-			<File
-				RelativePath="..\src\icons\zoomOut.bmp">
-			</File>
 				<File
 					RelativePath="..\src\icons\zoomOut_off.ico">
 				</File>
@@ -795,10 +765,113 @@ copy ..\src\font\LINEDRAW.TTF ..\bin\LINEDRAW.TTF
 					RelativePath="..\src\icons\zoomOut_on.ico">
 				</File>
 			</Filter>
+			<Filter
+				Name="RC Files"
+				Filter="">
 				<File
-			RelativePath="..\src\WinControls\ColourPicker\notepad++.exe.manifest">
+					RelativePath="..\src\WinControls\ColourPicker\ColourPopup.rc">
 				</File>
+				<File
+					RelativePath="..\src\ScitillaComponent\columnEditor.rc">
+				</File>
+				<File
+					RelativePath="..\src\WinControls\DockingWnd\DockingGUIWidget.rc">
+				</File>
+				<File
+					RelativePath="..\src\ScitillaComponent\FindReplaceDlg.rc">
+				</File>
+				<File
+					RelativePath="..\src\Notepad_plus.rc">
+				</File>
+				<File
+					RelativePath="..\src\WinControls\Preference\preference.rc">
+				</File>
+				<File
+					RelativePath="..\src\MISC\RegExt\regExtDlg.rc">
+				</File>
+				<File
+					RelativePath="..\src\WinControls\StaticDialog\RunDlg\RunDlg.rc">
+				</File>
+				<File
+					RelativePath="..\src\WinControls\shortcut\RunMacroDlg.rc">
+				</File>
+				<File
+					RelativePath="..\src\WinControls\shortcut\shortcut.rc">
+				</File>
+				<File
+					RelativePath="..\src\WinControls\Grid\ShortcutMapper.rc">
+				</File>
+				<File
+					RelativePath="..\src\WinControls\TaskList\TaskListDlg.rc">
+				</File>
+				<File
+					RelativePath="..\src\ScitillaComponent\UserDefineDialog.rc">
+				</File>
+				<File
+					RelativePath="..\src\WinControls\WindowsDlg\WindowsDlg.rc">
+				</File>
+				<File
+					RelativePath="..\src\WinControls\ColourPicker\WordStyleDlg.rc">
+				</File>
+			</Filter>
+			<Filter
+				Name="Cursors"
+				Filter="">
+				<File
+					RelativePath="..\src\cursors\drag.cur">
+				</File>
+				<File
+					RelativePath="..\src\cursors\drag_interdit.cur">
+				</File>
+				<File
+					RelativePath="..\src\cursors\drag_plus.cur">
+				</File>
+				<File
+					RelativePath="..\src\cursors\up.cur">
+				</File>
+			</Filter>
+			<Filter
+				Name="Bitmaps"
+				Filter="">
+				<File
+					RelativePath="..\src\icons\closeAll.bmp">
+				</File>
+				<File
+					RelativePath="..\src\icons\closefile.bmp">
+				</File>
+				<File
+					RelativePath="..\src\icons\find.bmp">
+				</File>
+				<File
+					RelativePath="..\src\icons\findReplace.bmp">
+				</File>
+				<File
+					RelativePath="..\src\icons\indentGuide.bmp">
+				</File>
+				<File
+					RelativePath="..\src\icons\invisibleChar.bmp">
+				</File>
+				<File
+					RelativePath="..\src\icons\saveAll.bmp">
+				</File>
+				<File
+					RelativePath="..\src\icons\showPannel.bmp">
+				</File>
+				<File
+					RelativePath="..\src\icons\wrap.bmp">
+				</File>
+				<File
+					RelativePath="..\src\icons\zoomIn.bmp">
+				</File>
+				<File
+					RelativePath="..\src\icons\zoomOut.bmp">
+				</File>
+			</Filter>
+		</Filter>
 	</Files>
 	<Globals>
+		<Global
+			Name="RESOURCE_FILE"
+			Value="\Programming\Projects\Npp\Source\PowerEditor\src\WinControls\ColourPicker\ColourPopup.rc"/>
 	</Globals>
 </VisualStudioProject>