From 21938074f394833af3be8d817f68636fd692362b Mon Sep 17 00:00:00 2001 From: fledge68 Date: Mon, 11 Jun 2012 12:28:37 +0000 Subject: [PATCH] - 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. --- source/menu/menu_main.cpp | 38 ++++++++---- source/menu/menu_startup.cpp | 2 +- wii/wiiflow/help/english.txt | 114 ++++++++++++++++++----------------- 3 files changed, 86 insertions(+), 68 deletions(-) diff --git a/source/menu/menu_main.cpp b/source/menu/menu_main.cpp index 1cd0793b..d7d1ff87 100644 --- a/source/menu/menu_main.cpp +++ b/source/menu/menu_main.cpp @@ -317,13 +317,7 @@ int CMenu::main(void) } 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))) { u32 lastView = m_current_view; @@ -498,6 +492,13 @@ int CMenu::main(void) } if (BTN_B_PRESSED) { + if (m_btnMgr.selected(m_mainBtnQuit)) + { + _hideMain(true); + _Source(); + LoadView(); + continue; + } //Events to Show Categories if (m_btnMgr.selected(m_mainBtnFavoritesOn) || m_btnMgr.selected(m_mainBtnFavoritesOff)) { @@ -569,12 +570,25 @@ int CMenu::main(void) m_cf.pageUp(); else if (m_btnMgr.selected(m_mainBtnNext)) m_cf.pageDown(); - else if(m_btnMgr.selected(m_mainBtnQuit)) + else if (m_btnMgr.selected(m_mainBtnQuit)) { - _hideMain(true); - _Source(); - LoadView(); - continue; + if(!m_locked && !m_disable_exit) + { + struct stat dummy; + 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)) { diff --git a/source/menu/menu_startup.cpp b/source/menu/menu_startup.cpp index a99bb944..ce83f501 100644 --- a/source/menu/menu_startup.cpp +++ b/source/menu/menu_startup.cpp @@ -310,7 +310,7 @@ void CMenu::_initSourceMenu(CMenu::SThemeData &theme) page = i / 12; row = (i / 4 ) - (page * 3); 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); diff --git a/wii/wiiflow/help/english.txt b/wii/wiiflow/help/english.txt index 6392742c..d42d79b2 100644 --- a/wii/wiiflow/help/english.txt +++ b/wii/wiiflow/help/english.txt @@ -1,55 +1,59 @@ - -Controls: -- Main menu (coverflow) : --- Up / Down = Previous / next game (vertical) --- Left / Right = Previous / next game (horizontal) --- Minus / Plus = Fast skip through games --- A = Select game --- B+A = Launch game immediately --- B+Home = Reload Wiiflow --- Home = Exit to Wii menu --- 1 / 2 = Previous / next coverflow mode --- B+Left / B+Right = Change Song --- B+UP / B+DOWN = Alphabetic search --- B+Onscreen Arrows = Alphabetic search --- B+Minus = Switch Partition --- B+Plus = Sort Games - --- A on Star Icon = Favorites --- B on Star Icon = Categories --- A on Gear Icon = Wiiflow settings --- 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 Channels Icon = Switch to Channels menu (icon changes to USB) --- A on Home Icon = Display source menu - -- Game : --- A on box = Show the backside --- A out of screen = Launch game --- B = Back to coverflow --- Up / Down = Previous / next game (vertical) --- Left / Right = Previous / next game (horizontal) --- Plus = Game Info ----Right (in Game Info) = Game Description ----Left (in Game Desc) = Game Info --- A on Star Icon = Toggle Favorite (Yellow = Favorite) --- A on Hand Icon = Parental Lock (Red = locked) --- A on Gear Icon = Game Settings --- A on X Icon = Delete Game - -- Settings menus : --- Minus / Plus = Previous / next page --- Left / Right = Previous / next page - -- Coverflow Adjust settings : --- B+Minus / B+Plus = Previous / next page --- B = Faster adjustment (B+A instead of just A to click a button) --- B+1 = Copy whole coverflow --- B+2 = Paste coverflow\n\ - -TIPS for running games that crash: -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. + +Controls: +- Main menu (coverflow) : +-- Up / Down = Previous / next game (vertical) +-- Left / Right = Previous / next game (horizontal) +-- Minus / Plus = Fast skip through games +-- A = Select game +-- B+A = Launch game immediately +-- B+Home = Reload Wiiflow +-- Home = Exit to Wii menu +-- 1 / 2 = Previous / next coverflow mode +-- B+Left / B+Right = Change Song +-- B+UP / B+DOWN = Alphabetic search +-- B+Onscreen Arrows = Alphabetic search +-- B+Minus = Switch Partition +-- B+Plus = Sort Games + +-- A on Star Icon = Favorites +-- B on Star Icon = Categories +-- 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 Question Mark Icon = Display credits and this help file, and update WiiFlow + +- Game : +-- A on box = Show the backside +-- A out of screen = Launch game +-- B = Back to coverflow +-- Up / Down = Previous / next game (vertical) +-- Left / Right = Previous / next game (horizontal) +-- Plus = Game Info +---Right (in Game Info) = Game Description +---Left (in Game Desc) = Game Info +-- 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 Gear Icon = Game Settings +-- A on X Icon = Delete Game + +- Settings menus : +-- Minus / Plus = Previous / next page +-- Left / Right = Previous / next page + +- Coverflow Adjust settings : +-- B+Minus / B+Plus = Previous / next page +-- B = Faster adjustment (B+A instead of just A to click a button) +-- B+1 = Copy whole coverflow +-- B+2 = Paste coverflow\n\ + +TIPS for running games that crash: +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.