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

-added fledge68 to thanks list, his changes:

Browse Source 
-fixed last theme layout not showing correctly
-fixed display color in menu_wbfs for themes
-fixed synopsis only displays right the first time
This commit is contained in:
fix94.1 2012-02-04 21:45:51 +00:00
parent 08cfe6c95e
commit b8208dfb9f
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/defines.h
View File

@ -21,7 +21,7 @@
#define THANKS \ #define THANKS \
"Lustar, CedWii, Benjay, Domi78, Oops, \ "Lustar, CedWii, Benjay, Domi78, Oops, \
Celtiore, Jiiwah, FluffyKiwi, Roku93, \ Celtiore, Jiiwah, FluffyKiwi, Roku93, \
Spayrosam, Bluescreen81, Chappy23, \ Spayrosam, Bluescreen81, Chappy23, fledge68, \
BlindDude, Bubba, DJTaz, OggZee, entropy, \ BlindDude, Bubba, DJTaz, OggZee, entropy, \
Usptactical, WiiPower, Hermes, Spidy1000, \ Usptactical, WiiPower, Hermes, Spidy1000, \
Dimok, Kovani, Drexyl, DvZ, Etheboss, \ Dimok, Kovani, Drexyl, DvZ, Etheboss, \

1
source/menu/menu_config_adv.cpp
View File

@ -157,6 +157,7 @@ int CMenu::_configAdv(void)
s8 direction = m_btnMgr.selected(m_configAdvBtnCurThemeP) ? 1 : -1; s8 direction = m_btnMgr.selected(m_configAdvBtnCurThemeP) ? 1 : -1;
curTheme = loopNum(curTheme + direction, (int)themes.size()); curTheme = loopNum(curTheme + direction, (int)themes.size());
m_cfg.setString("GENERAL", "theme", themes[curTheme]); m_cfg.setString("GENERAL", "theme", themes[curTheme]);
m_cfg.setInt(_domainFromView(), "last_cf_mode", 1);
_showConfigAdv(); _showConfigAdv();
} }
else if (m_btnMgr.selected(m_configAdvBtnCurLanguageP) || m_btnMgr.selected(m_configAdvBtnCurLanguageM)) else if (m_btnMgr.selected(m_configAdvBtnCurLanguageP) || m_btnMgr.selected(m_configAdvBtnCurLanguageM))

3
source/menu/menu_gameinfo.cpp
View File

