The-Homebrew-Cloud/WiiFlow_Lite
2
0
Fork 0
mirror of https://github.com/Fledge68/WiiFlow_Lite.git synced 2024-11-23 19:59:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

- moved source menu settings to page 12 of main settings. no more pressing 'home' while viewing the source menu/flow.

Browse Source
This commit is contained in:
Fledge68 2019-03-06 07:30:56 -06:00
parent 5dc8212037
commit cba6c0bcd6
6 changed files with 41 additions and 49 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: 3.3 MiB

After

Width:  |  Height:  |  Size: 3.3 MiB

12
source/menu/menu_config7.cpp
View File

@ -70,8 +70,8 @@ void CMenu::_showConfig7(int curPage)
{
m_btnMgr.show(m_config7Lbl1);
m_btnMgr.show(m_config7Btn1);
//m_btnMgr.show(m_config7Lbl2);
//m_btnMgr.show(m_config7Btn2);
m_btnMgr.show(m_config7Lbl2);
m_btnMgr.show(m_config7Btn2);
}
else
{
@ -152,8 +152,8 @@ void CMenu::_showConfig7(int curPage)
{
m_btnMgr.setText(m_config7Lbl1, _t("cfg722", L"Homebrew settings"));
m_btnMgr.setText(m_config7Btn1, _t("cfg14", L"Set"));
//m_btnMgr.setText(m_config7Lbl2, _t("cfg723", L"Source menu settings"));
//m_btnMgr.setText(m_config7Btn2, _t("cfg14", L"Set"));
m_btnMgr.setText(m_config7Lbl2, _t("cfg723", L"Source menu settings"));
m_btnMgr.setText(m_config7Btn2, _t("cfg14", L"Set"));
}
}
@ -310,12 +310,12 @@ int CMenu::_config7(int curPage)
_CfgHB();
_showConfig7(12);
}
/*else if(m_btnMgr.selected(m_config7Btn2))
else if(m_btnMgr.selected(m_config7Btn2))
{
_hideConfig7();
_CfgSrc();
_showConfig7(12);
}*/
}
}
}
}

39
source/menu/menu_config_source.cpp
View File

