kernel explorer: Make it single-instance tool

RPCS3 · Jan 9, 2021 · b3feaa9 · b3feaa9
1 parent a36f25c
commit b3feaa9
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 8 deletions.
diff --git a/rpcs3/rpcs3qt/kernel_explorer.cpp b/rpcs3/rpcs3qt/kernel_explorer.cpp
@@ -3,6 +3,7 @@
 #include <QVBoxLayout>
 #include <QPushButton>
 #include <QHeaderView>
+#include <QTreeWidget>
 #include <QTreeWidgetItem>
 
 #include "Emu/IdManager.h"
@@ -167,17 +168,20 @@ kernel_explorer::kernel_explorer(QWidget* parent) : QDialog(parent)
 	m_tree->header()->close();
 
 	// Merge and display everything
-	vbox_panel->addSpacing(10);
+	vbox_panel->addSpacing(8);
 	vbox_panel->addLayout(hbox_buttons);
-	vbox_panel->addSpacing(10);
+	vbox_panel->addSpacing(8);
 	vbox_panel->addWidget(m_tree);
-	vbox_panel->addSpacing(10);
 	setLayout(vbox_panel);
 
 	// Events
 	connect(button_refresh, &QAbstractButton::clicked, this, &kernel_explorer::Update);
+}
 
-	Update();
+void kernel_explorer::closeEvent(QCloseEvent *event)
+{
+	QDialog::closeEvent(event);
+	Q_EMIT FrameClosed();
 }
 
 void kernel_explorer::Update()

diff --git a/rpcs3/rpcs3qt/kernel_explorer.h b/rpcs3/rpcs3qt/kernel_explorer.h
@@ -1,10 +1,11 @@
 #pragma once
 
 #include <QDialog>
-#include <QTreeWidget>
 
 #include "util/types.hpp"
 
+class QTreeWidget;
+
 class kernel_explorer : public QDialog
 {
 	Q_OBJECT
@@ -30,6 +31,11 @@ class kernel_explorer : public QDialog
 private:
 	QTreeWidget* m_tree;
 
-private Q_SLOTS:
+	void closeEvent(QCloseEvent* event) override;
+
+Q_SIGNALS:
+	void FrameClosed();
+
+public:
 	void Update();
 };
diff --git a/rpcs3/rpcs3qt/main_window.cpp b/rpcs3/rpcs3qt/main_window.cpp
@@ -1289,6 +1289,12 @@ void main_window::EnableMenus(bool enabled)
 	ui->toolsRsxDebuggerAct->setEnabled(enabled);
 	ui->toolsStringSearchAct->setEnabled(enabled);
 	ui->actionCreate_RSX_Capture->setEnabled(enabled);
+
+	if (!enabled)
+	{
+		if (m_kernel_explorer)
+			m_kernel_explorer->close();
+	}
 }
 
 void main_window::BootRecentAction(const QAction* act)
@@ -1759,8 +1765,10 @@ void main_window::CreateConnects()
 
 	connect(ui->toolskernel_explorerAct, &QAction::triggered, [this]
 	{
-		kernel_explorer* kernelExplorer = new kernel_explorer(this);
-		kernelExplorer->show();
+		if (!m_kernel_explorer)
+			m_kernel_explorer = new kernel_explorer(this);
+
+		m_kernel_explorer->show();
 	});
 
 	connect(ui->toolsmemory_viewerAct, &QAction::triggered, [this]
@@ -1988,6 +1996,11 @@ void main_window::CreateDockWindows()
 		}
 	});
 
+	connect(m_kernel_explorer, &kernel_explorer::FrameClosed, [this]()
+	{
+		m_kernel_explorer = nullptr;
+	});
+
 	connect(m_debugger_frame, &debugger_frame::DebugFrameClosed, [this]()
 	{
 		if (ui->showDebuggerAct->isChecked())

diff --git a/rpcs3/rpcs3qt/main_window.h b/rpcs3/rpcs3qt/main_window.h
@@ -21,6 +21,7 @@ class game_list_frame;
 class gui_settings;
 class emu_settings;
 class persistent_settings;
+class kernel_explorer;
 
 struct gui_game_info;
 
@@ -164,6 +165,7 @@ private Q_SLOTS:
 	log_frame* m_log_frame = nullptr;
 	debugger_frame* m_debugger_frame = nullptr;
 	game_list_frame* m_game_list_frame = nullptr;
+	kernel_explorer* m_kernel_explorer = nullptr;
 	std::shared_ptr<gui_settings> m_gui_settings;
 	std::shared_ptr<emu_settings> m_emu_settings;
 	std::shared_ptr<persistent_settings> m_persistent_settings;