@ -121,6 +121,7 @@ void CMenu::_gameinfo(void)
m_btnMgr.reset(m_gameinfoLblSynopsis); m_btnMgr.reset(m_gameinfoLblSynopsis);
m_btnMgr.setText(m_gameinfoLblSynopsis, wfmt(L"%s", gameinfo.Synopsis.c_str()), true); //, line, false); m_btnMgr.setText(m_gameinfoLblSynopsis, wfmt(L"%s", gameinfo.Synopsis.c_str()), true); //, line, false);
m_btnMgr.hide(m_gameinfoLblID, true);
m_btnMgr.hide(m_gameinfoLblDev, true); m_btnMgr.hide(m_gameinfoLblDev, true);
m_btnMgr.hide(m_gameinfoLblRegion, true); m_btnMgr.hide(m_gameinfoLblRegion, true);
m_btnMgr.hide(m_gameinfoLblPublisher, true); m_btnMgr.hide(m_gameinfoLblPublisher, true);
@ -144,12 +145,12 @@ void CMenu::_gameinfo(void)
else else
m_btnMgr.show(m_gameinfoLblUser[i]); m_btnMgr.show(m_gameinfoLblUser[i]);
m_btnMgr.show(m_gameinfoLblID);
m_btnMgr.show(m_gameinfoLblSynopsis); m_btnMgr.show(m_gameinfoLblSynopsis);
} }
else if (BTN_LEFT_PRESSED && !(m_thrdWorking && m_thrdStop)) else if (BTN_LEFT_PRESSED && !(m_thrdWorking && m_thrdStop))
{ {
page = 0; page = 0;
first = true;
m_btnMgr.show(m_gameinfoLblID); m_btnMgr.show(m_gameinfoLblID);
m_btnMgr.show(m_gameinfoLblDev); m_btnMgr.show(m_gameinfoLblDev);
m_btnMgr.show(m_gameinfoLblRegion); m_btnMgr.show(m_gameinfoLblRegion);

2
source/menu/menu_main.cpp
View File

@ -272,7 +272,7 @@ int CMenu::main(void)
{ {
const char *domain = _domainFromView(); const char *domain = _domainFromView();
s8 direction = BTN_1_PRESSED ? 1 : -1; s8 direction = BTN_1_PRESSED ? 1 : -1;
int cfVersion = loopNum(m_cfg.getInt(domain, "last_cf_mode", 1) + direction, m_numCFVersions); int cfVersion = 1+loopNum((m_cfg.getInt(domain, "last_cf_mode", 1)-1) + direction, m_numCFVersions);
_loadCFLayout(cfVersion); _loadCFLayout(cfVersion);
m_cf.applySettings(); m_cf.applySettings();
m_cfg.setInt(domain, "last_cf_mode", cfVersion); m_cfg.setInt(domain, "last_cf_mode", cfVersion);

12
source/menu/menu_wbfs.cpp
View File

@ -235,16 +235,14 @@ bool CMenu::_wbfsOp(CMenu::WBFS_OP op)
void CMenu::_initWBFSMenu(CMenu::SThemeData &theme) void CMenu::_initWBFSMenu(CMenu::SThemeData &theme)
{ {
CColor fontColor(0xD0BFDFFF);
_addUserLabels(theme, m_wbfsLblUser, ARRAY_SIZE(m_wbfsLblUser), "WBFS"); _addUserLabels(theme, m_wbfsLblUser, ARRAY_SIZE(m_wbfsLblUser), "WBFS");
m_wbfsBg = _texture(theme.texSet, "WBFS/BG", "texture", theme.bg); m_wbfsBg = _texture(theme.texSet, "WBFS/BG", "texture", theme.bg);
m_wbfsLblTitle = _addLabel(theme, "WBFS/TITLE", theme.titleFont, L"", 20, 30, 600, 60, fontColor, FTGX_JUSTIFY_CENTER | FTGX_ALIGN_MIDDLE); m_wbfsLblTitle = _addLabel(theme, "WBFS/TITLE", theme.titleFont, L"", 20, 30, 600, 60, theme.titleFontColor, FTGX_JUSTIFY_CENTER | FTGX_ALIGN_MIDDLE);
m_wbfsLblDialog = _addLabel(theme, "WBFS/DIALOG", theme.lblFont, L"", 40, 90, 560, 200, CColor(0xFFDFDFDF), FTGX_JUSTIFY_LEFT | FTGX_ALIGN_MIDDLE); m_wbfsLblDialog = _addLabel(theme, "WBFS/DIALOG", theme.lblFont, L"", 40, 90, 560, 200, theme.lblFontColor, FTGX_JUSTIFY_LEFT | FTGX_ALIGN_MIDDLE);
m_wbfsLblMessage = _addLabel(theme, "WBFS/MESSAGE", theme.lblFont, L"", 40, 300, 560, 100, CColor(0xFFDFDFDF), FTGX_JUSTIFY_CENTER | FTGX_ALIGN_TOP); m_wbfsLblMessage = _addLabel(theme, "WBFS/MESSAGE", theme.lblFont, L"", 40, 300, 560, 100, theme.lblFontColor, FTGX_JUSTIFY_CENTER | FTGX_ALIGN_TOP);
m_wbfsPBar = _addProgressBar(theme, "WBFS/PROGRESS_BAR", 40, 270, 560, 20); m_wbfsPBar = _addProgressBar(theme, "WBFS/PROGRESS_BAR", 40, 270, 560, 20);
m_wbfsBtnBack = _addButton(theme, "WBFS/BACK_BTN", theme.btnFont, L"", 420, 410, 200, 56, fontColor); m_wbfsBtnBack = _addButton(theme, "WBFS/BACK_BTN", theme.btnFont, L"", 420, 410, 200, 56, theme.btnFontColor);
m_wbfsBtnGo = _addButton(theme, "WBFS/GO_BTN", theme.btnFont, L"", 245, 260, 150, 56, fontColor); m_wbfsBtnGo = _addButton(theme, "WBFS/GO_BTN", theme.btnFont, L"", 245, 260, 150, 56, theme.btnFontColor);
// //
_setHideAnim(m_wbfsLblTitle, "WBFS/TITLE", 0, 0, -2.f, 0.f); _setHideAnim(m_wbfsLblTitle, "WBFS/TITLE", 0, 0, -2.f, 0.f);
_setHideAnim(m_wbfsLblDialog, "WBFS/DIALOG", 0, 0, -2.f, 0.f); _setHideAnim(m_wbfsLblDialog, "WBFS/DIALOG", 0, 0, -2.f, 0.f);