diff --git a/rpcs3/rpcs3qt/debugger_frame.cpp b/rpcs3/rpcs3qt/debugger_frame.cpp index cef63fef4c..6c99cdc3e8 100644 --- a/rpcs3/rpcs3qt/debugger_frame.cpp +++ b/rpcs3/rpcs3qt/debugger_frame.cpp @@ -5,6 +5,7 @@ #include inline QString qstr(const std::string& _in) { return QString::fromUtf8(_in.data(), _in.size()); } +extern bool user_asked_for_frame_capture; debugger_frame::debugger_frame(QWidget *parent) : QDockWidget(tr("Debugger"), parent) { @@ -30,6 +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_capture = new QPushButton(tr("Capture"), this); m_btn_step = new QPushButton(tr("Step"), this); m_btn_run = new QPushButton(Run, this); @@ -37,6 +39,7 @@ debugger_frame::debugger_frame(QWidget *parent) : QDockWidget(tr("Debugger"), pa hbox_b_main->addWidget(m_go_to_addr); hbox_b_main->addWidget(m_go_to_pc); + hbox_b_main->addWidget(m_btn_capture); hbox_b_main->addWidget(m_btn_step); hbox_b_main->addWidget(m_btn_run); hbox_b_main->addWidget(m_choice_units); @@ -72,6 +75,7 @@ debugger_frame::debugger_frame(QWidget *parent) : QDockWidget(tr("Debugger"), pa connect(m_go_to_addr, &QAbstractButton::clicked, this, &debugger_frame::Show_Val); connect(m_go_to_pc, &QAbstractButton::clicked, this, &debugger_frame::Show_PC); + connect(m_btn_capture, &QAbstractButton::clicked, [=]() { user_asked_for_frame_capture = true; }); connect(m_btn_step, &QAbstractButton::clicked, this, &debugger_frame::DoStep); connect(m_btn_run, &QAbstractButton::clicked, [=](){ if (const auto cpu = this->cpu.lock()) diff --git a/rpcs3/rpcs3qt/debugger_frame.h b/rpcs3/rpcs3qt/debugger_frame.h index 09fccdff07..76e0d3c185 100644 --- a/rpcs3/rpcs3qt/debugger_frame.h +++ b/rpcs3/rpcs3qt/debugger_frame.h @@ -40,6 +40,7 @@ class debugger_frame : public QDockWidget QTextEdit* m_regs; QPushButton* m_go_to_addr; QPushButton* m_go_to_pc; + QPushButton* m_btn_capture; QPushButton* m_btn_step; QPushButton* m_btn_run; QComboBox* m_choice_units; diff --git a/rpcs3/rpcs3qt/main_window.cpp b/rpcs3/rpcs3qt/main_window.cpp index c1ce472dc5..fc8b51ad36 100644 --- a/rpcs3/rpcs3qt/main_window.cpp +++ b/rpcs3/rpcs3qt/main_window.cpp @@ -691,8 +691,6 @@ void main_window::OnEmuReady() EnableMenus(true); } -extern bool user_asked_for_frame_capture; - void main_window::EnableMenus(bool enabled) { // Thumbnail Buttons @@ -958,7 +956,6 @@ void main_window::CreateConnects() connect(ui->sysPauseAct, &QAction::triggered, Pause); connect(ui->sysStopAct, &QAction::triggered, [=]() { Emu.Stop(); }); connect(ui->sysRebootAct, &QAction::triggered, [=]() { Emu.Stop(); Emu.Load(); }); - connect(ui->captureFrame, &QAction::triggered, [=]() { user_asked_for_frame_capture = true; }); connect(ui->sysSendOpenMenuAct, &QAction::triggered, [=](){ sysutil_send_system_cmd(m_sys_menu_opened ? 0x0132 /* CELL_SYSUTIL_SYSTEM_MENU_CLOSE */ : 0x0131 /* CELL_SYSUTIL_SYSTEM_MENU_OPEN */, 0); m_sys_menu_opened = !m_sys_menu_opened; @@ -1121,7 +1118,7 @@ void main_window::CreateConnects() connect(ui->toolbar_refresh, &QAction::triggered, [=]() { gameListFrame->Refresh(true); }); connect(ui->toolbar_stop, &QAction::triggered, [=]() { Emu.Stop(); }); connect(ui->toolbar_start, &QAction::triggered, Pause); - //connect(ui->toolbar_snap, &QAction::triggered, [=]() { user_asked_for_frame_capture = true; }); + //connect(ui->toolbar_snap, &QAction::triggered, [=]() {}); connect(ui->toolbar_fullscreen, &QAction::triggered, [=]() { if (isFullScreen()) { diff --git a/rpcs3/rpcs3qt/main_window.ui b/rpcs3/rpcs3qt/main_window.ui index 936daaeb98..e87d8f74ba 100644 --- a/rpcs3/rpcs3qt/main_window.ui +++ b/rpcs3/rpcs3qt/main_window.ui @@ -186,8 +186,6 @@ margin-left:14px; - - @@ -518,14 +516,6 @@ QLineEdit { background-color: rgba(227, 227, 227, 255); } Manage User Accounts - - - false - - - Manage .yml Patches - - Cg Disasm @@ -594,11 +584,6 @@ QLineEdit { background-color: rgba(227, 227, 227, 255); } About Qt - - - Show Controls - - true @@ -620,11 +605,6 @@ QLineEdit { background-color: rgba(227, 227, 227, 255); } Game List Refresh - - - Game List Categories - - false @@ -725,16 +705,6 @@ QLineEdit { background-color: rgba(227, 227, 227, 255); } Restart - - - Pause - - - - - Save State - - true @@ -801,14 +771,6 @@ QLineEdit { background-color: rgba(227, 227, 227, 255); } Unknown - - - Capture Frame - - - Capture frame - - @@ -978,16 +940,6 @@ QLineEdit { background-color: rgba(227, 227, 227, 255); } Show Game Tool Bar - - - Network - - - - - Emulator - -