- 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))
{ {
@ -569,12 +570,25 @@ int CMenu::main(void)
m_cf.pageUp(); m_cf.pageUp();
else if (m_btnMgr.selected(m_mainBtnNext)) else if (m_btnMgr.selected(m_mainBtnNext))
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,55 +1,59 @@

Controls: Controls:
- Main menu (coverflow) : - Main menu (coverflow) :
-- Up / Down = Previous / next game (vertical) -- Up / Down = Previous / next game (vertical)
-- Left / Right = Previous / next game (horizontal) -- Left / Right = Previous / next game (horizontal)
-- Minus / Plus = Fast skip through games -- Minus / Plus = Fast skip through games
-- A = Select game -- A = Select game
-- B+A = Launch game immediately -- B+A = Launch game immediately
-- B+Home = Reload Wiiflow -- B+Home = Reload Wiiflow
-- Home = Exit to Wii menu -- Home = Exit to Wii menu
-- 1 / 2 = Previous / next coverflow mode -- 1 / 2 = Previous / next coverflow mode
-- B+Left / B+Right = Change Song -- B+Left / B+Right = Change Song
-- B+UP / B+DOWN = Alphabetic search -- B+UP / B+DOWN = Alphabetic search
-- B+Onscreen Arrows = Alphabetic search -- B+Onscreen Arrows = Alphabetic search
-- B+Minus = Switch Partition -- B+Minus = Switch Partition
-- B+Plus = Sort Games -- B+Plus = Sort Games
-- 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
-- A on Disc Icon (Game Disc in Drive) = Launch game disc -- B on Gear Icon = Refresh cache
-- A on USB Icon = Switch to Game menu (icon changes to channels) -- A on USB, DML, Channels, Emu, or Homebrew Icon = Switch to that view
-- A on Channels Icon = Switch to Channels menu (icon changes to USB) -- B on USB, DML, Channels, Emu, or Homebrew Icon = Enable/Disable Emu-NAND and switch to Channels view
-- A on Home Icon = Display source menu -- A on Home Icon = Exit to Wii menu
-- B on Home Icon = Display Source menu
- Game : -- A on Disc Icon (Game Disc in Drive) = Launch game disc
-- A on box = Show the backside -- A on Question Mark Icon = Display credits and this help file, and update WiiFlow
-- A out of screen = Launch game
-- B = Back to coverflow - Game :
-- Up / Down = Previous / next game (vertical) -- A on box = Show the backside
-- Left / Right = Previous / next game (horizontal) -- A out of screen = Launch game
-- Plus = Game Info -- B = Back to coverflow
---Right (in Game Info) = Game Description -- Up / Down = Previous / next game (vertical)
---Left (in Game Desc) = Game Info -- Left / Right = Previous / next game (horizontal)
-- A on Star Icon = Toggle Favorite (Yellow = Favorite) -- Plus = Game Info
-- A on Hand Icon = Parental Lock (Red = locked) ---Right (in Game Info) = Game Description
-- A on Gear Icon = Game Settings ---Left (in Game Desc) = Game Info
-- A on X Icon = Delete Game -- A on Star Icon = Toggle Favorite (Yellow = Favorite)
-- B on Star Icon = Set Categories for game
- Settings menus : -- A on Hand Icon = Parental Lock (Red = locked)
-- Minus / Plus = Previous / next page -- A on Gear Icon = Game Settings
-- Left / Right = Previous / next page -- A on X Icon = Delete Game
- Coverflow Adjust settings : - Settings menus :
-- B+Minus / B+Plus = Previous / next page -- Minus / Plus = Previous / next page
-- B = Faster adjustment (B+A instead of just A to click a button) -- Left / Right = Previous / next page
-- B+1 = Copy whole coverflow
-- B+2 = Paste coverflow\n\ - Coverflow Adjust settings :
-- B+Minus / B+Plus = Previous / next page
TIPS for running games that crash: -- B = Faster adjustment (B+A instead of just A to click a button)
If the game just locks up with a black screen at launch then check to see if it is a PAL game. -- B+1 = Copy whole coverflow
(Press the Plus button on the game screen.) If it is PAL, then set the game's video mode to "PAL 50Hz" in the game's setting screen. -- B+2 = Paste coverflow\n\
You will need to use a component connection to the TV and have your WII set to 480p video mode.
TIPS for running games that crash:
If a game crashes, then try running the game again. If it continually crashes, then turn the USB Emulation to \"Off\" in the game's setting screen. If the game just locks up with a black screen at launch then check to see if it is a PAL game.
(Press the Plus button on the game screen.) If it is PAL, then set the game's video mode to "PAL 50Hz" in the game's setting screen.
You will need to use a component connection to the TV and have your WII set to 480p video mode.
If a game crashes, then try running the game again. If it continually crashes, then turn the USB Emulation to \"Off\" in the game's setting screen.