* Added ExitTo menu, to open it just click on Exit To in Home menu

* Added giantpune and Wii Banner Player Project to credits * Updated italian, german and spanish translations
2024-11-27 13:44:15 +01:00 · 2012-07-05 19:57:28 +00:00 · 2012-07-05 19:57:28 +00:00 · f3e90060e2
commit f3e90060e2
parent 24899a421a
10 changed files with 149 additions and 38 deletions
--- a/source/defines.h
+++ b/source/defines.h
@ -35,7 +35,7 @@ Spayrosam, Bluescreen81, Chappy23, fledge68, \
 BlindDude, Bubba, DJTaz, OggZee, entropy, \
 Usptactical, WiiPower, Hermes, Spidy1000, \
 Dimok, Kovani, Drexyl, DvZ, Etheboss, stfour, \
-GaiaKnight, nibb, NJ7, Plasma, Pakatus, \
+GaiaKnight, nibb, NJ7, Plasma, Pakatus, giantpune, \
 wolf, ravmn, spidercaleb, Ziggy34, xFede, \
 And to anyone who has donated or \
 contributed to Wiiflow that we missed!"
@ -47,8 +47,10 @@ tgames.fr.nf"

 #define THANKS_CODE \
 "CFG Loader, uLoader, USB Loader GX, \
-NeoGamma, WiiXplorer, Mighty Channels, \
-Triiforce, postLoader" 
+NeoGamma, Wii Banner Player Project, \
+Mighty Channels, WiiXplorer, Triiforce, \
+postLoader"
+

 #define WIINNERTAG_URL 			"http://www.wiinnertag.com/wiinnertag_scripts/update_sign.php?key={KEY}&game_id={ID6}"
-#define DUTAG_URL				"http://tag.darkumbra.net/{KEY}.update={ID6}"
+#define DUTAG_URL				"http://tag.darkumbra.net/{KEY}.update={ID6}"
--- a/source/menu/menu.cpp
+++ b/source/menu/menu.cpp
@ -1076,7 +1076,7 @@ void CMenu::_buildMenus(void)
 	_initSystemMenu(theme);
 	_initGameInfoMenu(theme);
 	_initNandEmuMenu(theme);
-	_initHomeMenu(theme);
+	_initHomeAndExitToMenu(theme);

 	_loadCFCfg(theme);
 }
--- a/source/menu/menu.hpp
+++ b/source/menu/menu.hpp
@ -44,7 +44,7 @@ public:
 	~CMenu(void) {cleanup();}
 	void init(void);
 	void error(const wstringEx &msg);
-	void exitHandler(void);
+	void exitHandler(int ExitTo);
 	int main(void);
 	void cleanup(bool ios_reload = false);
 	u8 m_current_view;
@ -838,7 +838,7 @@ private:
 	void _initSystemMenu(SThemeData &theme);
 	void _initGameInfoMenu(SThemeData &theme);
 	void _initNandEmuMenu(CMenu::SThemeData &theme);
-	void _initHomeMenu(CMenu::SThemeData &theme);
+	void _initHomeAndExitToMenu(CMenu::SThemeData &theme);
 	//
 	void _textSource(void);
 	void _textPluginSettings(void);
@ -863,6 +863,7 @@ private:
 	void _textGameInfo(void);
 	void _textNandEmu(void);
 	void _textHome(void);
+	void _textExitTo(void);
 	//
 	void _hideCheatSettings(bool instant = false);
 	void _hideError(bool instant = false);
@ -890,6 +891,7 @@ private:
 	void _hideCheatDownload(bool instant = false);
 	void _hideNandEmu(bool instant = false);
 	void _hideHome(bool instant = false);
+	void _hideExitTo(bool instant = false);
 	//
 	void _showError(void);
 	void _showMain(void);
@ -918,6 +920,7 @@ private:
 	void _showGameSettings(void);
 	void _showCheatDownload(void);
 	void _showHome(void);
