diff --git a/rpcs3/rpcs3qt/gs_frame.cpp b/rpcs3/rpcs3qt/gs_frame.cpp index f1ffad0bb6..89b3e76888 100644 --- a/rpcs3/rpcs3qt/gs_frame.cpp +++ b/rpcs3/rpcs3qt/gs_frame.cpp @@ -187,21 +187,7 @@ void gs_frame::keyPressEvent(QKeyEvent *keyEvent) return; } break; - case Qt::Key_S: - if (keyEvent->modifiers() == Qt::ControlModifier && !m_disable_kb_hotkeys && !Emu.IsStopped()) - { - Emu.Stop(); - return; - } - break; case Qt::Key_R: - if (keyEvent->modifiers() == Qt::ControlModifier && !m_disable_kb_hotkeys && !Emu.GetBoot().empty()) - { - Emu.Restart(); - return; - } - break; - case Qt::Key_E: if (keyEvent->modifiers() == Qt::ControlModifier && !m_disable_kb_hotkeys) { switch (Emu.GetStatus()) diff --git a/rpcs3/rpcs3qt/main_window.cpp b/rpcs3/rpcs3qt/main_window.cpp index 1962aa4ec3..5fca2b7108 100644 --- a/rpcs3/rpcs3qt/main_window.cpp +++ b/rpcs3/rpcs3qt/main_window.cpp @@ -145,7 +145,7 @@ bool main_window::Init(bool with_cli_boot) if (enable_play_last) { - ui->sysPauseAct->setText(tr("&Play last played game\tCtrl+E")); + ui->sysPauseAct->setText(tr("&Play last played game\tCtrl+R")); ui->sysPauseAct->setIcon(m_icon_play); ui->toolbar_start->setToolTip(start_tooltip); } @@ -1519,7 +1519,7 @@ void main_window::OnEmuPause() const m_thumb_playPause->setToolTip(resume_tooltip); m_thumb_playPause->setIcon(m_icon_thumb_play); #endif - ui->sysPauseAct->setText(tr("&Resume\tCtrl+E")); + ui->sysPauseAct->setText(tr("&Resume\tCtrl+R")); ui->sysPauseAct->setIcon(m_icon_play); ui->toolbar_start->setIcon(m_icon_play); ui->toolbar_start->setText(tr("Play")); @@ -1539,7 +1539,7 @@ void main_window::OnEmuStop() m_debugger_frame->UpdateUI(); - ui->sysPauseAct->setText(Emu.IsReady() ? tr("&Play\tCtrl+E") : tr("&Resume\tCtrl+E")); + ui->sysPauseAct->setText(Emu.IsReady() ? tr("&Play\tCtrl+R") : tr("&Resume\tCtrl+R")); ui->sysPauseAct->setIcon(m_icon_play); #ifdef _WIN32 m_thumb_playPause->setToolTip(play_tooltip); @@ -1598,7 +1598,7 @@ void main_window::OnEmuReady() const m_thumb_playPause->setToolTip(play_tooltip); m_thumb_playPause->setIcon(m_icon_thumb_play); #endif - ui->sysPauseAct->setText(Emu.IsReady() ? tr("&Play\tCtrl+E") : tr("&Resume\tCtrl+E")); + ui->sysPauseAct->setText(Emu.IsReady() ? tr("&Play\tCtrl+R") : tr("&Resume\tCtrl+R")); ui->sysPauseAct->setIcon(m_icon_play); ui->toolbar_start->setIcon(m_icon_play); ui->toolbar_start->setText(tr("Play")); @@ -2656,7 +2656,7 @@ void main_window::keyPressEvent(QKeyEvent *keyEvent) { switch (keyEvent->key()) { - case Qt::Key_E: + case Qt::Key_R: { switch (Emu.GetStatus()) { @@ -2666,8 +2666,6 @@ void main_window::keyPressEvent(QKeyEvent *keyEvent) } } case Qt::Key_P: if (Emu.IsRunning()) Emu.Pause(); return; - case Qt::Key_S: if (!Emu.IsStopped()) Emu.Stop(); return; - case Qt::Key_R: if (!Emu.GetBoot().empty()) Emu.Restart(); return; } } }