Commit cb6863ce authored by OyyoDams's avatar OyyoDams

Shutdown System option moved at the top of the Quit menu

parent 2c3fe346
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/). This project adheres to [Semantic Versioning](http://semver.org/).
## [6.1] Shutdown System option moved at the top of the Quit menu
## [6.0] ## [6.0]
### Added ### Added
- Mame roms fullname in Netplay GUI - Mame roms fullname in Netplay GUI
......
...@@ -1604,17 +1604,7 @@ void GuiMenu::menuQuit(){ ...@@ -1604,17 +1604,7 @@ void GuiMenu::menuQuit(){
Window *window = mWindow; Window *window = mWindow;
ComponentListRow row; ComponentListRow row;
row.makeAcceptInputHandler([window] {
window->pushGui(new GuiMsgBox(window, _("REALLY RESTART?"), _("YES"), [] {
if (RecalboxSystem::getInstance()->reboot() != 0) {
LOG(LogWarning) << "Restart terminated with non-zero result!";
}
}, _("NO"), nullptr));
});
row.addElement(std::make_shared<TextComponent>(window, _("RESTART SYSTEM"), mMenuTheme->menuText.font, mMenuTheme->menuText.color), true);
s->addRow(row);
row.elements.clear();
row.makeAcceptInputHandler([window] { row.makeAcceptInputHandler([window] {
window->pushGui(new GuiMsgBox(window, _("REALLY SHUTDOWN?"), _("YES"), [] { window->pushGui(new GuiMsgBox(window, _("REALLY SHUTDOWN?"), _("YES"), [] {
if (RecalboxSystem::getInstance()->shutdown() != 0) { if (RecalboxSystem::getInstance()->shutdown() != 0) {
...@@ -1635,6 +1625,18 @@ void GuiMenu::menuQuit(){ ...@@ -1635,6 +1625,18 @@ void GuiMenu::menuQuit(){
}); });
row.addElement(std::make_shared<TextComponent>(window, _("FAST SHUTDOWN SYSTEM"), mMenuTheme->menuText.font, mMenuTheme->menuText.color), true); row.addElement(std::make_shared<TextComponent>(window, _("FAST SHUTDOWN SYSTEM"), mMenuTheme->menuText.font, mMenuTheme->menuText.color), true);
s->addRow(row); s->addRow(row);
row.elements.clear();
row.makeAcceptInputHandler([window] {
window->pushGui(new GuiMsgBox(window, _("REALLY RESTART?"), _("YES"), [] {
if (RecalboxSystem::getInstance()->reboot() != 0) {
LOG(LogWarning) << "Restart terminated with non-zero result!";
}
}, _("NO"), nullptr));
});
row.addElement(std::make_shared<TextComponent>(window, _("RESTART SYSTEM"), mMenuTheme->menuText.font, mMenuTheme->menuText.color), true);
s->addRow(row);
mWindow->pushGui(s); mWindow->pushGui(s);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment