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

- added backgrounds dir to wiiflow_lite.ini

Browse Source 
- other code cleanup for dirs
This commit is contained in:
Fledge68 2019-07-24 11:23:05 -05:00
parent 3af4cef548
commit a0cbc70f7a
5 changed files with 59 additions and 43 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

50
source/menu/menu.cpp
View File

@ -199,13 +199,10 @@ bool CMenu::init()
m_imgsDir = fmt("%s/imgs", m_appDir.c_str()); m_imgsDir = fmt("%s/imgs", m_appDir.c_str());
m_binsDir = fmt("%s/bins", m_appDir.c_str()); m_binsDir = fmt("%s/bins", m_appDir.c_str());
m_sourceDir = m_cfg.getString("GENERAL", "dir_Source", fmt("%s/source_menu", m_dataDir.c_str()));
m_customBnrDir = m_cfg.getString("GENERAL", "dir_custom_banners", fmt("%s/custom_banners", m_dataDir.c_str()));
m_pluginsDir = m_cfg.getString("GENERAL", "dir_plugins", fmt("%s/plugins", m_dataDir.c_str()));
m_cacheDir = m_cfg.getString("GENERAL", "dir_cache", fmt("%s/cache", m_dataDir.c_str())); m_cacheDir = m_cfg.getString("GENERAL", "dir_cache", fmt("%s/cache", m_dataDir.c_str()));
m_listCacheDir = m_cfg.getString("GENERAL", "dir_list_cache", fmt("%s/lists", m_cacheDir.c_str())); m_listCacheDir = m_cfg.getString("GENERAL", "dir_list_cache", fmt("%s/lists", m_cacheDir.c_str()));
m_bnrCacheDir = m_cfg.getString("GENERAL", "dir_banner_cache", fmt("%s/banners", m_cacheDir.c_str())); m_bnrCacheDir = m_cfg.getString("GENERAL", "dir_banner_cache", fmt("%s/banners", m_cacheDir.c_str()));
m_customBnrDir = m_cfg.getString("GENERAL", "dir_custom_banners", fmt("%s/custom_banners", m_dataDir.c_str()));
m_txtCheatDir = m_cfg.getString("GENERAL", "dir_txtcheat", fmt("%s/codes", m_dataDir.c_str())); m_txtCheatDir = m_cfg.getString("GENERAL", "dir_txtcheat", fmt("%s/codes", m_dataDir.c_str()));
m_cheatDir = m_cfg.getString("GENERAL", "dir_cheat", fmt("%s/gct", m_txtCheatDir.c_str())); m_cheatDir = m_cfg.getString("GENERAL", "dir_cheat", fmt("%s/gct", m_txtCheatDir.c_str()));
@ -213,29 +210,32 @@ bool CMenu::init()
m_settingsDir = m_cfg.getString("GENERAL", "dir_settings", fmt("%s/settings", m_dataDir.c_str())); m_settingsDir = m_cfg.getString("GENERAL", "dir_settings", fmt("%s/settings", m_dataDir.c_str()));
m_languagesDir = m_cfg.getString("GENERAL", "dir_languages", fmt("%s/languages", m_dataDir.c_str())); m_languagesDir = m_cfg.getString("GENERAL", "dir_languages", fmt("%s/languages", m_dataDir.c_str()));
m_helpDir = m_cfg.getString("GENERAL", "dir_help", fmt("%s/help", m_dataDir.c_str()));
m_screenshotDir = m_cfg.getString("GENERAL", "dir_screenshot", fmt("%s/screenshots", m_dataDir.c_str()));
m_boxPicDir = m_cfg.getString("GENERAL", "dir_box_covers", fmt("%s/boxcovers", m_dataDir.c_str())); m_boxPicDir = m_cfg.getString("GENERAL", "dir_box_covers", fmt("%s/boxcovers", m_dataDir.c_str()));
m_picDir = m_cfg.getString("GENERAL", "dir_flat_covers", fmt("%s/covers", m_dataDir.c_str())); m_picDir = m_cfg.getString("GENERAL", "dir_flat_covers", fmt("%s/covers", m_dataDir.c_str()));
m_themeDir = m_cfg.getString("GENERAL", "dir_themes_lite", fmt("%s/themes_lite", m_dataDir.c_str())); m_themeDir = m_cfg.getString("GENERAL", "dir_themes_lite", fmt("%s/themes_lite", m_dataDir.c_str()));
m_coverflowsDir = m_cfg.getString("GENERAL", "dir_coverflows", fmt("%s/coverflows", m_themeDir.c_str()));
m_musicDir = m_cfg.getString("GENERAL", "dir_music", fmt("%s/music", m_dataDir.c_str())); m_musicDir = m_cfg.getString("GENERAL", "dir_music", fmt("%s/music", m_dataDir.c_str()));
m_videoDir = m_cfg.getString("GENERAL", "dir_trailers", fmt("%s/trailers", m_dataDir.c_str())); m_videoDir = m_cfg.getString("GENERAL", "dir_trailers", fmt("%s/trailers", m_dataDir.c_str()));
m_fanartDir = m_cfg.getString("GENERAL", "dir_fanart", fmt("%s/fanart", m_dataDir.c_str())); m_fanartDir = m_cfg.getString("GENERAL", "dir_fanart", fmt("%s/fanart", m_dataDir.c_str()));
m_screenshotDir = m_cfg.getString("GENERAL", "dir_screenshot", fmt("%s/screenshots", m_dataDir.c_str())); m_bckgrndsDir = m_cfg.getString("GENERAL", "dir_backgrounds", fmt("%s/backgrounds", m_dataDir.c_str()));
m_helpDir = m_cfg.getString("GENERAL", "dir_help", fmt("%s/help", m_dataDir.c_str()));
m_sourceDir = m_cfg.getString("GENERAL", "dir_Source", fmt("%s/source_menu", m_dataDir.c_str()));
m_pluginsDir = m_cfg.getString("GENERAL", "dir_plugins", fmt("%s/plugins", m_dataDir.c_str()));
m_pluginDataDir = m_cfg.getString("GENERAL", "dir_plugins_data", fmt("%s/plugins_data", m_dataDir.c_str()));
m_cartDir = m_cfg.getString("GENERAL", "dir_cart", fmt("%s/cart_disk", m_dataDir.c_str())); m_cartDir = m_cfg.getString("GENERAL", "dir_cart", fmt("%s/cart_disk", m_dataDir.c_str()));
m_snapDir = m_cfg.getString("GENERAL", "dir_snap", fmt("%s/snapshots", m_dataDir.c_str())); m_snapDir = m_cfg.getString("GENERAL", "dir_snap", fmt("%s/snapshots", m_dataDir.c_str()));
m_pluginDataDir = m_cfg.getString("GENERAL", "dir_plugins_data", fmt("%s/plugins_data", m_dataDir.c_str()));
/* Create our Folder Structure */ /* Create our Folder Structure */
fsop_MakeFolder(m_dataDir.c_str()); //D'OH! fsop_MakeFolder(m_dataDir.c_str()); //D'OH!
fsop_MakeFolder(m_sourceDir.c_str());
fsop_MakeFolder(m_customBnrDir.c_str());
fsop_MakeFolder(m_pluginsDir.c_str());
fsop_MakeFolder(m_pluginDataDir.c_str());
fsop_MakeFolder(m_cacheDir.c_str()); fsop_MakeFolder(m_cacheDir.c_str());
fsop_MakeFolder(m_listCacheDir.c_str()); fsop_MakeFolder(m_listCacheDir.c_str());
fsop_MakeFolder(m_bnrCacheDir.c_str()); fsop_MakeFolder(m_bnrCacheDir.c_str());
fsop_MakeFolder(m_customBnrDir.c_str());
fsop_MakeFolder(m_txtCheatDir.c_str()); fsop_MakeFolder(m_txtCheatDir.c_str());
fsop_MakeFolder(m_cheatDir.c_str()); fsop_MakeFolder(m_cheatDir.c_str());
@ -243,16 +243,24 @@ bool CMenu::init()
fsop_MakeFolder(m_settingsDir.c_str()); fsop_MakeFolder(m_settingsDir.c_str());
fsop_MakeFolder(m_languagesDir.c_str()); fsop_MakeFolder(m_languagesDir.c_str());
fsop_MakeFolder(m_boxPicDir.c_str());
fsop_MakeFolder(m_picDir.c_str());
fsop_MakeFolder(m_themeDir.c_str());
fsop_MakeFolder(fmt("%s/coverflows", m_themeDir.c_str()));
fsop_MakeFolder(m_musicDir.c_str());
fsop_MakeFolder(m_videoDir.c_str());
fsop_MakeFolder(m_fanartDir.c_str());
fsop_MakeFolder(m_screenshotDir.c_str()); fsop_MakeFolder(m_screenshotDir.c_str());
fsop_MakeFolder(m_helpDir.c_str()); fsop_MakeFolder(m_helpDir.c_str());
fsop_MakeFolder(m_boxPicDir.c_str());
fsop_MakeFolder(m_picDir.c_str());
fsop_MakeFolder(m_themeDir.c_str());
fsop_MakeFolder(m_coverflowsDir.c_str());
fsop_MakeFolder(m_musicDir.c_str());
fsop_MakeFolder(m_videoDir.c_str());
fsop_MakeFolder(m_fanartDir.c_str());
fsop_MakeFolder(m_bckgrndsDir.c_str());
fsop_MakeFolder(m_sourceDir.c_str());
fsop_MakeFolder(m_pluginsDir.c_str());
fsop_MakeFolder(m_pluginDataDir.c_str());
fsop_MakeFolder(m_cartDir.c_str());
fsop_MakeFolder(m_snapDir.c_str());
/* set default wii games partition in case this is the first boot */ /* set default wii games partition in case this is the first boot */
int dp = -1; int dp = -1;
for(int i = SD; i <= USB8; i++) // Find a wbfs folder or a partition of wbfs file system for(int i = SD; i <= USB8; i++) // Find a wbfs folder or a partition of wbfs file system
@ -286,9 +294,9 @@ bool CMenu::init()
string themeName = m_cfg.getString("GENERAL", "theme", "default"); string themeName = m_cfg.getString("GENERAL", "theme", "default");
m_themeDataDir = fmt("%s/%s", m_themeDir.c_str(), themeName.c_str()); m_themeDataDir = fmt("%s/%s", m_themeDir.c_str(), themeName.c_str());
m_theme.load(fmt("%s.ini", m_themeDataDir.c_str())); m_theme.load(fmt("%s.ini", m_themeDataDir.c_str()));
m_coverflow.load(fmt("%s/coverflows/%s.ini", m_themeDir.c_str(), themeName.c_str())); m_coverflow.load(fmt("%s/%s.ini", m_coverflowsDir.c_str(), themeName.c_str()));
if(!m_coverflow.loaded()) if(!m_coverflow.loaded())
m_coverflow.load(fmt("%s/coverflows/default.ini", m_themeDir.c_str())); m_coverflow.load(fmt("%s/default.ini", m_coverflowsDir.c_str()));
m_platform.load(fmt("%s/platform.ini", m_pluginDataDir.c_str())); m_platform.load(fmt("%s/platform.ini", m_pluginDataDir.c_str()));
/* Get plugin ini files */ /* Get plugin ini files */

