The-Homebrew-Cloud/WiiFlow_Lite
2
0
Fork 0
mirror of https://github.com/Fledge68/WiiFlow_Lite.git synced 2024-12-25 11:21:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

- moved emunand partition setting from partitions menu to emunand setup menu. hopefully makes it less complicated.

Browse Source
This commit is contained in:
Fledge68 2023-03-22 17:21:06 -05:00
parent bd6c18802c
commit 9d41f679c3
3 changed files with 65 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
out/boot.dol
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.4 MiB

After

Width:  |  Height:  |  Size: 4.4 MiB

107
source/menu/menu_nandemu.cpp
View File

@ -110,6 +110,38 @@ void CMenu::_showNandEmu(void)
m_btnMgr.show(m_configBtn4M);
}
else if(nandemuPage == 2)
{
m_btnMgr.setText(m_configLbl1, _t("part3", L"Emu NANDS Partition"));
currentPartition = m_cfg.getInt(CHANNEL_DOMAIN, "partition", USB1);
m_btnMgr.setText(m_configLbl1Val, upperCase(DeviceName[currentPartition]));
m_btnMgr.setText(m_configLbl2, _t("cfgne38", L"Saves NAND Partition"));
currentPartition = m_cfg.getInt(WII_DOMAIN, "savepartition");
m_btnMgr.setText(m_configLbl2Val, upperCase(DeviceName[currentPartition]));
m_btnMgr.setText(m_configLbl3, _t("cfgne40", L"Use Real NAND Config"));
m_btnMgr.setText(m_configBtn3, m_cfg.getBool(CHANNEL_DOMAIN, "real_nand_config", false) ? _t("on", L"On") : _t("off", L"Off"));
m_btnMgr.setText(m_configLbl4, _t("cfgne41", L"Use Real NAND Miis"));
m_btnMgr.setText(m_configBtn4, m_cfg.getBool(CHANNEL_DOMAIN, "real_nand_miis", false) ? _t("on", L"On") : _t("off", L"Off"));
m_btnMgr.show(m_configLbl1);
m_btnMgr.show(m_configLbl1Val);
m_btnMgr.show(m_configBtn1P);
m_btnMgr.show(m_configBtn1M);
m_btnMgr.show(m_configLbl2);
m_btnMgr.show(m_configLbl2Val);
m_btnMgr.show(m_configBtn2P);
m_btnMgr.show(m_configBtn2M);
m_btnMgr.show(m_configLbl3);
m_btnMgr.show(m_configBtn3);
m_btnMgr.show(m_configLbl4);
m_btnMgr.show(m_configBtn4);
}
else
{
m_btnMgr.setText(m_configLbl1, _t("cfgne2", L"Extract Game Saves"));
m_btnMgr.setText(m_configBtn1, _t("cfgne3", L"All"));
@ -129,29 +161,6 @@ void CMenu::_showNandEmu(void)
m_btnMgr.show(m_configLbl4);
m_btnMgr.show(m_configBtn4);
}
else
{
m_btnMgr.setText(m_configLbl1, _t("cfgne38", L"Saves NAND Partition"));
currentPartition = m_cfg.getInt(WII_DOMAIN, "savepartition");
m_btnMgr.setText(m_configLbl1Val, upperCase(DeviceName[currentPartition]));
m_btnMgr.setText(m_configLbl2, _t("cfgne40", L"Use Real NAND Config"));
m_btnMgr.setText(m_configBtn2, m_cfg.getBool(CHANNEL_DOMAIN, "real_nand_config", false) ? _t("on", L"On") : _t("off", L"Off"));
m_btnMgr.setText(m_configLbl3, _t("cfgne41", L"Use Real NAND Miis"));
m_btnMgr.setText(m_configBtn3, m_cfg.getBool(CHANNEL_DOMAIN, "real_nand_miis", false) ? _t("on", L"On") : _t("off", L"Off"));
m_btnMgr.show(m_configLbl1);
m_btnMgr.show(m_configLbl1Val);
m_btnMgr.show(m_configBtn1P);
m_btnMgr.show(m_configBtn1M);
m_btnMgr.show(m_configLbl2);
m_btnMgr.show(m_configBtn2);
m_btnMgr.show(m_configLbl3);
m_btnMgr.show(m_configBtn3);
}
}
int CMenu::_NandEmuCfg(void)
@ -241,6 +250,37 @@ int CMenu::_NandEmuCfg(void)
}
}
else if(nandemuPage == 2)
{
if(m_btnMgr.selected(m_configBtn1P) || m_btnMgr.selected(m_configBtn1M))
{
direction = m_btnMgr.selected(m_configBtn1P) ? 1 : -1;
_setPartition(direction, m_cfg.getInt(CHANNEL_DOMAIN, "partition"), COVERFLOW_CHANNEL);
m_cfg.setInt(CHANNEL_DOMAIN, "partition", currentPartition);
m_btnMgr.setText(m_configLbl1Val, upperCase(DeviceName[currentPartition]));
_getEmuNands();
if(m_current_view & COVERFLOW_CHANNEL || (m_current_view & COVERFLOW_PLUGIN && m_plugin.GetEnabledStatus(ENAND_PMAGIC)))
m_refreshGameList = true;
}
else if(m_btnMgr.selected(m_configBtn2P) || m_btnMgr.selected(m_configBtn2M))
{
direction = m_btnMgr.selected(m_configBtn2P) ? 1 : -1;
_setPartition(direction, m_cfg.getInt(WII_DOMAIN, "savepartition"), COVERFLOW_NONE);
m_cfg.setInt(WII_DOMAIN, "savepartition", currentPartition);
m_btnMgr.setText(m_configLbl2Val, upperCase(DeviceName[currentPartition]));
_getEmuNands();// refresh emunands in case the partition was changed
}
else if(m_btnMgr.selected(m_configBtn3))
{
m_cfg.setBool(CHANNEL_DOMAIN, "real_nand_config", !m_cfg.getBool(CHANNEL_DOMAIN, "real_nand_config"));
m_btnMgr.setText(m_configBtn3, m_cfg.getBool(CHANNEL_DOMAIN, "real_nand_config", false) ? _t("on", L"On") : _t("off", L"Off"));
}
else if(m_btnMgr.selected(m_configBtn4))
{
m_cfg.setBool(CHANNEL_DOMAIN, "real_nand_miis", !m_cfg.getBool(CHANNEL_DOMAIN, "real_nand_miis"));
m_btnMgr.setText(m_configBtn4, m_cfg.getBool(CHANNEL_DOMAIN, "real_nand_miis", false) ? _t("on", L"On") : _t("off", L"Off"));
}
}
else if(nandemuPage == 3)
{
if(m_btnMgr.selected(m_configBtn1) || m_btnMgr.selected(m_configBtn2) || m_btnMgr.selected(m_configBtn3))
{
@ -291,27 +331,6 @@ int CMenu::_NandEmuCfg(void)
_showNandEmu();
}
}
else if(nandemuPage == 3)
{
if(m_btnMgr.selected(m_configBtn1P) || m_btnMgr.selected(m_configBtn1M))
{
direction = m_btnMgr.selected(m_configBtn1P) ? 1 : -1;
_setPartition(direction, m_cfg.getInt(WII_DOMAIN, "savepartition"), COVERFLOW_NONE);
m_cfg.setInt(WII_DOMAIN, "savepartition", currentPartition);
m_btnMgr.setText(m_configLbl1Val, upperCase(DeviceName[currentPartition]));
_getEmuNands();// refresh emunands in case the partition was changed
}
else if(m_btnMgr.selected(m_configBtn2))
{
m_cfg.setBool(CHANNEL_DOMAIN, "real_nand_config", !m_cfg.getBool(CHANNEL_DOMAIN, "real_nand_config"));
m_btnMgr.setText(m_configBtn2, m_cfg.getBool(CHANNEL_DOMAIN, "real_nand_config", false) ? _t("on", L"On") : _t("off", L"Off"));
}
else if(m_btnMgr.selected(m_configBtn3))
{
m_cfg.setBool(CHANNEL_DOMAIN, "real_nand_miis", !m_cfg.getBool(CHANNEL_DOMAIN, "real_nand_miis"));
m_btnMgr.setText(m_configBtn3, m_cfg.getBool(CHANNEL_DOMAIN, "real_nand_miis", false) ? _t("on", L"On") : _t("off", L"Off"));
}
}
}
if(m_thrdMessageAdded)