+	void _showExitTo(void);
 	void _updateSourceBtns(void);
 	void _updatePluginCheckboxes(void);
 	void _updateCheckboxes(void);
@ -961,6 +964,7 @@ private:
 	void _PluginSettings();
 	void _CategorySettings(bool fromGameSet=false);
 	bool _Home();
+	bool _ExitTo();
 	//
 	void _mainLoopCommon(bool withCF = false, bool blockReboot = false, bool adjusting = false);
 	// 
--- a/source/menu/menu_home.cpp
+++ b/source/menu/menu_home.cpp
@ -3,12 +3,18 @@
 #include "svnrev.h"

 u32 m_homeLblTitle;
+u32 m_exittoLblTitle;

 u32 m_homeBtnSettings;
 u32 m_homeBtnReloadCache;
 u32 m_homeBtnUpdate;
 u32 m_homeBtnAbout;
-u32 m_homeBtnExit;
+u32 m_homeBtnExitTo; // Exit To
+
+u32 m_homeBtnExitToHBC;
+u32 m_homeBtnExitToMenu;
+u32 m_homeBtnExitToPriiloader;
+u32 m_homeBtnExitToBootmii;

 STexture m_homeBg;

@ -66,25 +72,71 @@ bool CMenu::_Home(void)
 					break;
 				_showHome();
 			}
-			else if(m_btnMgr.selected(m_homeBtnExit))
+			else if(m_btnMgr.selected(m_homeBtnExitTo))
 			{
-				exitHandler();
+				exit = _ExitTo();
+				break;
+			}
+		}
+		else if(BTN_HOME_PRESSED)
+		{
+		    exitHandler(0);
+			exit = true;
+			break;
+		}
+		else if(BTN_B_PRESSED)
+		    break;
+	}	
+
+	_hideHome();
+	return exit;
+}
+
+bool CMenu::_ExitTo(void)
+{
+	bool exit = false;
+
+	SetupInput();
+	
+	_hideHome();
+	_showExitTo();
+
+	while(1)
+	{
+		_mainLoopCommon();
+		if(BTN_A_PRESSED)
+		{
+			if(m_btnMgr.selected(m_homeBtnExitToHBC))
+			{
+				
+				exitHandler(1);
+				exit = true;
+				break;
+			}
+			else if(m_btnMgr.selected(m_homeBtnExitToMenu))
+			{
+				exitHandler(2);
+				exit = true;
+				break;
+			}
+			else if(m_btnMgr.selected(m_homeBtnExitToPriiloader))
+			{
+				exitHandler(3);
+				exit = true;
+				break;
+			}
+			else if(m_btnMgr.selected(m_homeBtnExitToBootmii))
+			{
+				exitHandler(4);
 				exit = true;
 				break;
 			}
 		}
 		else if(BTN_B_PRESSED)
-		{
 			break;
-		}
-		else if(BTN_HOME_PRESSED)
-		{
-			exitHandler();
-			exit = true;
-			break;
-		}
 	}
-	_hideHome();
+	
+	_hideExitTo();
 	return exit;
 }

@ -97,7 +149,18 @@ void CMenu::_showHome(void)
 	m_btnMgr.show(m_homeBtnReloadCache);
 	m_btnMgr.show(m_homeBtnUpdate);
 	m_btnMgr.show(m_homeBtnAbout);
-	m_btnMgr.show(m_homeBtnExit);
+	m_btnMgr.show(m_homeBtnExitTo);
+}
+
+void CMenu::_showExitTo(void)
+{
+	_setBg(m_homeBg, m_homeBg);
+	m_btnMgr.show(m_exittoLblTitle);
+
+	m_btnMgr.show(m_homeBtnExitToHBC);
+	m_btnMgr.show(m_homeBtnExitToMenu);
+	m_btnMgr.show(m_homeBtnExitToPriiloader);
+	m_btnMgr.show(m_homeBtnExitToBootmii);
 }

 void CMenu::_hideHome(bool instant)
