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

-changed switch order to wii -> gc > channels > homebrew (issue 13)

Browse Source
This commit is contained in:
fix94.1 2012-02-13 17:09:26 +00:00
parent 1277fd0c6e
commit abd7956bb8
1 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
source/menu/menu_main.cpp
View File

@ -92,30 +92,30 @@ void CMenu::_showMain(void)
switch(m_current_view) switch(m_current_view)
{ {
case COVERFLOW_HOMEBREW: case COVERFLOW_DML:
if( m_show_dml ) if(show_channel)
m_btnMgr.show(m_mainBtnDML); m_btnMgr.show(m_mainBtnChannel);
else else if(show_homebrew)
m_btnMgr.show(m_mainBtnHomebrew);
else
m_btnMgr.show(m_mainBtnUsb); m_btnMgr.show(m_mainBtnUsb);
break; break;
case COVERFLOW_CHANNEL: case COVERFLOW_CHANNEL:
if(show_homebrew) if(show_homebrew)
m_btnMgr.show(m_mainBtnHomebrew); m_btnMgr.show(m_mainBtnHomebrew);
else if( m_show_dml ) else
m_btnMgr.show(m_mainBtnDML);
else
m_btnMgr.show(m_mainBtnUsb); m_btnMgr.show(m_mainBtnUsb);
break; break;
case COVERFLOW_DML: case COVERFLOW_HOMEBREW:
m_btnMgr.show(m_mainBtnUsb); m_btnMgr.show(m_mainBtnUsb);
break; break;
default: default:
if (show_channel) if(m_show_dml)
m_btnMgr.show(m_mainBtnDML);
else if (show_channel)
m_btnMgr.show(m_mainBtnChannel); m_btnMgr.show(m_mainBtnChannel);
else if (show_homebrew && (parental_homebrew || !m_locked)) else if (show_homebrew && (parental_homebrew || !m_locked))
m_btnMgr.show(m_mainBtnHomebrew); m_btnMgr.show(m_mainBtnHomebrew);
else if( m_show_dml )
m_btnMgr.show(m_mainBtnDML);
else else
m_btnMgr.show(m_mainBtnUsb); m_btnMgr.show(m_mainBtnUsb);
break; break;
@ -506,12 +506,12 @@ int CMenu::main(void)
else if (m_btnMgr.selected(m_mainBtnChannel) || m_btnMgr.selected(m_mainBtnUsb) || m_btnMgr.selected(m_mainBtnDML) || m_btnMgr.selected(m_mainBtnHomebrew)) else if (m_btnMgr.selected(m_mainBtnChannel) || m_btnMgr.selected(m_mainBtnUsb) || m_btnMgr.selected(m_mainBtnDML) || m_btnMgr.selected(m_mainBtnHomebrew))
{ {
if (m_current_view == COVERFLOW_USB) if (m_current_view == COVERFLOW_USB)
m_current_view = show_channel ? COVERFLOW_CHANNEL : ((show_homebrew && (parental_homebrew || !m_locked)) ? COVERFLOW_HOMEBREW : ( m_show_dml ? COVERFLOW_DML : COVERFLOW_USB )); m_current_view = m_show_dml ? COVERFLOW_DML : (show_channel ? COVERFLOW_CHANNEL : ((show_homebrew && (parental_homebrew || !m_locked)) ? COVERFLOW_HOMEBREW : COVERFLOW_USB));
else if (m_current_view == COVERFLOW_CHANNEL)
m_current_view = (show_homebrew && (parental_homebrew || !m_locked)) ? COVERFLOW_HOMEBREW : ( m_show_dml ? COVERFLOW_DML : COVERFLOW_USB );
else if (m_current_view == COVERFLOW_HOMEBREW)
m_current_view = m_show_dml ? COVERFLOW_DML : COVERFLOW_USB;
else if (m_current_view == COVERFLOW_DML) else if (m_current_view == COVERFLOW_DML)
m_current_view = show_channel ? COVERFLOW_CHANNEL : ((show_homebrew && (parental_homebrew || !m_locked)) ? COVERFLOW_HOMEBREW : COVERFLOW_USB);
else if (m_current_view == COVERFLOW_CHANNEL)
m_current_view = (show_homebrew && (parental_homebrew || !m_locked)) ? COVERFLOW_HOMEBREW : COVERFLOW_USB;
else if (m_current_view == COVERFLOW_HOMEBREW)
m_current_view = COVERFLOW_USB; m_current_view = COVERFLOW_USB;
m_category = m_cat.getInt(_domainFromView(), "category", 0); m_category = m_cat.getInt(_domainFromView(), "category", 0);
@ -630,36 +630,36 @@ int CMenu::main(void)
} }
if (!m_cfg.getBool("GENERAL", "hideviews", false) && (m_gameList.empty() || m_show_zone_main2)) if (!m_cfg.getBool("GENERAL", "hideviews", false) && (m_gameList.empty() || m_show_zone_main2))
{ {
switch(m_current_view) switch(m_current_view)
{ {
case COVERFLOW_HOMEBREW: case COVERFLOW_DML:
if( m_show_dml ) if(show_channel)
m_btnMgr.show(m_mainBtnDML); m_btnMgr.show(m_mainBtnChannel);
else else if(show_homebrew)
m_btnMgr.show(m_mainBtnUsb); m_btnMgr.show(m_mainBtnHomebrew);
break; else
case COVERFLOW_CHANNEL:
if (show_homebrew && (parental_homebrew || !m_locked))
m_btnMgr.show(m_mainBtnHomebrew);
else if( m_show_dml )
m_btnMgr.show(m_mainBtnDML);
else
m_btnMgr.show(m_mainBtnUsb);
break;
case COVERFLOW_DML:
m_btnMgr.show(m_mainBtnUsb); m_btnMgr.show(m_mainBtnUsb);
break; break;
default: case COVERFLOW_CHANNEL:
if (show_channel) if(show_homebrew)
m_btnMgr.show(m_mainBtnChannel); m_btnMgr.show(m_mainBtnHomebrew);
else if (show_homebrew && (parental_homebrew || !m_locked)) else
m_btnMgr.show(m_mainBtnHomebrew); m_btnMgr.show(m_mainBtnUsb);
else if( m_show_dml ) break;
m_btnMgr.show(m_mainBtnDML); case COVERFLOW_HOMEBREW:
else m_btnMgr.show(m_mainBtnUsb);
m_btnMgr.show(m_mainBtnUsb); break;
break; default:
} if(m_show_dml)
m_btnMgr.show(m_mainBtnDML);
else if (show_channel)
m_btnMgr.show(m_mainBtnChannel);
else if (show_homebrew && (parental_homebrew || !m_locked))
m_btnMgr.show(m_mainBtnHomebrew);
else
m_btnMgr.show(m_mainBtnUsb);
break;
}
m_btnMgr.show(m_mainLblUser[2]); m_btnMgr.show(m_mainLblUser[2]);
m_btnMgr.show(m_mainLblUser[3]); m_btnMgr.show(m_mainLblUser[3]);
} }