[FEATURE] If RichHeader has been deleted, remove the tab

Author: hasherezade

pe-bear/gui/DetailsTab.cpp

@@ -82,7 +82,8 @@ DetailsTab::DetailsTab(PeHandler *peHndl, QWidget *parent)
 	fileHdrTree(this), optionalHdrTree(this), disasmView(this),
 	hdrsSplitter(this), secHdrTreeView(&hdrsSplitter), secDiagramSplitter(&hdrsSplitter),
 	fileHdrModel(NULL), optHdrModel(NULL), secHdrsModel(NULL), importsModel(NULL), exportsModel(NULL), expFuncModel(NULL), 
-	secDiagramModel(NULL), disasmModel(NULL), resourcesModel(NULL), clrModel(NULL)
+	secDiagramModel(NULL), disasmModel(NULL), resourcesModel(NULL), clrModel(NULL),
+	cRichHdrTab(-1)
 {
 	for (int i = 0; i < pe::DIR_ENTRIES_COUNT; i++)  {
 		dirSplitters[i] = NULL;
@@ -199,17 +200,15 @@ DetailsTab::DetailsTab(PeHandler *peHndl, QWidget *parent)
 	cStringsTab = addTab(&stringsBrowseWindow, tr("Strings"));
 
 	cDOSHdrTab = addTab(&dosHdrTree, tr("DOS Hdr"));
-	if (peHndl && peHndl->getPe() && peHndl->getPe()->getRichHeaderSign()) {
-		cRichHdrTab = addTab(&richHdrTree, tr("Rich Hdr"));
-	}
+	cRichHdrTab = addTab(&richHdrTree, tr("Rich Hdr"));
 	cFileHdrsTab = addTab(&fileHdrTree, tr("File Hdr"));
 	cOptHdrsTab = addTab(&optionalHdrTree, tr("Optional Hdr"));
 	cSecHdrsTab = addTab(&hdrsSplitter, tr("Section Hdrs"));
 
 	setScaledIcons();
-	reloadDirView();
+	reloadTabsView();
 
-	connect(this->myPeHndl, SIGNAL(modified()), this, SLOT(reloadDirView()) );
+	connect(this->myPeHndl, SIGNAL(modified()), this, SLOT(reloadTabsView()) );
 	connect(this->myPeHndl, SIGNAL(pageOffsetModified(offset_t, bufsize_t)), this, SLOT(setDisasmTabText(offset_t)) );
 	connect(this->myPeHndl, SIGNAL(pageOffsetModified(offset_t, bufsize_t)), disasmModel, SLOT(setShownContent(offset_t, bufsize_t)) );
 
@@ -468,7 +467,7 @@ void DetailsTab::setDisasmTabText(offset_t raw)
 		if (sec2Name.size()) 
 			secName += " to " + sec2Name;
 	}
-	setTabText(this->cDisasmTab, tr( "Disasm") + secName);
+	setTabText(this->cDisasmTab, tr("Disasm") + secName);
 }
 
 void DetailsTab::shirtTabsAfter(pe::dir_entry dirNum, bool toTheLeft)
@@ -533,8 +532,32 @@ void DetailsTab::manageDirTab(pe::dir_entry dirNum)
 	}
 }
 
-void DetailsTab::reloadDirView()
+void DetailsTab::manageRichHdrTab()
 {
+	if (!myPeHndl || !m_PE) return;
+	
+	//add/remove Rich Header tab
+	if (m_PE->getRichHeaderSign()) {
+		if (cRichHdrTab == (-1)) {
+			int lastBefore = this->cDOSHdrTab;
+			int tabIndex = lastBefore + 1;
+			cRichHdrTab = this->insertTab(tabIndex, &richHdrTree, tr("Rich Hdr"));
+		}
+	}
+	else {
+		if (cRichHdrTab != (-1)) {
+			removeTab(cRichHdrTab);
+			cRichHdrTab = (-1);
+		}
+	}
+}
+
+void DetailsTab::reloadTabsView()
+{
+	if (!myPeHndl || !m_PE) return;
+
+	manageRichHdrTab();
+	
 	for (int i = 0; i < pe::DIR_ENTRIES_COUNT; i++) {
 		manageDirTab(pe::dir_entry(i));
 	}

pe-bear/gui/DetailsTab.h

@@ -46,11 +46,11 @@ protected slots:
 	void onAutoAddImports();
 
 	void setDisasmTabText(offset_t raw);
-
-	void reloadDirView();
-	void manageDirTab(pe::dir_entry dirNum);
+	void reloadTabsView();
 
 protected:
+	void manageDirTab(pe::dir_entry dirNum);
+	void manageRichHdrTab();
 	void shirtTabsAfter(pe::dir_entry dirNum, bool toTheLeft);
 	void createModels();
 	void deleteModels();

pe-bear/gui/ResourceDirSplitter.cpp

@@ -126,6 +126,13 @@ bool ResourcesDirSplitter::displayText(ResourceContentWrapper *resContent)
 	return true;
 }
 
+bool ResourcesDirSplitter::displayResVersion(ResourceVersionWrapper *verContent)
+{
+	if (!verContent) return false;
+	//TODO: finish this
+	return false;
+}
+
 bool ResourcesDirSplitter::displayResStrings(ResourceStringsWrapper *strContent)
 {
 	if (!strContent) return false;
@@ -320,8 +327,12 @@ void ResourcesDirSplitter::refreshLeafContent()
 			break;
 		}
 		case RESTYPE_STRING: {
-			ResourceStringsWrapper *strWrapper = dynamic_cast<ResourceStringsWrapper*>(resContent);
-			isOk = displayResStrings(strWrapper);
+			isOk = displayResStrings(dynamic_cast<ResourceStringsWrapper*>(resContent));
+			if (isOk) changeView(RES_VIEW_RAW);
+			break;
+		}
+		case RESTYPE_VERSION: {
+			isOk = displayResVersion(dynamic_cast<ResourceVersionWrapper*>(resContent));
 			if (isOk) changeView(RES_VIEW_RAW);
 			break;
 		}

pe-bear/gui/ResourceDirSplitter.h

@@ -46,6 +46,7 @@ public slots:
 
 	void changeView(res_view_type viewType);
 	void clearContentDisplay();
+	bool displayResVersion(ResourceVersionWrapper *resContent);
 	bool displayResStrings(ResourceStringsWrapper *resContent);
 	bool displayText(ResourceContentWrapper *resContent);
 	bool displayBitmap(ResourceContentWrapper *resContent);