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

- moved 'settings button' from main screen to 'Home Menu' and removed 'cache covers' from 'Home Menu' because it is automatically done after reload cache. So to get to main settings go to home menu and select Settings. a little extra step but its ok.

Browse Source 
- some theme domain name changes:
[MAIN/CONFIG_BTN] is deleted
[HOME/SETTINGS] is now [HOME/HELP]
[HOME/FTP] is now [HOME/SELECT_PLUGIN]
[HOME/ABOUT] is now [HOME/CREDITS]
[HOME/UPDATE] is now [HOME/SETTINGS]
This commit is contained in:
Fledge68 2019-10-21 08:38:26 -05:00
parent 8bfe832e61
commit 7f5a8641ea
3 changed files with 90 additions and 88 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.4 MiB

After

Width:  |  Height:  |  Size: 3.4 MiB

96
source/menu/menu_home.cpp
View File

@ -24,16 +24,16 @@
s16 m_homeLblTitle; s16 m_homeLblTitle;
s16 m_homeLblUser[4]; s16 m_homeLblUser[4];
s16 m_homeBtnSettings; s16 m_homeBtnHelp;
s16 m_homeBtnReloadCache; s16 m_homeBtnReloadCache;
s16 m_homeBtnUpdate;
s16 m_homeBtnExplorer; s16 m_homeBtnExplorer;
s16 m_homeBtnInstall;
s16 m_homeBtnAbout;
s16 m_homeBtnExitTo;
s16 m_homeBtnSelPlugin; s16 m_homeBtnSelPlugin;
s16 m_homeBtnCredits;
s16 m_homeBtnInstall;
s16 m_homeBtnExitTo;
s16 m_homeBtnSettings;
s16 m_homeLblBattery; s16 m_homeLblBattery;
/* exit to menu */ /* exit to menu */
@ -41,9 +41,9 @@ s16 m_exittoLblTitle;
s16 m_exittoLblUser[4]; s16 m_exittoLblUser[4];
s16 m_homeBtnExitToHBC; s16 m_homeBtnExitToHBC;
s16 m_homeBtnExitToMenu; s16 m_homeBtnExitToMenu;
s16 m_homeBtnExitToNeek;
s16 m_homeBtnExitToPriiloader; s16 m_homeBtnExitToPriiloader;
s16 m_homeBtnExitToBootmii; s16 m_homeBtnExitToBootmii;
s16 m_homeBtnExitToNeek;
TexData m_homeBg; TexData m_homeBg;
static const wstringEx PLAYER_BATTERY_LABEL("P1 %003.f%% | P2 %003.f%% | P3 %003.f%% | P4 %003.f%%"); static const wstringEx PLAYER_BATTERY_LABEL("P1 %003.f%% | P2 %003.f%% | P3 %003.f%% | P4 %003.f%%");
@ -51,6 +51,10 @@ static const wstringEx PLAYER_BATTERY_LABEL("P1 %003.f%% | P2 %003.f%% | P3 %003
bool CMenu::_Home(void) bool CMenu::_Home(void)
{ {
SetupInput(); SetupInput();
if(isWiiVC || m_locked)
m_btnMgr.setText(m_homeBtnExitTo, _t("home12", L"Exit"));
else
m_btnMgr.setText(m_homeBtnExitTo, _t("home5", L"Exit To"));
_showHome(); _showHome();
while(!m_exit) while(!m_exit)
@ -74,7 +78,7 @@ bool CMenu::_Home(void)
} }
else if(BTN_A_PRESSED) else if(BTN_A_PRESSED)
{ {
if(m_btnMgr.selected(m_homeBtnSettings))//actually help guide btn if(m_btnMgr.selected(m_homeBtnHelp))
{ {
_hideHome(); _hideHome();
_about(true); _about(true);
@ -95,7 +99,16 @@ bool CMenu::_Home(void)
m_refreshGameList = true; m_refreshGameList = true;
break; break;
} }
else if(m_btnMgr.selected(m_homeBtnUpdate)) else if(m_btnMgr.selected(m_homeBtnSettings))
{
_hideHome();
_config(1);
//if(m_refreshGameList)
break;
_showHome();
}
/* use this for export game list
else if(m_btnMgr.selected(m_homeBtnUpdate))// cache covers
{ {
_hideHome(); _hideHome();
m_btnMgr.setProgress(m_wbfsPBar, 0.f, true); m_btnMgr.setProgress(m_wbfsPBar, 0.f, true);
@ -121,14 +134,14 @@ bool CMenu::_Home(void)
} }
} }
_showHome(); _showHome();
} }*/
else if(m_btnMgr.selected(m_homeBtnInstall)) else if(m_btnMgr.selected(m_homeBtnInstall))// replace
{ {
_hideHome(); _hideHome();
_wbfsOp(WO_ADD_GAME); _wbfsOp(WO_ADD_GAME);
_showHome(); _showHome();
} }
else if(m_btnMgr.selected(m_homeBtnAbout)) else if(m_btnMgr.selected(m_homeBtnCredits))
{ {
_hideHome(); _hideHome();
_about(); _about();
@ -142,9 +155,6 @@ bool CMenu::_Home(void)
exitHandler(EXIT_TO_MENU); exitHandler(EXIT_TO_MENU);
break; break;
} }
if(m_locked)
exitHandler(WIIFLOW_DEF);
else
_ExitTo(); _ExitTo();
_showHome(); _showHome();
} }
@ -252,15 +262,15 @@ void CMenu::_showHome(void)
if(!m_locked) if(!m_locked)
{ {
m_btnMgr.show(m_homeBtnSettings); m_btnMgr.show(m_homeBtnHelp);
m_btnMgr.show(m_homeBtnReloadCache); m_btnMgr.show(m_homeBtnReloadCache);
m_btnMgr.show(m_homeBtnUpdate);
m_btnMgr.show(m_homeBtnExplorer); m_btnMgr.show(m_homeBtnExplorer);
m_btnMgr.show(m_homeBtnCredits);
m_btnMgr.show(m_homeBtnInstall); m_btnMgr.show(m_homeBtnInstall);
m_btnMgr.show(m_homeBtnAbout);
m_btnMgr.show(m_homeBtnExitTo); m_btnMgr.show(m_homeBtnExitTo);
} }
m_btnMgr.show(m_homeBtnSettings);
m_btnMgr.show(m_homeBtnSelPlugin); m_btnMgr.show(m_homeBtnSelPlugin);
m_btnMgr.show(m_homeLblBattery); m_btnMgr.show(m_homeLblBattery);
@ -277,10 +287,10 @@ void CMenu::_showExitTo(void)
m_btnMgr.show(m_homeBtnExitToHBC); m_btnMgr.show(m_homeBtnExitToHBC);
m_btnMgr.show(m_homeBtnExitToMenu); m_btnMgr.show(m_homeBtnExitToMenu);
m_btnMgr.show(m_homeBtnExitToNeek);
m_btnMgr.show(m_homeBtnExitToPriiloader);// exit to wii u on wii u m_btnMgr.show(m_homeBtnExitToPriiloader);// exit to wii u on wii u
if(IsOnWiiU() == false) if(IsOnWiiU() == false)
m_btnMgr.show(m_homeBtnExitToBootmii); m_btnMgr.show(m_homeBtnExitToBootmii);
m_btnMgr.show(m_homeBtnExitToNeek);
for(u8 i = 0; i < ARRAY_SIZE(m_exittoLblUser); ++i) for(u8 i = 0; i < ARRAY_SIZE(m_exittoLblUser); ++i)
if(m_exittoLblUser[i] != -1) if(m_exittoLblUser[i] != -1)
@ -291,16 +301,16 @@ void CMenu::_hideHome(bool instant)
{ {
m_btnMgr.hide(m_homeLblTitle, instant); m_btnMgr.hide(m_homeLblTitle, instant);
m_btnMgr.hide(m_homeBtnSettings, instant); m_btnMgr.hide(m_homeBtnHelp, instant);
m_btnMgr.hide(m_homeBtnReloadCache, instant); m_btnMgr.hide(m_homeBtnReloadCache, instant);
m_btnMgr.hide(m_homeBtnUpdate, instant);
m_btnMgr.hide(m_homeBtnExplorer, instant); m_btnMgr.hide(m_homeBtnExplorer, instant);
m_btnMgr.hide(m_homeBtnInstall, instant);
m_btnMgr.hide(m_homeBtnAbout, instant);
m_btnMgr.hide(m_homeBtnExitTo, instant);
m_btnMgr.hide(m_homeBtnSelPlugin, instant); m_btnMgr.hide(m_homeBtnSelPlugin, instant);
m_btnMgr.hide(m_homeBtnCredits, instant);
m_btnMgr.hide(m_homeBtnInstall, instant);
m_btnMgr.hide(m_homeBtnExitTo, instant);
m_btnMgr.hide(m_homeBtnSettings, instant);
m_btnMgr.hide(m_homeLblBattery, instant); m_btnMgr.hide(m_homeLblBattery, instant);
for(u8 i = 0; i < ARRAY_SIZE(m_homeLblUser); ++i) for(u8 i = 0; i < ARRAY_SIZE(m_homeLblUser); ++i)
@ -314,9 +324,9 @@ void CMenu::_hideExitTo(bool instant)
m_btnMgr.hide(m_homeBtnExitToHBC, instant); m_btnMgr.hide(m_homeBtnExitToHBC, instant);
m_btnMgr.hide(m_homeBtnExitToMenu, instant); m_btnMgr.hide(m_homeBtnExitToMenu, instant);
m_btnMgr.hide(m_homeBtnExitToNeek, instant);
m_btnMgr.hide(m_homeBtnExitToPriiloader, instant); m_btnMgr.hide(m_homeBtnExitToPriiloader, instant);
m_btnMgr.hide(m_homeBtnExitToBootmii, instant); m_btnMgr.hide(m_homeBtnExitToBootmii, instant);
m_btnMgr.hide(m_homeBtnExitToNeek, instant);
for(u8 i = 0; i < ARRAY_SIZE(m_exittoLblUser); ++i) for(u8 i = 0; i < ARRAY_SIZE(m_exittoLblUser); ++i)
if(m_exittoLblUser[i] != -1) if(m_exittoLblUser[i] != -1)
@ -331,29 +341,29 @@ void CMenu::_initHomeAndExitToMenu()
_addUserLabels(m_homeLblUser, ARRAY_SIZE(m_homeLblUser), "HOME"); _addUserLabels(m_homeLblUser, ARRAY_SIZE(m_homeLblUser), "HOME");
m_homeLblTitle = _addLabel("HOME/TITLE", theme.titleFont, L"", 0, 10, 640, 60, theme.titleFontColor, FTGX_JUSTIFY_CENTER | FTGX_ALIGN_MIDDLE); m_homeLblTitle = _addLabel("HOME/TITLE", theme.titleFont, L"", 0, 10, 640, 60, theme.titleFontColor, FTGX_JUSTIFY_CENTER | FTGX_ALIGN_MIDDLE);
m_homeBtnSettings = _addButton("HOME/SETTINGS", theme.btnFont, L"", 60, 100, 250, 48, theme.btnFontColor); m_homeBtnHelp = _addButton("HOME/HELP", theme.btnFont, L"", 60, 100, 250, 48, theme.btnFontColor);
m_homeBtnReloadCache = _addButton("HOME/RELOAD_CACHE", theme.btnFont, L"", 60, 180, 250, 48, theme.btnFontColor); m_homeBtnReloadCache = _addButton("HOME/RELOAD_CACHE", theme.btnFont, L"", 60, 180, 250, 48, theme.btnFontColor);
m_homeBtnExplorer = _addButton("HOME/EXPLORER", theme.btnFont, L"", 60, 260, 250, 48, theme.btnFontColor); m_homeBtnExplorer = _addButton("HOME/EXPLORER", theme.btnFont, L"", 60, 260, 250, 48, theme.btnFontColor);
m_homeBtnSelPlugin = _addButton("HOME/FTP", theme.btnFont, L"", 60, 340, 250, 48, theme.btnFontColor); m_homeBtnSelPlugin = _addButton("HOME/SELECT_PLUGIN", theme.btnFont, L"", 60, 340, 250, 48, theme.btnFontColor);
m_homeBtnAbout = _addButton("HOME/ABOUT", theme.btnFont, L"", 330, 100, 250, 48, theme.btnFontColor); m_homeBtnCredits = _addButton("HOME/CREDITS", theme.btnFont, L"", 330, 100, 250, 48, theme.btnFontColor);
m_homeBtnInstall = _addButton("HOME/INSTALL", theme.btnFont, L"", 330, 180, 250, 48, theme.btnFontColor); m_homeBtnInstall = _addButton("HOME/INSTALL", theme.btnFont, L"", 330, 180, 250, 48, theme.btnFontColor);
m_homeBtnExitTo = _addButton("HOME/EXIT_TO", theme.btnFont, L"", 330, 260, 250, 48, theme.btnFontColor); m_homeBtnExitTo = _addButton("HOME/EXIT_TO", theme.btnFont, L"", 330, 260, 250, 48, theme.btnFontColor);
m_homeBtnUpdate = _addButton("HOME/UPDATE", theme.btnFont, L"", 330, 340, 250, 48, theme.btnFontColor); m_homeBtnSettings = _addButton("HOME/SETTINGS", theme.btnFont, L"", 330, 340, 250, 48, theme.btnFontColor);
m_homeLblBattery = _addLabel("HOME/BATTERY", theme.btnFont, L"", 0, 420, 640, 48, theme.btnFontColor, FTGX_JUSTIFY_CENTER | FTGX_ALIGN_MIDDLE, theme.btnTexC); m_homeLblBattery = _addLabel("HOME/BATTERY", theme.btnFont, L"", 0, 420, 640, 48, theme.btnFontColor, FTGX_JUSTIFY_CENTER | FTGX_ALIGN_MIDDLE, theme.btnTexC);
_setHideAnim(m_homeLblTitle, "HOME/TITLE", 0, 0, -2.f, 0.f); _setHideAnim(m_homeLblTitle, "HOME/TITLE", 0, 0, -2.f, 0.f);
_setHideAnim(m_homeBtnSettings, "HOME/SETTINGS", 50, 0, 1.f, 0.f); _setHideAnim(m_homeBtnHelp, "HOME/HELP", 50, 0, 1.f, 0.f);
_setHideAnim(m_homeBtnReloadCache, "HOME/RELOAD_CACHE", 50, 0, 1.f, 0.f); _setHideAnim(m_homeBtnReloadCache, "HOME/RELOAD_CACHE", 50, 0, 1.f, 0.f);
_setHideAnim(m_homeBtnSelPlugin, "HOME/FTP", 50, 0, 1.f, 0.f);
_setHideAnim(m_homeBtnExplorer, "HOME/EXPLORER", 50, 0, 1.f, 0.f); _setHideAnim(m_homeBtnExplorer, "HOME/EXPLORER", 50, 0, 1.f, 0.f);
_setHideAnim(m_homeBtnSelPlugin, "HOME/SELECT_PLUGIN", 50, 0, 1.f, 0.f);
_setHideAnim(m_homeBtnCredits, "HOME/CREDITS", -50, 0, 1.f, 0.f);
_setHideAnim(m_homeBtnInstall, "HOME/INSTALL", -50, 0, 1.f, 0.f); _setHideAnim(m_homeBtnInstall, "HOME/INSTALL", -50, 0, 1.f, 0.f);
_setHideAnim(m_homeBtnAbout, "HOME/ABOUT", -50, 0, 1.f, 0.f);
_setHideAnim(m_homeBtnExitTo, "HOME/EXIT_TO", -50, 0, 1.f, 0.f); _setHideAnim(m_homeBtnExitTo, "HOME/EXIT_TO", -50, 0, 1.f, 0.f);
_setHideAnim(m_homeBtnUpdate, "HOME/UPDATE", -50, 0, 1.f, 0.f); _setHideAnim(m_homeBtnSettings, "HOME/SETTINGS", -50, 0, 1.f, 0.f);
_setHideAnim(m_homeLblBattery, "HOME/BATTERY", 0, 0, -2.f, 0.f); _setHideAnim(m_homeLblBattery, "HOME/BATTERY", 0, 0, -2.f, 0.f);
@ -385,19 +395,15 @@ void CMenu::_initHomeAndExitToMenu()
void CMenu::_textHome(void) void CMenu::_textHome(void)
{ {
m_btnMgr.setText(m_homeLblTitle, wfmt(L"%s %s", APP_NAME, APP_VERSION)); m_btnMgr.setText(m_homeLblTitle, wfmt(L"%s %s", APP_NAME, APP_VERSION));
m_btnMgr.setText(m_homeBtnSettings, _t("about10", L"Help Guide")); m_btnMgr.setText(m_homeBtnHelp, _t("about10", L"Help Guide"));
m_btnMgr.setText(m_homeBtnReloadCache, _t("home2", L"Reload Cache")); m_btnMgr.setText(m_homeBtnReloadCache, _t("home2", L"Reload Cache"));
m_btnMgr.setText(m_homeBtnUpdate, _t("home11", L"Cache Covers"));
m_btnMgr.setText(m_homeBtnExplorer, _t("home8", L"File Explorer")); m_btnMgr.setText(m_homeBtnExplorer, _t("home8", L"File Explorer"));
m_btnMgr.setText(m_homeBtnInstall, _t("home7", L"Install Game"));
m_btnMgr.setText(m_homeBtnAbout, _t("home4", L"Credits"));
if(isWiiVC)
m_btnMgr.setText(m_homeBtnExitTo, _t("home12", L"Exit"));
else
m_btnMgr.setText(m_homeBtnExitTo, _t("home5", L"Exit To"));
m_btnMgr.setText(m_homeBtnSelPlugin, _t("cfgpl1", L"Select Plugins")); m_btnMgr.setText(m_homeBtnSelPlugin, _t("cfgpl1", L"Select Plugins"));
m_btnMgr.setText(m_homeBtnCredits, _t("home4", L"Credits"));
m_btnMgr.setText(m_homeBtnInstall, _t("home7", L"Install Game"));
m_btnMgr.setText(m_homeBtnExitTo, _t("home5", L"Exit To"));
m_btnMgr.setText(m_homeBtnSettings, _t("cfg1", L"Settings"));
} }
void CMenu::_textExitTo(void) void CMenu::_textExitTo(void)
@ -405,12 +411,12 @@ void CMenu::_textExitTo(void)
m_btnMgr.setText(m_exittoLblTitle, _t("exit_to", L"Exit To")); m_btnMgr.setText(m_exittoLblTitle, _t("exit_to", L"Exit To"));
m_btnMgr.setText(m_homeBtnExitToHBC, _t("hbc", L"Homebrew Channel")); m_btnMgr.setText(m_homeBtnExitToHBC, _t("hbc", L"Homebrew Channel"));
m_btnMgr.setText(m_homeBtnExitToMenu, _t("menu", L"System Menu")); m_btnMgr.setText(m_homeBtnExitToMenu, _t("menu", L"System Menu"));
m_btnMgr.setText(m_homeBtnExitToNeek, _t("neek2o", L"neek2o"));
if(IsOnWiiU()) if(IsOnWiiU())
m_btnMgr.setText(m_homeBtnExitToPriiloader, _t("wiiu", L"Wii U Menu")); m_btnMgr.setText(m_homeBtnExitToPriiloader, _t("wiiu", L"Wii U Menu"));
else else
m_btnMgr.setText(m_homeBtnExitToPriiloader, _t("prii", L"Priiloader")); m_btnMgr.setText(m_homeBtnExitToPriiloader, _t("prii", L"Priiloader"));
m_btnMgr.setText(m_homeBtnExitToBootmii, _t("bootmii", L"Bootmii")); m_btnMgr.setText(m_homeBtnExitToBootmii, _t("bootmii", L"Bootmii"));
m_btnMgr.setText(m_homeBtnExitToNeek, _t("neek2o", L"neek2o"));
} }
/*******************************************************************************/ /*******************************************************************************/

78
source/menu/menu_main.cpp
View File

@ -24,7 +24,7 @@ void CMenu::_hideMain(bool instant)
m_btnMgr.hide(m_mainBtnNext, instant); m_btnMgr.hide(m_mainBtnNext, instant);
m_btnMgr.hide(m_mainBtnPrev, instant); m_btnMgr.hide(m_mainBtnPrev, instant);
m_btnMgr.hide(m_mainBtnCategories, instant); m_btnMgr.hide(m_mainBtnCategories, instant);
m_btnMgr.hide(m_mainBtnConfig, instant); //m_btnMgr.hide(m_mainBtnConfig, instant);
m_btnMgr.hide(m_mainBtnHome, instant); m_btnMgr.hide(m_mainBtnHome, instant);
m_btnMgr.hide(m_mainBtnHomebrew, instant); m_btnMgr.hide(m_mainBtnHomebrew, instant);
m_btnMgr.hide(m_mainBtnChannel, instant); m_btnMgr.hide(m_mainBtnChannel, instant);
@ -364,8 +364,6 @@ int CMenu::main(void)
} }
m_catStartPage = m_cfg.getInt("GENERAL", "cat_startpage", 1); m_catStartPage = m_cfg.getInt("GENERAL", "cat_startpage", 1);
//if(m_source_cnt == 1)
// m_cfg.remove("GENERAL", "cat_startpage");
if(m_cfg.getBool("GENERAL", "update_cache", false)) if(m_cfg.getBool("GENERAL", "update_cache", false))
{ {
@ -432,17 +430,28 @@ int CMenu::main(void)
} }
} }
} }
if(BTN_HOME_PRESSED) if(BTN_HOME_PRESSED || (BTN_A_PRESSED && m_btnMgr.selected(m_mainBtnHome)))
{ {
_hideMain(); _hideMain();
/* Home menu */ /* Home menu */
if(_Home()) if(_Home())
break;// exit wiiflow break;// exit wiiflow
if(prevTheme != m_themeName)
{
/* new theme - exit wiiflow and reload */
fsop_deleteFolder(fmt("%s/sourceflow", m_cacheDir.c_str()));
m_reload = true;
break;
}
if(BTN_B_HELD) if(BTN_B_HELD)
{ {
bheld = true; bheld = true;
bUsed = true; bUsed = true;
} }
show_channel = !m_cfg.getBool(CHANNEL_DOMAIN, "disable", false);
show_plugin = !m_cfg.getBool(PLUGIN_DOMAIN, "disable", false);
show_gamecube = !m_cfg.getBool(GC_DOMAIN, "disable", false);
show_homebrew = !m_cfg.getBool(HOMEBREW_DOMAIN, "disable", false);
_showMain(); _showMain();
} }
else if(BTN_A_PRESSED) else if(BTN_A_PRESSED)
@ -451,19 +460,6 @@ int CMenu::main(void)
CoverFlow.pageUp(); CoverFlow.pageUp();
else if(m_btnMgr.selected(m_mainBtnNext)) else if(m_btnMgr.selected(m_mainBtnNext))
CoverFlow.pageDown(); CoverFlow.pageDown();
else if(m_btnMgr.selected(m_mainBtnHome))
{
/* home menu via main menu button */
_hideMain();
if(_Home())
break;// exit wiiflow
if(BTN_B_HELD)
{
bheld = true;
bUsed = true;
}
_showMain();
}
else if(m_btnMgr.selected(m_mainBtnChannel) || m_btnMgr.selected(m_mainBtnWii) || m_btnMgr.selected(m_mainBtnGamecube) else if(m_btnMgr.selected(m_mainBtnChannel) || m_btnMgr.selected(m_mainBtnWii) || m_btnMgr.selected(m_mainBtnGamecube)
|| m_btnMgr.selected(m_mainBtnPlugin) || m_btnMgr.selected(m_mainBtnHomebrew)) || m_btnMgr.selected(m_mainBtnPlugin) || m_btnMgr.selected(m_mainBtnHomebrew))
{ {
@ -485,14 +481,14 @@ int CMenu::main(void)
_setMainBg(); _setMainBg();
_showCF(true); _showCF(true);
} }
else if(m_btnMgr.selected(m_mainBtnConfig)) /*else if(m_btnMgr.selected(m_mainBtnConfig))
{ {
/* main menu global settings */ // main menu global settings //
_hideMain(); _hideMain();
_config(1); _config(1);
if(prevTheme != m_themeName) if(prevTheme != m_themeName)
{ {
/* new theme - exit wiiflow and reload */ // new theme - exit wiiflow and reload //
fsop_deleteFolder(fmt("%s/sourceflow", m_cacheDir.c_str())); fsop_deleteFolder(fmt("%s/sourceflow", m_cacheDir.c_str()));
m_reload = true; m_reload = true;
break; break;
@ -507,7 +503,7 @@ int CMenu::main(void)
show_gamecube = !m_cfg.getBool(GC_DOMAIN, "disable", false); show_gamecube = !m_cfg.getBool(GC_DOMAIN, "disable", false);
show_homebrew = !m_cfg.getBool(HOMEBREW_DOMAIN, "disable", false); show_homebrew = !m_cfg.getBool(HOMEBREW_DOMAIN, "disable", false);
_showMain(); _showMain();
} }*/
else if(m_btnMgr.selected(m_mainBtnCategories)) else if(m_btnMgr.selected(m_mainBtnCategories))
{ {
_hideMain(); _hideMain();
@ -821,7 +817,7 @@ int CMenu::main(void)
m_btnMgr.show(m_mainLblUser[0]); m_btnMgr.show(m_mainLblUser[0]);
m_btnMgr.show(m_mainLblUser[1]); m_btnMgr.show(m_mainLblUser[1]);
m_btnMgr.show(m_mainBtnCategories); m_btnMgr.show(m_mainBtnCategories);
m_btnMgr.show(m_mainBtnConfig); //m_btnMgr.show(m_mainBtnConfig);
m_btnMgr.show(m_mainBtnHome); m_btnMgr.show(m_mainBtnHome);
m_btnMgr.show(m_favorites ? m_mainBtnFavoritesOn : m_mainBtnFavoritesOff); m_btnMgr.show(m_favorites ? m_mainBtnFavoritesOn : m_mainBtnFavoritesOff);
m_btnMgr.hide(m_favorites ? m_mainBtnFavoritesOff : m_mainBtnFavoritesOn); m_btnMgr.hide(m_favorites ? m_mainBtnFavoritesOff : m_mainBtnFavoritesOn);
@ -830,7 +826,7 @@ int CMenu::main(void)
{ {
m_btnMgr.hide(m_mainLblUser[0]); m_btnMgr.hide(m_mainLblUser[0]);
m_btnMgr.hide(m_mainLblUser[1]); m_btnMgr.hide(m_mainLblUser[1]);
m_btnMgr.hide(m_mainBtnConfig); //m_btnMgr.hide(m_mainBtnConfig);
m_btnMgr.hide(m_mainBtnCategories); m_btnMgr.hide(m_mainBtnCategories);
m_btnMgr.hide(m_mainBtnHome); m_btnMgr.hide(m_mainBtnHome);
m_btnMgr.hide(m_mainBtnFavoritesOn); m_btnMgr.hide(m_mainBtnFavoritesOn);
@ -935,8 +931,8 @@ void CMenu::_initMainMenu()
TexData texCategoriesS; TexData texCategoriesS;
TexData texHome; TexData texHome;
TexData texHomeS; TexData texHomeS;
TexData texConfig; //TexData texConfig;
TexData texConfigS; //TexData texConfigS;
TexData texGamecube; TexData texGamecube;
TexData texGamecubes; TexData texGamecubes;
TexData texPlugin; TexData texPlugin;
@ -966,10 +962,10 @@ void CMenu::_initMainMenu()
TexHandle.fromImageFile(texCategories, fmt("%s/btncat.png", m_imgsDir.c_str())); TexHandle.fromImageFile(texCategories, fmt("%s/btncat.png", m_imgsDir.c_str()));
TexHandle.fromImageFile(texCategoriesS, fmt("%s/btncats.png", m_imgsDir.c_str())); TexHandle.fromImageFile(texCategoriesS, fmt("%s/btncats.png", m_imgsDir.c_str()));
TexHandle.fromImageFile(texHome, fmt("%s/btnquit.png", m_imgsDir.c_str()));// home button TexHandle.fromImageFile(texHome, fmt("%s/btnconfig.png", m_imgsDir.c_str()));// home button
TexHandle.fromImageFile(texHomeS, fmt("%s/btnquits.png", m_imgsDir.c_str())); TexHandle.fromImageFile(texHomeS, fmt("%s/btnconfigs.png", m_imgsDir.c_str()));
TexHandle.fromImageFile(texConfig, fmt("%s/btnconfig.png", m_imgsDir.c_str())); //TexHandle.fromImageFile(texConfig, fmt("%s/btnconfig.png", m_imgsDir.c_str()));
TexHandle.fromImageFile(texConfigS, fmt("%s/btnconfigs.png", m_imgsDir.c_str())); //TexHandle.fromImageFile(texConfigS, fmt("%s/btnconfigs.png", m_imgsDir.c_str()));
TexHandle.fromImageFile(texDVD, fmt("%s/btndvd.png", m_imgsDir.c_str())); TexHandle.fromImageFile(texDVD, fmt("%s/btndvd.png", m_imgsDir.c_str()));
TexHandle.fromImageFile(texDVDs, fmt("%s/btndvds.png", m_imgsDir.c_str())); TexHandle.fromImageFile(texDVDs, fmt("%s/btndvds.png", m_imgsDir.c_str()));
TexHandle.fromImageFile(texWii, fmt("%s/btnusb.png", m_imgsDir.c_str())); TexHandle.fromImageFile(texWii, fmt("%s/btnusb.png", m_imgsDir.c_str()));
@ -993,17 +989,17 @@ void CMenu::_initMainMenu()
_addUserLabels(m_mainLblUser, ARRAY_SIZE(m_mainLblUser), "MAIN"); _addUserLabels(m_mainLblUser, ARRAY_SIZE(m_mainLblUser), "MAIN");
m_mainBtnCategories = _addPicButton("MAIN/CATEGORIES_BTN", texCategories, texCategoriesS, 126, 400, 48, 48); m_mainBtnCategories = _addPicButton("MAIN/CATEGORIES_BTN", texCategories, texCategoriesS, 160, 400, 48, 48);
m_mainBtnFavoritesOn = _addPicButton("MAIN/FAVORITES_ON", texFavOn, texFavOnS, 194, 400, 48, 48); m_mainBtnFavoritesOn = _addPicButton("MAIN/FAVORITES_ON", texFavOn, texFavOnS, 228, 400, 48, 48);
m_mainBtnFavoritesOff = _addPicButton("MAIN/FAVORITES_OFF", texFavOff, texFavOffS, 194, 400, 48, 48); m_mainBtnFavoritesOff = _addPicButton("MAIN/FAVORITES_OFF", texFavOff, texFavOffS, 228, 400, 48, 48);
m_mainBtnConfig = _addPicButton("MAIN/CONFIG_BTN", texConfig, texConfigS, 262, 400, 48, 48); //m_mainBtnConfig = _addPicButton("MAIN/CONFIG_BTN", texConfig, texConfigS, 262, 400, 48, 48);
m_mainBtnHome = _addPicButton("MAIN/QUIT_BTN", texHome, texHomeS, 330, 400, 48, 48); m_mainBtnHome = _addPicButton("MAIN/QUIT_BTN", texHome, texHomeS, 296, 400, 48, 48);
m_mainBtnChannel = _addPicButton("MAIN/CHANNEL_BTN", texChannel, texChannels,398, 400, 48, 48); m_mainBtnChannel = _addPicButton("MAIN/CHANNEL_BTN", texChannel, texChannels,364, 400, 48, 48);
m_mainBtnHomebrew = _addPicButton("MAIN/HOMEBREW_BTN", texHomebrew, texHomebrews, 398, 400, 48, 48); m_mainBtnHomebrew = _addPicButton("MAIN/HOMEBREW_BTN", texHomebrew, texHomebrews, 364, 400, 48, 48);
m_mainBtnWii = _addPicButton("MAIN/USB_BTN", texWii, texWiis, 398, 400, 48, 48); m_mainBtnWii = _addPicButton("MAIN/USB_BTN", texWii, texWiis, 364, 400, 48, 48);
m_mainBtnGamecube = _addPicButton("MAIN/DML_BTN", texGamecube, texGamecubes, 398, 400, 48, 48); m_mainBtnGamecube = _addPicButton("MAIN/DML_BTN", texGamecube, texGamecubes, 364, 400, 48, 48);
m_mainBtnPlugin = _addPicButton("MAIN/EMU_BTN", texPlugin, texPlugins, 398, 400, 48, 48); m_mainBtnPlugin = _addPicButton("MAIN/EMU_BTN", texPlugin, texPlugins, 364, 400, 48, 48);
m_mainBtnDVD = _addPicButton("MAIN/DVD_BTN", texDVD, texDVDs, 466, 400, 48, 48); m_mainBtnDVD = _addPicButton("MAIN/DVD_BTN", texDVD, texDVDs, 432, 400, 48, 48);
m_mainBtnNext = _addPicButton("MAIN/NEXT_BTN", texNext, texNextS, 540, 146, 80, 80); m_mainBtnNext = _addPicButton("MAIN/NEXT_BTN", texNext, texNextS, 540, 146, 80, 80);
m_mainBtnPrev = _addPicButton("MAIN/PREV_BTN", texPrev, texPrevS, 20, 146, 80, 80); m_mainBtnPrev = _addPicButton("MAIN/PREV_BTN", texPrev, texPrevS, 20, 146, 80, 80);
@ -1050,7 +1046,7 @@ void CMenu::_initMainMenu()
_setHideAnim(m_mainBtnNext, "MAIN/NEXT_BTN", 0, 0, 0.f, 0.f); _setHideAnim(m_mainBtnNext, "MAIN/NEXT_BTN", 0, 0, 0.f, 0.f);
_setHideAnim(m_mainBtnPrev, "MAIN/PREV_BTN", 0, 0, 0.f, 0.f); _setHideAnim(m_mainBtnPrev, "MAIN/PREV_BTN", 0, 0, 0.f, 0.f);
_setHideAnim(m_mainBtnCategories, "MAIN/CATEGORIES_BTN", 0, 40, 0.f, 0.f); _setHideAnim(m_mainBtnCategories, "MAIN/CATEGORIES_BTN", 0, 40, 0.f, 0.f);
_setHideAnim(m_mainBtnConfig, "MAIN/CONFIG_BTN", 0, 40, 0.f, 0.f); //_setHideAnim(m_mainBtnConfig, "MAIN/CONFIG_BTN", 0, 40, 0.f, 0.f);
_setHideAnim(m_mainBtnHome, "MAIN/QUIT_BTN", 0, 40, 0.f, 0.f); _setHideAnim(m_mainBtnHome, "MAIN/QUIT_BTN", 0, 40, 0.f, 0.f);
_setHideAnim(m_mainBtnChannel, "MAIN/CHANNEL_BTN", 0, 40, 0.f, 0.f); _setHideAnim(m_mainBtnChannel, "MAIN/CHANNEL_BTN", 0, 40, 0.f, 0.f);
_setHideAnim(m_mainBtnHomebrew, "MAIN/HOMEBREW_BTN", 0, 40, 0.f, 0.f); _setHideAnim(m_mainBtnHomebrew, "MAIN/HOMEBREW_BTN", 0, 40, 0.f, 0.f);