From eb51195769bc4dab28efba9762405082504b9cd4 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Sat, 15 Nov 2014 00:28:54 -0800 Subject: [PATCH] Qt: Move FPS target options to A/V menu --- src/platform/qt/Window.cpp | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/platform/qt/Window.cpp b/src/platform/qt/Window.cpp index f0ce3b210..9fe07d466 100644 --- a/src/platform/qt/Window.cpp +++ b/src/platform/qt/Window.cpp @@ -356,18 +356,6 @@ void Window::setupMenu(QMenuBar* menubar) { m_gameActions.append(frameAdvance); emulationMenu->addAction(frameAdvance); - QMenu* target = emulationMenu->addMenu("FPS target"); - ConfigOption* fpsTargetOption = m_config->addOption("fpsTarget"); - fpsTargetOption->connect([this](const QVariant& value) { emit fpsTargetChanged(value.toInt()); }); - fpsTargetOption->addValue(tr("15"), 15, target); - fpsTargetOption->addValue(tr("30"), 30, target); - fpsTargetOption->addValue(tr("45"), 45, target); - fpsTargetOption->addValue(tr("60"), 60, target); - fpsTargetOption->addValue(tr("90"), 90, target); - fpsTargetOption->addValue(tr("120"), 120, target); - fpsTargetOption->addValue(tr("240"), 240, target); - m_config->updateOption("fpsTarget"); - emulationMenu->addSeparator(); QAction* turbo = new QAction(tr("T&urbo"), emulationMenu); @@ -440,6 +428,20 @@ void Window::setupMenu(QMenuBar* menubar) { buffers->addValue(tr("4096"), 4096, buffersMenu); m_config->updateOption("audioBuffers"); + avMenu->addSeparator(); + + QMenu* target = avMenu->addMenu("FPS target"); + ConfigOption* fpsTargetOption = m_config->addOption("fpsTarget"); + fpsTargetOption->connect([this](const QVariant& value) { emit fpsTargetChanged(value.toInt()); }); + fpsTargetOption->addValue(tr("15"), 15, target); + fpsTargetOption->addValue(tr("30"), 30, target); + fpsTargetOption->addValue(tr("45"), 45, target); + fpsTargetOption->addValue(tr("60"), 60, target); + fpsTargetOption->addValue(tr("90"), 90, target); + fpsTargetOption->addValue(tr("120"), 120, target); + fpsTargetOption->addValue(tr("240"), 240, target); + m_config->updateOption("fpsTarget"); + #if defined(USE_PNG) || defined(USE_FFMPEG) avMenu->addSeparator(); #endif