From 3a27d609374702c60215ea467f4c23462407be04 Mon Sep 17 00:00:00 2001 From: spycrab Date: Thu, 6 Jul 2017 11:00:37 +0200 Subject: [PATCH] Qt: Add "Load System Menu" option to menubar --- Source/Core/DolphinQt2/MenuBar.cpp | 18 ++++++++++++++++++ Source/Core/DolphinQt2/MenuBar.h | 2 ++ 2 files changed, 20 insertions(+) diff --git a/Source/Core/DolphinQt2/MenuBar.cpp b/Source/Core/DolphinQt2/MenuBar.cpp index 3a3a44a149..b576661c6a 100644 --- a/Source/Core/DolphinQt2/MenuBar.cpp +++ b/Source/Core/DolphinQt2/MenuBar.cpp @@ -86,6 +86,12 @@ void MenuBar::AddToolsMenu() QMenu* tools_menu = addMenu(tr("Tools")); m_wad_install_action = tools_menu->addAction(tr("Install WAD..."), this, SLOT(InstallWAD())); + // Label will be set by a NANDRefresh later + m_boot_sysmenu = tools_menu->addAction(QStringLiteral(""), [this] { emit BootWiiSystemMenu(); }); + m_boot_sysmenu->setEnabled(false); + + connect(&Settings::Instance(), &Settings::NANDRefresh, [this] { UpdateToolsMenu(false); }); + m_perform_online_update_menu = tools_menu->addMenu(tr("Perform Online System Update")); m_perform_online_update_for_current_region = m_perform_online_update_menu->addAction( tr("Current Region"), [this] { emit PerformOnlineUpdate(""); }); @@ -267,11 +273,23 @@ void MenuBar::AddTableColumnsMenu(QMenu* view_menu) void MenuBar::UpdateToolsMenu(bool emulation_started) { const bool enable_wii_tools = !emulation_started || !SConfig::GetInstance().bWii; + + m_boot_sysmenu->setEnabled(!emulation_started); m_perform_online_update_menu->setEnabled(enable_wii_tools); + if (enable_wii_tools) { IOS::HLE::Kernel ios; const auto tmd = ios.GetES()->FindInstalledTMD(Titles::SYSTEM_MENU); + + const QString sysmenu_version = + tmd.IsValid() ? + QString::fromStdString(DiscIO::GetSysMenuVersionString(tmd.GetTitleVersion())) : + QStringLiteral(""); + m_boot_sysmenu->setText(tr("Load Wii System Menu %1").arg(sysmenu_version)); + + m_boot_sysmenu->setEnabled(!emulation_started && tmd.IsValid()); + for (QAction* action : m_perform_online_update_menu->actions()) action->setEnabled(!tmd.IsValid()); m_perform_online_update_for_current_region->setEnabled(tmd.IsValid()); diff --git a/Source/Core/DolphinQt2/MenuBar.h b/Source/Core/DolphinQt2/MenuBar.h index 426c7748d6..848fad1e67 100644 --- a/Source/Core/DolphinQt2/MenuBar.h +++ b/Source/Core/DolphinQt2/MenuBar.h @@ -39,6 +39,7 @@ signals: void StateSaveUndo(); void StateSaveOldest(); void SetStateSlot(int slot); + void BootWiiSystemMenu(); void PerformOnlineUpdate(const std::string& region); @@ -95,6 +96,7 @@ private: QAction* m_fullscreen_action; QAction* m_frame_advance_action; QAction* m_screenshot_action; + QAction* m_boot_sysmenu; QMenu* m_state_load_menu; QMenu* m_state_save_menu; QMenu* m_state_slot_menu;