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

Qt: Move settings items to consistent location in Tools

This commit is contained in:
Jeffrey Pfau 2015-01-03 14:59:27 -08:00
parent caef397ad4
commit bb78cc1bd3
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -457,11 +457,6 @@ void Window::setupMenu(QMenuBar* menubar) {
quickSaveMenu->addAction(quickSave); quickSaveMenu->addAction(quickSave);
} }
#ifndef Q_OS_MAC
fileMenu->addSeparator();
#endif
fileMenu->addAction(tr("Settings"), this, SLOT(openSettingsWindow()));
#ifndef Q_OS_MAC #ifndef Q_OS_MAC
fileMenu->addSeparator(); fileMenu->addSeparator();
fileMenu->addAction(tr("E&xit"), this, SLOT(close()), QKeySequence::Quit); fileMenu->addAction(tr("E&xit"), this, SLOT(close()), QKeySequence::Quit);
@ -526,17 +521,6 @@ void Window::setupMenu(QMenuBar* menubar) {
audioSync->connect([this](const QVariant& value) { m_controller->setAudioSync(value.toBool()); }); audioSync->connect([this](const QVariant& value) { m_controller->setAudioSync(value.toBool()); });
m_config->updateOption("audioSync"); m_config->updateOption("audioSync");
emulationMenu->addSeparator();
QAction* keymap = new QAction(tr("Remap keyboard..."), emulationMenu);
connect(keymap, SIGNAL(triggered()), this, SLOT(openKeymapWindow()));
emulationMenu->addAction(keymap);
#ifdef BUILD_SDL
QAction* gamepad = new QAction(tr("Remap gamepad..."), emulationMenu);
connect(gamepad, SIGNAL(triggered()), this, SLOT(openGamepadWindow()));
emulationMenu->addAction(gamepad);
#endif
QMenu* avMenu = menubar->addMenu(tr("Audio/&Video")); QMenu* avMenu = menubar->addMenu(tr("Audio/&Video"));
QMenu* frameMenu = avMenu->addMenu(tr("Frame size")); QMenu* frameMenu = avMenu->addMenu(tr("Frame size"));
for (int i = 1; i <= 6; ++i) { for (int i = 1; i <= 6; ++i) {
@ -637,6 +621,19 @@ void Window::setupMenu(QMenuBar* menubar) {
toolsMenu->addAction(gdbWindow); toolsMenu->addAction(gdbWindow);
#endif #endif
toolsMenu->addSeparator();
toolsMenu->addAction(tr("Settings"), this, SLOT(openSettingsWindow()));
QAction* keymap = new QAction(tr("Remap keyboard..."), toolsMenu);
connect(keymap, SIGNAL(triggered()), this, SLOT(openKeymapWindow()));
toolsMenu->addAction(keymap);
#ifdef BUILD_SDL
QAction* gamepad = new QAction(tr("Remap gamepad..."), toolsMenu);
connect(gamepad, SIGNAL(triggered()), this, SLOT(openGamepadWindow()));
toolsMenu->addAction(gamepad);
#endif
ConfigOption* skipBios = m_config->addOption("skipBios"); ConfigOption* skipBios = m_config->addOption("skipBios");
skipBios->connect([this](const QVariant& value) { m_controller->setSkipBIOS(value.toBool()); }); skipBios->connect([this](const QVariant& value) { m_controller->setSkipBIOS(value.toBool()); });