ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: Move exit fullscreen to the frame size menu

This commit is contained in:
Jeffrey Pfau 2015-05-03 03:33:19 -07:00
parent 74af12317c
commit 1b74517e8b
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/platform/qt/Window.cpp
View File

@ -1016,10 +1016,10 @@ void Window::setupMenu(QMenuBar* menubar) {
m_inputController.setAllowOpposing(value.toBool()); m_inputController.setAllowOpposing(value.toBool());
}, this); }, this);
QMenu* other = new QMenu(tr("Other"), this); QAction* exitFullScreen = new QAction(tr("Exit fullscreen"), frameMenu);
m_shortcutController->addMenu(other); connect(exitFullScreen, SIGNAL(triggered()), this, SLOT(exitFullScreen()));
exitFullScreen->setShortcut(QKeySequence("Esc"));
addControlledAction(other, other->addAction(tr("Exit fullscreen"), this, SLOT(exitFullScreen()), QKeySequence("Esc")), "exitFullScreen"); addHiddenAction(frameMenu, exitFullScreen, "exitFullScreen");
foreach (QAction* action, m_gameActions) { foreach (QAction* action, m_gameActions) {
action->setDisabled(true); action->setDisabled(true);
@ -1066,8 +1066,13 @@ void Window::updateMRU() {
} }
QAction* Window::addControlledAction(QMenu* menu, QAction* action, const QString& name) { QAction* Window::addControlledAction(QMenu* menu, QAction* action, const QString& name) {
m_shortcutController->addAction(menu, action, name); addHiddenAction(menu, action, name);
menu->addAction(action); menu->addAction(action);
return action;
}
QAction* Window::addHiddenAction(QMenu* menu, QAction* action, const QString& name) {
m_shortcutController->addAction(menu, action, name);
action->setShortcutContext(Qt::WidgetShortcut); action->setShortcutContext(Qt::WidgetShortcut);
addAction(action); addAction(action);
return action; return action;

1
src/platform/qt/Window.h
View File

@ -131,6 +131,7 @@ private:
void openView(QWidget* widget); void openView(QWidget* widget);
QAction* addControlledAction(QMenu* menu, QAction* action, const QString& name); QAction* addControlledAction(QMenu* menu, QAction* action, const QString& name);
QAction* addHiddenAction(QMenu* menu, QAction* action, const QString& name);
GameController* m_controller; GameController* m_controller;
Display* m_display; Display* m_display;