Project restructured, all dialogs classes moved to Dialogs subdir.

jovibor · Jun 13, 2023 · 3ffd6b7 · 3ffd6b7
1 parent 04b398a
commit 3ffd6b7
Show file tree

Hide file tree

Showing 13 changed files with 33 additions and 33 deletions.
diff --git a/Hexer/CDlgOpenDevice.cpp → Hexer/Dialogs/CDlgOpenDevice.cpp b/Hexer/CDlgOpenDevice.cpp → Hexer/Dialogs/CDlgOpenDevice.cpp
diff --git a/Hexer/CDlgOpenDevice.h → Hexer/Dialogs/CDlgOpenDevice.h b/Hexer/CDlgOpenDevice.h → Hexer/Dialogs/CDlgOpenDevice.h
diff --git a/Hexer/CDlgOpenDisk.cpp → Hexer/Dialogs/CDlgOpenDisk.cpp b/Hexer/CDlgOpenDisk.cpp → Hexer/Dialogs/CDlgOpenDisk.cpp
diff --git a/Hexer/CDlgOpenDisk.h → Hexer/Dialogs/CDlgOpenDisk.h b/Hexer/CDlgOpenDisk.h → Hexer/Dialogs/CDlgOpenDisk.h
diff --git a/Hexer/CDlgOpenPath.cpp → Hexer/Dialogs/CDlgOpenPath.cpp b/Hexer/CDlgOpenPath.cpp → Hexer/Dialogs/CDlgOpenPath.cpp
diff --git a/Hexer/CDlgOpenPath.h → Hexer/Dialogs/CDlgOpenPath.h b/Hexer/CDlgOpenPath.h → Hexer/Dialogs/CDlgOpenPath.h
diff --git a/Hexer/CDlgOpenVolume.cpp → Hexer/Dialogs/CDlgOpenVolume.cpp b/Hexer/CDlgOpenVolume.cpp → Hexer/Dialogs/CDlgOpenVolume.cpp
diff --git a/Hexer/CDlgOpenVolume.h → Hexer/Dialogs/CDlgOpenVolume.h b/Hexer/CDlgOpenVolume.h → Hexer/Dialogs/CDlgOpenVolume.h
diff --git a/Hexer/CPaneFileProps.cpp → Hexer/Dialogs/CPaneFileProps.cpp b/Hexer/CPaneFileProps.cpp → Hexer/Dialogs/CPaneFileProps.cpp
diff --git a/Hexer/CPaneFileProps.h → Hexer/Dialogs/CPaneFileProps.h b/Hexer/CPaneFileProps.h → Hexer/Dialogs/CPaneFileProps.h
diff --git a/Hexer/Hexer.rc b/Hexer/Hexer.rc
@@ -175,7 +175,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM
 CAPTION "About Hexer"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    ICON            IDR_MAINFRAME,IDC_STATIC,12,14,21,20
+    ICON            IDR_HEXER_FRAME,IDC_STATIC,12,14,20,20
     DEFPUSHBUTTON   "OK",IDOK,144,61,50,14,WS_GROUP
     CONTROL         "MfcLink1",IDC_LINK_HEXER,"MfcLink",WS_TABSTOP,42,12,142,11
     CONTROL         "MfcLink2",IDC_LINK_HEXCTRL,"MfcLink",WS_TABSTOP,45,35,128,11

diff --git a/Hexer/Hexer.vcxproj b/Hexer/Hexer.vcxproj
@@ -64,7 +64,7 @@
       <ConformanceMode>true</ConformanceMode>
       <LanguageStandard>stdcpplatest</LanguageStandard>
       <PrecompiledHeader>Use</PrecompiledHeader>
-      <AdditionalIncludeDirectories>dep\HexCtrl\HexCtrl\;dep\HexCtrl\HexCtrl\dep\StrToNum\StrToNum;</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);Dialogs\;dep\HexCtrl\HexCtrl\;dep\HexCtrl\HexCtrl\dep\StrToNum\StrToNum;</AdditionalIncludeDirectories>
       <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
       <BuildStlModules>false</BuildStlModules>
     </ClCompile>
@@ -93,7 +93,7 @@
       <ConformanceMode>true</ConformanceMode>
       <LanguageStandard>stdcpplatest</LanguageStandard>
       <PrecompiledHeader>Use</PrecompiledHeader>
-      <AdditionalIncludeDirectories>dep\HexCtrl\HexCtrl\;dep\HexCtrl\HexCtrl\dep\StrToNum\StrToNum;</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);Dialogs\;dep\HexCtrl\HexCtrl\;dep\HexCtrl\HexCtrl\dep\StrToNum\StrToNum;</AdditionalIncludeDirectories>
       <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
       <BuildStlModules>false</BuildStlModules>
     </ClCompile>
@@ -116,10 +116,6 @@
   <ItemGroup>
     <ClInclude Include="CAppSettings.h" />
     <ClInclude Include="CChildFrame.h" />
