Update Merge.vcxproj.*

[winmerge-jp/winmerge-jp.git] / Src / Merge.vcxproj.filters

diff --git a/Src/Merge.vcxproj.filters b/Src/Merge.vcxproj.filters
index 20b0968..2260564 100644 (file)
--- a/Src/Merge.vcxproj.filters
+++ b/Src/Merge.vcxproj.filters
@@ -16,19 +16,9 @@
     <Filter Include="ChangeLogs">\r
       <UniqueIdentifier>{aefb7247-d6e5-411d-9cc5-4a12f5efda4a}</UniqueIdentifier>\r
     </Filter>\r
-    <Filter Include="Compare Engines">\r
-      <UniqueIdentifier>{b889169f-de55-4db7-ad06-423f6438fa90}</UniqueIdentifier>\r
-      <Extensions>cpp;c;h</Extensions>\r
-    </Filter>\r
     <Filter Include="MFCGui">\r
       <UniqueIdentifier>{caf52667-921a-47aa-84a3-f277aac15107}</UniqueIdentifier>\r
     </Filter>\r
-    <Filter Include="MFCGui\Source Files">\r
-      <UniqueIdentifier>{5dc3ba0d-6755-48f8-ad11-df56b167b514}</UniqueIdentifier>\r
-    </Filter>\r
-    <Filter Include="MFCGui\Header Files">\r
-      <UniqueIdentifier>{10ce7aff-bcfd-4ed0-98c3-766226c4c89e}</UniqueIdentifier>\r
-    </Filter>\r
     <Filter Include="MFCGui\Dialogs">\r
       <UniqueIdentifier>{d520b3a7-c530-4053-8766-07c26ed85f85}</UniqueIdentifier>\r
     </Filter>\r
@@ -80,6 +70,72 @@
     <Filter Include="Common\Source Files">\r
       <UniqueIdentifier>{ae04066b-7462-4a9b-8120-6d72fa5fe73e}</UniqueIdentifier>\r
     </Filter>\r