36
source/menu/menu.hpp
View File

@ -120,34 +120,42 @@ private:
s16 m_musicTimer; s16 m_musicTimer;
string m_curLanguage; string m_curLanguage;
string m_sourceDir; /* Dir strings */
string m_themeDataDir;
string m_appDir; string m_appDir;
string m_imgsDir; string m_imgsDir;
string m_binsDir; string m_binsDir;
string m_dataDir; string m_dataDir;
string m_pluginsDir;
string m_customBnrDir;
string m_picDir;
string m_boxPicDir;
string m_boxcPicDir;
string m_cacheDir; string m_cacheDir;
string m_listCacheDir; string m_listCacheDir;
string m_bnrCacheDir; string m_bnrCacheDir;
string m_themeDir; string m_customBnrDir;
string m_musicDir;
string m_txtCheatDir; string m_txtCheatDir;
string m_cheatDir; string m_cheatDir;
string m_wipDir; string m_wipDir;
string m_videoDir;
string m_fanartDir;
string m_screenshotDir;
string m_settingsDir; string m_settingsDir;
string m_languagesDir; string m_languagesDir;
string m_helpDir;
string m_screenshotDir;
string m_boxPicDir;
string m_picDir;
string m_themeDir;
string m_themeDataDir;
string m_coverflowsDir;
string m_musicDir;
string m_videoDir;
string m_fanartDir;
string m_bckgrndsDir;
string m_sourceDir;
string m_pluginsDir;
string m_pluginDataDir;
string m_cartDir; string m_cartDir;
string m_snapDir; string m_snapDir;
string m_pluginDataDir;
string m_helpDir;
/* NandEmulation */ /* NandEmulation */
char emu_nands_dir[32]; char emu_nands_dir[32];