-    <ClInclude Include="CDlgOpenDevice.h" />
-    <ClInclude Include="CDlgOpenDisk.h" />
-    <ClInclude Include="CDlgOpenPath.h" />
-    <ClInclude Include="CDlgOpenVolume.h" />
     <ClInclude Include="CFileLoader.h" />
     <ClInclude Include="CHexerDoc.h" />
     <ClInclude Include="CHexerDocMgr.h" />
@@ -144,17 +140,17 @@
     <ClInclude Include="dep\HexCtrl\HexCtrl\src\Dialogs\CHexDlgSearch.h" />
     <ClInclude Include="dep\HexCtrl\HexCtrl\src\Dialogs\CHexDlgTemplMgr.h" />
     <ClInclude Include="dep\HexCtrl\HexCtrl\src\HexUtility.h" />
+    <ClInclude Include="Dialogs\CDlgOpenDevice.h" />
+    <ClInclude Include="Dialogs\CDlgOpenDisk.h" />
+    <ClInclude Include="Dialogs\CDlgOpenPath.h" />
+    <ClInclude Include="Dialogs\CDlgOpenVolume.h" />
+    <ClInclude Include="Dialogs\CPaneFileProps.h" />
     <ClInclude Include="stdafx.h" />
-    <ClInclude Include="CPaneFileProps.h" />
     <ClInclude Include="resource.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="CAppSettings.cpp" />
     <ClCompile Include="CChildFrame.cpp" />
-    <ClCompile Include="CDlgOpenDevice.cpp" />
-    <ClCompile Include="CDlgOpenDisk.cpp" />
-    <ClCompile Include="CDlgOpenPath.cpp" />
-    <ClCompile Include="CDlgOpenVolume.cpp" />
     <ClCompile Include="CFileLoader.cpp" />
     <ClCompile Include="CHexerDoc.cpp" />
     <ClCompile Include="CHexerDocMgr.cpp" />
@@ -177,11 +173,15 @@
     <ClCompile Include="dep\HexCtrl\HexCtrl\src\Dialogs\CHexDlgSearch.cpp" />
     <ClCompile Include="dep\HexCtrl\HexCtrl\src\Dialogs\CHexDlgTemplMgr.cpp" />
     <ClCompile Include="dep\HexCtrl\HexCtrl\src\HexUtility.cpp" />
+    <ClCompile Include="Dialogs\CDlgOpenDevice.cpp" />
+    <ClCompile Include="Dialogs\CDlgOpenDisk.cpp" />
+    <ClCompile Include="Dialogs\CDlgOpenPath.cpp" />
+    <ClCompile Include="Dialogs\CDlgOpenVolume.cpp" />
+    <ClCompile Include="Dialogs\CPaneFileProps.cpp" />
     <ClCompile Include="stdafx.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="CPaneFileProps.cpp" />
     <ClCompile Include="Utility.ixx">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>

diff --git a/Hexer/Hexer.vcxproj.filters b/Hexer/Hexer.vcxproj.filters
@@ -36,9 +36,6 @@
     <ClInclude Include="resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="CPaneFileProps.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="stdafx.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -96,25 +93,28 @@
     <ClInclude Include="dep\HexCtrl\HexCtrl\src\HexUtility.h">
       <Filter>HexCtrl</Filter>
     </ClInclude>
-    <ClInclude Include="CDlgOpenDisk.h">
+    <ClInclude Include="CHexerDocMgr.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="CHexerRFL.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="CDlgOpenVolume.h">
+    <ClInclude Include="CFileLoader.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="CDlgOpenPath.h">
+    <ClInclude Include="Dialogs\CDlgOpenDevice.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="CDlgOpenDevice.h">
+    <ClInclude Include="Dialogs\CDlgOpenDisk.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="CHexerDocMgr.h">
+    <ClInclude Include="Dialogs\CDlgOpenPath.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="CHexerRFL.h">
+    <ClInclude Include="Dialogs\CDlgOpenVolume.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="CFileLoader.h">
+    <ClInclude Include="Dialogs\CPaneFileProps.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
@@ -134,9 +134,6 @@
     <ClCompile Include="CHexerView.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="CPaneFileProps.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="stdafx.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -191,25 +188,28 @@
     <ClCompile Include="dep\HexCtrl\HexCtrl\src\HexUtility.cpp">
       <Filter>HexCtrl</Filter>
     </ClCompile>
-    <ClCompile Include="CDlgOpenDisk.cpp">
+    <ClCompile Include="CHexerDocMgr.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="CHexerRFL.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="CDlgOpenVolume.cpp">
+    <ClCompile Include="CFileLoader.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="CDlgOpenPath.cpp">
+    <ClCompile Include="Dialogs\CDlgOpenDevice.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="CDlgOpenDevice.cpp">
+    <ClCompile Include="Dialogs\CDlgOpenDisk.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="CHexerDocMgr.cpp">
+    <ClCompile Include="Dialogs\CDlgOpenPath.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="CHexerRFL.cpp">
+    <ClCompile Include="Dialogs\CDlgOpenVolume.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="CFileLoader.cpp">
+    <ClCompile Include="Dialogs\CPaneFileProps.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>