22
source/menu/menu_partitions.cpp
View File

@ -34,8 +34,7 @@ void CMenu::_showPartitionsCfg(void)
m_btnMgr.setText(m_configLbl1, _t("part1", L"Wii Partition"));
m_btnMgr.setText(m_configLbl2, _t("part2", L"GameCube Partition"));
m_btnMgr.setText(m_configLbl3, _t("part3", L"Emu NANDS Partition"));
m_btnMgr.setText(m_configLbl4, _t("part4", L"Plugins Default Partition"));
m_btnMgr.setText(m_configLbl3, _t("part4", L"Plugins Default Partition"));
currentPartition = m_cfg.getInt(WII_DOMAIN, "partition", USB1);
m_btnMgr.setText(m_configLbl1Val, currentPartition == 8 ? "SD/USB" : upperCase(DeviceName[currentPartition]));
@ -43,11 +42,8 @@ void CMenu::_showPartitionsCfg(void)
currentPartition = m_cfg.getInt(GC_DOMAIN, "partition", USB1);
m_btnMgr.setText(m_configLbl2Val, currentPartition == 8 ? "SD/USB" : upperCase(DeviceName[currentPartition]));
currentPartition = m_cfg.getInt(CHANNEL_DOMAIN, "partition", USB1);
m_btnMgr.setText(m_configLbl3Val, upperCase(DeviceName[currentPartition]));
currentPartition = m_cfg.getInt(PLUGIN_DOMAIN, "partition", SD);
m_btnMgr.setText(m_configLbl4Val, upperCase(DeviceName[currentPartition]));
m_btnMgr.setText(m_configLbl3Val, upperCase(DeviceName[currentPartition]));
m_btnMgr.show(m_configLbl1);
m_btnMgr.show(m_configLbl1Val);
@ -61,10 +57,6 @@ void CMenu::_showPartitionsCfg(void)
m_btnMgr.show(m_configLbl3Val);
m_btnMgr.show(m_configBtn3P);
m_btnMgr.show(m_configBtn3M);
m_btnMgr.show(m_configLbl4);
m_btnMgr.show(m_configLbl4Val);
m_btnMgr.show(m_configBtn4P);
m_btnMgr.show(m_configBtn4M);
}
void CMenu::_partitionsCfg(void)
@ -105,16 +97,6 @@ void CMenu::_partitionsCfg(void)
else if(m_btnMgr.selected(m_configBtn3P) || m_btnMgr.selected(m_configBtn3M))
{
s8 direction = m_btnMgr.selected(m_configBtn3P) ? 1 : -1;
_setPartition(direction, m_cfg.getInt(CHANNEL_DOMAIN, "partition"), COVERFLOW_CHANNEL);
m_cfg.setInt(CHANNEL_DOMAIN, "partition", currentPartition);
_showPartitionsCfg();
// partition only for emu nands
if(m_current_view & COVERFLOW_CHANNEL || (m_current_view & COVERFLOW_PLUGIN && m_plugin.GetEnabledStatus(ENAND_PMAGIC)))
m_refreshGameList = true;
}
else if(m_btnMgr.selected(m_configBtn4P) || m_btnMgr.selected(m_configBtn4M))
{
s8 direction = m_btnMgr.selected(m_configBtn4P) ? 1 : -1;
_setPartition(direction, m_cfg.getInt(PLUGIN_DOMAIN, "partition"), COVERFLOW_PLUGIN);
m_cfg.setInt(PLUGIN_DOMAIN, "partition", currentPartition);
_showPartitionsCfg();