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

-sync with 4.0.1

Browse Source
This commit is contained in:
fix94.1 2012-09-02 20:05:35 +00:00
parent 185ad059c0
commit 15c24c708b
4 changed files with 88 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/defines.h
View File

@ -1,5 +1,5 @@
#define APP_NAME "WiiFlow" #define APP_NAME "WiiFlow"
#define APP_VERSION "Beta 4.0.1" #define APP_VERSION "4.0.1"
#define APPDATA_DIR "wiiflow" #define APPDATA_DIR "wiiflow"
#define APPDATA_DIR2 "apps/wiiflow" #define APPDATA_DIR2 "apps/wiiflow"

54
source/menu/menu.cpp
View File

@ -874,7 +874,7 @@ void CMenu::_buildMenus(void)
{ {
if(!m_base_font.get()) if(!m_base_font.get())
_loadDefaultFont(CONF_GetLanguage() == CONF_LANG_KOREAN); _loadDefaultFont(CONF_GetLanguage() == CONF_LANG_KOREAN);
// Default fonts // Default fonts
theme.btnFont = _font(theme.fontSet, "GENERAL", "button_font", BUTTONFONT); theme.btnFont = _font(theme.fontSet, "GENERAL", "button_font", BUTTONFONT);
theme.btnFontColor = m_theme.getColor("GENERAL", "button_font_color", 0xD0BFDFFF); theme.btnFontColor = m_theme.getColor("GENERAL", "button_font_color", 0xD0BFDFFF);
@ -884,47 +884,48 @@ void CMenu::_buildMenus(void)
theme.titleFont = _font(theme.fontSet, "GENERAL", "title_font", TITLEFONT); theme.titleFont = _font(theme.fontSet, "GENERAL", "title_font", TITLEFONT);
theme.titleFontColor = m_theme.getColor("GENERAL", "title_font_color", 0xFFFFFFFF); theme.titleFontColor = m_theme.getColor("GENERAL", "title_font_color", 0xFFFFFFFF);
theme.txtFont = _font(theme.fontSet, "GENERAL", "text_font", TEXTFONT); theme.txtFont = _font(theme.fontSet, "GENERAL", "text_font", TEXTFONT);
theme.txtFontColor = m_theme.getColor("GENERAL", "text_font_color", 0xFFFFFFFF); theme.txtFontColor = m_theme.getColor("GENERAL", "text_font_color", 0xFFFFFFFF);
theme.selsbtnFontColor = m_theme.getColor("GENERAL", "selsbtn_font_color", 0xFA5882FF); theme.selsbtnFontColor = m_theme.getColor("GENERAL", "selsbtn_font_color", 0xFA5882FF);
theme.selubtnFontColor = m_theme.getColor("GENERAL", "selubtn_font_color", 0xD0BFDFFF); theme.selubtnFontColor = m_theme.getColor("GENERAL", "selubtn_font_color", 0xD0BFDFFF);
// Default Sounds // Default Sounds
theme.clickSound = _sound(theme.soundSet, "GENERAL", "click_sound", click_wav, click_wav_size, string("default_btn_click"), false); theme.clickSound = _sound(theme.soundSet, "GENERAL", "click_sound", click_wav, click_wav_size, string("default_btn_click"), false);
theme.hoverSound = _sound(theme.soundSet, "GENERAL", "hover_sound", hover_wav, hover_wav_size, string("default_btn_hover"), false); theme.hoverSound = _sound(theme.soundSet, "GENERAL", "hover_sound", hover_wav, hover_wav_size, string("default_btn_hover"), false);
theme.cameraSound = _sound(theme.soundSet, "GENERAL", "camera_sound", camera_wav, camera_wav_size, string("default_camera"), false); theme.cameraSound = _sound(theme.soundSet, "GENERAL", "camera_sound", camera_wav, camera_wav_size, string("default_camera"), false);
m_cameraSound = theme.cameraSound; m_cameraSound = theme.cameraSound;
// Default textures // Default textures
theme.btnTexL.fromPNG(butleft_png); theme.btnTexL.fromPNG(butleft_png);
theme.btnTexL = _texture(theme.texSet, "GENERAL", "button_texture_left", theme.btnTexL); theme.btnTexL = _texture(theme.texSet, "GENERAL", "button_texture_left", theme.btnTexL);
theme.btnTexR.fromPNG(butright_png); theme.btnTexR.fromPNG(butright_png);
theme.btnTexR = _texture(theme.texSet, "GENERAL", "button_texture_right", theme.btnTexR); theme.btnTexR = _texture(theme.texSet, "GENERAL", "button_texture_right", theme.btnTexR);
theme.btnTexC.fromPNG(butcenter_png); theme.btnTexC.fromPNG(butcenter_png);
theme.btnTexC = _texture(theme.texSet, "GENERAL", "button_texture_center", theme.btnTexC); theme.btnTexC = _texture(theme.texSet, "GENERAL", "button_texture_center", theme.btnTexC);
theme.btnTexLS.fromPNG(butsleft_png); theme.btnTexLS.fromPNG(butsleft_png);
theme.btnTexLS = _texture(theme.texSet, "GENERAL", "button_texture_left_selected", theme.btnTexLS); theme.btnTexLS = _texture(theme.texSet, "GENERAL", "button_texture_left_selected", theme.btnTexLS);
theme.btnTexRS.fromPNG(butsright_png); theme.btnTexRS.fromPNG(butsright_png);
theme.btnTexRS = _texture(theme.texSet, "GENERAL", "button_texture_right_selected", theme.btnTexRS); theme.btnTexRS = _texture(theme.texSet, "GENERAL", "button_texture_right_selected", theme.btnTexRS);
theme.btnTexCS.fromPNG(butscenter_png); theme.btnTexCS.fromPNG(butscenter_png);
theme.btnTexCS = _texture(theme.texSet, "GENERAL", "button_texture_center_selected", theme.btnTexCS); theme.btnTexCS = _texture(theme.texSet, "GENERAL", "button_texture_center_selected", theme.btnTexCS);
theme.btnTexLH.fromPNG(buthleft_png); theme.btnTexLH.fromPNG(buthleft_png);
theme.btnTexLH = _texture(theme.texSet, "GENERAL", "button_texture_hlleft", theme.btnTexLH); theme.btnTexLH = _texture(theme.texSet, "GENERAL", "button_texture_hlleft", theme.btnTexLH);
theme.btnTexRH.fromPNG(buthright_png); theme.btnTexRH.fromPNG(buthright_png);
theme.btnTexRH = _texture(theme.texSet, "GENERAL", "button_texture_hlright", theme.btnTexRH); theme.btnTexRH = _texture(theme.texSet, "GENERAL", "button_texture_hlright", theme.btnTexRH);
theme.btnTexCH.fromPNG(buthcenter_png); theme.btnTexCH.fromPNG(buthcenter_png);
theme.btnTexCH = _texture(theme.texSet, "GENERAL", "button_texture_hlcenter", theme.btnTexCH); theme.btnTexCH = _texture(theme.texSet, "GENERAL", "button_texture_hlcenter", theme.btnTexCH);
theme.btnTexLSH.fromPNG(buthsleft_png); theme.btnTexLSH.fromPNG(buthsleft_png);
theme.btnTexLSH = _texture(theme.texSet, "GENERAL", "button_texture_hlleft_selected", theme.btnTexLSH); theme.btnTexLSH = _texture(theme.texSet, "GENERAL", "button_texture_hlleft_selected", theme.btnTexLSH);
theme.btnTexRSH.fromPNG(buthsright_png); theme.btnTexRSH.fromPNG(buthsright_png);
theme.btnTexRSH = _texture(theme.texSet, "GENERAL", "button_texture_hlright_selected", theme.btnTexRSH); theme.btnTexRSH = _texture(theme.texSet, "GENERAL", "button_texture_hlright_selected", theme.btnTexRSH);
theme.btnTexCSH.fromPNG(buthscenter_png); theme.btnTexCSH.fromPNG(buthscenter_png);
theme.btnTexCSH = _texture(theme.texSet, "GENERAL", "button_texture_hlcenter_selected", theme.btnTexCSH); theme.btnTexCSH = _texture(theme.texSet, "GENERAL", "button_texture_hlcenter_selected", theme.btnTexCSH);
theme.btnAUOn.fromPNG(butauon_png); theme.btnAUOn.fromPNG(butauon_png);
theme.btnAUOn = _texture(theme.texSet, "GENERAL", "button_au_on", theme.btnAUOn); theme.btnAUOn = _texture(theme.texSet, "GENERAL", "button_au_on", theme.btnAUOn);
theme.btnAUOns.fromPNG(butauons_png); theme.btnAUOns.fromPNG(butauons_png);
theme.btnAUOns = _texture(theme.texSet, "GENERAL", "button_au_on_selected", theme.btnAUOns); theme.btnAUOns = _texture(theme.texSet, "GENERAL", "button_au_on_selected", theme.btnAUOns);
theme.btnAUOff.fromPNG(butauoff_png); theme.btnAUOff.fromPNG(butauoff_png);
@ -933,7 +934,7 @@ void CMenu::_buildMenus(void)
theme.btnAUOffs = _texture(theme.texSet, "GENERAL", "button_au_off_selected", theme.btnAUOffs); theme.btnAUOffs = _texture(theme.texSet, "GENERAL", "button_au_off_selected", theme.btnAUOffs);
theme.btnENOn.fromPNG(butenon_png); theme.btnENOn.fromPNG(butenon_png);
theme.btnENOn = _texture(theme.texSet, "GENERAL", "button_en_on", theme.btnENOn); theme.btnENOn = _texture(theme.texSet, "GENERAL", "button_en_on", theme.btnENOn);
theme.btnENOns.fromPNG(butenons_png); theme.btnENOns.fromPNG(butenons_png);
theme.btnENOns = _texture(theme.texSet, "GENERAL", "button_en_on_selected", theme.btnENOns); theme.btnENOns = _texture(theme.texSet, "GENERAL", "button_en_on_selected", theme.btnENOns);
theme.btnENOff.fromPNG(butenoff_png); theme.btnENOff.fromPNG(butenoff_png);
@ -942,7 +943,7 @@ void CMenu::_buildMenus(void)
theme.btnENOffs = _texture(theme.texSet, "GENERAL", "button_en_off_selected", theme.btnENOffs); theme.btnENOffs = _texture(theme.texSet, "GENERAL", "button_en_off_selected", theme.btnENOffs);
theme.btnJAOn.fromPNG(butjaon_png); theme.btnJAOn.fromPNG(butjaon_png);
theme.btnJAOn = _texture(theme.texSet, "GENERAL", "button_ja_on", theme.btnJAOn); theme.btnJAOn = _texture(theme.texSet, "GENERAL", "button_ja_on", theme.btnJAOn);
theme.btnJAOns.fromPNG(butjaons_png); theme.btnJAOns.fromPNG(butjaons_png);
theme.btnJAOns = _texture(theme.texSet, "GENERAL", "button_ja_on_selected", theme.btnJAOns); theme.btnJAOns = _texture(theme.texSet, "GENERAL", "button_ja_on_selected", theme.btnJAOns);
theme.btnJAOff.fromPNG(butjaoff_png); theme.btnJAOff.fromPNG(butjaoff_png);
@ -951,7 +952,7 @@ void CMenu::_buildMenus(void)
theme.btnJAOffs = _texture(theme.texSet, "GENERAL", "button_ja_off_selected", theme.btnJAOffs); theme.btnJAOffs = _texture(theme.texSet, "GENERAL", "button_ja_off_selected", theme.btnJAOffs);
theme.btnFROn.fromPNG(butfron_png); theme.btnFROn.fromPNG(butfron_png);
theme.btnFROn = _texture(theme.texSet, "GENERAL", "button_fr_on", theme.btnFROn); theme.btnFROn = _texture(theme.texSet, "GENERAL", "button_fr_on", theme.btnFROn);
theme.btnFROns.fromPNG(butfrons_png); theme.btnFROns.fromPNG(butfrons_png);
theme.btnFROns = _texture(theme.texSet, "GENERAL", "button_fr_on_selected", theme.btnFROns); theme.btnFROns = _texture(theme.texSet, "GENERAL", "button_fr_on_selected", theme.btnFROns);
theme.btnFROff.fromPNG(butfroff_png); theme.btnFROff.fromPNG(butfroff_png);
@ -960,7 +961,7 @@ void CMenu::_buildMenus(void)
theme.btnFROffs = _texture(theme.texSet, "GENERAL", "button_fr_off_selected", theme.btnFROffs); theme.btnFROffs = _texture(theme.texSet, "GENERAL", "button_fr_off_selected", theme.btnFROffs);
theme.btnDEOn.fromPNG(butdeon_png); theme.btnDEOn.fromPNG(butdeon_png);
theme.btnDEOn = _texture(theme.texSet, "GENERAL", "button_de_on", theme.btnDEOn); theme.btnDEOn = _texture(theme.texSet, "GENERAL", "button_de_on", theme.btnDEOn);
theme.btnDEOns.fromPNG(butdeons_png); theme.btnDEOns.fromPNG(butdeons_png);
theme.btnDEOns = _texture(theme.texSet, "GENERAL", "button_de_on_selected", theme.btnDEOns); theme.btnDEOns = _texture(theme.texSet, "GENERAL", "button_de_on_selected", theme.btnDEOns);
theme.btnDEOff.fromPNG(butdeoff_png); theme.btnDEOff.fromPNG(butdeoff_png);
@ -969,7 +970,7 @@ void CMenu::_buildMenus(void)
theme.btnDEOffs = _texture(theme.texSet, "GENERAL", "button_de_off_selected", theme.btnDEOffs); theme.btnDEOffs = _texture(theme.texSet, "GENERAL", "button_de_off_selected", theme.btnDEOffs);
theme.btnESOn.fromPNG(buteson_png); theme.btnESOn.fromPNG(buteson_png);
theme.btnESOn = _texture(theme.texSet, "GENERAL", "button_es_on", theme.btnESOn); theme.btnESOn = _texture(theme.texSet, "GENERAL", "button_es_on", theme.btnESOn);
theme.btnESOns.fromPNG(butesons_png); theme.btnESOns.fromPNG(butesons_png);
theme.btnESOns = _texture(theme.texSet, "GENERAL", "button_es_on_selected", theme.btnESOns); theme.btnESOns = _texture(theme.texSet, "GENERAL", "button_es_on_selected", theme.btnESOns);
theme.btnESOff.fromPNG(butesoff_png); theme.btnESOff.fromPNG(butesoff_png);
@ -978,7 +979,7 @@ void CMenu::_buildMenus(void)
theme.btnESOffs = _texture(theme.texSet, "GENERAL", "button_es_off_selected", theme.btnESOffs); theme.btnESOffs = _texture(theme.texSet, "GENERAL", "button_es_off_selected", theme.btnESOffs);
theme.btnITOn.fromPNG(butiton_png); theme.btnITOn.fromPNG(butiton_png);
theme.btnITOn = _texture(theme.texSet, "GENERAL", "button_it_on", theme.btnITOn); theme.btnITOn = _texture(theme.texSet, "GENERAL", "button_it_on", theme.btnITOn);
theme.btnITOns.fromPNG(butitons_png); theme.btnITOns.fromPNG(butitons_png);
theme.btnITOns = _texture(theme.texSet, "GENERAL", "button_it_on_selected", theme.btnITOns); theme.btnITOns = _texture(theme.texSet, "GENERAL", "button_it_on_selected", theme.btnITOns);
theme.btnITOff.fromPNG(butitoff_png); theme.btnITOff.fromPNG(butitoff_png);
@ -987,7 +988,7 @@ void CMenu::_buildMenus(void)
theme.btnITOffs = _texture(theme.texSet, "GENERAL", "button_it_off_selected", theme.btnITOffs); theme.btnITOffs = _texture(theme.texSet, "GENERAL", "button_it_off_selected", theme.btnITOffs);
theme.btnNLOn.fromPNG(butnlon_png); theme.btnNLOn.fromPNG(butnlon_png);
theme.btnNLOn = _texture(theme.texSet, "GENERAL", "button_nl_on", theme.btnNLOn); theme.btnNLOn = _texture(theme.texSet, "GENERAL", "button_nl_on", theme.btnNLOn);
theme.btnNLOns.fromPNG(butnlons_png); theme.btnNLOns.fromPNG(butnlons_png);
theme.btnNLOns = _texture(theme.texSet, "GENERAL", "button_nl_on_selected", theme.btnNLOns); theme.btnNLOns = _texture(theme.texSet, "GENERAL", "button_nl_on_selected", theme.btnNLOns);
theme.btnNLOff.fromPNG(butnloff_png); theme.btnNLOff.fromPNG(butnloff_png);
@ -996,7 +997,7 @@ void CMenu::_buildMenus(void)
theme.btnNLOffs = _texture(theme.texSet, "GENERAL", "button_nl_off_selected", theme.btnNLOffs); theme.btnNLOffs = _texture(theme.texSet, "GENERAL", "button_nl_off_selected", theme.btnNLOffs);
theme.btnPTOn.fromPNG(butpton_png); theme.btnPTOn.fromPNG(butpton_png);
theme.btnPTOn = _texture(theme.texSet, "GENERAL", "button_pt_on", theme.btnPTOn); theme.btnPTOn = _texture(theme.texSet, "GENERAL", "button_pt_on", theme.btnPTOn);
theme.btnPTOns.fromPNG(butptons_png); theme.btnPTOns.fromPNG(butptons_png);
theme.btnPTOns = _texture(theme.texSet, "GENERAL", "button_pt_on_selected", theme.btnPTOns); theme.btnPTOns = _texture(theme.texSet, "GENERAL", "button_pt_on_selected", theme.btnPTOns);
theme.btnPTOff.fromPNG(butptoff_png); theme.btnPTOff.fromPNG(butptoff_png);
@ -1005,7 +1006,7 @@ void CMenu::_buildMenus(void)
theme.btnPTOffs = _texture(theme.texSet, "GENERAL", "button_pt_off_selected", theme.btnPTOffs); theme.btnPTOffs = _texture(theme.texSet, "GENERAL", "button_pt_off_selected", theme.btnPTOffs);
theme.btnRUOn.fromPNG(butruon_png); theme.btnRUOn.fromPNG(butruon_png);
theme.btnRUOn = _texture(theme.texSet, "GENERAL", "button_ru_on", theme.btnRUOn); theme.btnRUOn = _texture(theme.texSet, "GENERAL", "button_ru_on", theme.btnRUOn);
theme.btnRUOns.fromPNG(butruons_png); theme.btnRUOns.fromPNG(butruons_png);
theme.btnRUOns = _texture(theme.texSet, "GENERAL", "button_ru_on_selected", theme.btnRUOns); theme.btnRUOns = _texture(theme.texSet, "GENERAL", "button_ru_on_selected", theme.btnRUOns);
theme.btnRUOff.fromPNG(butruoff_png); theme.btnRUOff.fromPNG(butruoff_png);
@ -1014,7 +1015,7 @@ void CMenu::_buildMenus(void)
theme.btnRUOffs = _texture(theme.texSet, "GENERAL", "button_ru_off_selected", theme.btnRUOffs); theme.btnRUOffs = _texture(theme.texSet, "GENERAL", "button_ru_off_selected", theme.btnRUOffs);
theme.btnKOOn.fromPNG(butkoon_png); theme.btnKOOn.fromPNG(butkoon_png);
theme.btnKOOn = _texture(theme.texSet, "GENERAL", "button_ko_on", theme.btnKOOn); theme.btnKOOn = _texture(theme.texSet, "GENERAL", "button_ko_on", theme.btnKOOn);
theme.btnKOOns.fromPNG(butkoons_png); theme.btnKOOns.fromPNG(butkoons_png);
theme.btnKOOns = _texture(theme.texSet, "GENERAL", "button_ko_on_selected", theme.btnKOOns); theme.btnKOOns = _texture(theme.texSet, "GENERAL", "button_ko_on_selected", theme.btnKOOns);
theme.btnKOOff.fromPNG(butkooff_png); theme.btnKOOff.fromPNG(butkooff_png);
@ -1023,7 +1024,7 @@ void CMenu::_buildMenus(void)
theme.btnKOOffs = _texture(theme.texSet, "GENERAL", "button_ko_off_selected", theme.btnKOOffs); theme.btnKOOffs = _texture(theme.texSet, "GENERAL", "button_ko_off_selected", theme.btnKOOffs);
theme.btnZHCNOn.fromPNG(butzhcnon_png); theme.btnZHCNOn.fromPNG(butzhcnon_png);
theme.btnZHCNOn = _texture(theme.texSet, "GENERAL", "button_zhcn_on", theme.btnZHCNOn); theme.btnZHCNOn = _texture(theme.texSet, "GENERAL", "button_zhcn_on", theme.btnZHCNOn);
theme.btnZHCNOns.fromPNG(butzhcnons_png); theme.btnZHCNOns.fromPNG(butzhcnons_png);
theme.btnZHCNOns = _texture(theme.texSet, "GENERAL", "button_zhcn_on_selected", theme.btnZHCNOns); theme.btnZHCNOns = _texture(theme.texSet, "GENERAL", "button_zhcn_on_selected", theme.btnZHCNOns);
theme.btnZHCNOff.fromPNG(butzhcnoff_png); theme.btnZHCNOff.fromPNG(butzhcnoff_png);
@ -1032,7 +1033,7 @@ void CMenu::_buildMenus(void)
theme.btnZHCNOffs = _texture(theme.texSet, "GENERAL", "button_zhcn_off_selected", theme.btnZHCNOffs); theme.btnZHCNOffs = _texture(theme.texSet, "GENERAL", "button_zhcn_off_selected", theme.btnZHCNOffs);
theme.checkboxoff.fromPNG(checkbox_png); theme.checkboxoff.fromPNG(checkbox_png);
theme.checkboxoff = _texture(theme.texSet, "GENERAL", "checkbox_off", theme.checkboxoff); theme.checkboxoff = _texture(theme.texSet, "GENERAL", "checkbox_off", theme.checkboxoff);
theme.checkboxoffs.fromPNG(checkbox_png); theme.checkboxoffs.fromPNG(checkbox_png);
theme.checkboxoffs = _texture(theme.texSet, "GENERAL", "checkbox_off_selected", theme.checkboxoffs); theme.checkboxoffs = _texture(theme.texSet, "GENERAL", "checkbox_off_selected", theme.checkboxoffs);
theme.checkboxon.fromPNG(checkboxs_png); theme.checkboxon.fromPNG(checkboxs_png);
@ -1040,7 +1041,7 @@ void CMenu::_buildMenus(void)
theme.checkboxons.fromPNG(checkboxs_png); theme.checkboxons.fromPNG(checkboxs_png);
theme.checkboxons = _texture(theme.texSet, "GENERAL", "checkbox_on_selected", theme.checkboxons); theme.checkboxons = _texture(theme.texSet, "GENERAL", "checkbox_on_selected", theme.checkboxons);
theme.checkboxHid.fromPNG(checkboxhid_png); theme.checkboxHid.fromPNG(checkboxhid_png);
theme.checkboxHid = _texture(theme.texSet, "GENERAL", "checkbox_Hid", theme.checkboxHid); theme.checkboxHid = _texture(theme.texSet, "GENERAL", "checkbox_Hid", theme.checkboxHid);
theme.checkboxHids.fromPNG(checkboxhid_png); theme.checkboxHids.fromPNG(checkboxhid_png);
theme.checkboxHids = _texture(theme.texSet, "GENERAL", "checkbox_Hid_selected", theme.checkboxHids); theme.checkboxHids = _texture(theme.texSet, "GENERAL", "checkbox_Hid_selected", theme.checkboxHids);
theme.checkboxReq.fromPNG(checkboxreq_png); theme.checkboxReq.fromPNG(checkboxreq_png);
@ -1068,6 +1069,7 @@ void CMenu::_buildMenus(void)
theme.btnTexMinus = _texture(theme.texSet, "GENERAL", "minus_button_texture", theme.btnTexMinus); theme.btnTexMinus = _texture(theme.texSet, "GENERAL", "minus_button_texture", theme.btnTexMinus);
theme.btnTexMinusS.fromPNG(btnminuss_png); theme.btnTexMinusS.fromPNG(btnminuss_png);
theme.btnTexMinusS = _texture(theme.texSet, "GENERAL", "minus_button_texture_selected", theme.btnTexMinusS); theme.btnTexMinusS = _texture(theme.texSet, "GENERAL", "minus_button_texture_selected", theme.btnTexMinusS);
// Default background // Default background
theme.bg.fromJPG(background_jpg, background_jpg_size); theme.bg.fromJPG(background_jpg, background_jpg_size);
m_mainBgLQ.fromJPG(background_jpg, background_jpg_size, GX_TF_CMPR, ALLOC_MEM2, 64, 64); m_mainBgLQ.fromJPG(background_jpg, background_jpg_size, GX_TF_CMPR, ALLOC_MEM2, 64, 64);

46
source/menu/menu_categories.cpp
View File

@ -33,14 +33,14 @@ void CMenu::_hideCategorySettings(bool instant)
m_btnMgr.hide(m_categoryBtnPageP, instant); m_btnMgr.hide(m_categoryBtnPageP, instant);
m_btnMgr.hide(m_categoryBtnClear, instant); m_btnMgr.hide(m_categoryBtnClear, instant);
m_btnMgr.hide(m_categoryBtnBack, instant); m_btnMgr.hide(m_categoryBtnBack, instant);
for(u8 i = 0; i < ARRAY_SIZE(m_categoryLblUser); ++i) for(u8 i = 0; i < ARRAY_SIZE(m_categoryLblUser); ++i)
{ {
if(m_categoryLblUser[i] != (u16)-1u) if(m_categoryLblUser[i] != (u16)-1u)
m_btnMgr.hide(m_categoryLblUser[i], instant); m_btnMgr.hide(m_categoryLblUser[i], instant);
} }
for(int i = 1; i < 11; ++i) for(u8 i = 1; i < 11; ++i)
{ {
m_btnMgr.hide(m_categoryLblCat[i]); m_btnMgr.hide(m_categoryLblCat[i]);
m_btnMgr.hide(m_categoryBtnCat[i]); m_btnMgr.hide(m_categoryBtnCat[i]);
@ -53,17 +53,14 @@ void CMenu::_hideCategorySettings(bool instant)
void CMenu::_showCategorySettings(void) void CMenu::_showCategorySettings(void)
{ {
_setBg(m_categoryBg, m_categoryBg); _setBg(m_categoryBg, m_categoryBg);
for(u8 i = 0; i < ARRAY_SIZE(m_categoryLblUser); ++i) for(u8 i = 0; i < ARRAY_SIZE(m_categoryLblUser); ++i)
{ {
if(m_categoryLblUser[i] != (u16)-1) if(m_categoryLblUser[i] != (u16)-1)
m_btnMgr.show(m_categoryLblUser[i]); m_btnMgr.show(m_categoryLblUser[i]);
} }
m_btnMgr.show(m_categoryLblTitle); m_btnMgr.show(m_categoryLblTitle);
m_btnMgr.show(m_categoryBtnClear); m_btnMgr.show(m_categoryBtnClear);
m_btnMgr.show(m_categoryBtnBack); m_btnMgr.show(m_categoryBtnBack);
_updateCheckboxes(); _updateCheckboxes();
} }
@ -77,7 +74,7 @@ void CMenu::_updateCheckboxes(void)
m_btnMgr.hide(m_categoryBtnCatReq[i], true); m_btnMgr.hide(m_categoryBtnCatReq[i], true);
m_btnMgr.hide(m_categoryLblCat[i], true); m_btnMgr.hide(m_categoryLblCat[i], true);
} }
if(m_max_categories > 11) if(m_max_categories > 11)
{ {
m_btnMgr.setText(m_categoryLblPage, wfmt(L"%i / %i", curPage, ((m_max_categories - 2) / 10) + 1)); m_btnMgr.setText(m_categoryLblPage, wfmt(L"%i / %i", curPage, ((m_max_categories - 2) / 10) + 1));
@ -85,8 +82,7 @@ void CMenu::_updateCheckboxes(void)
m_btnMgr.show(m_categoryBtnPageM); m_btnMgr.show(m_categoryBtnPageM);
m_btnMgr.show(m_categoryBtnPageP); m_btnMgr.show(m_categoryBtnPageP);
} }
for(u8 i = 1; i < 11; ++i)
for(int i = 1; i < 11; ++i)
{ {
int j = i + ((curPage - 1) * 10); int j = i + ((curPage - 1) * 10);
if(j == m_max_categories) if(j == m_max_categories)
@ -123,7 +119,6 @@ void CMenu::_CategorySettings(bool fromGameSet)
SetupInput(); SetupInput();
curPage = 1; curPage = 1;
gameSet = fromGameSet; gameSet = fromGameSet;
if(fromGameSet) if(fromGameSet)
{ {
if(m_current_view != COVERFLOW_EMU) if(m_current_view != COVERFLOW_EMU)
@ -147,17 +142,13 @@ void CMenu::_CategorySettings(bool fromGameSet)
catSettings = m_cat.getString(fmt("%s/GENERAL", _domainFromView()), "categories").c_str(); catSettings = m_cat.getString(fmt("%s/GENERAL", _domainFromView()), "categories").c_str();
m_btnMgr.setText(m_categoryLblTitle, _t("cat1", L"Select Categories")); m_btnMgr.setText(m_categoryLblTitle, _t("cat1", L"Select Categories"));
} }
memset(&m_categories, '0', m_max_categories); memset(&m_categories, '0', m_max_categories);
memcpy(&m_categories, catSettings, m_max_categories); memcpy(&m_categories, catSettings, m_max_categories);
_showCategorySettings(); _showCategorySettings();
while(true) while(true)
{ {
_mainLoopCommon(); _mainLoopCommon();
m_cf.tick(); m_cf.tick();
if(!m_btnMgr.selected(lastBtn)) if(!m_btnMgr.selected(lastBtn))
m_btnMgr.noHover(false); m_btnMgr.noHover(false);
@ -186,20 +177,16 @@ void CMenu::_CategorySettings(bool fromGameSet)
//m_cat.save(); //m_cat.save();
break; 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_PLUS_PRESSED && fromGameSet) if(BTN_PLUS_PRESSED && fromGameSet)
{ {
char newCatSettings[m_max_categories + 1]; char newCatSettings[m_max_categories + 1];
memset(&newCatSettings, 0, sizeof(newCatSettings)); memset(&newCatSettings, 0, sizeof(newCatSettings));
memcpy(&newCatSettings, &m_categories, sizeof(m_categories)); memcpy(&newCatSettings, &m_categories, sizeof(m_categories));
m_cat.setString(_domainFromView(), id, newCatSettings); m_cat.setString(_domainFromView(), id, newCatSettings);
_hideCategorySettings(); _hideCategorySettings();
m_cf.right(); m_cf.right();
curPage = 1; curPage = 1;
@ -221,17 +208,14 @@ void CMenu::_CategorySettings(bool fromGameSet)
memset(&m_categories, '0', m_max_categories); memset(&m_categories, '0', m_max_categories);
memcpy(&m_categories, catSettings, m_max_categories); memcpy(&m_categories, catSettings, m_max_categories);
_showCategorySettings(); _showCategorySettings();
} }
if(BTN_MINUS_PRESSED && fromGameSet) if(BTN_MINUS_PRESSED && fromGameSet)
{ {
char newCatSettings[m_max_categories + 1]; char newCatSettings[m_max_categories + 1];
memset(&newCatSettings, 0, sizeof(newCatSettings)); memset(&newCatSettings, 0, sizeof(newCatSettings));
memcpy(&newCatSettings, &m_categories, sizeof(m_categories)); memcpy(&newCatSettings, &m_categories, sizeof(m_categories));
m_cat.setString(_domainFromView(), id, newCatSettings); m_cat.setString(_domainFromView(), id, newCatSettings);
_hideCategorySettings(); _hideCategorySettings();
m_cf.left(); m_cf.left();
curPage = 1; curPage = 1;
@ -253,36 +237,28 @@ void CMenu::_CategorySettings(bool fromGameSet)
memset(&m_categories, '0', m_max_categories); memset(&m_categories, '0', m_max_categories);
memcpy(&m_categories, catSettings, m_max_categories); memcpy(&m_categories, catSettings, m_max_categories);
_showCategorySettings(); _showCategorySettings();
} }
if((BTN_LEFT_PRESSED && m_max_categories>11) || (BTN_A_PRESSED && m_btnMgr.selected(m_categoryBtnPageM))) if((BTN_LEFT_PRESSED && m_max_categories>11) || (BTN_A_PRESSED && m_btnMgr.selected(m_categoryBtnPageM)))
{ {
lastBtn = m_categoryBtnPageM; lastBtn = m_categoryBtnPageM;
m_btnMgr.noHover(true); m_btnMgr.noHover(true);
curPage--; curPage--;
if(curPage < 1) if(curPage < 1)
curPage = ((m_max_categories - 2) / 10) + 1; curPage = ((m_max_categories - 2) / 10) + 1;
if(BTN_LEFT_PRESSED || BTN_MINUS_PRESSED) if(BTN_LEFT_PRESSED || BTN_MINUS_PRESSED)
m_btnMgr.click(m_categoryBtnPageM); m_btnMgr.click(m_categoryBtnPageM);
_updateCheckboxes(); _updateCheckboxes();
} }
else if((BTN_RIGHT_PRESSED && m_max_categories>11) || (BTN_A_PRESSED && m_btnMgr.selected(m_categoryBtnPageP))) else if((BTN_RIGHT_PRESSED && m_max_categories>11) || (BTN_A_PRESSED && m_btnMgr.selected(m_categoryBtnPageP)))
{ {
lastBtn = m_categoryBtnPageP; lastBtn = m_categoryBtnPageP;
m_btnMgr.noHover(true); m_btnMgr.noHover(true);
curPage++; curPage++;
if(curPage > ((m_max_categories - 2) / 10) + 1) if(curPage > ((m_max_categories - 2) / 10) + 1)
curPage = 1; curPage = 1;
if(BTN_RIGHT_PRESSED || BTN_PLUS_PRESSED) if(BTN_RIGHT_PRESSED || BTN_PLUS_PRESSED)
m_btnMgr.click(m_categoryBtnPageP); m_btnMgr.click(m_categoryBtnPageP);
_updateCheckboxes(); _updateCheckboxes();
} }
if(BTN_A_PRESSED) if(BTN_A_PRESSED)
@ -294,8 +270,7 @@ void CMenu::_CategorySettings(bool fromGameSet)
m_categories[j] = '0'; m_categories[j] = '0';
_updateCheckboxes(); _updateCheckboxes();
} }
for(u8 i = 1; i < 11; ++i)
for(int i = 1; i < 11; ++i)
{ {
if(m_btnMgr.selected(m_categoryBtnCat[i]) || m_btnMgr.selected(m_categoryBtnCats[i]) || m_btnMgr.selected(m_categoryBtnCatHid[i]) || m_btnMgr.selected(m_categoryBtnCatReq[i])) if(m_btnMgr.selected(m_categoryBtnCat[i]) || m_btnMgr.selected(m_categoryBtnCats[i]) || m_btnMgr.selected(m_categoryBtnCatHid[i]) || m_btnMgr.selected(m_categoryBtnCatReq[i]))
{ {
@ -307,7 +282,6 @@ void CMenu::_CategorySettings(bool fromGameSet)
else if(m_btnMgr.selected(m_categoryBtnCatReq[i])) else if(m_btnMgr.selected(m_categoryBtnCatReq[i]))
lastBtn = m_categoryBtnCatReq[i]; lastBtn = m_categoryBtnCatReq[i];
m_btnMgr.noHover(true); m_btnMgr.noHover(true);
int j = i + ((curPage - 1) * 10); int j = i + ((curPage - 1) * 10);
if(fromGameSet) if(fromGameSet)
{ {
@ -319,12 +293,10 @@ void CMenu::_CategorySettings(bool fromGameSet)
if(m_categories[0] == '1' && m_categories[j] != '0') if(m_categories[0] == '1' && m_categories[j] != '0')
m_categories[0] = '0'; m_categories[0] = '0';
} }
m_btnMgr.hide(m_categoryBtnCat[i], true); m_btnMgr.hide(m_categoryBtnCat[i], true);
m_btnMgr.hide(m_categoryBtnCats[i], true); m_btnMgr.hide(m_categoryBtnCats[i], true);
m_btnMgr.hide(m_categoryBtnCatHid[i], true); m_btnMgr.hide(m_categoryBtnCatHid[i], true);
m_btnMgr.hide(m_categoryBtnCatReq[i], true); m_btnMgr.hide(m_categoryBtnCatReq[i], true);
if(m_categories[0] =='1' && !fromGameSet) if(m_categories[0] =='1' && !fromGameSet)
m_btnMgr.show(m_categoryBtnCat[i]); m_btnMgr.show(m_categoryBtnCat[i]);
else else
@ -362,9 +334,8 @@ void CMenu::_initCategorySettingsMenu(CMenu::SThemeData &theme)
m_categoryLblPage = _addLabel(theme, "CATEGORY/PAGE_BTN", theme.btnFont, L"", 76, 400, 100, 56, theme.btnFontColor, FTGX_JUSTIFY_CENTER | FTGX_ALIGN_MIDDLE, theme.btnTexC); m_categoryLblPage = _addLabel(theme, "CATEGORY/PAGE_BTN", theme.btnFont, L"", 76, 400, 100, 56, theme.btnFontColor, FTGX_JUSTIFY_CENTER | FTGX_ALIGN_MIDDLE, theme.btnTexC);
m_categoryBtnPageP = _addPicButton(theme, "CATEGORY/PAGE_PLUS", theme.btnTexPlus, theme.btnTexPlusS, 176, 400, 56, 56); m_categoryBtnPageP = _addPicButton(theme, "CATEGORY/PAGE_PLUS", theme.btnTexPlus, theme.btnTexPlusS, 176, 400, 56, 56);
m_categoryBtnBack = _addButton(theme, "CATEGORY/BACK_BTN", theme.btnFont, L"", 420, 400, 200, 56, theme.btnFontColor); m_categoryBtnBack = _addButton(theme, "CATEGORY/BACK_BTN", theme.btnFont, L"", 420, 400, 200, 56, theme.btnFontColor);
m_categoryBtnClear = _addButton(theme, "CATEGORY/CLEAR_BTN", theme.btnFont, L"", 255, 400, 150, 56, theme.btnFontColor); m_categoryBtnClear = _addButton(theme, "CATEGORY/CLEAR_BTN", theme.btnFont, L"", 255, 400, 150, 56, theme.btnFontColor);
for(u8 i = 1; i < 6; ++i)
for(int i = 1; i < 6; ++i)
{ // left half { // left half
m_categoryBtnCat[i] = _addPicButton(theme, fmt("CATEGORY/CAT_%i_BTN", i), theme.checkboxoff, theme.checkboxoffs, 30, (42+i*58), 44, 48); m_categoryBtnCat[i] = _addPicButton(theme, fmt("CATEGORY/CAT_%i_BTN", i), theme.checkboxoff, theme.checkboxoffs, 30, (42+i*58), 44, 48);
m_categoryBtnCats[i] = _addPicButton(theme, fmt("CATEGORY/CAT_%i_BTNS", i), theme.checkboxon, theme.checkboxons, 30, (42+i*58), 44, 48); m_categoryBtnCats[i] = _addPicButton(theme, fmt("CATEGORY/CAT_%i_BTNS", i), theme.checkboxon, theme.checkboxons, 30, (42+i*58), 44, 48);
@ -384,8 +355,7 @@ void CMenu::_initCategorySettingsMenu(CMenu::SThemeData &theme)
_setHideAnim(m_categoryBtnPageP, "CATEGORY/PAGE_PLUS", 0, 0, 1.f, -1.f); _setHideAnim(m_categoryBtnPageP, "CATEGORY/PAGE_PLUS", 0, 0, 1.f, -1.f);
_setHideAnim(m_categoryBtnClear, "CATEGORY/CLEAR_BTN", 0, 0, 1.f, -1.f); _setHideAnim(m_categoryBtnClear, "CATEGORY/CLEAR_BTN", 0, 0, 1.f, -1.f);
_setHideAnim(m_categoryBtnBack, "CATEGORY/BACK_BTN", 0, 0, 1.f, -1.f); _setHideAnim(m_categoryBtnBack, "CATEGORY/BACK_BTN", 0, 0, 1.f, -1.f);
for(u8 i = 1; i < 11; ++i)
for(int i = 1; i < 11; ++i)
{ {
_setHideAnim(m_categoryBtnCat[i], fmt("CATEGORY/CAT_%i_BTN", i), 0, 0, 1.f, 0.f); _setHideAnim(m_categoryBtnCat[i], fmt("CATEGORY/CAT_%i_BTN", i), 0, 0, 1.f, 0.f);
_setHideAnim(m_categoryBtnCats[i], fmt("CATEGORY/CAT_%i_BTNS", i), 0, 0, 1.f, 0.f); _setHideAnim(m_categoryBtnCats[i], fmt("CATEGORY/CAT_%i_BTNS", i), 0, 0, 1.f, 0.f);

100
wii/apps/wiiflow/meta.xml
View File

@ -1,50 +1,52 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<app version="2.2"> <app version="4.0.1">
<name> WiiFlow</name> <name> WiiFlow</name>
<coder>r-win, Miigotu</coder> <coder>OverjoY, FIX94</coder>
<version>r416</version> <version>r431</version>
<release_date>TBD</release_date> <release_date>TBD</release_date>
<short_description>USB Loader / Nand Emulator</short_description> <short_description>USB Loader / Nand Emulator</short_description>
<long_description>WiiFlow is a Wii Game, Channel, Wiiware, Virtual Console, and Savegame Emulator intended for use with legal backups. <long_description>
Controls : WiiFlow is a Wii Game, Channel, Wiiware, Virtual Console, and Savegame Emulator intended for use with legal backups.
- Main menu (coverflow) : Controls:
-- Up / Down Previous / next game (vertical) - Main menu (coverflow):
-- Left / Right Previous / next game (horizontal) -- Up / Down Previous / next game (vertical)
-- A Select game -- Left / Right Previous / next game (horizontal)
-- B+A Launch game immediately -- A Select game
-- B+Home Reload Wiiflow -- B+A Launch game immediately
-- Home Exit -- B+Home Reload Wiiflow
-- 1 / 2 Previous / next coverflow mode -- Home Exit
-- B+Left / B+Right Change Song -- 1 / 2 Previous / next coverflow mode
-- B+UP / B+DOWN Alphabetic search -- B+Left / B+Right Change Song
-- B+Minus Switch Partition -- B+UP / B+DOWN Alphabetic search
-- B+Plus Sort Games -- B+Minus Switch Partition
-- Minus+Home Exit to Homebrew Channel -- B+Plus Sort Games
-- Plus+Home Exit to System Menu -- Minus+Home Exit to Homebrew Channel
-- 1+Home Exit to Priiloader -- Plus+Home Exit to System Menu
-- 2+Home Exit to BootMii -- 1+Home Exit to Priiloader
-- 2+Home Exit to BootMii
-- Minus+A on Exit Icon Exit to Homebrew Channel
-- Plus+A on Exit Icon Exit to System Menu -- Minus+A on Exit Icon Exit to Homebrew Channel
-- 1+A on Exit Icon Exit to Priiloader -- Plus+A on Exit Icon Exit to System Menu
-- 2+A on Exit Icon Exit to BootMii -- 1+A on Exit Icon Exit to Priiloader
-- B on View Icon Enable/Disable Nand emulator -- 2+A on Exit Icon Exit to BootMii
-- B on View Icon Enable/Disable Nand emulator
- Game :
-- A on box Show the backside - Game :
-- A out of screen Launch game -- A on box Show the backside
-- B Back to coverflow -- A out of screen Launch game
-- Minus / Plus Previous / next game (vertical) -- B Back to coverflow
-- Left / Right Previous / next game (horizontal) -- Minus / Plus Previous / next game (vertical)
-- Left / Right Previous / next game (horizontal)
- Settings menus :
-- Minus / Plus Previous / next page - Settings menus :
-- Left / Right Previous / next page -- Minus / Plus Previous / next page
-- Left / Right Previous / next page
- Coverflow settings :
-- B+Minus / B+Plus Previous / next page - Coverflow settings :
-- B Faster adjustement (B+A instead of just A to click a button) -- B+Minus / B+Plus Previous / next page
-- B+1 Copy whole coverflow -- B Faster adjustement (B+A instead of just A to click a button)
-- B+2 Paste coverflow -- B+1 Copy whole coverflow
</long_description> -- B+2 Paste coverflow
</long_description>
<no_ios_reload/>
</app> </app>