mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-03-29 22:20:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Qt: Fix Play/Pause/Resume Shortcuts

Browse Source
This commit is contained in:
Megamouse 2021-06-10 20:10:06 +02:00
parent 0628a5d931
commit 9cbcce671d
1 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
rpcs3/rpcs3qt/main_window.cpp
View File

@ -146,7 +146,8 @@ bool main_window::Init(bool with_cli_boot)
if (enable_play_last) if (enable_play_last)
{ {
ui->sysPauseAct->setText(tr("&Play last played game\tCtrl+R")); ui->sysPauseAct->setText(tr("&Play last played game"));
ui->sysPauseAct->setShortcut(QKeySequence("Ctrl+R"));
ui->sysPauseAct->setIcon(m_icon_play); ui->sysPauseAct->setIcon(m_icon_play);
ui->toolbar_start->setToolTip(start_tooltip); ui->toolbar_start->setToolTip(start_tooltip);
} }
@ -1480,7 +1481,8 @@ void main_window::OnEmuRun(bool /*start_playtime*/) const
m_thumb_playPause->setToolTip(pause_tooltip); m_thumb_playPause->setToolTip(pause_tooltip);
m_thumb_playPause->setIcon(m_icon_thumb_pause); m_thumb_playPause->setIcon(m_icon_thumb_pause);
#endif #endif
ui->sysPauseAct->setText(tr("&Pause\tCtrl+P")); ui->sysPauseAct->setText(tr("&Pause"));
ui->sysPauseAct->setShortcut(QKeySequence("Ctrl+P"));
ui->sysPauseAct->setIcon(m_icon_pause); ui->sysPauseAct->setIcon(m_icon_pause);
ui->toolbar_start->setIcon(m_icon_pause); ui->toolbar_start->setIcon(m_icon_pause);
ui->toolbar_start->setText(tr("Pause")); ui->toolbar_start->setText(tr("Pause"));
@ -1503,7 +1505,8 @@ void main_window::OnEmuResume() const
m_thumb_playPause->setToolTip(pause_tooltip); m_thumb_playPause->setToolTip(pause_tooltip);
m_thumb_playPause->setIcon(m_icon_thumb_pause); m_thumb_playPause->setIcon(m_icon_thumb_pause);
#endif #endif
ui->sysPauseAct->setText(tr("&Pause\tCtrl+P")); ui->sysPauseAct->setText(tr("&Pause"));
ui->sysPauseAct->setShortcut(QKeySequence("Ctrl+P"));
ui->sysPauseAct->setIcon(m_icon_pause); ui->sysPauseAct->setIcon(m_icon_pause);
ui->toolbar_start->setIcon(m_icon_pause); ui->toolbar_start->setIcon(m_icon_pause);
ui->toolbar_start->setText(tr("Pause")); ui->toolbar_start->setText(tr("Pause"));
@ -1520,7 +1523,8 @@ void main_window::OnEmuPause() const
m_thumb_playPause->setToolTip(resume_tooltip); m_thumb_playPause->setToolTip(resume_tooltip);
m_thumb_playPause->setIcon(m_icon_thumb_play); m_thumb_playPause->setIcon(m_icon_thumb_play);
#endif #endif
ui->sysPauseAct->setText(tr("&Resume\tCtrl+R")); ui->sysPauseAct->setText(tr("&Resume"));
ui->sysPauseAct->setShortcut(QKeySequence("Ctrl+R"));
ui->sysPauseAct->setIcon(m_icon_play); ui->sysPauseAct->setIcon(m_icon_play);
ui->toolbar_start->setIcon(m_icon_play); ui->toolbar_start->setIcon(m_icon_play);
ui->toolbar_start->setText(tr("Play")); ui->toolbar_start->setText(tr("Play"));
@ -1540,7 +1544,8 @@ void main_window::OnEmuStop()
m_debugger_frame->UpdateUI(); m_debugger_frame->UpdateUI();
ui->sysPauseAct->setText(Emu.IsReady() ? tr("&Play\tCtrl+R") : tr("&Resume\tCtrl+R")); ui->sysPauseAct->setText(Emu.IsReady() ? tr("&Play") : tr("&Resume"));
ui->sysPauseAct->setShortcut(QKeySequence("Ctrl+R"));
ui->sysPauseAct->setIcon(m_icon_play); ui->sysPauseAct->setIcon(m_icon_play);
#ifdef _WIN32 #ifdef _WIN32
m_thumb_playPause->setToolTip(play_tooltip); m_thumb_playPause->setToolTip(play_tooltip);
@ -1599,7 +1604,8 @@ void main_window::OnEmuReady() const
m_thumb_playPause->setToolTip(play_tooltip); m_thumb_playPause->setToolTip(play_tooltip);
m_thumb_playPause->setIcon(m_icon_thumb_play); m_thumb_playPause->setIcon(m_icon_thumb_play);
#endif #endif
ui->sysPauseAct->setText(Emu.IsReady() ? tr("&Play\tCtrl+R") : tr("&Resume\tCtrl+R")); ui->sysPauseAct->setText(Emu.IsReady() ? tr("&Play") : tr("&Resume"));
ui->sysPauseAct->setShortcut(QKeySequence("Ctrl+R"));
ui->sysPauseAct->setIcon(m_icon_play); ui->sysPauseAct->setIcon(m_icon_play);
ui->toolbar_start->setIcon(m_icon_play); ui->toolbar_start->setIcon(m_icon_play);
ui->toolbar_start->setText(tr("Play")); ui->toolbar_start->setText(tr("Play"));
@ -1797,7 +1803,7 @@ void main_window::AddRecentAction(const q_string_pair& entry)
// refill menu with actions // refill menu with actions
for (int i = 0; i < m_recent_game_acts.count(); i++) for (int i = 0; i < m_recent_game_acts.count(); i++)
{ {
m_recent_game_acts[i]->setShortcut(tr("Ctrl+%1").arg(i+1)); m_recent_game_acts[i]->setShortcut(tr("Ctrl+%1").arg(i + 1));
m_recent_game_acts[i]->setToolTip(m_rg_entries.at(i).second); m_recent_game_acts[i]->setToolTip(m_rg_entries.at(i).second);
ui->bootRecentMenu->addAction(m_recent_game_acts[i]); ui->bootRecentMenu->addAction(m_recent_game_acts[i]);
} }
@ -2652,23 +2658,6 @@ void main_window::keyPressEvent(QKeyEvent *keyEvent)
{ {
ui->toolbar_fullscreen->trigger(); ui->toolbar_fullscreen->trigger();
} }
if (keyEvent->modifiers() & Qt::ControlModifier)
{
switch (keyEvent->key())
{
case Qt::Key_R:
{
switch (Emu.GetStatus())
{
case system_state::paused: Emu.Resume(); return;
case system_state::ready: Emu.Run(true); return;
default: return;
}
}
case Qt::Key_P: if (Emu.IsRunning()) Emu.Pause(); return;
}
}
} }
void main_window::mouseDoubleClickEvent(QMouseEvent *event) void main_window::mouseDoubleClickEvent(QMouseEvent *event)