@ -89,14 +89,20 @@ static void _showCfgSrc(bool m_sourceflow)
void CMenu::_CfgSrc(void)
{
if(!m_use_source)
{
error(_t("cfgsmerr", L"No source menu found!"));
return;
}
SetupInput();
_setBg(m_cfgsrcBg, m_cfgsrcBg);
m_btnMgr.setText(m_cfgsrcBtnEnableSF, m_cfg.getBool(SOURCEFLOW_DOMAIN, "enabled") ? _t("on", L"On") : _t("off", L"Off"));
m_btnMgr.setText(m_cfgsrcBtnSmallbox, m_cfg.getBool(SOURCEFLOW_DOMAIN, "smallbox") ? _t("on", L"On") : _t("off", L"Off"));
m_btnMgr.setText(m_cfgsrcBtnBoxMode, m_cfg.getBool(SOURCEFLOW_DOMAIN, "box_mode") ? _t("on", L"On") : _t("off", L"Off"));
m_btnMgr.setText(m_cfgsrcBtnMultisource, m_cfg.getBool("GENERAL", "multisource") ? _t("on", L"On") : _t("off", L"Off"));
_showCfgSrc(m_sourceflow);
_showCfgSrc(m_cfg.getBool(SOURCEFLOW_DOMAIN, "enabled", false));
bool temp;
while(!m_exit)
{
_mainLoopCommon();
@ -112,31 +118,32 @@ void CMenu::_CfgSrc(void)
break;
else if(m_btnMgr.selected(m_cfgsrcBtnEnableSF))
{
m_sourceflow = !m_sourceflow;
m_cfg.setBool(SOURCEFLOW_DOMAIN, "enabled", m_sourceflow);
m_btnMgr.setText(m_cfgsrcBtnEnableSF, m_sourceflow ? _t("on", L"On") : _t("off", L"Off"));
_showCfgSrc(m_sourceflow);
temp = !m_cfg.getBool(SOURCEFLOW_DOMAIN, "enabled", false);
m_cfg.setBool(SOURCEFLOW_DOMAIN, "enabled", temp);
m_btnMgr.setText(m_cfgsrcBtnEnableSF, temp ? _t("on", L"On") : _t("off", L"Off"));
_showCfgSrc(temp);
}
else if(m_btnMgr.selected(m_cfgsrcBtnSmallbox))
{
m_refreshGameList = true;
//fsop_deleteFolder(fmt("%s/sourceflow", m_cacheDir.c_str()));
m_cfg.setBool(SOURCEFLOW_DOMAIN, "smallbox", !m_cfg.getBool(SOURCEFLOW_DOMAIN, "smallbox", false));
m_btnMgr.setText(m_cfgsrcBtnSmallbox, m_cfg.getBool(SOURCEFLOW_DOMAIN, "smallbox") ? _t("on", L"On") : _t("off", L"Off"));
temp = !m_cfg.getBool(SOURCEFLOW_DOMAIN, "smallbox", false);
m_cfg.setBool(SOURCEFLOW_DOMAIN, "smallbox", temp);
m_btnMgr.setText(m_cfgsrcBtnSmallbox, temp ? _t("on", L"On") : _t("off", L"Off"));
}
else if(m_btnMgr.selected(m_cfgsrcBtnBoxMode))
{
m_refreshGameList = true;
//fsop_deleteFolder(fmt("%s/sourceflow", m_cacheDir.c_str()));
m_cfg.setBool(SOURCEFLOW_DOMAIN, "box_mode", !m_cfg.getBool(SOURCEFLOW_DOMAIN, "box_mode", false));
m_btnMgr.setText(m_cfgsrcBtnBoxMode, m_cfg.getBool(SOURCEFLOW_DOMAIN, "box_mode") ? _t("on", L"On") : _t("off", L"Off"));
temp = !m_cfg.getBool(SOURCEFLOW_DOMAIN, "box_mode", false);
m_cfg.setBool(SOURCEFLOW_DOMAIN, "box_mode", temp);
m_btnMgr.setText(m_cfgsrcBtnBoxMode, temp ? _t("on", L"On") : _t("off", L"Off"));
}
else if(m_btnMgr.selected(m_cfgsrcBtnAdjustCF))
{
m_refreshGameList = true;
_hideCfgSrc(true);
m_sourceflow = true;
_showCF(true);
_cfTheme();
_showCfgSrc(m_sourceflow);
m_sourceflow = false;
_showCF(true);
_showCfgSrc(true);
}
else if(m_btnMgr.selected(m_cfgsrcBtnMultisource))
{

31
source/menu/menu_main.cpp
View File

@ -382,34 +382,15 @@ int CMenu::main(void)
if(BTN_HOME_PRESSED)
{
_hideMain();
/* sourceflow config menu */
if(m_sourceflow)
{
_CfgSrc();
if(BTN_B_HELD)
{
bheld = true;
bUsed = true;
}
if(!m_cfg.getBool(SOURCEFLOW_DOMAIN, "enabled"))
{
m_sourceflow = false;
m_refreshGameList = true;
}
_showMain();
}
/* Home menu */
else
if(_Home())
break;// exit wiiflow
if(BTN_B_HELD)
{
if(_Home())
break;// exit wiiflow
if(BTN_B_HELD)
{
bheld = true;
bUsed = true;
}
_showMain();
bheld = true;
bUsed = true;
}
_showMain();
}
else if(BTN_A_PRESSED)
{

2
source/menu/menu_wbfs.cpp
View File

@ -284,6 +284,8 @@ bool CMenu::_wbfsOp(CMenu::WBFS_OP op)
SetupInput();
_showWBFS(op);
m_btnMgr.show(m_wbfsLblMessage);
m_btnMgr.setText(m_wbfsLblMessage, _t("wbfsop27", L"Or press 'B' to go back."));
switch (op)
{
case WO_ADD_GAME:

6
wii/wiiflow/Languages/english.ini
View File

@ -63,6 +63,8 @@ cfg718=Source Menu on start
cfg719=Mount SD only
cfg720=Play GC banner sound
cfg721=Play GC default sound
cfg722=Homebrew settings
cfg723=Source menu settings
cfga2=Install game
cfga3=Install
cfga6=Language
@ -223,6 +225,7 @@ cfgsm1=Source Menu Settings
cfgsm3=Enable Sourceflow
cfgsm4=Sourceflow Smallbox
cfgsm5=Clear Sourceflow Cache
cfgsmerr=No source menu found!
cfghb1=Homebrew Settings
cfghb2=Coverflow Smallbox
cfghb3=Homebrew Partition
@ -331,8 +334,6 @@ errgame17=Can not delete real NAND Channels!
errgame18=No game info!
errgame19=Can't launch in Wii virtual console mode!
errneek1=Cannot launch neek2o. Verify your neek2o setup
errsource1=Homebrew locked!
errsource2=Homebrew and multisource not allowed!
exit_to=Exit To
ftp1=Start
ftp2=Stop
@ -486,6 +487,7 @@ wbfsop23=Calculating space needed for %s...\n Please insert disc %d to continue
wbfsop24=Not enough space: %d blocks needed, %d available
wbfsop25=Disc read error!! Please clean the disc
wbfsop26=Disc ejected!! Please insert disc again
wbfsop27=Or press'B' to go back.
wbfsop4=Back
wbfsop5=Go
wbfsop6=Installing [%s] %s...