Fixing enabling "Edit mode" not working.

jovibor · May 22, 2023 · d34bec5 · d34bec5
1 parent c6fc206
commit d34bec5
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 4 deletions.
diff --git a/Pepper/CPepperDoc.cpp b/Pepper/CPepperDoc.cpp
@@ -104,6 +104,7 @@ BOOL CPepperDoc::OnOpenDocument(LPCTSTR lpszPathName)
 		}
 	}
 
+	libPE.CloseFile();
 	m_stFileLoader.LoadFile(lpszPathName, this);
 	UpdateAllViews(nullptr);
 

diff --git a/Pepper/Pepper.vcxproj b/Pepper/Pepper.vcxproj
@@ -171,6 +171,7 @@
     <ClCompile Include="dep\HexCtrl\HexCtrl\src\Dialogs\CHexDlgEncoding.cpp" />
     <ClCompile Include="dep\HexCtrl\HexCtrl\src\Dialogs\CHexDlgFillData.cpp" />
     <ClCompile Include="dep\HexCtrl\HexCtrl\src\Dialogs\CHexDlgGoTo.cpp" />
+    <ClCompile Include="dep\HexCtrl\HexCtrl\src\Dialogs\CHexDlgModify.cpp" />
     <ClCompile Include="dep\HexCtrl\HexCtrl\src\Dialogs\CHexDlgOpers.cpp" />
     <ClCompile Include="dep\HexCtrl\HexCtrl\src\Dialogs\CHexDlgSearch.cpp" />
     <ClCompile Include="dep\HexCtrl\HexCtrl\src\Dialogs\CHexDlgTemplMgr.cpp" />
@@ -213,6 +214,7 @@
     <ClInclude Include="dep\HexCtrl\HexCtrl\src\Dialogs\CHexDlgEncoding.h" />
     <ClInclude Include="dep\HexCtrl\HexCtrl\src\Dialogs\CHexDlgFillData.h" />
     <ClInclude Include="dep\HexCtrl\HexCtrl\src\Dialogs\CHexDlgGoTo.h" />
+    <ClInclude Include="dep\HexCtrl\HexCtrl\src\Dialogs\CHexDlgModify.h" />
     <ClInclude Include="dep\HexCtrl\HexCtrl\src\Dialogs\CHexDlgOpers.h" />
     <ClInclude Include="dep\HexCtrl\HexCtrl\src\Dialogs\CHexDlgSearch.h" />
     <ClInclude Include="dep\HexCtrl\HexCtrl\src\Dialogs\CHexDlgTemplMgr.h" />

diff --git a/Pepper/Pepper.vcxproj.filters b/Pepper/Pepper.vcxproj.filters
@@ -88,6 +88,9 @@
     <ClCompile Include="Utility.ixx">
       <Filter>Header Files</Filter>
     </ClCompile>
+    <ClCompile Include="dep\HexCtrl\HexCtrl\src\Dialogs\CHexDlgModify.cpp">
+      <Filter>HexCtrl</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="res\resource.h">
@@ -180,6 +183,9 @@
     <ClInclude Include="dep\HexCtrl\HexCtrl\HexCtrl.h">
       <Filter>HexCtrl</Filter>
     </ClInclude>
+    <ClInclude Include="dep\HexCtrl\HexCtrl\src\Dialogs\CHexDlgModify.h">
+      <Filter>HexCtrl</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="res\Pepper.rc">

diff --git a/Pepper/Utility.ixx b/Pepper/Utility.ixx
@@ -577,10 +577,10 @@ export namespace Util
 		{ 18, { sizeof(DWORD), 68, L"ManagedNativeHeader.Size" } }
 	};
 