8
source/menu/menu_cftheme.cpp
View File

@ -335,9 +335,9 @@ void CMenu::_cfTheme(void)
{ {
m_coverflow.clear(); m_coverflow.clear();
m_coverflow.unload(); m_coverflow.unload();
m_coverflow.load(fmt("%s/coverflows/%s.ini", m_themeDir.c_str(), m_cfg.getString("GENERAL", "theme", "default").c_str())); m_coverflow.load(fmt("%s/%s.ini", m_coverflowsDir.c_str(), m_cfg.getString("GENERAL", "theme", "default").c_str()));
if(!m_coverflow.loaded()) if(!m_coverflow.loaded())
m_coverflow.load(fmt("%s/coverflows/default.ini", m_themeDir.c_str())); m_coverflow.load(fmt("%s/default.ini", m_coverflowsDir.c_str()));
break; break;
} }
else if(BTN_UP_PRESSED) else if(BTN_UP_PRESSED)
@ -428,9 +428,9 @@ void CMenu::_cfTheme(void)
{ {
m_coverflow.clear(); m_coverflow.clear();
m_coverflow.unload(); m_coverflow.unload();
m_coverflow.load(fmt("%s/coverflows/%s.ini", m_themeDir.c_str(), m_cfg.getString("GENERAL", "theme", "default").c_str())); m_coverflow.load(fmt("%s/%s.ini", m_coverflowsDir.c_str(), m_cfg.getString("GENERAL", "theme", "default").c_str()));
if(!m_coverflow.loaded()) if(!m_coverflow.loaded())
m_coverflow.load(fmt("%s/coverflows/default.ini", m_themeDir.c_str())); m_coverflow.load(fmt("%s/default.ini", m_coverflowsDir.c_str()));
break; break;
} }
else if (m_btnMgr.selected(m_cfThemeBtnAlt)) else if (m_btnMgr.selected(m_cfThemeBtnAlt))

