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

- downloads menu now using main config buttons and cleaned up.

Browse Source
This commit is contained in:
Fledge68 2022-07-09 12:18:37 -05:00
parent 5a4f3fd759
commit 7f269c9406
3 changed files with 270 additions and 347 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: 4.3 MiB

After

Width:  |  Height:  |  Size: 4.3 MiB

42
source/menu/menu.hpp
View File

@ -267,6 +267,18 @@ private:
s16 m_configBtn4P; s16 m_configBtn4P;
//Download menu //Download menu
s16 m_downloadLblTitle;
s16 m_downloadBtnBack;
s16 m_downloadLblGameTDB;
s16 m_downloadLblUser[4];
s16 m_downloadPBar;
s16 m_downloadLblMessage;
s16 m_downloadLblDialog;
//download cover settings
s16 m_downloadLblCoverPrio;
s16 m_downloadLblPrio;
s16 m_downloadBtnPrioM;
s16 m_downloadBtnPrioP;
s16 m_downloadPrioVal; s16 m_downloadPrioVal;
enum CoverPrio enum CoverPrio
{ {
@ -295,28 +307,6 @@ private:
FLAT, FLAT,
CFLAT, CFLAT,
}; };
s16 m_downloadLblTitle;
s16 m_downloadLblGameTDB;
s16 m_downloadLblUser[4];
s16 m_downloadLblCovers;
s16 m_downloadBtnAll;
s16 m_downloadBtnMissing;
s16 m_downloadLblGameTDBDownload;
s16 m_downloadBtnGameTDBDownload;
s16 m_downloadLblBanners;
s16 m_downloadBtnBanners;
s16 m_downloadLblCoverSet;
s16 m_downloadBtnCoverSet;
s16 m_downloadBtnCancel;// used as back btn
s16 m_downloadPBar;
s16 m_downloadLblMessage[2];
//settings
s16 m_downloadLblSetTitle;
s16 m_downloadBtnBack;
s16 m_downloadLblCoverPrio;
s16 m_downloadLblPrio;
s16 m_downloadBtnPrioM;
s16 m_downloadBtnPrioP;
s16 m_downloadLblRegion; s16 m_downloadLblRegion;
enum Regions enum Regions
{ {
@ -936,8 +926,7 @@ private:
void _hidePartitionsCfg(bool instant = true); void _hidePartitionsCfg(bool instant = true);
void _hidePaths(bool instant = true); void _hidePaths(bool instant = true);
void _hideNandEmu(bool instant = true); void _hideNandEmu(bool instant = true);
void _hideDownload(bool instant = false); void _hideDownload(bool instant = true);
void _hideSettings(bool instant = false);
void _hideCode(bool instant = false); void _hideCode(bool instant = false);
void _hideAbout(bool instant = false); void _hideAbout(bool instant = false);
void _hideWBFS(bool instant = false); void _hideWBFS(bool instant = false);
@ -967,7 +956,6 @@ private:
void _showNandEmu(void); void _showNandEmu(void);
void _showGame(void); void _showGame(void);
void _showDownload(void); void _showDownload(void);
void _showSettings();
void _showCode(void); void _showCode(void);
void _showAbout(void); void _showAbout(void);
void _showBoot(void); void _showBoot(void);
@ -1020,7 +1008,7 @@ private:
int _ExtractGameSave(string gameId); int _ExtractGameSave(string gameId);
int _FlashGameSave(string gameId); int _FlashGameSave(string gameId);
void _game(bool launch = false); void _game(bool launch = false);
void _downloadUrl(const char *url, u8 **dl_file, u32 *dl_size); //void _downloadUrl(const char *url, u8 **dl_file, u32 *dl_size);
void _download(string gameId = string(), int dl_type = 0); void _download(string gameId = string(), int dl_type = 0);
bool _code(char code[4], bool erase = false); bool _code(char code[4], bool erase = false);
void _about(bool help = false); void _about(bool help = false);
@ -1169,7 +1157,7 @@ private:
void _listEmuNands(const char *path, vector<string> &nands); void _listEmuNands(const char *path, vector<string> &nands);
int _downloadCheatFileAsync(); int _downloadCheatFileAsync();
static void * _downloadUrlAsync(void *obj); //static void * _downloadUrlAsync(void *obj);
void _playGameSound(void); void _playGameSound(void);
void _stopGameSoundThread(void); void _stopGameSoundThread(void);

375
source/menu/menu_download.cpp
View File

@ -30,11 +30,29 @@ static const char FMT_CBPIC_URL[] = "https://art.gametdb.com/{console}/coverfull
static const char FMT_CPIC_URL[] = "https://art.gametdb.com/{console}/cover2/{loc}/{gameid}.png"; static const char FMT_CPIC_URL[] = "https://art.gametdb.com/{console}/cover2/{loc}/{gameid}.png";
static bool settingsmenu = false; static bool settingsmenu = false;
static bool exitMenu = false;
static string dl_gameID; static string dl_gameID;
void CMenu::_hideSettings(bool instant) void CMenu::_hideDownload(bool instant)
{ {
m_btnMgr.hide(m_downloadLblSetTitle, instant); if(exitMenu)
{
m_btnMgr.hide(m_downloadLblTitle, instant);
m_btnMgr.hide(m_downloadBtnBack, instant);
for(u8 i = 0; i < ARRAY_SIZE(m_downloadLblUser); ++i)
if(m_downloadLblUser[i] != -1)
m_btnMgr.hide(m_downloadLblUser[i], instant);
}
_hideConfigButtons(instant);
m_btnMgr.hide(m_downloadLblGameTDB, instant);
m_btnMgr.hide(m_downloadPBar, instant);
m_btnMgr.hide(m_downloadLblDialog, instant);
m_btnMgr.hide(m_downloadLblMessage, instant);
// settings page
m_btnMgr.hide(m_downloadLblCoverPrio, instant); m_btnMgr.hide(m_downloadLblCoverPrio, instant);
m_btnMgr.hide(m_downloadLblPrio, instant); m_btnMgr.hide(m_downloadLblPrio, instant);
m_btnMgr.hide(m_downloadBtnPrioM, instant); m_btnMgr.hide(m_downloadBtnPrioM, instant);
@ -64,25 +82,51 @@ void CMenu::_hideSettings(bool instant)
m_btnMgr.hide(m_downloadBtnKOs, instant); m_btnMgr.hide(m_downloadBtnKOs, instant);
m_btnMgr.hide(m_downloadBtnZHCNs, instant); m_btnMgr.hide(m_downloadBtnZHCNs, instant);
m_btnMgr.hide(m_downloadBtnAUs, instant); m_btnMgr.hide(m_downloadBtnAUs, instant);
m_btnMgr.hide(m_downloadBtnBack, instant);
for(u8 i = 0; i < ARRAY_SIZE(m_downloadLblUser); ++i)
if(m_downloadLblUser[i] != -1)
m_btnMgr.hide(m_downloadLblUser[i], instant);
} }
void CMenu::_showSettings() void CMenu::_showDownload(void)
{ {
_hideDownload(); _hideDownload();
_setBg(m_downloadBg, m_downloadBg);
m_btnMgr.show(m_downloadLblGameTDB);
m_btnMgr.show(m_downloadLblTitle);
m_btnMgr.show(m_downloadBtnBack);
for(u8 i = 0; i < ARRAY_SIZE(m_downloadLblUser); ++i) for(u8 i = 0; i < ARRAY_SIZE(m_downloadLblUser); ++i)
if(m_downloadLblUser[i] != -1) if(m_downloadLblUser[i] != -1)
m_btnMgr.show(m_downloadLblUser[i]); m_btnMgr.show(m_downloadLblUser[i]);
m_btnMgr.show(m_downloadLblSetTitle);
m_btnMgr.show(m_downloadBtnBack); if(!settingsmenu)// first page
{
m_btnMgr.setText(m_downloadLblTitle, _t("dl5", L"Downloads"));
m_btnMgr.setText(m_configLbl1, _t("dl8", L"Covers"));
m_btnMgr.setText(m_configBtn1, _t("dl6", L"Download"));
m_btnMgr.setText(m_configLbl2, _t("dl15", L"Cover download settings"));
m_btnMgr.setText(m_configBtn2, _t("dl16", L"Set"));
m_btnMgr.setText(m_configLbl3, _t("dl12", L"GameTDB"));
m_btnMgr.setText(m_configBtn3, _t("dl6", L"Download"));
m_btnMgr.setText(m_configLbl4, _t("dl26", L"GC Custom Banners"));
m_btnMgr.setText(m_configBtn4, _t("dl6", L"Download"));
m_btnMgr.show(m_configLbl1);
m_btnMgr.show(m_configBtn1);
m_btnMgr.show(m_configLbl2);
m_btnMgr.show(m_configBtn2);
m_btnMgr.show(m_configLbl3);
m_btnMgr.show(m_configBtn3);
m_btnMgr.show(m_configLbl4);
m_btnMgr.show(m_configBtn4);
}
else // settings page
{
m_btnMgr.setText(m_downloadLblTitle, _t("dl17", L"Cover Download Settings"));
m_btnMgr.show(m_downloadLblCoverPrio); m_btnMgr.show(m_downloadLblCoverPrio);
m_btnMgr.show(m_downloadLblPrio); m_btnMgr.show(m_downloadLblPrio);
m_btnMgr.show(m_downloadBtnPrioM); m_btnMgr.show(m_downloadBtnPrioM);
m_btnMgr.show(m_downloadBtnPrioP); m_btnMgr.show(m_downloadBtnPrioP);
m_btnMgr.show(m_downloadLblRegion); m_btnMgr.show(m_downloadLblRegion);
if(m_downloadPrioVal&C_TYPE_EN) if(m_downloadPrioVal&C_TYPE_EN)
m_btnMgr.show(m_downloadBtnENs); m_btnMgr.show(m_downloadBtnENs);
else else
@ -143,7 +187,7 @@ void CMenu::_showSettings()
else else
m_btnMgr.show(m_downloadBtnAU); m_btnMgr.show(m_downloadBtnAU);
// // cover type
if(m_downloadPrioVal&C_TYPE_ONOR) if(m_downloadPrioVal&C_TYPE_ONOR)
{ {
m_btnMgr.setText(m_downloadLblPrio, _t("dl24", L"Custom only")); m_btnMgr.setText(m_downloadLblPrio, _t("dl24", L"Custom only"));
@ -181,47 +225,6 @@ void CMenu::_showSettings()
} }
} }
} }
void CMenu::_hideDownload(bool instant)
{
m_btnMgr.hide(m_downloadLblTitle, instant);
m_btnMgr.hide(m_downloadBtnBack, instant);
m_btnMgr.hide(m_downloadBtnCancel, instant);
m_btnMgr.hide(m_downloadLblCovers, instant);
m_btnMgr.hide(m_downloadBtnAll, instant);
m_btnMgr.hide(m_downloadLblCoverSet, instant);
m_btnMgr.hide(m_downloadBtnCoverSet, instant);
m_btnMgr.hide(m_downloadLblGameTDBDownload, instant);
m_btnMgr.hide(m_downloadBtnGameTDBDownload, instant);
m_btnMgr.hide(m_downloadLblBanners, instant);
m_btnMgr.hide(m_downloadBtnBanners, instant);
m_btnMgr.hide(m_downloadPBar, instant);
m_btnMgr.hide(m_downloadLblMessage[0], 0, 0, -2.f, 0.f, instant);
m_btnMgr.hide(m_downloadLblMessage[1], 0, 0, -2.f, 0.f, instant);
m_btnMgr.hide(m_downloadLblGameTDB, instant);
for(u8 i = 0; i < ARRAY_SIZE(m_downloadLblUser); ++i)
if(m_downloadLblUser[i] != -1)
m_btnMgr.hide(m_downloadLblUser[i], instant);
}
void CMenu::_showDownload(void)
{
_hideSettings();
_setBg(m_downloadBg, m_downloadBg);
m_btnMgr.show(m_downloadLblGameTDB);
m_btnMgr.show(m_downloadLblTitle);
m_btnMgr.show(m_downloadBtnBack);
m_btnMgr.show(m_downloadLblCovers);
m_btnMgr.show(m_downloadBtnAll);
m_btnMgr.show(m_downloadLblCoverSet);
m_btnMgr.show(m_downloadBtnCoverSet);
m_btnMgr.show(m_downloadLblGameTDBDownload);
m_btnMgr.show(m_downloadBtnGameTDBDownload);
m_btnMgr.show(m_downloadLblBanners);
m_btnMgr.show(m_downloadBtnBanners);
for(u8 i = 0; i < ARRAY_SIZE(m_downloadLblUser); ++i)
if(m_downloadLblUser[i] != -1)
m_btnMgr.show(m_downloadLblUser[i]);
} }
int count, countFlat; int count, countFlat;
@ -230,6 +233,7 @@ void CMenu::_download(string gameId, int dl_type)
{ {
dl_gameID = gameId; dl_gameID = gameId;
bool dl_finished = false; bool dl_finished = false;
exitMenu = false;
SetupInput(); SetupInput();
_showDownload(); _showDownload();
@ -241,15 +245,14 @@ void CMenu::_download(string gameId, int dl_type)
if(settingsmenu) if(settingsmenu)
{ {
settingsmenu = false; settingsmenu = false;
_hideSettings();
_showDownload(); _showDownload();
} }
else if(dl_finished) else if(dl_finished)
{ {
dl_finished = false; dl_finished = false;
m_btnMgr.hide(m_wbfsPBar); m_btnMgr.hide(m_downloadPBar);
m_btnMgr.hide(m_wbfsLblMessage); m_btnMgr.hide(m_downloadLblMessage);
m_btnMgr.hide(m_wbfsLblDialog); m_btnMgr.hide(m_downloadLblDialog);
if(strlen(dl_gameID.c_str()) > 0) if(strlen(dl_gameID.c_str()) > 0)
break; break;
_showDownload(); _showDownload();
@ -257,32 +260,35 @@ void CMenu::_download(string gameId, int dl_type)
else else
break; break;
} }
else if(BTN_A_PRESSED && m_btnMgr.selected(m_downloadBtnBack))
{
if(settingsmenu)
{
settingsmenu = false;
_showDownload();
}
else
break;
}
else if(BTN_UP_PRESSED) else if(BTN_UP_PRESSED)
m_btnMgr.up(); m_btnMgr.up();
else if(BTN_DOWN_PRESSED) else if(BTN_DOWN_PRESSED)
m_btnMgr.down(); m_btnMgr.down();
if(BTN_A_PRESSED || dl_type > 0) if(BTN_A_PRESSED || dl_type > 0)
{ {
if(m_btnMgr.selected(m_downloadBtnAll) || dl_type == 1) if(m_btnMgr.selected(m_configBtn1) || dl_type == 1)// download cover/covers
{ {
m_refreshGameList = true; // Not needed instead just initcf() m_refreshGameList = true; // Not needed instead just initcf()
m_btnMgr.hide(m_downloadLblCovers); _hideConfigButtons();
m_btnMgr.hide(m_downloadBtnAll);
m_btnMgr.hide(m_downloadLblGameTDBDownload);
m_btnMgr.hide(m_downloadBtnGameTDBDownload);
m_btnMgr.hide(m_downloadLblCoverSet);
m_btnMgr.hide(m_downloadBtnCoverSet);
m_btnMgr.hide(m_downloadLblBanners);
m_btnMgr.hide(m_downloadBtnBanners);
m_btnMgr.hide(m_downloadBtnBack); m_btnMgr.hide(m_downloadBtnBack);
m_btnMgr.setProgress(m_wbfsPBar, 0.f, true); m_btnMgr.setProgress(m_downloadPBar, 0.f, true);
m_btnMgr.setText(m_wbfsLblMessage, L"0%"); m_btnMgr.setText(m_downloadLblMessage, L"0%");
m_btnMgr.setText(m_wbfsLblDialog, L""); m_btnMgr.setText(m_downloadLblDialog, L"");
m_btnMgr.show(m_wbfsPBar); m_btnMgr.show(m_downloadPBar);
m_btnMgr.show(m_wbfsLblMessage); m_btnMgr.show(m_downloadLblMessage);
m_btnMgr.show(m_wbfsLblDialog); m_btnMgr.show(m_downloadLblDialog);
_start_pThread(); _start_pThread();
int ret = _coverDownloader(); int ret = _coverDownloader();
@ -292,45 +298,38 @@ void CMenu::_download(string gameId, int dl_type)
if(countFlat == 0) if(countFlat == 0)
{ {
m_thrdMessage = wfmt(_fmt("dlmsg5", L"%i/%i files downloaded."), count, n); m_thrdMessage = wfmt(_fmt("dlmsg5", L"%i/%i files downloaded."), count, n);
m_btnMgr.setText(m_wbfsLblDialog, m_thrdMessage); m_btnMgr.setText(m_downloadLblDialog, m_thrdMessage);
} }
else else
{ {
m_thrdMessage = wfmt(_fmt("dlmsg9", L"%i/%i files downloaded. %i are front covers only."), count + countFlat, n, countFlat); m_thrdMessage = wfmt(_fmt("dlmsg9", L"%i/%i files downloaded. %i are front covers only."), count + countFlat, n, countFlat);
m_btnMgr.setText(m_wbfsLblDialog, m_thrdMessage); m_btnMgr.setText(m_downloadLblDialog, m_thrdMessage);
} }
} }
else if(ret == -1) else if(ret == -1)
m_btnMgr.setText(m_wbfsLblDialog, _t("dlmsg27", L"Not enough memory!")); m_btnMgr.setText(m_downloadLblDialog, _t("dlmsg27", L"Not enough memory!"));
else if(ret == -2) else if(ret == -2)
m_btnMgr.setText(m_wbfsLblDialog, _t("dlmsg2", L"Network initialization failed!")); m_btnMgr.setText(m_downloadLblDialog, _t("dlmsg2", L"Network initialization failed!"));
else if(ret == -3) else if(ret == -3)
m_btnMgr.setText(m_wbfsLblDialog, _t("dlmsg30", L"No covers missing.")); m_btnMgr.setText(m_downloadLblDialog, _t("dlmsg30", L"No covers missing."));
dl_finished = true; dl_finished = true;
dl_type = 0; dl_type = 0;
// Maybe show back button // Maybe show back button
//m_btnMgr.show(m_downloadBtnBack); //m_btnMgr.show(m_downloadBtnBack);
} }
if(m_btnMgr.selected(m_downloadBtnBanners) || dl_type == 2) else if(m_btnMgr.selected(m_configBtn4) || dl_type == 2)// download banner/banners
{ {
//m_refreshGameList = true; //m_refreshGameList = true;
m_btnMgr.hide(m_downloadLblCovers); _hideConfigButtons();
m_btnMgr.hide(m_downloadBtnAll);
m_btnMgr.hide(m_downloadLblGameTDBDownload);
m_btnMgr.hide(m_downloadBtnGameTDBDownload);
m_btnMgr.hide(m_downloadLblCoverSet);
m_btnMgr.hide(m_downloadBtnCoverSet);
m_btnMgr.hide(m_downloadLblBanners);
m_btnMgr.hide(m_downloadBtnBanners);
m_btnMgr.hide(m_downloadBtnBack); m_btnMgr.hide(m_downloadBtnBack);
m_btnMgr.setProgress(m_wbfsPBar, 0.f, true); m_btnMgr.setProgress(m_downloadPBar, 0.f, true);
m_btnMgr.setText(m_wbfsLblMessage, L"0%"); m_btnMgr.setText(m_downloadLblMessage, L"0%");
m_btnMgr.setText(m_wbfsLblDialog, L""); m_btnMgr.setText(m_downloadLblDialog, L"");
m_btnMgr.show(m_wbfsPBar); m_btnMgr.show(m_downloadPBar);
m_btnMgr.show(m_wbfsLblMessage); m_btnMgr.show(m_downloadLblMessage);
m_btnMgr.show(m_wbfsLblDialog); m_btnMgr.show(m_downloadLblDialog);
_start_pThread(); _start_pThread();
int ret = _bannerDownloader(); int ret = _bannerDownloader();
@ -340,56 +339,48 @@ void CMenu::_download(string gameId, int dl_type)
if(dl_gameID.empty()) if(dl_gameID.empty())
{ {
m_thrdMessage = wfmt(_fmt("dlmsg5", L"%i/%i files downloaded."), count, n); m_thrdMessage = wfmt(_fmt("dlmsg5", L"%i/%i files downloaded."), count, n);
m_btnMgr.setText(m_wbfsLblDialog, m_thrdMessage); m_btnMgr.setText(m_downloadLblDialog, m_thrdMessage);
} }
else else
m_btnMgr.setText(m_wbfsLblDialog, _t("dlmsg14", L"Done.")); m_btnMgr.setText(m_downloadLblDialog, _t("dlmsg14", L"Done."));
} }
else if(ret == -1) else if(ret == -1)
m_btnMgr.setText(m_wbfsLblDialog, _t("dlmsg34", L"Banner URL not set properly!")); // Banner URL not set m_btnMgr.setText(m_downloadLblDialog, _t("dlmsg34", L"Banner URL not set properly!")); // Banner URL not set
else if(ret == -2) else if(ret == -2)
m_btnMgr.setText(m_wbfsLblDialog, _t("dlmsg2", L"Network initialization failed!")); m_btnMgr.setText(m_downloadLblDialog, _t("dlmsg2", L"Network initialization failed!"));
else if(ret == -3) else if(ret == -3)
m_btnMgr.setText(m_wbfsLblDialog, _t("dlmsg33", L"No banners missing.")); // No banners missing m_btnMgr.setText(m_downloadLblDialog, _t("dlmsg33", L"No banners missing.")); // No banners missing
dl_finished = true; dl_finished = true;
dl_type = 0; dl_type = 0;
// Maybe show back button // Maybe show back button
//m_btnMgr.show(m_downloadBtnBack); //m_btnMgr.show(m_downloadBtnBack);
} }
else if(m_btnMgr.selected(m_downloadBtnGameTDBDownload)) else if(m_btnMgr.selected(m_configBtn3))// download gametdb.xml
{ {
m_refreshGameList = true; // To refresh titles m_refreshGameList = true; // To refresh titles
m_btnMgr.hide(m_downloadLblCovers); _hideConfigButtons();
m_btnMgr.hide(m_downloadBtnAll);
m_btnMgr.hide(m_downloadBtnMissing);
m_btnMgr.hide(m_downloadLblGameTDBDownload);
m_btnMgr.hide(m_downloadBtnGameTDBDownload);
m_btnMgr.hide(m_downloadLblCoverSet);
m_btnMgr.hide(m_downloadBtnCoverSet);
m_btnMgr.hide(m_downloadLblBanners);
m_btnMgr.hide(m_downloadBtnBanners);
m_btnMgr.hide(m_downloadBtnBack); m_btnMgr.hide(m_downloadBtnBack);
m_btnMgr.setProgress(m_wbfsPBar, 0.f, true); m_btnMgr.setProgress(m_downloadPBar, 0.f, true);
m_btnMgr.setText(m_wbfsLblMessage, L"0%"); m_btnMgr.setText(m_downloadLblMessage, L"0%");
m_btnMgr.setText(m_wbfsLblDialog, L""); m_btnMgr.setText(m_downloadLblDialog, L"");
m_btnMgr.show(m_wbfsPBar); m_btnMgr.show(m_downloadPBar);
m_btnMgr.show(m_wbfsLblMessage); m_btnMgr.show(m_downloadLblMessage);
m_btnMgr.show(m_wbfsLblDialog); m_btnMgr.show(m_downloadLblDialog);
_start_pThread(); _start_pThread();
int ret = _gametdbDownloaderAsync(); int ret = _gametdbDownloaderAsync();
_stop_pThread(); _stop_pThread();
if(ret == -1) if(ret == -1)
m_btnMgr.setText(m_wbfsLblDialog, _t("dlmsg27", L"Not enough memory!")); m_btnMgr.setText(m_downloadLblDialog, _t("dlmsg27", L"Not enough memory!"));
else if(ret == -2) else if(ret == -2)
m_btnMgr.setText(m_wbfsLblDialog, _t("dlmsg2", L"Network initialization failed!")); m_btnMgr.setText(m_downloadLblDialog, _t("dlmsg2", L"Network initialization failed!"));
else if(ret == -3) else if(ret == -3)
m_btnMgr.setText(m_wbfsLblDialog, _t("dlmsg12", L"Download failed!")); m_btnMgr.setText(m_downloadLblDialog, _t("dlmsg12", L"Download failed!"));
else if(ret == -4) else if(ret == -4)
m_btnMgr.setText(m_wbfsLblDialog, _t("dlmsg15", L"Couldn't save ZIP file")); m_btnMgr.setText(m_downloadLblDialog, _t("dlmsg15", L"Couldn't save ZIP file"));
else else
m_btnMgr.setText(m_wbfsLblDialog, _t("dlmsg14", L"Done.")); m_btnMgr.setText(m_downloadLblDialog, _t("dlmsg14", L"Done."));
dl_finished = true; dl_finished = true;
} }
/*else if(m_btnMgr.selected(m_downloadBtnCancel)) /*else if(m_btnMgr.selected(m_downloadBtnCancel))
@ -399,22 +390,11 @@ void CMenu::_download(string gameId, int dl_type)
m_thrdMessageAdded = true; m_thrdMessageAdded = true;
m_thrdMessage = _t("dlmsg6", L"Canceling..."); m_thrdMessage = _t("dlmsg6", L"Canceling...");
}*/ }*/
else if(m_btnMgr.selected(m_downloadBtnCoverSet)) else if(m_btnMgr.selected(m_configBtn2))// switch to cover download settings ie. type and regions
{ {
settingsmenu = true; settingsmenu = true;
_showSettings();
}
else if(m_btnMgr.selected(m_downloadBtnBack))
{
if(settingsmenu)
{
settingsmenu = false;
_hideSettings();
_showDownload(); _showDownload();
} }
else
break;
}
else if(m_btnMgr.selected(m_downloadBtnPrioM)) else if(m_btnMgr.selected(m_downloadBtnPrioM))
{ {
if(m_downloadPrioVal & C_TYPE_ONOR) if(m_downloadPrioVal & C_TYPE_ONOR)
@ -457,9 +437,8 @@ void CMenu::_download(string gameId, int dl_type)
m_downloadPrioVal ^= C_TYPE_PRIOB; m_downloadPrioVal ^= C_TYPE_PRIOB;
} }
} }
_hideSettings();
m_cfg.setUInt("GENERAL", "cover_prio", m_downloadPrioVal); m_cfg.setUInt("GENERAL", "cover_prio", m_downloadPrioVal);
_showSettings(); _showDownload();
} }
else if(m_btnMgr.selected(m_downloadBtnPrioP)) else if(m_btnMgr.selected(m_downloadBtnPrioP))
{ {
@ -503,124 +482,102 @@ void CMenu::_download(string gameId, int dl_type)
m_downloadPrioVal ^= C_TYPE_ONCU; m_downloadPrioVal ^= C_TYPE_ONCU;
} }
} }
_hideSettings();
m_cfg.setUInt( "GENERAL", "cover_prio", m_downloadPrioVal ); m_cfg.setUInt( "GENERAL", "cover_prio", m_downloadPrioVal );
_showSettings(); _showDownload();
} }
else if(m_btnMgr.selected(m_downloadBtnEN) || m_btnMgr.selected(m_downloadBtnENs)) else if(m_btnMgr.selected(m_downloadBtnEN) || m_btnMgr.selected(m_downloadBtnENs))
{ {
_hideSettings();
m_downloadPrioVal ^= C_TYPE_EN; m_downloadPrioVal ^= C_TYPE_EN;
m_cfg.setUInt("GENERAL", "cover_prio", m_downloadPrioVal); m_cfg.setUInt("GENERAL", "cover_prio", m_downloadPrioVal);
_showSettings(); _showDownload();
} }
else if(m_btnMgr.selected(m_downloadBtnJA) || m_btnMgr.selected(m_downloadBtnJAs)) else if(m_btnMgr.selected(m_downloadBtnJA) || m_btnMgr.selected(m_downloadBtnJAs))
{ {
_hideSettings();
m_downloadPrioVal ^= C_TYPE_JA; m_downloadPrioVal ^= C_TYPE_JA;
m_cfg.setUInt("GENERAL", "cover_prio", m_downloadPrioVal); m_cfg.setUInt("GENERAL", "cover_prio", m_downloadPrioVal);
_showSettings(); _showDownload();
} }
else if(m_btnMgr.selected(m_downloadBtnFR) || m_btnMgr.selected(m_downloadBtnFRs)) else if(m_btnMgr.selected(m_downloadBtnFR) || m_btnMgr.selected(m_downloadBtnFRs))
{ {
_hideSettings();
m_downloadPrioVal ^= C_TYPE_FR; m_downloadPrioVal ^= C_TYPE_FR;
m_cfg.setUInt("GENERAL", "cover_prio", m_downloadPrioVal); m_cfg.setUInt("GENERAL", "cover_prio", m_downloadPrioVal);
_showSettings(); _showDownload();
} }
else if(m_btnMgr.selected(m_downloadBtnDE) || m_btnMgr.selected(m_downloadBtnDEs)) else if(m_btnMgr.selected(m_downloadBtnDE) || m_btnMgr.selected(m_downloadBtnDEs))
{ {
_hideSettings();
m_downloadPrioVal ^= C_TYPE_DE; m_downloadPrioVal ^= C_TYPE_DE;
m_cfg.setUInt("GENERAL", "cover_prio", m_downloadPrioVal); m_cfg.setUInt("GENERAL", "cover_prio", m_downloadPrioVal);
_showSettings(); _showDownload();
} }
else if(m_btnMgr.selected(m_downloadBtnES) || m_btnMgr.selected(m_downloadBtnESs)) else if(m_btnMgr.selected(m_downloadBtnES) || m_btnMgr.selected(m_downloadBtnESs))
{ {
_hideSettings();
m_downloadPrioVal ^= C_TYPE_ES; m_downloadPrioVal ^= C_TYPE_ES;
m_cfg.setUInt("GENERAL", "cover_prio", m_downloadPrioVal); m_cfg.setUInt("GENERAL", "cover_prio", m_downloadPrioVal);
_showSettings(); _showDownload();
} }
else if(m_btnMgr.selected(m_downloadBtnIT) || m_btnMgr.selected(m_downloadBtnITs)) else if(m_btnMgr.selected(m_downloadBtnIT) || m_btnMgr.selected(m_downloadBtnITs))
{ {
_hideSettings();
m_downloadPrioVal ^= C_TYPE_IT; m_downloadPrioVal ^= C_TYPE_IT;
m_cfg.setUInt("GENERAL", "cover_prio", m_downloadPrioVal); m_cfg.setUInt("GENERAL", "cover_prio", m_downloadPrioVal);
_showSettings(); _showDownload();
} }
else if(m_btnMgr.selected(m_downloadBtnNL) || m_btnMgr.selected(m_downloadBtnNLs)) else if(m_btnMgr.selected(m_downloadBtnNL) || m_btnMgr.selected(m_downloadBtnNLs))
{ {
_hideSettings();
m_downloadPrioVal ^= C_TYPE_NL; m_downloadPrioVal ^= C_TYPE_NL;
m_cfg.setUInt("GENERAL", "cover_prio", m_downloadPrioVal); m_cfg.setUInt("GENERAL", "cover_prio", m_downloadPrioVal);
_showSettings(); _showDownload();
} }
else if(m_btnMgr.selected(m_downloadBtnPT) || m_btnMgr.selected(m_downloadBtnPTs)) else if(m_btnMgr.selected(m_downloadBtnPT) || m_btnMgr.selected(m_downloadBtnPTs))
{ {
_hideSettings();
m_downloadPrioVal ^= C_TYPE_PT; m_downloadPrioVal ^= C_TYPE_PT;
m_cfg.setUInt("GENERAL", "cover_prio", m_downloadPrioVal); m_cfg.setUInt("GENERAL", "cover_prio", m_downloadPrioVal);
_showSettings(); _showDownload();
} }
else if(m_btnMgr.selected(m_downloadBtnRU) || m_btnMgr.selected(m_downloadBtnRUs)) else if(m_btnMgr.selected(m_downloadBtnRU) || m_btnMgr.selected(m_downloadBtnRUs))
{ {
_hideSettings();
m_downloadPrioVal ^= C_TYPE_RU; m_downloadPrioVal ^= C_TYPE_RU;
m_cfg.setUInt("GENERAL", "cover_prio", m_downloadPrioVal); m_cfg.setUInt("GENERAL", "cover_prio", m_downloadPrioVal);
_showSettings(); _showDownload();
} }
else if(m_btnMgr.selected(m_downloadBtnKO) || m_btnMgr.selected(m_downloadBtnKOs)) else if(m_btnMgr.selected(m_downloadBtnKO) || m_btnMgr.selected(m_downloadBtnKOs))
{ {
_hideSettings();
m_downloadPrioVal ^= C_TYPE_KO; m_downloadPrioVal ^= C_TYPE_KO;
m_cfg.setUInt("GENERAL", "cover_prio", m_downloadPrioVal); m_cfg.setUInt("GENERAL", "cover_prio", m_downloadPrioVal);
_showSettings(); _showDownload();
} }
else if(m_btnMgr.selected(m_downloadBtnZHCN) || m_btnMgr.selected(m_downloadBtnZHCNs)) else if(m_btnMgr.selected(m_downloadBtnZHCN) || m_btnMgr.selected(m_downloadBtnZHCNs))
{ {
_hideSettings();
m_downloadPrioVal ^= C_TYPE_ZHCN; m_downloadPrioVal ^= C_TYPE_ZHCN;
m_cfg.setUInt("GENERAL", "cover_prio", m_downloadPrioVal); m_cfg.setUInt("GENERAL", "cover_prio", m_downloadPrioVal);
_showSettings(); _showDownload();
} }
else if(m_btnMgr.selected(m_downloadBtnAU) || m_btnMgr.selected(m_downloadBtnAUs)) else if(m_btnMgr.selected(m_downloadBtnAU) || m_btnMgr.selected(m_downloadBtnAUs))
{ {
_hideSettings();
m_downloadPrioVal ^= C_TYPE_AU; m_downloadPrioVal ^= C_TYPE_AU;
m_cfg.setUInt("GENERAL", "cover_prio", m_downloadPrioVal); m_cfg.setUInt("GENERAL", "cover_prio", m_downloadPrioVal);
_showSettings(); _showDownload();
} }
} }
} }
exitMenu = true;
_hideDownload(); _hideDownload();
_hideSettings();
} }
void CMenu::_initDownloadMenu() void CMenu::_initDownloadMenu()
{ {
// Download menu
_addUserLabels(m_downloadLblUser, ARRAY_SIZE(m_downloadLblUser), "DOWNLOAD");
m_downloadBg = _texture("DOWNLOAD/BG", "texture", theme.bg, false); m_downloadBg = _texture("DOWNLOAD/BG", "texture", theme.bg, false);
_addUserLabels(m_downloadLblUser, ARRAY_SIZE(m_downloadLblUser), "DOWNLOAD");
m_downloadLblTitle = _addLabel("DOWNLOAD/TITLE", theme.titleFont, L"", 0, 10, 640, 60, theme.titleFontColor, FTGX_JUSTIFY_CENTER | FTGX_ALIGN_MIDDLE); m_downloadLblTitle = _addLabel("DOWNLOAD/TITLE", theme.titleFont, L"", 0, 10, 640, 60, theme.titleFontColor, FTGX_JUSTIFY_CENTER | FTGX_ALIGN_MIDDLE);
m_downloadBtnBack = _addButton("DOWNLOAD/BACK_BTN", theme.btnFont, L"", 420, 400, 200, 48, theme.btnFontColor);
m_downloadLblCovers = _addLabel("DOWNLOAD/COVERS", theme.btnFont, L"", 20, 125, 385, 56, theme.lblFontColor, FTGX_JUSTIFY_LEFT | FTGX_ALIGN_MIDDLE); // Download menu
m_downloadBtnAll = _addButton("DOWNLOAD/ALL_BTN", theme.btnFont, L"", 420, 130, 200, 48, theme.btnFontColor);
m_downloadLblCoverSet = _addLabel("DOWNLOAD/COVERSSET", theme.btnFont, L"", 20, 185, 385, 56, theme.lblFontColor, FTGX_JUSTIFY_LEFT | FTGX_ALIGN_MIDDLE);
m_downloadBtnCoverSet = _addButton("DOWNLOAD/COVERSET_BTN", theme.btnFont, L"", 420, 190, 200, 48, theme.btnFontColor);
m_downloadLblGameTDBDownload = _addLabel("DOWNLOAD/GAMETDB_DOWNLOAD", theme.btnFont, L"", 20, 245, 385, 56, theme.lblFontColor, FTGX_JUSTIFY_LEFT | FTGX_ALIGN_MIDDLE);
m_downloadBtnGameTDBDownload = _addButton("DOWNLOAD/GAMETDB_DOWNLOAD_BTN", theme.btnFont, L"", 420, 250, 200, 48, theme.btnFontColor);
m_downloadLblBanners = _addLabel("DOWNLOAD/BANNERS", theme.btnFont, L"", 20, 305, 385, 56, theme.lblFontColor, FTGX_JUSTIFY_LEFT | FTGX_ALIGN_MIDDLE);
m_downloadBtnBanners = _addButton("DOWNLOAD/BANNERS_BTN", theme.btnFont, L"", 420, 310, 200, 48, theme.btnFontColor);
m_downloadLblGameTDB = _addLabel("DOWNLOAD/GAMETDB", theme.lblFont, L"", 20, 390, 370, 60, theme.lblFontColor, FTGX_JUSTIFY_LEFT | FTGX_ALIGN_MIDDLE); m_downloadLblGameTDB = _addLabel("DOWNLOAD/GAMETDB", theme.lblFont, L"", 20, 390, 370, 60, theme.lblFontColor, FTGX_JUSTIFY_LEFT | FTGX_ALIGN_MIDDLE);
m_downloadBtnCancel = _addButton("DOWNLOAD/CANCEL_BTN", theme.btnFont, L"", 420, 400, 200, 48, theme.btnFontColor);
m_downloadPBar = _addProgressBar("DOWNLOAD/PROGRESS_BAR", 40, 200, 560, 20); m_downloadPBar = _addProgressBar("DOWNLOAD/PROGRESS_BAR", 40, 200, 560, 20);
m_downloadLblMessage[0] = _addLabel("DOWNLOAD/MESSAGE1", theme.lblFont, L"", 40, 228, 560, 100, theme.txtFontColor, FTGX_JUSTIFY_LEFT | FTGX_ALIGN_TOP); m_downloadLblDialog = _addLabel("DOWNLOAD/DIALOG", theme.lblFont, L"", 40, 75, 600, 200, theme.lblFontColor, FTGX_JUSTIFY_LEFT | FTGX_ALIGN_MIDDLE);
m_downloadLblMessage[1] = _addLabel("DOWNLOAD/MESSAGE2", theme.lblFont, L"", 40, 228, 560, 100, theme.txtFontColor, FTGX_JUSTIFY_LEFT | FTGX_ALIGN_TOP); m_downloadLblMessage = _addLabel("DOWNLOAD/MESSAGE", theme.lblFont, L"", 40, 300, 600, 100, theme.lblFontColor, FTGX_JUSTIFY_CENTER | FTGX_ALIGN_TOP);
// Cover settings // Cover settings
m_downloadLblSetTitle = _addLabel("DOWNLOAD/SETTITLE", theme.titleFont, L"", 0, 10, 640, 60, theme.titleFontColor, FTGX_JUSTIFY_CENTER | FTGX_ALIGN_MIDDLE);
m_downloadLblCoverPrio = _addLabel("DOWNLOAD/COVERPRIO", theme.lblFont, L"", 20, 110, 385, 56, theme.lblFontColor, FTGX_JUSTIFY_LEFT | FTGX_ALIGN_MIDDLE); m_downloadLblCoverPrio = _addLabel("DOWNLOAD/COVERPRIO", theme.lblFont, L"", 20, 110, 385, 56, theme.lblFontColor, FTGX_JUSTIFY_LEFT | FTGX_ALIGN_MIDDLE);
m_downloadLblPrio = _addLabel("DOWNLOAD/PRIO_BTN", theme.btnFont, L"", 394, 110, 178, 48, theme.btnFontColor, FTGX_JUSTIFY_CENTER | FTGX_ALIGN_MIDDLE, theme.btnTexC); m_downloadLblPrio = _addLabel("DOWNLOAD/PRIO_BTN", theme.btnFont, L"", 394, 110, 178, 48, theme.btnFontColor, FTGX_JUSTIFY_CENTER | FTGX_ALIGN_MIDDLE, theme.btnTexC);
m_downloadBtnPrioM = _addPicButton("DOWNLOAD/PRIO_MINUS", theme.btnTexMinus, theme.btnTexMinusS, 346, 110, 48, 48); m_downloadBtnPrioM = _addPicButton("DOWNLOAD/PRIO_MINUS", theme.btnTexMinus, theme.btnTexMinusS, 346, 110, 48, 48);
@ -650,25 +607,17 @@ void CMenu::_initDownloadMenu()
m_downloadBtnJAs = _addPicButton("DOWNLOAD/JAS", theme.btnJAOn, theme.btnJAOns, 330, 300, 80, 80); m_downloadBtnJAs = _addPicButton("DOWNLOAD/JAS", theme.btnJAOn, theme.btnJAOns, 330, 300, 80, 80);
m_downloadBtnRUs = _addPicButton("DOWNLOAD/RUS", theme.btnRUOn, theme.btnRUOns, 430, 300, 80, 80); m_downloadBtnRUs = _addPicButton("DOWNLOAD/RUS", theme.btnRUOn, theme.btnRUOns, 430, 300, 80, 80);
m_downloadBtnZHCNs = _addPicButton("DOWNLOAD/ZHCNS", theme.btnZHCNOn, theme.btnZHCNOns, 530, 300, 80, 80); m_downloadBtnZHCNs = _addPicButton("DOWNLOAD/ZHCNS", theme.btnZHCNOn, theme.btnZHCNOns, 530, 300, 80, 80);
m_downloadBtnBack = _addButton("DOWNLOAD/BACK_BTN", theme.btnFont, L"", 420, 400, 200, 48, theme.btnFontColor);
// Download menu // Download menu
_setHideAnim(m_downloadLblTitle, "DOWNLOAD/TITLE", 0, 0, -2.f, 0.f); _setHideAnim(m_downloadLblTitle, "DOWNLOAD/TITLE", 0, 0, -2.f, 0.f);
_setHideAnim(m_downloadLblCovers, "DOWNLOAD/COVERS", 50, 0, -2.f, 0.f); _setHideAnim(m_downloadBtnBack, "DOWNLOAD/BACK_BTN", 0, 0, 1.f, -1.f);
_setHideAnim(m_downloadBtnAll, "DOWNLOAD/ALL_BTN", -50, 0, 1.f, 0.f);
_setHideAnim(m_downloadLblCoverSet, "DOWNLOAD/COVERSSET", 50, 0, -2.f, 0.f);
_setHideAnim(m_downloadBtnCoverSet, "DOWNLOAD/COVERSET_BTN", -50, 0, 1.f, 0.f);
_setHideAnim(m_downloadLblGameTDBDownload, "DOWNLOAD/GAMETDB_DOWNLOAD", 50, 0, -2.f, 0.f);
_setHideAnim(m_downloadBtnGameTDBDownload, "DOWNLOAD/GAMETDB_DOWNLOAD_BTN", -50, 0, 1.f, 0.f);
_setHideAnim(m_downloadLblBanners, "DOWNLOAD/BANNERS", 50, 0, -2.f, 0.f);
_setHideAnim(m_downloadBtnBanners, "DOWNLOAD/BANNERS_BTN", -50, 0, 1.f, 0.f);
_setHideAnim(m_downloadLblGameTDB, "DOWNLOAD/GAMETDB", 50, 0, -2.f, 0.f); _setHideAnim(m_downloadLblGameTDB, "DOWNLOAD/GAMETDB", 50, 0, -2.f, 0.f);
_setHideAnim(m_downloadPBar, "DOWNLOAD/PROGRESS_BAR", 0, 0, -2.f, 0.f); _setHideAnim(m_downloadPBar, "DOWNLOAD/PROGRESS_BAR", 0, 0, -2.f, 0.f);
_setHideAnim(m_downloadBtnCancel, "DOWNLOAD/CANCEL_BTN", 0, 0, 1.f, -1.f); _setHideAnim(m_downloadLblDialog, "DOWNLOAD/DIALOG", 0, 0, -2.f, 0.f);
_setHideAnim(m_downloadLblMessage, "DOWNLOAD/MESSAGE", 0, 0, -2.f, 0.f);
// Cover settings // Cover settings
_setHideAnim(m_downloadLblSetTitle, "DOWNLOAD/SETTITLE", 0, 0, -2.f, 0.f);
_setHideAnim(m_downloadLblCoverPrio, "DOWNLOAD/COVERPRIO", 50, 0, -2.f, 0.f); _setHideAnim(m_downloadLblCoverPrio, "DOWNLOAD/COVERPRIO", 50, 0, -2.f, 0.f);
_setHideAnim(m_downloadLblPrio, "DOWNLOAD/PRIO_BTN", -50, 0, 1.f, 0.f); _setHideAnim(m_downloadLblPrio, "DOWNLOAD/PRIO_BTN", -50, 0, 1.f, 0.f);
_setHideAnim(m_downloadBtnPrioM, "DOWNLOAD/PRIO_MINUS", -50, 0, 1.f, 0.f); _setHideAnim(m_downloadBtnPrioM, "DOWNLOAD/PRIO_MINUS", -50, 0, 1.f, 0.f);
@ -698,7 +647,6 @@ void CMenu::_initDownloadMenu()
_setHideAnim(m_downloadBtnJAs, "DOWNLOAD/JAS", 0, 0, -2.f, 0.f); _setHideAnim(m_downloadBtnJAs, "DOWNLOAD/JAS", 0, 0, -2.f, 0.f);
_setHideAnim(m_downloadBtnRUs, "DOWNLOAD/RUS", 0, 0, -2.f, 0.f); _setHideAnim(m_downloadBtnRUs, "DOWNLOAD/RUS", 0, 0, -2.f, 0.f);
_setHideAnim(m_downloadBtnZHCNs, "DOWNLOAD/ZHCNS", 0, 0, -2.f, 0.f); _setHideAnim(m_downloadBtnZHCNs, "DOWNLOAD/ZHCNS", 0, 0, -2.f, 0.f);
_setHideAnim(m_downloadBtnBack, "DOWNLOAD/BACK_BTN", 0, 0, 1.f, -1.f);
m_downloadPrioVal = m_cfg.getUInt("GENERAL", "cover_prio", 0); m_downloadPrioVal = m_cfg.getUInt("GENERAL", "cover_prio", 0);
@ -708,23 +656,10 @@ void CMenu::_initDownloadMenu()
void CMenu::_textDownload(void) void CMenu::_textDownload(void)
{ {
m_btnMgr.setText(m_downloadLblTitle, _t("dl5", L"Downloads")); m_btnMgr.setText(m_downloadBtnBack, _t("dl18", L"Back"));
m_btnMgr.setText(m_downloadLblCovers, _t("dl8", L"Covers"));
m_btnMgr.setText(m_downloadBtnAll, _t("dl6", L"Download"));
m_btnMgr.setText(m_downloadLblCoverSet, _t("dl15", L"Cover download settings"));
m_btnMgr.setText(m_downloadBtnCoverSet, _t("dl16", L"Set"));
m_btnMgr.setText(m_downloadLblGameTDBDownload, _t("dl12", L"GameTDB"));
m_btnMgr.setText(m_downloadBtnGameTDBDownload, _t("dl6", L"Download"));
m_btnMgr.setText(m_downloadLblBanners, _t("dl26", L"GC Custom Banners"));
m_btnMgr.setText(m_downloadBtnBanners, _t("dl6", L"Download"));
m_btnMgr.setText(m_downloadLblGameTDB, _t("dl10", L"Please donate\nto GameTDB.com")); m_btnMgr.setText(m_downloadLblGameTDB, _t("dl10", L"Please donate\nto GameTDB.com"));
m_btnMgr.setText(m_downloadBtnCancel, _t("dl1", L"Cancel"));
m_btnMgr.setText(m_downloadLblSetTitle, _t("dl17", L"Cover Download Settings"));
m_btnMgr.setText(m_downloadLblCoverPrio, _t("dl13", L"Download order")); m_btnMgr.setText(m_downloadLblCoverPrio, _t("dl13", L"Download order"));
m_btnMgr.setText(m_downloadLblRegion, _t("dl14", L"Select regions to check for covers:")); m_btnMgr.setText(m_downloadLblRegion, _t("dl14", L"Select regions to check for covers:"));
m_btnMgr.setText(m_downloadBtnBack, _t("dl18", L"Back"));
} }
/************************************* Setup network connection *********************************************/ /************************************* Setup network connection *********************************************/
@ -936,8 +871,8 @@ void * CMenu::_pThread(void *obj)
m->_downloadProgress(obj, m->m_thrdTotal, m->m_thrdWritten); m->_downloadProgress(obj, m->m_thrdTotal, m->m_thrdWritten);
if(m->m_thrdProgress > 0.f) if(m->m_thrdProgress > 0.f)
{ {
m_btnMgr.setText(m->m_wbfsLblMessage, wfmt(L"%i%%", (int)(m->m_thrdProgress * 100.f))); m_btnMgr.setText(m->m_downloadLblMessage, wfmt(L"%i%%", (int)(m->m_thrdProgress * 100.f)));
m_btnMgr.setProgress(m->m_wbfsPBar, m->m_thrdProgress); m_btnMgr.setProgress(m->m_downloadPBar, m->m_thrdProgress);
} }
m->m_thrdDone = true; m->m_thrdDone = true;
} }
@ -945,7 +880,7 @@ void * CMenu::_pThread(void *obj)
{ {
m->m_thrdMessageAdded = false; m->m_thrdMessageAdded = false;
if(!m->m_thrdMessage.empty()) if(!m->m_thrdMessage.empty())
m_btnMgr.setText(m->m_wbfsLblDialog, m->m_thrdMessage); m_btnMgr.setText(m->m_downloadLblDialog, m->m_thrdMessage);
} }
} }
m->m_thrdWorking = false; m->m_thrdWorking = false;
@ -979,8 +914,8 @@ void CMenu::_stop_pThread(void)
LWP_JoinThread(m_thrdPtr, NULL); LWP_JoinThread(m_thrdPtr, NULL);
m_thrdPtr = LWP_THREAD_NULL; m_thrdPtr = LWP_THREAD_NULL;
m_btnMgr.setProgress(m_wbfsPBar, 1.f); m_btnMgr.setProgress(m_downloadPBar, 1.f);
m_btnMgr.setText(m_wbfsLblMessage, L"100%"); m_btnMgr.setText(m_downloadLblMessage, L"100%");
} }
void CMenu::update_pThread(u64 amount, bool add) void CMenu::update_pThread(u64 amount, bool add)
@ -1810,7 +1745,7 @@ int CMenu::_bannerDownloader()
/**************************************************************************************/ /**************************************************************************************/
/**************************************************************************************/ /**************************************************************************************/
/*
const char *url_dl = NULL; const char *url_dl = NULL;
void CMenu::_downloadUrl(const char *url, u8 **dl_file, u32 *dl_size) // Nothing uses this void CMenu::_downloadUrl(const char *url, u8 **dl_file, u32 *dl_size) // Nothing uses this
{ {
@ -1820,8 +1755,8 @@ void CMenu::_downloadUrl(const char *url, u8 **dl_file, u32 *dl_size) // Nothing
m_btnMgr.show(m_downloadPBar); m_btnMgr.show(m_downloadPBar);
m_btnMgr.setProgress(m_downloadPBar, 0.f); m_btnMgr.setProgress(m_downloadPBar, 0.f);
m_btnMgr.show(m_downloadBtnCancel); //m_btnMgr.show(m_downloadBtnCancel);
m_btnMgr.setText(m_downloadBtnCancel, _t("dl1", L"Cancel")); //m_btnMgr.setText(m_downloadBtnCancel, _t("dl1", L"Cancel"));
m_thrdStop = false; m_thrdStop = false;
m_thrdMessageAdded = false; m_thrdMessageAdded = false;
@ -1837,13 +1772,13 @@ void CMenu::_downloadUrl(const char *url, u8 **dl_file, u32 *dl_size) // Nothing
break; break;
if (BTN_A_PRESSED && !(m_thrdWorking && m_thrdStop)) if (BTN_A_PRESSED && !(m_thrdWorking && m_thrdStop))
{ {
if (m_btnMgr.selected(m_downloadBtnCancel)) //if (m_btnMgr.selected(m_downloadBtnCancel))
{ //{
LockMutex lock(m_mutex); // LockMutex lock(m_mutex);
m_thrdStop = true; // m_thrdStop = true;
m_thrdMessageAdded = true; // m_thrdMessageAdded = true;
m_thrdMessage = _t("dlmsg6", L"Canceling..."); // m_thrdMessage = _t("dlmsg6", L"Canceling...");
} //}
} }
if (Sys_Exiting()) if (Sys_Exiting())
{ {
@ -1861,9 +1796,9 @@ void CMenu::_downloadUrl(const char *url, u8 **dl_file, u32 *dl_size) // Nothing
if (prevMsg != m_thrdMessage) if (prevMsg != m_thrdMessage)
{ {
prevMsg = m_thrdMessage; prevMsg = m_thrdMessage;
m_btnMgr.setText(m_downloadLblMessage[0], m_thrdMessage, false); m_btnMgr.setText(m_downloadLblMessage, m_thrdMessage, false);
m_btnMgr.hide(m_downloadLblMessage[0], 0, 0, -1.f, -1.f, true); m_btnMgr.hide(m_downloadLblMessage, 0, 0, -1.f, -1.f, true);
m_btnMgr.show(m_downloadLblMessage[0]); m_btnMgr.show(m_downloadLblMessage);
} }
} }
if (m_thrdStop && !m_thrdWorking) if (m_thrdStop && !m_thrdWorking)
@ -1874,9 +1809,9 @@ void CMenu::_downloadUrl(const char *url, u8 **dl_file, u32 *dl_size) // Nothing
LWP_JoinThread(thread, NULL); LWP_JoinThread(thread, NULL);
thread = LWP_THREAD_NULL; thread = LWP_THREAD_NULL;
} }
m_btnMgr.hide(m_downloadLblMessage[0]); m_btnMgr.hide(m_downloadLblMessage);
m_btnMgr.hide(m_downloadPBar); m_btnMgr.hide(m_downloadPBar);
m_btnMgr.hide(m_downloadBtnCancel); //m_btnMgr.hide(m_downloadBtnCancel);
*dl_file = m_file; *dl_file = m_file;
*dl_size = m_filesize; *dl_size = m_filesize;
@ -1904,7 +1839,7 @@ void * CMenu::_downloadUrlAsync(void *obj)
return 0; return 0;
} }
u32 bufferSize = 0x400000; /* 4mb max */ u32 bufferSize = 0x400000; // 4mb max
m->m_buffer = (u8*)MEM2_alloc(bufferSize); m->m_buffer = (u8*)MEM2_alloc(bufferSize);
if(m->m_buffer == NULL) if(m->m_buffer == NULL)
{ {
@ -1917,4 +1852,4 @@ void * CMenu::_downloadUrlAsync(void *obj)
//m->m_filesize = file.size; //m->m_filesize = file.size;
m->m_thrdWorking = false; m->m_thrdWorking = false;
return 0; return 0;
} }*/