+    <Filter Include="MFCGui\MDIChild">\r
+      <UniqueIdentifier>{1f2458e6-d5ad-4cb9-befd-f338acdff5ac}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="MFCGui\MDIChild\BinaryCompare">\r
+      <UniqueIdentifier>{072167b2-c1b4-4339-9492-6cfa6154aff8}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="MFCGui\MDIChild\BinaryCompare\Source Files">\r
+      <UniqueIdentifier>{ec3f094d-be90-415f-b761-e865b34e206c}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="MFCGui\MDIChild\BinaryCompare\Header Files">\r
+      <UniqueIdentifier>{3397ca0f-4696-4b89-831d-bb65586db0ef}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="MFCGui\MDIChild\FolderCompare">\r
+      <UniqueIdentifier>{5da52cb1-3476-4e40-8cd7-1adda82b4245}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="MFCGui\MDIChild\FolderCompare\Source Files">\r
+      <UniqueIdentifier>{bca05f76-2dcc-4aa8-a6f4-62009329c79b}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="MFCGui\MDIChild\FolderCompare\Header Files">\r
+      <UniqueIdentifier>{7a9fc16d-2b05-4264-b158-a691ff4b785f}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="MFCGui\MDIChild\ImageCompare">\r
+      <UniqueIdentifier>{f9b51c1a-5423-4052-8aa7-d75247e0c7cf}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="MFCGui\MDIChild\ImageCompare\Source Files">\r
+      <UniqueIdentifier>{74ff89d4-a14f-4bc4-81be-dcaf1fbfacdc}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="MFCGui\MDIChild\ImageCompare\Header Files">\r
+      <UniqueIdentifier>{e93cdb71-1171-4312-8980-36cee9b8d721}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="MFCGui\MDIChild\TextTableCompare">\r
+      <UniqueIdentifier>{862990a2-192f-47e9-b408-55de9000d3b1}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="MFCGui\MDIChild\TextTableCompare\Source Files">\r
+      <UniqueIdentifier>{974619ee-b245-4048-aa9a-684d2d6bec2c}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="MFCGui\MDIChild\TextTableCompare\Header Files">\r
+      <UniqueIdentifier>{c0626ebd-4b06-4061-9538-3625a53a9ea4}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="MFCGui\MDIChild\Common">\r
+      <UniqueIdentifier>{1e14cf2f-c8f6-4f83-9c1d-f96f57eb6193}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="MFCGui\MDIChild\Common\Source Files">\r
+      <UniqueIdentifier>{60515146-a6af-45ae-9be9-ba926506098e}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="MFCGui\MDIChild\Common\Header Files">\r
+      <UniqueIdentifier>{15c37d4b-df6a-45b3-b477-b87359f12823}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="MFCGui\Main">\r
+      <UniqueIdentifier>{f31d764e-516f-4bd2-b936-d4b8b8d0dea0}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="MFCGui\Main\Source Files">\r
+      <UniqueIdentifier>{5dc3ba0d-6755-48f8-ad11-df56b167b514}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="MFCGui\Main\Header Files">\r
+      <UniqueIdentifier>{10ce7aff-bcfd-4ed0-98c3-766226c4c89e}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="MFCGui\MDIChild\SelectFilesOrFolders">\r
+      <UniqueIdentifier>{a7198765-ac65-4fbc-ac03-7ff708693586}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="MFCGui\MDIChild\SelectFilesOrFolders\Source Files">\r
+      <UniqueIdentifier>{cc427f14-5308-4d99-9774-640158ade47a}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="MFCGui\MDIChild\SelectFilesOrFolders\Header Files">\r
+      <UniqueIdentifier>{4d3d0027-2f4c-4a04-b3ba-a168e25b28d0}</UniqueIdentifier>\r
+    </Filter>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClCompile Include="charsets.c">\r
@@ -214,95 +270,11 @@
     <ClCompile Include="MergeApp.cpp">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="7zCommon.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="DiffTextBuffer.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="DiffViewBar.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="DirDoc.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="DirFrame.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="DirView.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="EditorFilepathBar.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="EncodingErrorBar.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="FileActionScript.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="FileOrFolderSelect.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="FilepathEdit.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="GhostTextBuffer.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="GhostTextView.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="HexMergeDoc.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="HexMergeFrm.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="HexMergeView.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="LocationBar.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="LocationView.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="MainFrm.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="Merge.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="MergeDoc.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="MergeDocDiffSync.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="MergeDocEncoding.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="MergeDocLineDiffs.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="MergeEditView.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="OpenDoc.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="OpenFrm.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="OpenView.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
+      <Filter>MFCGui\Main\Source Files</Filter>\r
     </ClCompile>\r
     <ClCompile Include="StdAfx.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="DirCompProgressBar.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
+      <Filter>MFCGui\Main\Source Files</Filter>\r
     </ClCompile>\r
     <ClCompile Include="OptionsFont.cpp">\r
       <Filter>Source Files</Filter>\r
@@ -319,18 +291,12 @@
     <ClCompile Include="OptionsDirColors.cpp">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="PatchTool.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="JumpList.cpp">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
     <ClCompile Include="OptionsCustomColors.cpp">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="ImgMergeFrm.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="Merge7zFormatMergePluginImpl.cpp">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
@@ -343,21 +309,9 @@
     <ClCompile Include="DirActions.cpp">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="DropHandler.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="OptionsDef.cpp">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="TrDialogs.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="MergeStatusBar.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="MergeEditSplitterView.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="Test.cpp">\r
       <Filter>MergeTest</Filter>\r
     </ClCompile>\r
@@ -373,12 +327,6 @@
     <ClCompile Include="pch.cpp">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="OptionsPanel.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="MergeEditFrm.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="Common\BCMenu.cpp">\r
       <Filter>MFCGui\Common\Source Files</Filter>\r
     </ClCompile>\r
@@ -394,15 +342,9 @@
     <ClCompile Include="Common\LanguageSelect.cpp">\r
       <Filter>MFCGui\Common\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="Common\MDITabBar.cpp">\r
-      <Filter>MFCGui\Common\Source Files</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="Common\MessageBoxDialog.cpp">\r
       <Filter>MFCGui\Common\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="Common\PropertyPageHost.cpp">\r
-      <Filter>MFCGui\Common\Source Files</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="Common\scbarcf.cpp">\r
       <Filter>MFCGui\Common\Source Files</Filter>\r
     </ClCompile>\r
