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

-replaced the help button in the home menu with a install game button

Browse Source 
-replaced the about button in coverflow with the wiiflow help
-added partition selection to the install game menu
-modified the pos of the go button (themers, update plz)
-new text for translators, "Install Game" in "home7"
-updated english and german ini
This commit is contained in:
fix94.1 2012-12-21 15:11:24 +00:00
parent 09638f273a
commit cf903ce99a
6 changed files with 67 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/menu/menu.hpp
View File

@ -394,7 +394,6 @@ private:
//menu_wbfs //menu_wbfs
s16 m_wbfsLblTitle; s16 m_wbfsLblTitle;
s16 m_wbfsPBar; s16 m_wbfsPBar;
s16 m_wbfsBtnBack;
s16 m_wbfsBtnGo; s16 m_wbfsBtnGo;
s16 m_wbfsLblDialog; s16 m_wbfsLblDialog;
s16 m_wbfsLblMessage; s16 m_wbfsLblMessage;

30
source/menu/menu_home.cpp
View File

@ -10,7 +10,7 @@ s16 m_exittoLblTitle;
s16 m_homeBtnSettings; s16 m_homeBtnSettings;
s16 m_homeBtnReloadCache; s16 m_homeBtnReloadCache;
s16 m_homeBtnUpdate; s16 m_homeBtnUpdate;
s16 m_homeBtnHelp; s16 m_homeBtnInstall;
s16 m_homeBtnAbout; s16 m_homeBtnAbout;
s16 m_homeBtnExitTo; s16 m_homeBtnExitTo;
@ -65,27 +65,23 @@ bool CMenu::_Home(void)
_system(); _system();
remove(m_ver.c_str()); remove(m_ver.c_str());
if(m_exit) if(m_exit)
{
_launchHomebrew(m_dol.c_str(), m_homebrewArgs); _launchHomebrew(m_dol.c_str(), m_homebrewArgs);
break; else
{
_showHome();
CoverFlow.startCoverLoader();
} }
_showHome();
CoverFlow.startCoverLoader();
} }
else if(m_btnMgr.selected(m_homeBtnHelp)) else if(m_btnMgr.selected(m_homeBtnInstall))
{ {
_hideHome(); _hideHome();
_about(true); _wbfsOp(WO_ADD_GAME);
if(m_exit)
break;
_showHome(); _showHome();
} }
else if(m_btnMgr.selected(m_homeBtnAbout)) else if(m_btnMgr.selected(m_homeBtnAbout))
{ {
_hideHome(); _hideHome();
_about(); _about();
if(m_exit)
break;
_showHome(); _showHome();
} }
else if(m_btnMgr.selected(m_homeBtnExitTo)) else if(m_btnMgr.selected(m_homeBtnExitTo))
@ -95,8 +91,6 @@ bool CMenu::_Home(void)
exitHandler(WIIFLOW_DEF); exitHandler(WIIFLOW_DEF);
else else
_ExitTo(); _ExitTo();
if(m_exit)
break;
_showHome(); _showHome();
} }
} }
@ -181,7 +175,7 @@ void CMenu::_showHome(void)
m_btnMgr.show(m_homeBtnSettings); m_btnMgr.show(m_homeBtnSettings);
m_btnMgr.show(m_homeBtnReloadCache); m_btnMgr.show(m_homeBtnReloadCache);
m_btnMgr.show(m_homeBtnUpdate); m_btnMgr.show(m_homeBtnUpdate);
m_btnMgr.show(m_homeBtnHelp); m_btnMgr.show(m_homeBtnInstall);
m_btnMgr.show(m_homeBtnAbout); m_btnMgr.show(m_homeBtnAbout);
m_btnMgr.show(m_homeBtnExitTo); m_btnMgr.show(m_homeBtnExitTo);
@ -207,7 +201,7 @@ void CMenu::_hideHome(bool instant)
m_btnMgr.hide(m_homeBtnSettings, instant); m_btnMgr.hide(m_homeBtnSettings, instant);
m_btnMgr.hide(m_homeBtnReloadCache, instant); m_btnMgr.hide(m_homeBtnReloadCache, instant);
m_btnMgr.hide(m_homeBtnUpdate, instant); m_btnMgr.hide(m_homeBtnUpdate, instant);
m_btnMgr.hide(m_homeBtnHelp, instant); m_btnMgr.hide(m_homeBtnInstall, instant);
m_btnMgr.hide(m_homeBtnAbout, instant); m_btnMgr.hide(m_homeBtnAbout, instant);
m_btnMgr.hide(m_homeBtnExitTo, instant); m_btnMgr.hide(m_homeBtnExitTo, instant);
@ -238,7 +232,7 @@ void CMenu::_initHomeAndExitToMenu()
m_homeBtnSettings = _addButton("HOME/SETTINGS", theme.btnFont, L"", 60, 120, 250, 56, theme.btnFontColor); m_homeBtnSettings = _addButton("HOME/SETTINGS", theme.btnFont, L"", 60, 120, 250, 56, theme.btnFontColor);
m_homeBtnReloadCache = _addButton("HOME/RELOAD_CACHE", theme.btnFont, L"", 60, 230, 250, 56, theme.btnFontColor); m_homeBtnReloadCache = _addButton("HOME/RELOAD_CACHE", theme.btnFont, L"", 60, 230, 250, 56, theme.btnFontColor);
m_homeBtnUpdate = _addButton("HOME/UPDATE", theme.btnFont, L"", 60, 340, 250, 56, theme.btnFontColor); m_homeBtnUpdate = _addButton("HOME/UPDATE", theme.btnFont, L"", 60, 340, 250, 56, theme.btnFontColor);
m_homeBtnHelp = _addButton("HOME/HELP", theme.btnFont, L"", 330, 120, 250, 56, theme.btnFontColor); m_homeBtnInstall = _addButton("HOME/INSTALL", theme.btnFont, L"", 330, 120, 250, 56, theme.btnFontColor);
m_homeBtnAbout = _addButton("HOME/ABOUT", theme.btnFont, L"", 330, 230, 250, 56, theme.btnFontColor); m_homeBtnAbout = _addButton("HOME/ABOUT", theme.btnFont, L"", 330, 230, 250, 56, theme.btnFontColor);
m_homeBtnExitTo = _addButton("HOME/EXIT_TO", theme.btnFont, L"", 330, 340, 250, 56, theme.btnFontColor); m_homeBtnExitTo = _addButton("HOME/EXIT_TO", theme.btnFont, L"", 330, 340, 250, 56, theme.btnFontColor);
m_homeLblBattery = _addLabel("HOME/BATTERY", theme.btnFont, L"", 0, 420, 640, 56, theme.btnFontColor, FTGX_JUSTIFY_CENTER | FTGX_ALIGN_MIDDLE, theme.btnTexC); m_homeLblBattery = _addLabel("HOME/BATTERY", theme.btnFont, L"", 0, 420, 640, 56, theme.btnFontColor, FTGX_JUSTIFY_CENTER | FTGX_ALIGN_MIDDLE, theme.btnTexC);
@ -246,7 +240,7 @@ void CMenu::_initHomeAndExitToMenu()
_setHideAnim(m_homeBtnSettings, "HOME/SETTINGS", 0, 0, -2.f, 0.f); _setHideAnim(m_homeBtnSettings, "HOME/SETTINGS", 0, 0, -2.f, 0.f);
_setHideAnim(m_homeBtnReloadCache, "HOME/RELOAD_CACHE", 0, 0, -2.f, 0.f); _setHideAnim(m_homeBtnReloadCache, "HOME/RELOAD_CACHE", 0, 0, -2.f, 0.f);
_setHideAnim(m_homeBtnUpdate, "HOME/UPDATE", 0, 0, -2.f, 0.f); _setHideAnim(m_homeBtnUpdate, "HOME/UPDATE", 0, 0, -2.f, 0.f);
_setHideAnim(m_homeBtnHelp, "HOME/HELP", 0, 0, -2.f, 0.f); _setHideAnim(m_homeBtnInstall, "HOME/INSTALL", 0, 0, -2.f, 0.f);
_setHideAnim(m_homeBtnAbout, "HOME/ABOUT", 0, 0, -2.f, 0.f); _setHideAnim(m_homeBtnAbout, "HOME/ABOUT", 0, 0, -2.f, 0.f);
_setHideAnim(m_homeBtnExitTo, "HOME/EXIT_TO", 0, 0, -2.f, 0.f); _setHideAnim(m_homeBtnExitTo, "HOME/EXIT_TO", 0, 0, -2.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);
@ -280,7 +274,7 @@ void CMenu::_textHome(void)
m_btnMgr.setText(m_homeBtnSettings, _t("home1", L"Settings")); m_btnMgr.setText(m_homeBtnSettings, _t("home1", L"Settings"));
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("home3", L"Update")); m_btnMgr.setText(m_homeBtnUpdate, _t("home3", L"Update"));
m_btnMgr.setText(m_homeBtnHelp, _t("home6", L"Help")); m_btnMgr.setText(m_homeBtnInstall, _t("home7", L"Install Game"));
m_btnMgr.setText(m_homeBtnAbout, _t("home4", L"About")); m_btnMgr.setText(m_homeBtnAbout, _t("home4", L"About"));
m_btnMgr.setText(m_homeBtnExitTo, _t("home5", L"Exit To")); m_btnMgr.setText(m_homeBtnExitTo, _t("home5", L"Exit To"));
} }

