Archive/rpcs3
0
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-04-28 13:28:01 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Qt: Remove CELL_SYSUTIL_SYSTEM_MENU_CLOSE menu option

Browse source 
This never made any sense
This commit is contained in:
Megamouse 2023-01-14 00:05:21 +01:00
parent 240cb2d627
commit 2d9d92b7d7
3 changed files with 2 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

22
rpcs3/rpcs3qt/main_window.cpp
View file

@ -1867,11 +1867,6 @@ void main_window::OnEmuStop()
ui->actionManage_Users->setEnabled(true); ui->actionManage_Users->setEnabled(true);
ui->confCamerasAct->setEnabled(true); ui->confCamerasAct->setEnabled(true);
if (std::exchange(m_sys_menu_opened, false))
{
ui->sysSendOpenMenuAct->setText(tr("Send open system menu cmd"));
}
// Refresh game list in order to update time played // Refresh game list in order to update time played
if (m_game_list_frame) if (m_game_list_frame)
{ {
@ -1925,9 +1920,6 @@ void main_window::EnableMenus(bool enabled) const
ui->sysStopAct->setEnabled(enabled); ui->sysStopAct->setEnabled(enabled);
ui->sysRebootAct->setEnabled(enabled); ui->sysRebootAct->setEnabled(enabled);
// PS3 Commands
ui->sysSendOpenMenuAct->setEnabled(enabled);
// Tools // Tools
ui->toolskernel_explorerAct->setEnabled(enabled); ui->toolskernel_explorerAct->setEnabled(enabled);
ui->toolsmemory_viewerAct->setEnabled(enabled); ui->toolsmemory_viewerAct->setEnabled(enabled);
@ -2259,7 +2251,7 @@ void main_window::CreateConnects()
{ {
// Enable/Disable Recent Games List // Enable/Disable Recent Games List
const bool stopped = Emu.IsStopped(); const bool stopped = Emu.IsStopped();
for (auto act : ui->bootRecentMenu->actions()) for (QAction* act : ui->bootRecentMenu->actions())
{ {
if (act != ui->freezeRecentAct && act != ui->clearRecentAct) if (act != ui->freezeRecentAct && act != ui->clearRecentAct)
{ {
@ -2275,7 +2267,7 @@ void main_window::CreateConnects()
return; return;
} }
m_rg_entries.clear(); m_rg_entries.clear();
for (auto act : m_recent_game_acts) for (QAction* act : m_recent_game_acts)
{ {
ui->bootRecentMenu->removeAction(act); ui->bootRecentMenu->removeAction(act);
} }
@ -2344,16 +2336,6 @@ void main_window::CreateConnects()
m_gui_settings->SetValue(gui::fd_insert_disc, QFileInfo(dir_path).path()); m_gui_settings->SetValue(gui::fd_insert_disc, QFileInfo(dir_path).path());
}); });
connect(ui->sysSendOpenMenuAct, &QAction::triggered, this, [this]()
{
if (Emu.IsStopped()) return;
gui_log.notice("User triggered \"Send %s system menu command\" action in menu bar", m_sys_menu_opened ? "close" : "open");
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 ^= true;
ui->sysSendOpenMenuAct->setText(tr("Send &%0 system menu cmd").arg(m_sys_menu_opened ? tr("close") : tr("open")));
});
const auto open_settings = [this](int tabIndex) const auto open_settings = [this](int tabIndex)
{ {
settings_dialog dlg(m_gui_settings, m_emu_settings, tabIndex, this); settings_dialog dlg(m_gui_settings, m_emu_settings, tabIndex, this);

1
rpcs3/rpcs3qt/main_window.h
View file

@ -45,7 +45,6 @@ class main_window : public QMainWindow
std::unique_ptr<Ui::main_window> ui; std::unique_ptr<Ui::main_window> ui;
bool m_sys_menu_opened = false;
bool m_is_list_mode = true; bool m_is_list_mode = true;
bool m_save_slider_pos = false; bool m_save_slider_pos = false;
int m_other_slider_pos = 0; int m_other_slider_pos = 0;

2
rpcs3/rpcs3qt/main_window.ui
View file

@ -225,8 +225,6 @@
<addaction name="separator"/> <addaction name="separator"/>
<addaction name="insertDiscAct"/> <addaction name="insertDiscAct"/>
<addaction name="ejectDiscAct"/> <addaction name="ejectDiscAct"/>
<addaction name="separator"/>
<addaction name="sysSendOpenMenuAct"/>
</widget> </widget>
<widget class="QMenu" name="menuConfiguration"> <widget class="QMenu" name="menuConfiguration">
<property name="title"> <property name="title">