@@ -568,15 +510,9 @@
     <ClCompile Include="xdiff_gnudiff_compat.cpp">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="MergeFrameCommon.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="DirSelectFilesDlg.cpp">\r
       <Filter>MFCGui\Dialogs\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="WindowsManagerDialog.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="Concurrent.cpp">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
@@ -622,6 +558,126 @@
     <ClCompile Include="PropMessageBoxes.cpp">\r
       <Filter>MFCGui\PropertyPages\Source Files</Filter>\r
     </ClCompile>\r
+    <ClCompile Include="DirView.cpp">\r
+      <Filter>MFCGui\MDIChild\FolderCompare\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="DirFrame.cpp">\r
+      <Filter>MFCGui\MDIChild\FolderCompare\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="DirDoc.cpp">\r
+      <Filter>MFCGui\MDIChild\FolderCompare\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="DirCompProgressBar.cpp">\r
+      <Filter>MFCGui\MDIChild\FolderCompare\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="EncodingErrorBar.cpp">\r
+      <Filter>MFCGui\MDIChild\TextTableCompare\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="GhostTextBuffer.cpp">\r
+      <Filter>MFCGui\MDIChild\TextTableCompare\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="GhostTextView.cpp">\r
+      <Filter>MFCGui\MDIChild\TextTableCompare\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="HexMergeView.cpp">\r
+      <Filter>MFCGui\MDIChild\BinaryCompare\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="HexMergeDoc.cpp">\r
+      <Filter>MFCGui\MDIChild\BinaryCompare\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="HexMergeFrm.cpp">\r
+      <Filter>MFCGui\MDIChild\BinaryCompare\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="LocationView.cpp">\r
+      <Filter>MFCGui\MDIChild\TextTableCompare\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="LocationBar.cpp">\r
+      <Filter>MFCGui\MDIChild\TextTableCompare\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="MergeDoc.cpp">\r
+      <Filter>MFCGui\MDIChild\TextTableCompare\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="MergeDocDiffSync.cpp">\r
+      <Filter>MFCGui\MDIChild\TextTableCompare\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="MergeDocEncoding.cpp">\r
+      <Filter>MFCGui\MDIChild\TextTableCompare\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="MergeDocLineDiffs.cpp">\r
+      <Filter>MFCGui\MDIChild\TextTableCompare\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="MergeEditFrm.cpp">\r
+      <Filter>MFCGui\MDIChild\TextTableCompare\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="MergeEditSplitterView.cpp">\r
+      <Filter>MFCGui\MDIChild\TextTableCompare\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="MergeEditView.cpp">\r
+      <Filter>MFCGui\MDIChild\TextTableCompare\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="MergeStatusBar.cpp">\r
+      <Filter>MFCGui\MDIChild\TextTableCompare\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="DiffTextBuffer.cpp">\r
+      <Filter>MFCGui\MDIChild\TextTableCompare\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="DiffViewBar.cpp">\r
+      <Filter>MFCGui\MDIChild\TextTableCompare\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="ImgMergeFrm.cpp">\r
+      <Filter>MFCGui\MDIChild\ImageCompare\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="OpenView.cpp">\r
+      <Filter>MFCGui\MDIChild\SelectFilesOrFolders\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="OpenDoc.cpp">\r
+      <Filter>MFCGui\MDIChild\SelectFilesOrFolders\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="OpenFrm.cpp">\r
+      <Filter>MFCGui\MDIChild\SelectFilesOrFolders\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="7zCommon.cpp">\r
+      <Filter>MFCGui\MDIChild\FolderCompare\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="DropHandler.cpp">\r
+      <Filter>MFCGui\Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="FileOrFolderSelect.cpp">\r
+      <Filter>MFCGui\Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="TrDialogs.cpp">\r
+      <Filter>MFCGui\Dialogs\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="OptionsPanel.cpp">\r
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="PatchTool.cpp">\r
+      <Filter>MFCGui\Dialogs\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="FilepathEdit.cpp">\r
+      <Filter>MFCGui\Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="MainFrm.cpp">\r
+      <Filter>MFCGui\Main\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="MergeFrameCommon.cpp">\r
+      <Filter>MFCGui\MDIChild\Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="EditorFilepathBar.cpp">\r
+      <Filter>MFCGui\MDIChild\Common\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\PropertyPageHost.cpp">\r
+      <Filter>MFCGui\PropertyPages\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="WindowsManagerDialog.cpp">\r
+      <Filter>MFCGui\Main\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="Common\MDITabBar.cpp">\r
+      <Filter>MFCGui\Main\Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="FileActionScript.cpp">\r
+      <Filter>MFCGui\MDIChild\FolderCompare\Source Files</Filter>\r
+    </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="charsets.h">\r
@@ -775,101 +831,17 @@
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
     <ClInclude Include="StdAfx.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
