- upped to beta 8

- mainly just some various code cleanups
- added 'Always show main icons' option page 14 of main settings. this prevents the main screen icons from hiding.
This commit is contained in:
Fledge68 2020-10-15 14:46:28 -05:00
parent c2007e3421
commit d93017e4ad
10 changed files with 31 additions and 29 deletions

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.1 MiB

After

Width:  |  Height:  |  Size: 4.1 MiB

View File

@ -1,6 +1,6 @@
#define APP_NAME "WiiFlow WFL" #define APP_NAME "WiiFlow WFL"
#define APP_VERSION "5.4.7 beta 7" #define APP_VERSION "5.4.7 beta 8"
#define APP_DATA_DIR "wiiflow" #define APP_DATA_DIR "wiiflow"
#define APPS_DIR "apps/wiiflow" #define APPS_DIR "apps/wiiflow"

View File

@ -61,7 +61,7 @@ void DeviceHandler::MountAll()
void DeviceHandler::UnMountAll() void DeviceHandler::UnMountAll()
{ {
/* Kill possible USB thread */ /* Kill possible USB thread */
KillUSBKeepAliveThread(); //KillUSBKeepAliveThread();
for(u32 i = SD; i < MAXDEVICES; i++) for(u32 i = SD; i < MAXDEVICES; i++)
UnMount(i); UnMount(i);

View File

@ -160,18 +160,9 @@ bool AHBPROT_Patched(void)
} }
/* WiiU Check by crediar, thanks */ /* WiiU Check by crediar, thanks */
bool WiiUChecked = false;
bool WiiUMode = false;
bool IsOnWiiU(void) bool IsOnWiiU(void)
{ {
if(WiiUChecked) return ((*HW_PROCESSOR >> 16 ) == 0xCAFE);
return WiiUMode;
if((*HW_PROCESSOR >> 16) == 0xCAFE)
WiiUMode = true;
WiiUChecked = true;
return WiiUMode;
} }
void Sys_SetNeekPath(const char *Path) void Sys_SetNeekPath(const char *Path)

View File

@ -50,10 +50,10 @@ void CMenu::_showConfig7(int curPage)
m_btnMgr.show(m_config7Lbl1); m_btnMgr.show(m_config7Lbl1);
m_btnMgr.show(m_config7Btn1); m_btnMgr.show(m_config7Btn1);
m_btnMgr.show(m_config7Lbl2);
m_btnMgr.show(m_config7Btn2);
if(curPage != 14) if(curPage != 14)
{ {
m_btnMgr.show(m_config7Lbl2);
m_btnMgr.show(m_config7Btn2);
m_btnMgr.show(m_config7Lbl3); m_btnMgr.show(m_config7Lbl3);
m_btnMgr.show(m_config7Btn3); m_btnMgr.show(m_config7Btn3);
m_btnMgr.show(m_config7Lbl4); m_btnMgr.show(m_config7Lbl4);
@ -149,6 +149,8 @@ void CMenu::_showConfig7(int curPage)
{ {
m_btnMgr.setText(m_config7Lbl1, _t("cfg729", L"Use system proxy settings")); m_btnMgr.setText(m_config7Lbl1, _t("cfg729", L"Use system proxy settings"));
m_btnMgr.setText(m_config7Btn1, m_cfg.getBool("PROXY", "proxy_use_system") ? _t("on", L"On") : _t("off", L"Off")); m_btnMgr.setText(m_config7Btn1, m_cfg.getBool("PROXY", "proxy_use_system") ? _t("on", L"On") : _t("off", L"Off"));
m_btnMgr.setText(m_config7Lbl2, _t("cfg730", L"Always show main icons"));
m_btnMgr.setText(m_config7Btn2, !m_cfg.getBool("GENERAL", "auto_hide_icons", true) ? _t("yes", L"Yes") : _t("no", L"No"));
} }
} }
@ -365,6 +367,13 @@ int CMenu::_config7(int curPage)
mainMenu.proxyUseSystem = val; mainMenu.proxyUseSystem = val;
m_btnMgr.setText(m_config7Btn1, val ? _t("on", L"On") : _t("off", L"Off")); m_btnMgr.setText(m_config7Btn1, val ? _t("on", L"On") : _t("off", L"Off"));
} }
else if(m_btnMgr.selected(m_config7Btn2))
{
bool val = !m_cfg.getBool("GENERAL", "auto_hide_icons");
m_cfg.setBool("GENERAL", "auto_hide_icons", val);
m_btnMgr.setText(m_config7Btn2, !val ? _t("yes", L"Yes") : _t("no", L"No"));
Auto_hide_icons = val;
}
} }
} }
} }

View File

