- Launch Source menu by pressing 'B' on home/exit icon.

'A' on home/exit icon restored to exit wiiflow
updated help file to show changes
changed Source menu button images size to 120 x 90. no need to redo current images they look fine stretched a little.
This commit is contained in:
fledge68 2012-06-11 12:28:37 +00:00
parent 067c730017
commit 21938074f3
3 changed files with 86 additions and 68 deletions

View File

@ -317,13 +317,7 @@ int CMenu::main(void)
} }
break; break;
} }
if (BTN_PLUS_PRESSED && (m_btnMgr.selected(m_mainBtnChannel) || m_btnMgr.selected(m_mainBtnUsb) || m_btnMgr.selected(m_mainBtnDML) || m_btnMgr.selected(m_mainBtnHomebrew) || m_btnMgr.selected(m_mainBtnEmu)))
{
_hideMain(true);
_Source();
LoadView();
continue;
}
if ((BTN_UP_PRESSED || BTN_DOWN_PRESSED || BTN_LEFT_PRESSED || BTN_RIGHT_PRESSED) && dpad_mode && (m_btnMgr.selected(m_mainBtnChannel) || m_btnMgr.selected(m_mainBtnUsb) || m_btnMgr.selected(m_mainBtnDML) || m_btnMgr.selected(m_mainBtnHomebrew) || m_btnMgr.selected(m_mainBtnEmu))) if ((BTN_UP_PRESSED || BTN_DOWN_PRESSED || BTN_LEFT_PRESSED || BTN_RIGHT_PRESSED) && dpad_mode && (m_btnMgr.selected(m_mainBtnChannel) || m_btnMgr.selected(m_mainBtnUsb) || m_btnMgr.selected(m_mainBtnDML) || m_btnMgr.selected(m_mainBtnHomebrew) || m_btnMgr.selected(m_mainBtnEmu)))
{ {
u32 lastView = m_current_view; u32 lastView = m_current_view;
@ -498,6 +492,13 @@ int CMenu::main(void)
} }
if (BTN_B_PRESSED) if (BTN_B_PRESSED)
{ {
if (m_btnMgr.selected(m_mainBtnQuit))
{
_hideMain(true);
_Source();
LoadView();
continue;
}
//Events to Show Categories //Events to Show Categories
if (m_btnMgr.selected(m_mainBtnFavoritesOn) || m_btnMgr.selected(m_mainBtnFavoritesOff)) if (m_btnMgr.selected(m_mainBtnFavoritesOn) || m_btnMgr.selected(m_mainBtnFavoritesOff))
{ {
@ -571,10 +572,23 @@ int CMenu::main(void)
m_cf.pageDown(); m_cf.pageDown();
else if (m_btnMgr.selected(m_mainBtnQuit)) else if (m_btnMgr.selected(m_mainBtnQuit))
{ {
_hideMain(true); if(!m_locked && !m_disable_exit)
_Source(); {
LoadView(); struct stat dummy;
continue; if(BTN_PLUS_HELD) Sys_ExitTo(EXIT_TO_HBC);
else if(BTN_MINUS_HELD) Sys_ExitTo(EXIT_TO_MENU);
else if(BTN_1_HELD) Sys_ExitTo(EXIT_TO_PRIILOADER);
else if(BTN_2_HELD) //Check that the files are there, or ios will hang.
{
if(DeviceHandler::Instance()->IsInserted(SD) &&
stat(fmt("%s:/bootmii/armboot.bin", DeviceName[SD]), &dummy) == 0 &&
stat(fmt("%s:/bootmii/ppcboot.elf", DeviceName[SD]), &dummy) == 0)
Sys_ExitTo(EXIT_TO_BOOTMII);
else Sys_ExitTo(EXIT_TO_HBC);
}
}
m_reload = (BTN_B_HELD || m_disable_exit);
break;
} }
else if(m_btnMgr.selected(m_mainBtnChannel) || m_btnMgr.selected(m_mainBtnUsb) || m_btnMgr.selected(m_mainBtnDML) || m_btnMgr.selected(m_mainBtnHomebrew) || m_btnMgr.selected(m_mainBtnEmu)) else if(m_btnMgr.selected(m_mainBtnChannel) || m_btnMgr.selected(m_mainBtnUsb) || m_btnMgr.selected(m_mainBtnDML) || m_btnMgr.selected(m_mainBtnHomebrew) || m_btnMgr.selected(m_mainBtnEmu))
{ {

View File

@ -310,7 +310,7 @@ void CMenu::_initSourceMenu(CMenu::SThemeData &theme)
page = i / 12; page = i / 12;
row = (i / 4 ) - (page * 3); row = (i / 4 ) - (page * 3);
col = (i - (page * 12)) - (row * 4); col = (i - (page * 12)) - (row * 4);
m_sourceBtnSource[i] = _addPicButton(theme, fmt("SOURCE/SOURCE_BTN_%i", i), texConsoleImg, texConsoleImgs, (30 + 150 * col), (90 + 100 * row), 90, 90); m_sourceBtnSource[i] = _addPicButton(theme, fmt("SOURCE/SOURCE_BTN_%i", i), texConsoleImg, texConsoleImgs, (30 + 150 * col), (90 + 100 * row), 120, 90);
} }
_setHideAnim(m_sourceLblTitle, "SOURCE/TITLE", 0, -200, 0.f, 1.f); _setHideAnim(m_sourceLblTitle, "SOURCE/TITLE", 0, -200, 0.f, 1.f);

View File

@ -1,4 +1,4 @@

Controls: Controls:
- Main menu (coverflow) : - Main menu (coverflow) :
-- Up / Down = Previous / next game (vertical) -- Up / Down = Previous / next game (vertical)
@ -18,10 +18,13 @@ Controls:
-- A on Star Icon = Favorites -- A on Star Icon = Favorites
-- B on Star Icon = Categories -- B on Star Icon = Categories
-- A on Gear Icon = Wiiflow settings -- A on Gear Icon = Wiiflow settings
-- B on Gear Icon = Refresh cache
-- A on USB, DML, Channels, Emu, or Homebrew Icon = Switch to that view
-- B on USB, DML, Channels, Emu, or Homebrew Icon = Enable/Disable Emu-NAND and switch to Channels view
-- A on Home Icon = Exit to Wii menu
-- B on Home Icon = Display Source menu
-- A on Disc Icon (Game Disc in Drive) = Launch game disc -- A on Disc Icon (Game Disc in Drive) = Launch game disc
-- A on USB Icon = Switch to Game menu (icon changes to channels) -- A on Question Mark Icon = Display credits and this help file, and update WiiFlow
-- A on Channels Icon = Switch to Channels menu (icon changes to USB)
-- A on Home Icon = Display source menu
- Game : - Game :
-- A on box = Show the backside -- A on box = Show the backside
@ -33,6 +36,7 @@ Controls:
---Right (in Game Info) = Game Description ---Right (in Game Info) = Game Description
---Left (in Game Desc) = Game Info ---Left (in Game Desc) = Game Info
-- A on Star Icon = Toggle Favorite (Yellow = Favorite) -- A on Star Icon = Toggle Favorite (Yellow = Favorite)
-- B on Star Icon = Set Categories for game
-- A on Hand Icon = Parental Lock (Red = locked) -- A on Hand Icon = Parental Lock (Red = locked)
-- A on Gear Icon = Game Settings -- A on Gear Icon = Game Settings
-- A on X Icon = Delete Game -- A on X Icon = Delete Game