Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Qt: Implement "Load System Menu" #5756

Merged
merged 2 commits into from
Jul 7, 2017
Merged

Conversation

spycrab
Copy link
Contributor

@spycrab spycrab commented Jul 6, 2017

No description provided.


const QString Settings::GetInstalledWiiSystemMenuVersion() const
{
const auto& sys_menu_loader = DiscIO::NANDContentManager::Access().GetNANDLoader(

This comment was marked as off-topic.

This comment was marked as off-topic.

@ligfx
Copy link
Contributor

ligfx commented Jul 6, 2017

Hmm. Would there be a better home somewhere for the NAND-was-changed callback? Maybe WiiUtils, or somewhere in NAND or IOS?

@@ -268,10 +274,19 @@ void MenuBar::UpdateToolsMenu(bool emulation_started)
{
const bool enable_wii_tools = !emulation_started || !SConfig::GetInstance().bWii;
m_perform_online_update_menu->setEnabled(enable_wii_tools);

IOS::HLE::Kernel ios;

This comment was marked as off-topic.

This comment was marked as off-topic.

@leoetlino
Copy link
Member

leoetlino commented Jul 6, 2017

I think keeping the reload logic in the UI code as it is currently is fine, as a NAND changed callback would be complex to implement (if we get Starlet LLE -- how do we know something changed?) or might not be useful (the UI code shouldn't access the NAND when emulation is running).

@@ -150,3 +150,8 @@ QVector<QString> Settings::GetProfiles(const InputConfig* config) const

return vec;
}

void Settings::TriggerNANDRefresh()

This comment was marked as off-topic.

@@ -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;

This comment was marked as off-topic.

m_boot_sysmenu = tools_menu->addAction(QStringLiteral(""), [this] { emit BootWiiSystemMenu(); });
m_boot_sysmenu->setEnabled(false);

connect(&Settings::Instance(), &Settings::NANDRefresh, [this] { UpdateToolsMenu(false); });

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

QStringLiteral("");
m_boot_sysmenu->setText(tr("Load Wii System Menu %1").arg(sysmenu_version));

m_boot_sysmenu->setEnabled(!emulation_started && tmd.IsValid());

This comment was marked as off-topic.

@leoetlino leoetlino merged commit ff9f271 into dolphin-emu:master Jul 7, 2017
@spycrab spycrab deleted the qt_sysmenu branch July 9, 2017 14:15
@leoetlino leoetlino modified the milestone: Qt Sep 13, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants