From 6380d52d1cc910dd047b00c96109dc22695ee88a Mon Sep 17 00:00:00 2001 From: Valentin Vanelslande Date: Sat, 30 Jun 2018 12:30:56 -0500 Subject: [PATCH 1/2] citra_qt: add Restart hotkey & menu action code --- src/citra_qt/main.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp index ff16a00068..ba52f71a77 100644 --- a/src/citra_qt/main.cpp +++ b/src/citra_qt/main.cpp @@ -309,6 +309,7 @@ void GMainWindow::InitializeHotkeys() { RegisterHotkey("Main Window", "Load File", QKeySequence::Open); RegisterHotkey("Main Window", "Start Emulation"); RegisterHotkey("Main Window", "Continue/Pause", QKeySequence(Qt::Key_F4)); + RegisterHotkey("Main Window", "Restart", QKeySequence(Qt::Key_F5)); RegisterHotkey("Main Window", "Swap Screens", QKeySequence(tr("F9"))); RegisterHotkey("Main Window", "Toggle Screen Layout", QKeySequence(tr("F10"))); RegisterHotkey("Main Window", "Fullscreen", QKeySequence::FullScreen); @@ -335,6 +336,11 @@ void GMainWindow::InitializeHotkeys() { } } }); + connect(GetHotkey("Main Window", "Restart", this), &QShortcut::activated, this, [&] { + if (!Core::System::GetInstance().IsPoweredOn()) + return; + BootGame(QString(UISettings::values.recent_files.first())); + }); connect(GetHotkey("Main Window", "Swap Screens", render_window), &QShortcut::activated, ui.action_Screen_Layout_Swap_Screens, &QAction::trigger); connect(GetHotkey("Main Window", "Toggle Screen Layout", render_window), &QShortcut::activated, @@ -450,6 +456,8 @@ void GMainWindow::ConnectMenuEvents() { connect(ui.action_Start, &QAction::triggered, this, &GMainWindow::OnStartGame); connect(ui.action_Pause, &QAction::triggered, this, &GMainWindow::OnPauseGame); connect(ui.action_Stop, &QAction::triggered, this, &GMainWindow::OnStopGame); + connect(ui.action_Restart, &QAction::triggered, this, + [&] { BootGame(QString(UISettings::values.recent_files.first())); }); connect(ui.action_Report_Compatibility, &QAction::triggered, this, &GMainWindow::OnMenuReportCompatibility); connect(ui.action_Configure, &QAction::triggered, this, &GMainWindow::OnConfigure); @@ -740,6 +748,7 @@ void GMainWindow::ShutdownGame() { ui.action_Start->setText(tr("Start")); ui.action_Pause->setEnabled(false); ui.action_Stop->setEnabled(false); + ui.action_Restart->setEnabled(false); ui.action_Report_Compatibility->setEnabled(false); render_window->hide(); if (game_list->isEmpty()) @@ -1016,6 +1025,7 @@ void GMainWindow::OnStartGame() { ui.action_Pause->setEnabled(true); ui.action_Stop->setEnabled(true); + ui.action_Restart->setEnabled(true); ui.action_Report_Compatibility->setEnabled(true); } From 5a60c85f5871195f1402d7dd62cab660ca159e08 Mon Sep 17 00:00:00 2001 From: Valentin Vanelslande Date: Sat, 30 Jun 2018 12:34:09 -0500 Subject: [PATCH 2/2] citra_qt: add Restart to UI --- src/citra_qt/main.ui | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/citra_qt/main.ui b/src/citra_qt/main.ui index 9b0c512e3e..bee688600d 100644 --- a/src/citra_qt/main.ui +++ b/src/citra_qt/main.ui @@ -71,6 +71,7 @@ + @@ -351,6 +352,14 @@ false + + + false + + + Restart + +