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"

2
source/menu/menu.cpp
View File

@ -896,6 +896,7 @@ void CMenu::_buildMenus(void)
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);
@ -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);

40
source/menu/menu_categories.cpp
View File

@ -40,7 +40,7 @@ void CMenu::_hideCategorySettings(bool instant)
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();
} }
@ -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
@ -363,8 +335,7 @@ void CMenu::_initCategorySettingsMenu(CMenu::SThemeData &theme)
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);

86
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 -- Minus+A on Exit Icon Exit to Homebrew Channel
-- Plus+A on Exit Icon Exit to System Menu -- Plus+A on Exit Icon Exit to System Menu
-- 1+A on Exit Icon Exit to Priiloader -- 1+A on Exit Icon Exit to Priiloader
-- 2+A on Exit Icon Exit to BootMii -- 2+A on Exit Icon Exit to BootMii
-- B on View Icon Enable/Disable Nand emulator -- B on View Icon Enable/Disable Nand emulator
- Game : - Game :
-- A on box Show the backside -- A on box Show the backside
-- A out of screen Launch game -- A out of screen Launch game
-- B Back to coverflow -- B Back to coverflow
-- Minus / Plus Previous / next game (vertical) -- Minus / Plus Previous / next game (vertical)
-- Left / Right Previous / next game (horizontal) -- Left / Right Previous / next game (horizontal)
- Settings menus : - Settings menus :
-- Minus / Plus Previous / next page -- Minus / Plus Previous / next page
-- Left / Right Previous / next page -- Left / Right Previous / next page
- Coverflow settings : - Coverflow settings :
-- B+Minus / B+Plus Previous / next page -- B+Minus / B+Plus Previous / next page
-- B Faster adjustement (B+A instead of just A to click a button) -- B Faster adjustement (B+A instead of just A to click a button)
-- B+1 Copy whole coverflow -- B+1 Copy whole coverflow
-- B+2 Paste coverflow -- B+2 Paste coverflow
</long_description> </long_description>
<no_ios_reload/>
</app> </app>