From 06f6ac66fa70b9cc02b2f89eb2ee5e856e1a7bd1 Mon Sep 17 00:00:00 2001
From: Megamouse <studienricky89@googlemail.com>
Date: Tue, 11 Jul 2017 17:31:37 +0200
Subject: [PATCH] debugger_frame: remove pause button

and move its functionality to run button
---
 rpcs3/rpcs3qt/debugger_frame.cpp | 34 ++++++++++++++++----------------
 rpcs3/rpcs3qt/debugger_frame.h   |  5 +++--
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/rpcs3/rpcs3qt/debugger_frame.cpp b/rpcs3/rpcs3qt/debugger_frame.cpp
index 19bd582154..cef63fef4c 100644
--- a/rpcs3/rpcs3qt/debugger_frame.cpp
+++ b/rpcs3/rpcs3qt/debugger_frame.cpp
@@ -31,8 +31,7 @@ debugger_frame::debugger_frame(QWidget *parent) : QDockWidget(tr("Debugger"), pa
 	m_go_to_addr = new QPushButton(tr("Go To Address"), this);
 	m_go_to_pc = new QPushButton(tr("Go To PC"), this);
 	m_btn_step = new QPushButton(tr("Step"), this);
-	m_btn_run = new QPushButton(tr("Run"), this);
-	m_btn_pause = new QPushButton(tr("Pause"), this);
+	m_btn_run = new QPushButton(Run, this);
 
 	EnableButtons(!Emu.IsStopped());
 
@@ -40,7 +39,6 @@ debugger_frame::debugger_frame(QWidget *parent) : QDockWidget(tr("Debugger"), pa
 	hbox_b_main->addWidget(m_go_to_pc);
 	hbox_b_main->addWidget(m_btn_step);
 	hbox_b_main->addWidget(m_btn_run);
-	hbox_b_main->addWidget(m_btn_pause);
 	hbox_b_main->addWidget(m_choice_units);
 	hbox_b_main->addStretch();
 
@@ -76,14 +74,20 @@ debugger_frame::debugger_frame(QWidget *parent) : QDockWidget(tr("Debugger"), pa
 	connect(m_go_to_pc, &QAbstractButton::clicked, this, &debugger_frame::Show_PC);
 	connect(m_btn_step, &QAbstractButton::clicked, this, &debugger_frame::DoStep);
 	connect(m_btn_run, &QAbstractButton::clicked, [=](){
-		const auto cpu = this->cpu.lock();
-		if (cpu && cpu->state.test_and_reset(cpu_flag::dbg_pause))
-			if (!test(cpu->state, cpu_flag::dbg_pause + cpu_flag::dbg_global_pause))
-				cpu->notify();
-		UpdateUI();
-	});
-	connect(m_btn_pause, &QAbstractButton::clicked, [=](){
-		if (const auto cpu = this->cpu.lock()) cpu->state += cpu_flag::dbg_pause;
+		if (const auto cpu = this->cpu.lock())
+		{
+			if (m_btn_run->text() == Run && cpu->state.test_and_reset(cpu_flag::dbg_pause))
+			{
+				if (!test(cpu->state, cpu_flag::dbg_pause + cpu_flag::dbg_global_pause))
+				{
+					cpu->notify();
+				}
+			}
+			else
+			{
+				cpu->state += cpu_flag::dbg_pause;
+			}
+		}
 		UpdateUI();
 	});
 	connect(m_choice_units, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated), this, &debugger_frame::UpdateUI);
@@ -147,7 +151,6 @@ void debugger_frame::UpdateUI()
 
 			m_btn_run->setEnabled(false);
 			m_btn_step->setEnabled(false);
-			m_btn_pause->setEnabled(false);
 		}
 	}
 	else
@@ -163,15 +166,13 @@ void debugger_frame::UpdateUI()
 
 			if (test(state & cpu_flag::dbg_pause))
 			{
-				m_btn_run->setEnabled(true);
+				m_btn_run->setText(Run);
 				m_btn_step->setEnabled(true);
-				m_btn_pause->setEnabled(false);
 			}
 			else
 			{
-				m_btn_run->setEnabled(false);
+				m_btn_run->setText(Pause);
 				m_btn_step->setEnabled(false);
-				m_btn_pause->setEnabled(true);
 			}
 		}
 	}
@@ -407,7 +408,6 @@ void debugger_frame::EnableButtons(bool enable)
 	m_go_to_pc->setEnabled(enable);
 	m_btn_step->setEnabled(enable);
 	m_btn_run->setEnabled(enable);
-	m_btn_pause->setEnabled(enable);
 }
 
 debugger_list::debugger_list(debugger_frame* parent) : QListWidget(parent)
diff --git a/rpcs3/rpcs3qt/debugger_frame.h b/rpcs3/rpcs3qt/debugger_frame.h
index 59e86880af..09fccdff07 100644
--- a/rpcs3/rpcs3qt/debugger_frame.h
+++ b/rpcs3/rpcs3qt/debugger_frame.h
@@ -42,7 +42,6 @@ class debugger_frame : public QDockWidget
 	QPushButton* m_go_to_pc;
 	QPushButton* m_btn_step;
 	QPushButton* m_btn_run;
-	QPushButton* m_btn_pause;
 	QComboBox* m_choice_units;
 	QString m_current_choice;
 	bool m_noThreadSelected = true;
@@ -54,7 +53,9 @@ class debugger_frame : public QDockWidget
 
 	QTimer* update;
 
-	const QString NoThread = "No Thread";
+	const QString NoThread = tr("No Thread");
+	const QString Run = tr("Run");
+	const QString Pause = tr("Pause");
 
 public:
 	std::unique_ptr<CPUDisAsm> m_disasm;