From 0208c7456a12d0b928625b990051e6e54c12daa5 Mon Sep 17 00:00:00 2001 From: Vicki Pfau Date: Thu, 15 Apr 2021 19:47:29 -0700 Subject: [PATCH] Qt: Rearrange menus some --- CHANGES | 1 + src/platform/qt/Window.cpp | 9 +++------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/CHANGES b/CHANGES index 7724bfc3b..acd401c9e 100644 --- a/CHANGES +++ b/CHANGES @@ -25,6 +25,7 @@ Misc: - GBA: Default-enable VBA bug compat for Ruby and Emerald ROM hacks - GBA Memory: Log GPIO writes on non-GPIO carts as Pak Hardware instead of Memory - Qt: Add ROM filename and size to bug reporter + - Qt: Rearrange menus some 0.9.0: (2021-03-28) Features: diff --git a/src/platform/qt/Window.cpp b/src/platform/qt/Window.cpp index 08f3750a4..5348032ab 100644 --- a/src/platform/qt/Window.cpp +++ b/src/platform/qt/Window.cpp @@ -1181,9 +1181,6 @@ void Window::setupMenu(QMenuBar* menubar) { m_actions.addMenu(tr("Recent"), "mru", "file"); m_actions.addSeparator("file"); - m_actions.addAction(tr("Make portable"), "makePortable", this, &Window::tryMakePortable, "file"); - m_actions.addSeparator("file"); - Action* loadState = addGameAction(tr("&Load state"), "loadState", [this]() { this->openStateWindow(LoadSave::LOAD); }, "file", QKeySequence("F10")); @@ -1241,9 +1238,6 @@ void Window::setupMenu(QMenuBar* menubar) { m_nonMpActions.append(quickSave); } - m_actions.addSeparator("file"); - m_actions.addAction(tr("Load camera image..."), "loadCamImage", this, &Window::loadCamImage, "file"); - #ifdef M_CORE_GBA m_actions.addSeparator("file"); m_actions.addAction(tr("Convert save game..."), "convertSave", openControllerTView(), "file"); @@ -1373,6 +1367,8 @@ void Window::setupMenu(QMenuBar* menubar) { } #ifdef M_CORE_GB + m_actions.addAction(tr("Load camera image..."), "loadCamImage", this, &Window::loadCamImage, "emu"); + Action* gbPrint = addGameAction(tr("Game Boy Printer..."), "gbPrint", [this]() { PrinterView* view = new PrinterView(m_controller); openView(view); @@ -1540,6 +1536,7 @@ void Window::setupMenu(QMenuBar* menubar) { m_actions.addSeparator("tools"); m_actions.addAction(tr("Settings..."), "settings", this, &Window::openSettingsWindow, "tools"); + m_actions.addAction(tr("Make portable"), "makePortable", this, &Window::tryMakePortable, "tools"); #ifdef USE_DEBUGGERS m_actions.addSeparator("tools");