-	//All HexCtrl dialogs' IDs for hiding/showing in Views, when tab is disactivated/activated.
+	//All HexCtrl dialogs' IDs for hiding/showing in Views, when tab is deactivated/activated.
 	inline const std::vector<HEXCTRL::EHexWnd> g_vecHexDlgs {
-		HEXCTRL::EHexWnd::DLG_BKMMANAGER, HEXCTRL::EHexWnd::DLG_DATAINTERP, HEXCTRL::EHexWnd::DLG_FILLDATA,
-		HEXCTRL::EHexWnd::DLG_OPERS, HEXCTRL::EHexWnd::DLG_SEARCH, HEXCTRL::EHexWnd::DLG_ENCODING,
+		HEXCTRL::EHexWnd::DLG_BKMMANAGER, HEXCTRL::EHexWnd::DLG_DATAINTERP, HEXCTRL::EHexWnd::DLG_MODIFY,
+		HEXCTRL::EHexWnd::DLG_SEARCH, HEXCTRL::EHexWnd::DLG_ENCODING,
 		HEXCTRL::EHexWnd::DLG_GOTO, HEXCTRL::EHexWnd::DLG_TEMPLMGR };
 
 

diff --git a/Pepper/dep/HexCtrl b/Pepper/dep/HexCtrl
-Original file line number
+Diff line change
@@ Expand Up / @@ -104,6 +104,7 @@ BOOL CPepperDoc::OnOpenDocument(LPCTSTR lpszPathName) @@
     		}
     	}
+    	libPE.CloseFile();
     	m_stFileLoader.LoadFile(lpszPathName, this);
     	UpdateAllViews(nullptr);
@@ Expand Down @@
+12 −24		HexCtrl/HexCtrl.h
+44 −33		HexCtrl/res/HexCtrl.rc
+157 −160		HexCtrl/res/HexCtrlRes.h
+1 −1		HexCtrl/res/IDJ_HEXCTRL_KEYBIND.json
+36 −49		HexCtrl/src/CHexCtrl.cpp
+7 −9		HexCtrl/src/CHexCtrl.h
+481 −481		HexCtrl/src/Dialogs/CHexDlgBkmMgr.cpp
+1 −2		HexCtrl/src/Dialogs/CHexDlgBkmMgr.h
+2 −4		HexCtrl/src/Dialogs/CHexDlgDataInterp.cpp
+1 −2		HexCtrl/src/Dialogs/CHexDlgDataInterp.h
+3 −5		HexCtrl/src/Dialogs/CHexDlgEncoding.cpp
+2 −3		HexCtrl/src/Dialogs/CHexDlgEncoding.h
+26 −29		HexCtrl/src/Dialogs/CHexDlgFillData.cpp
+7 −8		HexCtrl/src/Dialogs/CHexDlgFillData.h
+2 −4		HexCtrl/src/Dialogs/CHexDlgGoTo.cpp
+1 −2		HexCtrl/src/Dialogs/CHexDlgGoTo.h
+97 −0		HexCtrl/src/Dialogs/CHexDlgModify.cpp
+33 −0		HexCtrl/src/Dialogs/CHexDlgModify.h
+51 −72		HexCtrl/src/Dialogs/CHexDlgOpers.cpp
+7 −6		HexCtrl/src/Dialogs/CHexDlgOpers.h
+113 −113		HexCtrl/src/Dialogs/CHexDlgSearch.cpp
+4 −5		HexCtrl/src/Dialogs/CHexDlgSearch.h
+1,753 −1,749		HexCtrl/src/Dialogs/CHexDlgTemplMgr.cpp
+1 −2		HexCtrl/src/Dialogs/CHexDlgTemplMgr.h
+152 −180		README.md
+2 −0		VS Projects/DLL Project/DLL Project.vcxproj
+6 −0		VS Projects/DLL Project/DLL Project.vcxproj.filters
+2 −0		VS Projects/Sample Project/Sample Project.vcxproj
+6 −0		VS Projects/Sample Project/Sample Project.vcxproj.filters
+ −		docs/img/HexCtrl_OperationsWnd.jpg