+      <Filter>MFCGui\Main\Header Files</Filter>\r
     </ClInclude>\r
     <ClInclude Include="Resource.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="OpenFrm.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="OpenView.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="OpenDoc.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="MergeEditView.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="MergeEditStatus.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="MergeDoc.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
+      <Filter>MFCGui\Main\Header Files</Filter>\r
     </ClInclude>\r
     <ClInclude Include="Merge.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="MainFrm.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="LocationView.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="LocationBar.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="IOptionsPanel.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="HexMergeFrm.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="heksedit.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="HexMergeDoc.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="GhostTextView.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="GhostTextBuffer.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="FileOrFolderSelect.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="DiffViewBar.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="DiffTextBuffer.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="DirDoc.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="DirFrame.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="DirView.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="EditorFilepathBar.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="EncodingErrorBar.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="FileActionScript.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="FilepathEdit.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="IListCtrlImpl.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="MergeLineFlags.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
+      <Filter>MFCGui\Main\Header Files</Filter>\r
     </ClInclude>\r
     <ClInclude Include="MergeApp.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="DirCompProgressBar.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="Diff3.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
@@ -888,21 +860,12 @@
     <ClInclude Include="OptionsDirColors.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="PatchTool.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="JumpList.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
     <ClInclude Include="OptionsCustomColors.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="7zCommon.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="ImgMergeFrm.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="IMergeDoc.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
@@ -918,27 +881,12 @@
     <ClInclude Include="DirActions.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="HexMergeView.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="OptionsPanel.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="DropHandler.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="Constants.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
     <ClInclude Include="OptionsInit.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="TrDialogs.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="MergeStatusBar.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="..\Externals\boost\boost\config.hpp">\r
       <Filter>Boost</Filter>\r
     </ClInclude>\r
@@ -951,9 +899,6 @@
     <ClInclude Include="..\Version.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="MergeEditSplitterView.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="TestMain.h">\r
       <Filter>MergeTest</Filter>\r
     </ClInclude>\r
@@ -975,9 +920,6 @@
     <ClInclude Include="pch.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="MergeEditFrm.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="Common\BCMenu.h">\r
       <Filter>MFCGui\Common\Header Files</Filter>\r
     </ClInclude>\r
@@ -993,9 +935,6 @@
     <ClInclude Include="Common\LanguageSelect.h">\r
       <Filter>MFCGui\Common\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="Common\MDITabBar.h">\r
-      <Filter>MFCGui\Common\Header Files</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="Common\memdc.h">\r
       <Filter>MFCGui\Common\Header Files</Filter>\r
     </ClInclude>\r
@@ -1005,9 +944,6 @@
     <ClInclude Include="Common\scbarcf.h">\r
       <Filter>MFCGui\Common\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="Common\PropertyPageHost.h">\r
-      <Filter>MFCGui\Common\Header Files</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="Common\scbarg.h">\r
       <Filter>MFCGui\Common\Header Files</Filter>\r
     </ClInclude>\r
@@ -1167,15 +1103,9 @@
     <ClInclude Include="xdiff_gnudiff_compat.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="MergeFrameCommon.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="DirSelectFilesDlg.h">\r
       <Filter>MFCGui\Dialogs\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="WindowsManagerDialog.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="Concurrent.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
@@ -1224,6 +1154,132 @@
     <ClInclude Include="PropMessageBoxes.h">\r
       <Filter>MFCGui\PropertyPages\Header Files</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="HexMergeDoc.h">\r