@ -108,11 +171,22 @@ void CMenu::_hideHome(bool instant)
 	m_btnMgr.hide(m_homeBtnReloadCache, instant);
 	m_btnMgr.hide(m_homeBtnUpdate, instant);
 	m_btnMgr.hide(m_homeBtnAbout, instant);
-	m_btnMgr.hide(m_homeBtnExit, instant);
+	m_btnMgr.hide(m_homeBtnExitTo, instant);
 }

-void CMenu::_initHomeMenu(CMenu::SThemeData &theme)
+void CMenu::_hideExitTo(bool instant)
 {
+	m_btnMgr.hide(m_exittoLblTitle, instant);
+
+	m_btnMgr.hide(m_homeBtnExitToHBC, instant);
+	m_btnMgr.hide(m_homeBtnExitToMenu, instant);
+	m_btnMgr.hide(m_homeBtnExitToPriiloader, instant);
+	m_btnMgr.hide(m_homeBtnExitToBootmii, instant);
+}
+
+void CMenu::_initHomeAndExitToMenu(CMenu::SThemeData &theme)
+{
+    //Home Menu
 	STexture emptyTex;
 	m_homeBg = _texture(theme.texSet, "HOME/BG", "texture", theme.bg);

@ -124,16 +198,34 @@ void CMenu::_initHomeMenu(CMenu::SThemeData &theme)
 	m_homeBtnReloadCache = _addButton(theme, "HOME/RELOAD_CACHE", theme.btnFont, L"", 220, 180, 200, 56, theme.btnFontColor);
 	m_homeBtnUpdate = _addButton(theme, "HOME/UPDATE", theme.btnFont, L"", 220, 240, 200, 56, theme.btnFontColor);
 	m_homeBtnAbout = _addButton(theme, "HOME/ABOUT", theme.btnFont, L"", 220, 300, 200, 56, theme.btnFontColor);
-	m_homeBtnExit = _addButton(theme, "HOME/EXIT", theme.btnFont, L"", 220, 360, 200, 56, theme.btnFontColor);
+	m_homeBtnExitTo = _addButton(theme, "HOME/EXIT_TO", theme.btnFont, L"", 220, 360, 200, 56, theme.btnFontColor);

 	_setHideAnim(m_homeBtnSettings, "HOME/SETTINGS", 0, 0, -2.f, 0.f);
 	_setHideAnim(m_homeBtnReloadCache, "HOME/RELOAD_CACHE", 0, 0, -2.f, 0.f);
 	_setHideAnim(m_homeBtnUpdate, "HOME/UPDATE", 0, 0, -2.f, 0.f);
 	_setHideAnim(m_homeBtnAbout, "HOME/ABOUT", 0, 0, -2.f, 0.f);
-	_setHideAnim(m_homeBtnExit, "HOME/EXIT", 0, 0, -2.f, 0.f);
+	_setHideAnim(m_homeBtnExitTo, "HOME/EXIT_TO", 0, 0, -2.f, 0.f);

 	_textHome();
 	_hideHome(true);
+	
+	//ExitTo Menu	
+	m_exittoLblTitle = _addTitle(theme, "EXIT_TO/TITLE", theme.titleFont, L"", 20, 30, 600, 75, theme.titleFontColor, FTGX_JUSTIFY_CENTER | FTGX_ALIGN_MIDDLE);
+
+	_setHideAnim(m_exittoLblTitle, "EXIT_TO/TITLE", 0, 100, 0.f, 0.f);
+
+	m_homeBtnExitToHBC = _addButton(theme, "EXIT_TO/HBC", theme.btnFont, L"", 220, 120, 200, 56, theme.btnFontColor);
+	m_homeBtnExitToMenu = _addButton(theme, "EXIT_TO/MENU", theme.btnFont, L"", 220, 180, 200, 56, theme.btnFontColor);
+	m_homeBtnExitToPriiloader = _addButton(theme, "EXIT_TO/PRIILOADER", theme.btnFont, L"", 220, 240, 200, 56, theme.btnFontColor);
+	m_homeBtnExitToBootmii = _addButton(theme, "EXIT_TO/BOOTMII", theme.btnFont, L"", 220, 300, 200, 56, theme.btnFontColor);
+
+	_setHideAnim(m_homeBtnExitToHBC, "EXIT_TO/HBC", 0, 0, -2.f, 0.f);
+	_setHideAnim(m_homeBtnExitToMenu, "EXIT_TO/MENU", 0, 0, -2.f, 0.f);
+	_setHideAnim(m_homeBtnExitToPriiloader, "EXIT_TO/PRIILOADER", 0, 0, -2.f, 0.f);
+	_setHideAnim(m_homeBtnExitToBootmii, "EXIT_TO/BOOTMII", 0, 0, -2.f, 0.f);
+
+	_textExitTo();
+	_hideExitTo(true);
 }

 void CMenu::_textHome(void)