8
source/menu/menu_main.cpp
View File

@ -83,13 +83,13 @@ void CMenu::_setMainBg()
if(fn.length() > 0) if(fn.length() > 0)
{ {
string themeName = m_cfg.getString("GENERAL", "theme", "default"); string themeName = m_cfg.getString("GENERAL", "theme", "default");
if(TexHandle.fromImageFile(m_mainAltBg, fmt("%s/backgrounds/%s/%s.png", m_dataDir.c_str(), themeName.c_str(), fn.c_str())) != TE_OK) if(TexHandle.fromImageFile(m_mainAltBg, fmt("%s/%s/%s.png", m_bckgrndsDir.c_str(), themeName.c_str(), fn.c_str())) != TE_OK)
{ {
if(TexHandle.fromImageFile(m_mainAltBg, fmt("%s/backgrounds/%s/%s.jpg", m_dataDir.c_str(), themeName.c_str(), fn.c_str())) != TE_OK) if(TexHandle.fromImageFile(m_mainAltBg, fmt("%s/%s/%s.jpg", m_bckgrndsDir.c_str(), themeName.c_str(), fn.c_str())) != TE_OK)
{ {
if(TexHandle.fromImageFile(m_mainAltBg, fmt("%s/backgrounds/%s.png", m_dataDir.c_str(), fn.c_str())) != TE_OK) if(TexHandle.fromImageFile(m_mainAltBg, fmt("%s/%s.png", m_bckgrndsDir.c_str(), fn.c_str())) != TE_OK)
{ {
if(TexHandle.fromImageFile(m_mainAltBg, fmt("%s/backgrounds/%s.jpg", m_dataDir.c_str(), fn.c_str())) != TE_OK) if(TexHandle.fromImageFile(m_mainAltBg, fmt("%s/%s.jpg", m_bckgrndsDir.c_str(), fn.c_str())) != TE_OK)
{ {
_setBg(m_mainBg, m_mainBgLQ); _setBg(m_mainBg, m_mainBgLQ);
return; return;