@ -138,7 +138,7 @@ void CMenu::_showCF(bool refreshList)
/* if game list is empty display message letting user know */ /* if game list is empty display message letting user know */
wstringEx Msg; wstringEx Msg;
wstringEx Pth; string Pth;
if(m_gameList.empty()) if(m_gameList.empty())
{ {
cacheCovers = false; cacheCovers = false;
@ -152,20 +152,20 @@ void CMenu::_showCF(bool refreshList)
switch(m_current_view) switch(m_current_view)
{ {
case COVERFLOW_WII: case COVERFLOW_WII:
Msg = _t("main2", L"No games found in "); Msg = _t("main2", L"No games found in");
Pth = wstringEx(fmt(wii_games_dir, DeviceName[currentPartition])); Pth = sfmt(wii_games_dir, DeviceName[currentPartition]);
break; break;
case COVERFLOW_GAMECUBE: case COVERFLOW_GAMECUBE:
Msg = _t("main2", L"No games found in "); Msg = _t("main2", L"No games found in");
Pth = wstringEx(fmt(gc_games_dir, DeviceName[currentPartition])); Pth = sfmt(gc_games_dir, DeviceName[currentPartition]);
break; break;
case COVERFLOW_CHANNEL: case COVERFLOW_CHANNEL:
Msg = _t("main3", L"No titles found in "); Msg = _t("main3", L"No titles found in");
Pth = wstringEx(fmt("%s:/%s/%s", DeviceName[currentPartition], emu_nands_dir, m_cfg.getString(CHANNEL_DOMAIN, "current_emunand").c_str())); Pth = sfmt("%s:/%s/%s", DeviceName[currentPartition], emu_nands_dir, m_cfg.getString(CHANNEL_DOMAIN, "current_emunand").c_str());
break; break;
case COVERFLOW_HOMEBREW: case COVERFLOW_HOMEBREW:
Msg = _t("main4", L"No apps found in "); Msg = _t("main4", L"No apps found in");
Pth = wstringEx(fmt(HOMEBREW_DIR, DeviceName[currentPartition])); Pth = sfmt(HOMEBREW_DIR, DeviceName[currentPartition]);
break; break;
case COVERFLOW_PLUGIN: case COVERFLOW_PLUGIN:
Pth = ""; Pth = "";
@ -175,18 +175,18 @@ void CMenu::_showCF(bool refreshList)
Msg = _t("main5", L"No roms/items found."); Msg = _t("main5", L"No roms/items found.");
else else
{ {
Msg = _t("main2", L"No games found in "); Msg = _t("main2", L"No games found in");
u8 i = 0; u8 i = 0;
while(m_plugin.PluginExist(i) && !m_plugin.GetEnabledStatus(i)){ ++i; } while(m_plugin.PluginExist(i) && !m_plugin.GetEnabledStatus(i)){ ++i; }
int romsPartition = m_plugin.GetRomPartition(i); int romsPartition = m_plugin.GetRomPartition(i);
if(romsPartition < 0) if(romsPartition < 0)
romsPartition = m_cfg.getInt(PLUGIN_DOMAIN, "partition", 0); romsPartition = m_cfg.getInt(PLUGIN_DOMAIN, "partition", 0);
Pth = wstringEx(fmt("%s:/%s", DeviceName[romsPartition], m_plugin.GetRomDir(i))); Pth = sfmt("%s:/%s", DeviceName[romsPartition], m_plugin.GetRomDir(i));
} }
break; break;
} }
} }
Msg.append(Pth); Msg.append(wstringEx(' ' + Pth));
m_btnMgr.setText(m_mainLblMessage, Msg); m_btnMgr.setText(m_mainLblMessage, Msg);
m_btnMgr.show(m_mainLblMessage); m_btnMgr.show(m_mainLblMessage);
return; return;

View File

@ -274,7 +274,7 @@ void CMenu::_checkboxesMenu(u8 md)
{ {
found = true;// and don't add it found = true;// and don't add it
} }
else else if(m_plugin.GetPluginPosition(strtoul(magicNums[i].c_str(), NULL, 16)) < 255)// make sure plugin exist
{ {
if(pluginsCount == 0) if(pluginsCount == 0)
newMagics = magicNums[j]; newMagics = magicNums[j];

View File

@ -69,7 +69,7 @@ void Plugin::init(const string& m_pluginsDir)
if(iniFile->find("scummvm.ini") != string::npos) if(iniFile->find("scummvm.ini") != string::npos)
continue; continue;
m_plugin_cfg.load(iniFile->c_str()); m_plugin_cfg.load(iniFile->c_str());
if(m_plugin_cfg.loaded()) if(m_plugin_cfg.loaded() && Plugins.size() < 256)// max plugins count = 255
{ {
m_plugin.AddPlugin(m_plugin_cfg, *iniFile); m_plugin.AddPlugin(m_plugin_cfg, *iniFile);
} }
@ -119,7 +119,7 @@ u8 Plugin::GetPluginPosition(u32 magic)
for(u8 pos = 0; pos < Plugins.size(); pos++) for(u8 pos = 0; pos < Plugins.size(); pos++)
{ {
if(magic == Plugins[pos].magic) if(magic == Plugins[pos].magic)
return (s16)pos; return pos;
} }
return 255; return 255;
} }

View File

@ -70,6 +70,8 @@ cfg725=Shutdown to idle standby
cfg726=Covers Box Mode cfg726=Covers Box Mode
cfg727=Use Plugin Database Titles cfg727=Use Plugin Database Titles
cfg728=Upsample music to 48khz cfg728=Upsample music to 48khz
cfg729=Use system proxy settings
cfg730=Always show main icons
cfga2=Install game cfga2=Install game
cfga3=Install cfga3=Install
cfga6=Language cfga6=Language