2
source/menu/menu_main.cpp
View File

@ -393,7 +393,7 @@ int CMenu::main(void)
else if(m_btnMgr.selected(m_mainBtnInfo)) else if(m_btnMgr.selected(m_mainBtnInfo))
{ {
_hideMain(); _hideMain();
_about(); _about(true);
_showMain(); _showMain();
if(BTN_B_HELD) if(BTN_B_HELD)
bUsed = true; bUsed = true;

93
source/menu/menu_wbfs.cpp
View File

@ -12,9 +12,12 @@
void CMenu::_hideWBFS(bool instant) void CMenu::_hideWBFS(bool instant)
{ {
m_btnMgr.hide(m_configLblPartitionName, instant);
m_btnMgr.hide(m_configLblPartition, instant);
m_btnMgr.hide(m_configBtnPartitionP, instant);
m_btnMgr.hide(m_configBtnPartitionM, instant);
m_btnMgr.hide(m_wbfsLblTitle, instant); m_btnMgr.hide(m_wbfsLblTitle, instant);
m_btnMgr.hide(m_wbfsPBar, instant); m_btnMgr.hide(m_wbfsPBar, instant);
m_btnMgr.hide(m_wbfsBtnBack, instant);
m_btnMgr.hide(m_wbfsBtnGo, instant); m_btnMgr.hide(m_wbfsBtnGo, instant);
m_btnMgr.hide(m_wbfsLblDialog); m_btnMgr.hide(m_wbfsLblDialog);
m_btnMgr.hide(m_wbfsLblMessage); m_btnMgr.hide(m_wbfsLblMessage);
@ -28,21 +31,25 @@ void CMenu::_showWBFS(CMenu::WBFS_OP op)
_setBg(m_wbfsBg, m_wbfsBg); _setBg(m_wbfsBg, m_wbfsBg);
switch (op) switch (op)
{ {
case CMenu::WO_ADD_GAME: case WO_ADD_GAME:
m_btnMgr.setText(m_wbfsLblTitle, _t("wbfsop1", L"Install Game")); m_btnMgr.setText(m_wbfsLblTitle, _t("wbfsop1", L"Install Game"));
m_btnMgr.setText(m_configLblPartition, upperCase(DeviceName[currentPartition]));
m_btnMgr.show(m_configLblPartitionName);
m_btnMgr.show(m_configLblPartition);
m_btnMgr.show(m_configBtnPartitionP);
m_btnMgr.show(m_configBtnPartitionM);
break; break;
case CMenu::WO_REMOVE_GAME: case WO_REMOVE_GAME:
m_btnMgr.setText(m_wbfsLblTitle, _t("wbfsop2", L"Delete Game")); m_btnMgr.setText(m_wbfsLblTitle, _t("wbfsop2", L"Delete Game"));
break; break;
case CMenu::WO_FORMAT: case WO_FORMAT:
// m_btnMgr.setText(m_wbfsLblTitle, _t("wbfsop3", L"Format")); // m_btnMgr.setText(m_wbfsLblTitle, _t("wbfsop3", L"Format"));
break; break;
case CMenu::WO_COPY_GAME: case WO_COPY_GAME:
m_btnMgr.setText(m_wbfsLblTitle, _t("wbfsop11", L"Copy Game")); m_btnMgr.setText(m_wbfsLblTitle, _t("wbfsop11", L"Copy Game"));
break; break;
}; };
m_btnMgr.show(m_wbfsLblTitle); m_btnMgr.show(m_wbfsLblTitle);
m_btnMgr.show(m_wbfsBtnBack);
m_btnMgr.show(m_wbfsBtnGo); m_btnMgr.show(m_wbfsBtnGo);
m_btnMgr.show(m_wbfsLblDialog); m_btnMgr.show(m_wbfsLblDialog);
for(u8 i = 0; i < ARRAY_SIZE(m_wbfsLblUser); ++i) for(u8 i = 0; i < ARRAY_SIZE(m_wbfsLblUser); ++i)
@ -138,7 +145,7 @@ int CMenu::_gameInstaller(void *obj)
m._setThrdMsg(L"", 0); m._setThrdMsg(L"", 0);
LWP_MutexUnlock(m.m_mutex); LWP_MutexUnlock(m.m_mutex);
ret = WBFS_AddGame(CMenu::_addDiscProgress, obj); ret = WBFS_AddGame(_addDiscProgress, obj);
LWP_MutexLock(m.m_mutex); LWP_MutexLock(m.m_mutex);
if (ret == 0) if (ret == 0)
m._setThrdMsg(m._t("wbfsop8", L"Game installed"), 1.f); m._setThrdMsg(m._t("wbfsop8", L"Game installed"), 1.f);
@ -167,7 +174,7 @@ int CMenu::_GCgameInstaller(void *obj)
if(skip) if(skip)
rsize = 8192; // Use small chunks when skip on error is enabled rsize = 8192; // Use small chunks when skip on error is enabled
m_gcdump.Init(skip, comp, wexf, alig, nretry, rsize,DeviceName[currentPartition],m.m_DMLgameDir.c_str(), CMenu::_addDiscProgress, CMenu::_Messenger, obj); m_gcdump.Init(skip, comp, wexf, alig, nretry, rsize,DeviceName[currentPartition],m.m_DMLgameDir.c_str(), _addDiscProgress, _Messenger, obj);
int ret; int ret;
m.m_progress = 0.f; m.m_progress = 0.f;
@ -251,7 +258,7 @@ int CMenu::_GCcopyGame(void *obj)
LWP_MutexUnlock(m.m_mutex); LWP_MutexUnlock(m.m_mutex);
if (!fsop_DirExist(folder)) if (!fsop_DirExist(folder))
fsop_MakeFolder(folder); fsop_MakeFolder(folder);
fsop_CopyFolder(source, target, CMenu::_addDiscProgress, obj); fsop_CopyFolder(source, target, _addDiscProgress, obj);
LWP_MutexLock(m.m_mutex); LWP_MutexLock(m.m_mutex);
m._setThrdMsg(m._t("wbfsop14", L"Game copied, press Back to boot the game."), 1.f); m._setThrdMsg(m._t("wbfsop14", L"Game copied, press Back to boot the game."), 1.f);
gprintf("Game copied.\n"); gprintf("Game copied.\n");
@ -280,15 +287,15 @@ bool CMenu::_wbfsOp(CMenu::WBFS_OP op)
_showWBFS(op); _showWBFS(op);
switch (op) switch (op)
{ {
case CMenu::WO_ADD_GAME: case WO_ADD_GAME:
m_btnMgr.setText(m_wbfsLblDialog, _t("wbfsadddlg", L"Please insert the disc you want to copy, then click on Go.")); m_btnMgr.setText(m_wbfsLblDialog, _t("wbfsadddlg", L"Please insert the disc you want to copy, then click on Go."));
break; break;
case CMenu::WO_REMOVE_GAME: case WO_REMOVE_GAME:
m_btnMgr.setText(m_wbfsLblDialog, wfmt(_fmt("wbfsremdlg", L"To permanently remove the game: %s, click on Go."), CoverFlow.getTitle().toUTF8().c_str())); m_btnMgr.setText(m_wbfsLblDialog, wfmt(_fmt("wbfsremdlg", L"To permanently remove the game: %s, click on Go."), CoverFlow.getTitle().toUTF8().c_str()));
break; break;
case CMenu::WO_FORMAT: case WO_FORMAT:
break; break;
case CMenu::WO_COPY_GAME: case WO_COPY_GAME:
m_btnMgr.setText(m_wbfsLblDialog, _t("wbfscpydlg", L"If you are sure you want to copy this game to SD, click on Go.")); m_btnMgr.setText(m_wbfsLblDialog, _t("wbfscpydlg", L"If you are sure you want to copy this game to SD, click on Go."));
break; break;
} }
@ -305,19 +312,20 @@ bool CMenu::_wbfsOp(CMenu::WBFS_OP op)
m_btnMgr.down(); m_btnMgr.down();
if(BTN_A_PRESSED && !m_thrdWorking) if(BTN_A_PRESSED && !m_thrdWorking)
{ {
if(m_btnMgr.selected(m_wbfsBtnBack)) if(m_btnMgr.selected(m_wbfsBtnGo))
break;
else if(m_btnMgr.selected(m_wbfsBtnGo))
{ {
switch(op) switch(op)
{ {
case CMenu::WO_ADD_GAME: case WO_ADD_GAME:
MusicPlayer.Stop(); MusicPlayer.Stop();
TempLoadIOS(); TempLoadIOS();
m_btnMgr.hide(m_configLblPartitionName);
m_btnMgr.hide(m_configLblPartition);
m_btnMgr.hide(m_configBtnPartitionP);
m_btnMgr.hide(m_configBtnPartitionM);
m_btnMgr.show(m_wbfsPBar); m_btnMgr.show(m_wbfsPBar);
m_btnMgr.setProgress(m_wbfsPBar, 0.f); m_btnMgr.setProgress(m_wbfsPBar, 0.f);
m_btnMgr.hide(m_wbfsBtnGo); m_btnMgr.hide(m_wbfsBtnGo);
m_btnMgr.hide(m_wbfsBtnBack);
m_btnMgr.show(m_wbfsLblMessage); m_btnMgr.show(m_wbfsLblMessage);
m_btnMgr.setText(m_wbfsLblMessage, L""); m_btnMgr.setText(m_wbfsLblMessage, L"");
if (Disc_Wait() < 0) if (Disc_Wait() < 0)
@ -349,7 +357,7 @@ bool CMenu::_wbfsOp(CMenu::WBFS_OP op)
m_thrdWorking = true; m_thrdWorking = true;
m_thrdProgress = 0.f; m_thrdProgress = 0.f;
m_thrdMessageAdded = false; m_thrdMessageAdded = false;
LWP_CreateThread(&thread, (void *(*)(void *))CMenu::_gameInstaller, (void *)this, 0, 8 * 1024, 64); LWP_CreateThread(&thread, (void *(*)(void *))_gameInstaller, (void *)this, 0, 8 * 1024, 64);
} }
else if(Disc_IsGC() == 0) else if(Disc_IsGC() == 0)
{ {
@ -368,7 +376,7 @@ bool CMenu::_wbfsOp(CMenu::WBFS_OP op)
m_thrdWorking = true; m_thrdWorking = true;
m_thrdProgress = 0.f; m_thrdProgress = 0.f;
m_thrdMessageAdded = false; m_thrdMessageAdded = false;
LWP_CreateThread(&thread, (void *(*)(void *))CMenu::_GCgameInstaller, (void *)this, 0, 8 * 1024, 64); LWP_CreateThread(&thread, (void *(*)(void *))_GCgameInstaller, (void *)this, 0, 8 * 1024, 64);
} }
else else
{ {
@ -376,7 +384,7 @@ bool CMenu::_wbfsOp(CMenu::WBFS_OP op)
out = true; out = true;
} }
break; break;
case CMenu::WO_REMOVE_GAME: case WO_REMOVE_GAME:
if(CF_Hdr->type == TYPE_GC_GAME) if(CF_Hdr->type == TYPE_GC_GAME)
{ {
char GC_Path[1024]; char GC_Path[1024];
@ -423,9 +431,9 @@ bool CMenu::_wbfsOp(CMenu::WBFS_OP op)
m_btnMgr.setText(m_wbfsLblMessage, _t("wbfsop7", L"Game deleted")); m_btnMgr.setText(m_wbfsLblMessage, _t("wbfsop7", L"Game deleted"));
done = true; done = true;
break; break;
case CMenu::WO_FORMAT: case WO_FORMAT:
break; break;
case CMenu::WO_COPY_GAME: case WO_COPY_GAME:
string GC_Path(CF_Hdr->path); string GC_Path(CF_Hdr->path);
if(strcasestr(GC_Path.c_str(), "boot.bin") != NULL) if(strcasestr(GC_Path.c_str(), "boot.bin") != NULL)
GC_Path.erase(GC_Path.end() - 13, GC_Path.end()); GC_Path.erase(GC_Path.end() - 13, GC_Path.end());
@ -440,7 +448,6 @@ bool CMenu::_wbfsOp(CMenu::WBFS_OP op)
m_btnMgr.show(m_wbfsPBar); m_btnMgr.show(m_wbfsPBar);
m_btnMgr.setProgress(m_wbfsPBar, 0.f); m_btnMgr.setProgress(m_wbfsPBar, 0.f);
m_btnMgr.hide(m_wbfsBtnGo); m_btnMgr.hide(m_wbfsBtnGo);
m_btnMgr.hide(m_wbfsBtnBack);
m_btnMgr.show(m_wbfsLblMessage); m_btnMgr.show(m_wbfsLblMessage);
m_btnMgr.setText(m_wbfsLblMessage, L""); m_btnMgr.setText(m_wbfsLblMessage, L"");
cfPos = string(CF_Hdr->id); cfPos = string(CF_Hdr->id);
@ -450,12 +457,18 @@ bool CMenu::_wbfsOp(CMenu::WBFS_OP op)
m_thrdWorking = true; m_thrdWorking = true;
m_thrdProgress = 0.f; m_thrdProgress = 0.f;
m_thrdMessageAdded = false; m_thrdMessageAdded = false;
LWP_CreateThread(&thread, (void *(*)(void *))CMenu::_GCcopyGame, (void *)this, 0, 8 * 1024, 64); LWP_CreateThread(&thread, (void *(*)(void *))_GCcopyGame, (void *)this, 0, 8 * 1024, 64);
break; break;
} }
if(out) if(out)
break; break;
} }
else if((m_btnMgr.selected(m_configBtnPartitionP) || m_btnMgr.selected(m_configBtnPartitionM)))
{
s8 direction = m_btnMgr.selected(m_configBtnPartitionP) ? 1 : -1;
_setPartition(direction);
m_btnMgr.setText(m_configLblPartition, upperCase(DeviceName[currentPartition]));
}
} }
if(m_thrdMessageAdded) if(m_thrdMessageAdded)
@ -466,45 +479,38 @@ bool CMenu::_wbfsOp(CMenu::WBFS_OP op)
m_btnMgr.setText(m_wbfsLblDialog, m_thrdMessage); m_btnMgr.setText(m_wbfsLblDialog, m_thrdMessage);
m_btnMgr.setProgress(m_wbfsPBar, m_thrdProgress); m_btnMgr.setProgress(m_wbfsPBar, m_thrdProgress);
m_btnMgr.setText(m_wbfsLblMessage, wfmt(L"%i%%", (int)(m_thrdProgress * 100.f))); m_btnMgr.setText(m_wbfsLblMessage, wfmt(L"%i%%", (int)(m_thrdProgress * 100.f)));
if(!m_thrdWorking) if(!m_thrdWorking && op == WO_ADD_GAME)
{ {
if(op == CMenu::WO_ADD_GAME) WDVD_StopMotor();
{ MusicPlayer.Stop();
WDVD_StopMotor(); TempLoadIOS(IOS_TYPE_NORMAL_IOS);
MusicPlayer.Stop();
TempLoadIOS(IOS_TYPE_NORMAL_IOS);
}
m_btnMgr.show(m_wbfsBtnBack);
} }
} }
} }
_hideWBFS(); _hideWBFS();
if (done && (op == CMenu::WO_REMOVE_GAME || op == CMenu::WO_ADD_GAME)) if(done && (op == WO_REMOVE_GAME || op == WO_ADD_GAME))
{ {
//m_gameList.SetLanguage(m_loc.getString(m_curLanguage, "gametdb_code", "EN").c_str()); //m_gameList.SetLanguage(m_loc.getString(m_curLanguage, "gametdb_code", "EN").c_str());
if(upd_dml) if(upd_dml)
UpdateCache(COVERFLOW_DML); UpdateCache(COVERFLOW_DML);
if(upd_usb) if(upd_usb)
UpdateCache(COVERFLOW_USB); UpdateCache(COVERFLOW_USB);
if(upd_emu) if(upd_emu)
UpdateCache(COVERFLOW_PLUGIN); UpdateCache(COVERFLOW_PLUGIN);
_loadList(); _loadList();
_initCF(); _initCF();
CoverFlow.findId(cfPos.c_str(), true); CoverFlow.findId(cfPos.c_str(), true);
} }
else if(done && op == CMenu::WO_COPY_GAME) else
{ {
//m_gameList.SetLanguage(m_loc.getString(m_curLanguage, "gametdb_code", "EN").c_str()); if(done && op == WO_COPY_GAME)
if(upd_dml)
{ {
UpdateCache(COVERFLOW_DML); UpdateCache(COVERFLOW_DML);
currentPartition = SD; currentPartition = SD;
UpdateCache(COVERFLOW_DML); UpdateCache(COVERFLOW_DML);
} }
_loadList();
_initCF();
} }
return done; return done;
} }
@ -517,14 +523,12 @@ void CMenu::_initWBFSMenu()
m_wbfsLblDialog = _addLabel("WBFS/DIALOG", theme.lblFont, L"", 40, 90, 560, 200, theme.lblFontColor, FTGX_JUSTIFY_LEFT | FTGX_ALIGN_MIDDLE); m_wbfsLblDialog = _addLabel("WBFS/DIALOG", theme.lblFont, L"", 40, 90, 560, 200, theme.lblFontColor, FTGX_JUSTIFY_LEFT | FTGX_ALIGN_MIDDLE);
m_wbfsLblMessage = _addLabel("WBFS/MESSAGE", theme.lblFont, L"", 40, 300, 560, 100, theme.lblFontColor, FTGX_JUSTIFY_CENTER | FTGX_ALIGN_TOP); m_wbfsLblMessage = _addLabel("WBFS/MESSAGE", theme.lblFont, L"", 40, 300, 560, 100, theme.lblFontColor, FTGX_JUSTIFY_CENTER | FTGX_ALIGN_TOP);
m_wbfsPBar = _addProgressBar("WBFS/PROGRESS_BAR", 40, 270, 560, 20); m_wbfsPBar = _addProgressBar("WBFS/PROGRESS_BAR", 40, 270, 560, 20);
m_wbfsBtnBack = _addButton("WBFS/BACK_BTN", theme.btnFont, L"", 420, 400, 200, 56, theme.btnFontColor); m_wbfsBtnGo = _addButton("WBFS/GO_BTN", theme.btnFont, L"", 420, 400, 200, 56, theme.btnFontColor);
m_wbfsBtnGo = _addButton("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);
_setHideAnim(m_wbfsLblMessage, "WBFS/MESSAGE", 0, 0, -2.f, 0.f); _setHideAnim(m_wbfsLblMessage, "WBFS/MESSAGE", 0, 0, -2.f, 0.f);
_setHideAnim(m_wbfsPBar, "WBFS/PROGRESS_BAR", 0, 0, -2.f, 0.f); _setHideAnim(m_wbfsPBar, "WBFS/PROGRESS_BAR", 0, 0, -2.f, 0.f);
_setHideAnim(m_wbfsBtnBack, "WBFS/BACK_BTN", 0, 0, -2.f, 0.f);
_setHideAnim(m_wbfsBtnGo, "WBFS/GO_BTN", 0, 0, -2.f, 0.f); _setHideAnim(m_wbfsBtnGo, "WBFS/GO_BTN", 0, 0, -2.f, 0.f);
_hideWBFS(true); _hideWBFS(true);
_textWBFS(); _textWBFS();
@ -532,6 +536,5 @@ void CMenu::_initWBFSMenu()
void CMenu::_textWBFS(void) void CMenu::_textWBFS(void)
{ {
m_btnMgr.setText(m_wbfsBtnBack, _t("wbfsop4", L"Back"));
m_btnMgr.setText(m_wbfsBtnGo, _t("wbfsop5", L"Go")); m_btnMgr.setText(m_wbfsBtnGo, _t("wbfsop5", L"Go"));
} }

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

@ -226,6 +226,7 @@ home3=Update
home4=About home4=About
home5=Exit To home5=Exit To
home6=Help home6=Help
home7=Install Game
hooktype1=VBI hooktype1=VBI
hooktype2=KPAD Read hooktype2=KPAD Read
hooktype3=Joypad hooktype3=Joypad

1
wii/wiiflow/Languages/german.ini
View File

@ -226,6 +226,7 @@ home3=WiiFlow updaten
home4=Über WiiFlow home4=Über WiiFlow
home5=Zurück zu home5=Zurück zu
home6=Hilfe home6=Hilfe
home7=Installiere Spiel
hooktype1=VBI hooktype1=VBI
hooktype2=KPAD Read hooktype2=KPAD Read
hooktype3=Joypad hooktype3=Joypad