+      <Filter>MFCGui\MDIChild\BinaryCompare\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="HexMergeFrm.h">\r
+      <Filter>MFCGui\MDIChild\BinaryCompare\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="HexMergeView.h">\r
+      <Filter>MFCGui\MDIChild\BinaryCompare\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="MergeEditView.h">\r
+      <Filter>MFCGui\MDIChild\TextTableCompare\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="MergeDoc.h">\r
+      <Filter>MFCGui\MDIChild\TextTableCompare\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="MergeEditFrm.h">\r
+      <Filter>MFCGui\MDIChild\TextTableCompare\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="MergeEditSplitterView.h">\r
+      <Filter>MFCGui\MDIChild\TextTableCompare\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="MergeEditStatus.h">\r
+      <Filter>MFCGui\MDIChild\TextTableCompare\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DirCompProgressBar.h">\r
+      <Filter>MFCGui\MDIChild\FolderCompare\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DirDoc.h">\r
+      <Filter>MFCGui\MDIChild\FolderCompare\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DirFrame.h">\r
+      <Filter>MFCGui\MDIChild\FolderCompare\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DirView.h">\r
+      <Filter>MFCGui\MDIChild\FolderCompare\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="OpenDoc.h">\r
+      <Filter>MFCGui\MDIChild\SelectFilesOrFolders\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="OpenFrm.h">\r
+      <Filter>MFCGui\MDIChild\SelectFilesOrFolders\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="OpenView.h">\r
+      <Filter>MFCGui\MDIChild\SelectFilesOrFolders\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="heksedit.h">\r
+      <Filter>MFCGui\MDIChild\BinaryCompare\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DiffTextBuffer.h">\r
+      <Filter>MFCGui\MDIChild\TextTableCompare\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DiffViewBar.h">\r
+      <Filter>MFCGui\MDIChild\TextTableCompare\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="GhostTextBuffer.h">\r
+      <Filter>MFCGui\MDIChild\TextTableCompare\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="GhostTextView.h">\r
+      <Filter>MFCGui\MDIChild\TextTableCompare\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="MergeLineFlags.h">\r
+      <Filter>MFCGui\MDIChild\TextTableCompare\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="MergeStatusBar.h">\r
+      <Filter>MFCGui\MDIChild\TextTableCompare\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="LocationBar.h">\r
+      <Filter>MFCGui\MDIChild\TextTableCompare\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="LocationView.h">\r
+      <Filter>MFCGui\MDIChild\TextTableCompare\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="MainFrm.h">\r
+      <Filter>MFCGui\Main\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="7zCommon.h">\r
+      <Filter>MFCGui\MDIChild\FolderCompare\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="DropHandler.h">\r
+      <Filter>MFCGui\Common\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="FileOrFolderSelect.h">\r
+      <Filter>MFCGui\Common\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="ImgMergeFrm.h">\r
+      <Filter>MFCGui\MDIChild\ImageCompare\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="EncodingErrorBar.h">\r
+      <Filter>MFCGui\MDIChild\TextTableCompare\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="FilepathEdit.h">\r
+      <Filter>MFCGui\Common\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="IOptionsPanel.h">\r
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="OptionsPanel.h">\r
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="PatchTool.h">\r
+      <Filter>MFCGui\Dialogs\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="TrDialogs.h">\r
+      <Filter>MFCGui\Dialogs\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="MergeFrameCommon.h">\r
+      <Filter>MFCGui\MDIChild\Common\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="EditorFilepathBar.h">\r
+      <Filter>MFCGui\MDIChild\Common\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\PropertyPageHost.h">\r
+      <Filter>MFCGui\PropertyPages\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="IListCtrlImpl.h">\r
+      <Filter>MFCGui\MDIChild\FolderCompare\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="WindowsManagerDialog.h">\r
+      <Filter>MFCGui\Main\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="Common\MDITabBar.h">\r
+      <Filter>MFCGui\Main\Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="FileActionScript.h">\r
+      <Filter>MFCGui\MDIChild\FolderCompare\Header Files</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <None Include="res\binarydiff.ico">\r
@@ -1325,7 +1381,7 @@
   </ItemGroup>\r
   <ItemGroup>\r
     <ResourceCompile Include="Merge.rc">\r
-      <Filter>MFCGui\Source Files</Filter>\r
+      <Filter>MFCGui\Main\Source Files</Filter>\r
     </ResourceCompile>\r
     <ResourceCompile Include="Merge2.rc">\r
       <Filter>Resource Files</Filter>\r