@ -144,5 +236,15 @@ void CMenu::_textHome(void)
 	m_btnMgr.setText(m_homeBtnReloadCache, _t("home2", L"Reload Cache"));
 	m_btnMgr.setText(m_homeBtnUpdate, _t("home3", L"Update"));
 	m_btnMgr.setText(m_homeBtnAbout, _t("home4", L"About"));
-	m_btnMgr.setText(m_homeBtnExit, _t("home5", L"Exit"));
+	m_btnMgr.setText(m_homeBtnExitTo, _t("home5", L"Exit To"));
 }
+
+void CMenu::_textExitTo(void)
+{
+	m_btnMgr.setText(m_exittoLblTitle, _t("exit_to", L"Exit To"));
+	
+	m_btnMgr.setText(m_homeBtnExitToHBC, _t("hbc", L"Homebrew Channel"));
+	m_btnMgr.setText(m_homeBtnExitToMenu, _t("menu", L"System Menu"));
+	m_btnMgr.setText(m_homeBtnExitToPriiloader, _t("prii", L"Priiloader"));
+	m_btnMgr.setText(m_homeBtnExitToBootmii, _t("bootmii", L"Bootmii"));
+}
--- a/source/menu/menu_main.cpp
+++ b/source/menu/menu_main.cpp
@ -213,20 +213,20 @@ void CMenu::LoadView(void)
 	m_btnMgr.show(m_mainLblNotice);
 }

