Merge pull request #3902 from valentinvanelslande/restart
citra_qt: add restart hotkey & menu option
This commit is contained in:
commit
751e00a615
@ -320,6 +320,7 @@ void GMainWindow::InitializeHotkeys() {
|
|||||||
RegisterHotkey("Main Window", "Load File", QKeySequence::Open);
|
RegisterHotkey("Main Window", "Load File", QKeySequence::Open);
|
||||||
RegisterHotkey("Main Window", "Start Emulation");
|
RegisterHotkey("Main Window", "Start Emulation");
|
||||||
RegisterHotkey("Main Window", "Continue/Pause", QKeySequence(Qt::Key_F4));
|
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", "Swap Screens", QKeySequence(tr("F9")));
|
||||||
RegisterHotkey("Main Window", "Toggle Screen Layout", QKeySequence(tr("F10")));
|
RegisterHotkey("Main Window", "Toggle Screen Layout", QKeySequence(tr("F10")));
|
||||||
RegisterHotkey("Main Window", "Fullscreen", QKeySequence::FullScreen);
|
RegisterHotkey("Main Window", "Fullscreen", QKeySequence::FullScreen);
|
||||||
@ -346,6 +347,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,
|
connect(GetHotkey("Main Window", "Swap Screens", render_window), &QShortcut::activated,
|
||||||
ui.action_Screen_Layout_Swap_Screens, &QAction::trigger);
|
ui.action_Screen_Layout_Swap_Screens, &QAction::trigger);
|
||||||
connect(GetHotkey("Main Window", "Toggle Screen Layout", render_window), &QShortcut::activated,
|
connect(GetHotkey("Main Window", "Toggle Screen Layout", render_window), &QShortcut::activated,
|
||||||
@ -462,6 +468,8 @@ void GMainWindow::ConnectMenuEvents() {
|
|||||||
connect(ui.action_Start, &QAction::triggered, this, &GMainWindow::OnStartGame);
|
connect(ui.action_Start, &QAction::triggered, this, &GMainWindow::OnStartGame);
|
||||||
connect(ui.action_Pause, &QAction::triggered, this, &GMainWindow::OnPauseGame);
|
connect(ui.action_Pause, &QAction::triggered, this, &GMainWindow::OnPauseGame);
|
||||||
connect(ui.action_Stop, &QAction::triggered, this, &GMainWindow::OnStopGame);
|
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,
|
connect(ui.action_Report_Compatibility, &QAction::triggered, this,
|
||||||
&GMainWindow::OnMenuReportCompatibility);
|
&GMainWindow::OnMenuReportCompatibility);
|
||||||
connect(ui.action_Configure, &QAction::triggered, this, &GMainWindow::OnConfigure);
|
connect(ui.action_Configure, &QAction::triggered, this, &GMainWindow::OnConfigure);
|
||||||
@ -752,6 +760,7 @@ void GMainWindow::ShutdownGame() {
|
|||||||
ui.action_Start->setText(tr("Start"));
|
ui.action_Start->setText(tr("Start"));
|
||||||
ui.action_Pause->setEnabled(false);
|
ui.action_Pause->setEnabled(false);
|
||||||
ui.action_Stop->setEnabled(false);
|
ui.action_Stop->setEnabled(false);
|
||||||
|
ui.action_Restart->setEnabled(false);
|
||||||
ui.action_Report_Compatibility->setEnabled(false);
|
ui.action_Report_Compatibility->setEnabled(false);
|
||||||
render_window->hide();
|
render_window->hide();
|
||||||
if (game_list->isEmpty())
|
if (game_list->isEmpty())
|
||||||
@ -1028,6 +1037,7 @@ void GMainWindow::OnStartGame() {
|
|||||||
|
|
||||||
ui.action_Pause->setEnabled(true);
|
ui.action_Pause->setEnabled(true);
|
||||||
ui.action_Stop->setEnabled(true);
|
ui.action_Stop->setEnabled(true);
|
||||||
|
ui.action_Restart->setEnabled(true);
|
||||||
ui.action_Report_Compatibility->setEnabled(true);
|
ui.action_Report_Compatibility->setEnabled(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -71,6 +71,7 @@
|
|||||||
<addaction name="action_Start"/>
|
<addaction name="action_Start"/>
|
||||||
<addaction name="action_Pause"/>
|
<addaction name="action_Pause"/>
|
||||||
<addaction name="action_Stop"/>
|
<addaction name="action_Stop"/>
|
||||||
|
<addaction name="action_Restart"/>
|
||||||
<addaction name="separator"/>
|
<addaction name="separator"/>
|
||||||
<addaction name="action_Configure"/>
|
<addaction name="action_Configure"/>
|
||||||
</widget>
|
</widget>
|
||||||
@ -351,6 +352,14 @@
|
|||||||
<bool>false</bool>
|
<bool>false</bool>
|
||||||
</property>
|
</property>
|
||||||
</action>
|
</action>
|
||||||
|
<action name="action_Restart">
|
||||||
|
<property name="enabled">
|
||||||
|
<bool>false</bool>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>Restart</string>
|
||||||
|
</property>
|
||||||
|
</action>
|
||||||
</widget>
|
</widget>
|
||||||
<resources/>
|
<resources/>
|
||||||
<connections/>
|
<connections/>
|
||||||
|
Loading…
Reference in New Issue
Block a user