-void CMenu::exitHandler(void)
+void CMenu::exitHandler(int ExitTo)
 {
 	gprintf("Exit WiiFlow called\n");
 	bool exitSet = false;
 	if(!m_locked && !m_disable_exit)
 	{
 		exitSet = true;
-		if(BTN_PLUS_HELD)
+		if(ExitTo == 1) // HBC
 			Sys_ExitTo(EXIT_TO_HBC);
-		else if(BTN_MINUS_HELD)
+		else if(ExitTo == 2) // System Menu
 			Sys_ExitTo(EXIT_TO_MENU);
-		else if(BTN_1_HELD)
+		else if(ExitTo == 3) // Priiloader
 			Sys_ExitTo(EXIT_TO_PRIILOADER);
-		else if(BTN_2_HELD)	//Check that the files are there, or ios will hang.
+		else if(ExitTo == 4) //Bootmii, check that the files are there, or ios will hang.
 		{
 			struct stat dummy;
 			if(DeviceHandler::Instance()->IsInserted(SD) && 
@ -238,9 +238,8 @@ void CMenu::exitHandler(void)
 			else
 				Sys_ExitTo(EXIT_TO_HBC);
 		}
-		else
-			exitSet = false;
 	}
+	
 	m_reload = (BTN_B_HELD || m_disable_exit);
 	if(!exitSet && !m_reload)
 	{
--- a/wii/wiiflow/Languages/english.ini
+++ b/wii/wiiflow/Languages/english.ini
@ -182,6 +182,7 @@ DMLpal=PAL 576i
 DMLpal60=PAL 480i
 DMLprog=NTSC 480p
 DMLprogP=PAL 480p
+exit_to = Exit To
 gameinfo1=Developer: %s
 gameinfo2=Publisher: %s
 gameinfo3=Region: %s
@ -197,7 +198,7 @@ home1=Settings
 home2=Reload Cache
 home3=Update
 home4=About
-home5=Exit
+home5=Exit To
 hooktype1=VBI
 hooktype2=KPAD Read
 hooktype3=Joypad
--- a/wii/wiiflow/Languages/german.ini
+++ b/wii/wiiflow/Languages/german.ini
@ -182,6 +182,7 @@ DMLntsc=NTSC 480i
 DMLpal60=PAL 480i
 DMLprog=NTSC 480p
 DMLprogP=PAL 480p
+exit_to = Zurück zu
 gameinfo1=Entwickler: %s
 gameinfo2=Herausgeber: %s
 gameinfo3=Region: %s
@ -197,7 +198,7 @@ home1=Einstellungen
 home2=Cache updaten
 home3=WiiFlow updaten
 home4=Über WiiFlow
-home5=Beenden
+home5= Zurück zu
 hooktype1=VBI
 hooktype2=KPAD Read
 hooktype3=Joypad
--- a/wii/wiiflow/Languages/italian.ini
+++ b/wii/wiiflow/Languages/italian.ini
@ -180,8 +180,9 @@ DMLdefG=Gioco
 DMLntsc=NTSC 480i
 DMLpal=PAL 576i
 DMLpal60=PAL 480i
-DMLprog=PAL 480p
+DMLprog=NTSC 480p
 DMLprogG=PAL 480p
+exit_to = Esci a
 gameinfo1=Sviluppatore: %s
 gameinfo2=Editore: %s
 gameinfo3=Regione: %s
@ -197,7 +198,7 @@ home1=Impostazioni
 home2=Ricarica cache
 home3=Aggiorna
 home4=Crediti
-home5=Esci
+home5=Esci a
 hooktype1=VBI
 hooktype2=KPAD Read
 hooktype3=Joypad
--- a/wii/wiiflow/Languages/spanish.ini
+++ b/wii/wiiflow/Languages/spanish.ini
@ -180,6 +180,7 @@ DMLntsc=NTSC 480i
 DMLpal60=PAL 480i
 DMLprog=NTSC 480p
 DMLprogP=PAL 480p
+exit_to = Salir a
 gameinfo1=Desarrollador: %s
 gameinfo2=Distribuidor: %s
 gameinfo3=Región: %s
--- a/wii/wiiflow/help/italian.txt
+++ b/wii/wiiflow/help/italian.txt
@ -8,7 +8,7 @@ Controlli:
 -- B+A = Avvia gioco immediatamente
 -- B+home = Ricarica wiiflow
 -- Home = Mostra menu principale
-- Home (nel menu principale) = Esci al menu di sistema
+-- Home (nel menu principale) = Esci a ...vedi impostazioni globali
 -- 1 / 2 = Precedente / prossima modalità coverflow
 -- B+sinistra / B+destra = Cambia canzone
 -- B+su / B+giù = Ricerca alfabetica
@ -21,7 +21,7 @@ Controlli:
 -- A sull’icona a ingranaggio = Impostazioni
 -- A sull’icona a USB, DM(L), canali, emulatori o homebrew = Vai a questa modalità
 -- B sull’icona a USB, DM(L), canali, emulatori o homebrew = Abilita/disabilita la nand emulata e vai alla modalità canali
-- A sull’icona home = Mostra menu principale / esci da wiiflow
+-- A sull’icona a casa = Mostra menu principale
 -- Premi B per 3 secondi/ B sull'icona a home(se è abilitato wii_gestures) = Mostra menu sorgente
 -- A sull’icona a disco (se è presente un disco) = Avvia il disco
 -- A sull’icona a punto di domanda = Mostra i ringraziamenti, questo file di aiuto e aggiorna wiiflow