- removed current IOS/cIOS info from Help Guide. Now only shows when viewing Credits.

- added a space after every comma for displaying genres on Game Info Menu. before = action,adventure. now = action, adventure. to me it looks nicer. - replaced info/help button on main screen with homebrew view button. removed homebrew view button from the choice of views. - moved info/help button to Home Menu replacing Settings Button which we didn't need two of. - homebrew/apps view has its own view now. pressing 'A' automatically launches the app, no need for a selected menu to launch app. - when returning from a launched app wiiflow now displays the Wii game view. before it would go to homebrew view. - still need to add a config menu for apps view so we can change the partition, smallbox, reload cache, and adjust coverflow.
2024-11-01 00:55:06 +01:00 · 2016-06-06 13:52:57 +00:00 · 2016-06-06 13:52:57 +00:00 · a639690822
commit a639690822
parent 8488dcff83
8 changed files with 102 additions and 113 deletions
--- a/out/boot.dol
+++ b/out/boot.dol
--- a/source/menu/menu.cpp
+++ b/source/menu/menu.cpp
@ -2148,10 +2148,15 @@ bool CMenu::_loadList(void)
 	vector<dir_discHdr> combinedList;
 	NANDemuView = false;
 	gprintf("Creating Gamelist\n");
-
+	
+	if(m_current_view == COVERFLOW_HOMEBREW)
+	{
+		_loadHomebrewList();
+		gprintf("Games found: %i\n", m_gameList.size());
+		return m_gameList.size() > 0 ? true : false;
+	}
 	if(m_current_view == COVERFLOW_PLUGIN || (m_combined_view && m_cfg.getBool(PLUGIN_DOMAIN, "source")))
 	{
-		m_current_view = COVERFLOW_PLUGIN;
 		_loadPluginList();
 		if(m_combined_view)
 			for(vector<dir_discHdr>::iterator tmp_itr = m_gameList.begin(); tmp_itr != m_gameList.end(); tmp_itr++)
@ -2159,7 +2164,6 @@ bool CMenu::_loadList(void)
 	}
 	if(m_current_view == COVERFLOW_WII || (m_combined_view && m_cfg.getBool(WII_DOMAIN, "source")))
 	{
-		m_current_view = COVERFLOW_WII;
 		_loadWiiList();
 		if(m_combined_view)
 			for(vector<dir_discHdr>::iterator tmp_itr = m_gameList.begin(); tmp_itr != m_gameList.end(); tmp_itr++)
@ -2167,7 +2171,6 @@ bool CMenu::_loadList(void)
 	}
 	if(m_current_view == COVERFLOW_CHANNEL || (m_combined_view && m_cfg.getBool(CHANNEL_DOMAIN, "source")))
 	{
-		m_current_view = COVERFLOW_CHANNEL;
 		_loadChannelList();
 		if(m_combined_view)
 			for(vector<dir_discHdr>::iterator tmp_itr = m_gameList.begin(); tmp_itr != m_gameList.end(); tmp_itr++)
@ -2175,20 +2178,11 @@ bool CMenu::_loadList(void)
 	}
 	if(m_current_view == COVERFLOW_GAMECUBE || (m_combined_view && m_cfg.getBool(GC_DOMAIN, "source")))
 	{
-		m_current_view = COVERFLOW_GAMECUBE;
 		_loadGamecubeList();
 		if(m_combined_view)
 			for(vector<dir_discHdr>::iterator tmp_itr = m_gameList.begin(); tmp_itr != m_gameList.end(); tmp_itr++)
 				combinedList.push_back(*tmp_itr);
 	}
-	if(m_current_view == COVERFLOW_HOMEBREW || (m_combined_view && m_cfg.getBool(HOMEBREW_DOMAIN, "source")))
-	{
-		m_current_view = COVERFLOW_HOMEBREW;
-		_loadHomebrewList();
-		if(m_combined_view)
-			for(vector<dir_discHdr>::iterator tmp_itr = m_gameList.begin(); tmp_itr != m_gameList.end(); tmp_itr++)
-				combinedList.push_back(*tmp_itr);
-	}
 	if(m_combined_view)
 	{
 		m_current_view = COVERFLOW_MAX;
@ -2308,26 +2302,22 @@ bool CMenu::_loadPluginList()
 	m_gameList.clear();
 	if(addGamecube)
 	{
-		m_current_view = COVERFLOW_GAMECUBE;
 		_loadGamecubeList();
 		for(vector<dir_discHdr>::iterator tmp_itr = m_gameList.begin(); tmp_itr != m_gameList.end(); tmp_itr++)
 				pluginList.push_back(*tmp_itr);
 	}
 	if(addWii)
 	{
-		m_current_view = COVERFLOW_WII;
 		_loadWiiList();
 		for(vector<dir_discHdr>::iterator tmp_itr = m_gameList.begin(); tmp_itr != m_gameList.end(); tmp_itr++)
 				pluginList.push_back(*tmp_itr);
 	}
 	if(addChannel)
 	{
-		m_current_view = COVERFLOW_CHANNEL;
 		_loadChannelList();
 		for(vector<dir_discHdr>::iterator tmp_itr = m_gameList.begin(); tmp_itr != m_gameList.end(); tmp_itr++)
 				pluginList.push_back(*tmp_itr);
 	}
-	m_current_view = COVERFLOW_PLUGIN;
 	m_gameList.clear();
 	for(vector<dir_discHdr>::iterator tmp_itr = pluginList.begin(); tmp_itr != pluginList.end(); tmp_itr++)
 	{
--- a/source/menu/menu.hpp
+++ b/source/menu/menu.hpp
@ -50,6 +50,7 @@ public:
 	const char *getFrontPath(const dir_discHdr *element);
 	const char *getBlankCoverPath(const dir_discHdr *element);

+	u8 m_prev_view;
 	u8 m_current_view;
 	bool m_combined_view;
 	u8 enabledPluginsCount;
--- a/source/menu/menu_about.cpp
+++ b/source/menu/menu_about.cpp
@ -81,7 +81,7 @@ void CMenu::_showAbout(void)
 {
 	_setBg(m_aboutBg, m_aboutBg);
 	m_btnMgr.show(m_aboutLblTitle);
-	if(m_txt_view == false)
+	if(m_txt_view == false && !showHelp)
 		m_btnMgr.show(m_aboutLblIOS);
 	m_btnMgr.show(m_aboutLblInfo,false);
 	for(u8 i = 0; i < ARRAY_SIZE(m_aboutLblUser); ++i)
@ -109,7 +109,7 @@ void CMenu::_initAboutMenu()

 void CMenu::_textAbout(void)
 {
-	if(m_txt_view)
+	if(m_txt_view)// used to show a txt file
 	{
 		wstringEx txt_file_name;
 		txt_file_name.fromUTF8(strrchr(m_txt_path, '/') + 1);
@ -126,9 +126,9 @@ void CMenu::_textAbout(void)
 			free(txt_mem);
 		}
 		txt_mem = NULL;
-		return; /* no need for ios checks */
+		return;
 	}
-	else if(showHelp)
+	if(showHelp) // show help guide
 	{
 		m_btnMgr.setText(m_aboutLblTitle, _t("about10", L"Help Guide"));
 		wstringEx help_text;
@ -145,36 +145,35 @@ void CMenu::_textAbout(void)
 		else
 			m_btnMgr.setText(m_aboutLblInfo, ENGLISH_TXT_W);
 		txt_mem = NULL;
+		return; 
 	}
-	else
-	{
-		m_btnMgr.setText(m_aboutLblTitle, VERSION_STRING);
+	// show credits and current cIOS
+	m_btnMgr.setText(m_aboutLblTitle, VERSION_STRING);

-		wstringEx developers(wfmt(_fmt("about6", L"\nCurrent Developers:\n%s"), DEVELOPERS));
-		wstringEx pDevelopers(wfmt(_fmt("about7", L"Past Developers:\n%s"), PAST_DEVELOPERS));
+	wstringEx developers(wfmt(_fmt("about6", L"\nCurrent Developers:\n%s"), DEVELOPERS));
+	wstringEx pDevelopers(wfmt(_fmt("about7", L"Past Developers:\n%s"), PAST_DEVELOPERS));

-		wstringEx origLoader(wfmt(_fmt("about1", L"Original Loader By:\n%s"), LOADER_AUTHOR));
-		wstringEx origGUI(wfmt(_fmt("about2", L"Original GUI By:\n%s"), GUI_AUTHOR));
+	wstringEx origLoader(wfmt(_fmt("about1", L"Original Loader By:\n%s"), LOADER_AUTHOR));
+	wstringEx origGUI(wfmt(_fmt("about2", L"Original GUI By:\n%s"), GUI_AUTHOR));

-		wstringEx codethx(wfmt(_fmt("about8", L"Bits of Code Obtained From:\n%s"), THANKS_CODE));
-		wstringEx sites(wfmt(_fmt("about9", L"Supporting Websites:\n%s"), THANKS_SITES));
+	wstringEx codethx(wfmt(_fmt("about8", L"Bits of Code Obtained From:\n%s"), THANKS_CODE));
+	wstringEx sites(wfmt(_fmt("about9", L"Supporting Websites:\n%s"), THANKS_SITES));

-		wstringEx translator(wfmt(L", %s", m_loc.getWString(m_curLanguage, "translation_author").toUTF8().c_str()));
-		wstringEx thanks(wfmt(_fmt("about4", L"Thanks To:\n%s"), THANKS));
-		if(translator.size() > 3)
-			thanks.append(translator);
+	wstringEx translator(wfmt(L", %s", m_loc.getWString(m_curLanguage, "translation_author").toUTF8().c_str()));
+	wstringEx thanks(wfmt(_fmt("about4", L"Thanks To:\n%s"), THANKS));
+	if(translator.size() > 3)
+		thanks.append(translator);

-		m_btnMgr.setText(m_aboutLblInfo,
-			wfmt(L"%s\n\n%s\n\n%s\n\n%s\n\n%s\n\n%s\n\n%s",
-			developers.toUTF8().c_str(),
-			pDevelopers.toUTF8().c_str(),
-			origLoader.toUTF8().c_str(),
-			origGUI.toUTF8().c_str(),
-			codethx.toUTF8().c_str(),
-			sites.toUTF8().c_str(),
-			thanks.toUTF8().c_str())
-		);
-	}
+	m_btnMgr.setText(m_aboutLblInfo,
+		wfmt(L"%s\n\n%s\n\n%s\n\n%s\n\n%s\n\n%s\n\n%s",
+		developers.toUTF8().c_str(),
+		pDevelopers.toUTF8().c_str(),
+		origLoader.toUTF8().c_str(),
+		origGUI.toUTF8().c_str(),
+		codethx.toUTF8().c_str(),
+		sites.toUTF8().c_str(),
+		thanks.toUTF8().c_str())
+	);
 	const char *IOS_Name = NULL;
 	switch(IOS_GetType(CurrentIOS.Version))
 	{
--- a/source/menu/menu_cftheme.cpp
+++ b/source/menu/menu_cftheme.cpp
@ -574,15 +574,6 @@ void CMenu::_cfParam(bool inc, int i, const CMenu::SCFParamDesc &p, int cfVersio
 const char *CMenu::_cfDomain(bool selected)
 {
 	return selected ? fmt("%s_%%i_S", cf_domain) : fmt("%s_%%i", cf_domain);
-	/*switch(m_current_view)
-	{
-		case COVERFLOW_PLUGIN:
-			return selected ? "_EMUFLOW_%i_S" : "_EMUFLOW_%i";
-		case COVERFLOW_HOMEBREW:
-			return selected ? "_BREWFLOW_%i_S" : "_BREWFLOW_%i";
-		default:
-			return selected ? "_COVERFLOW_%i_S" : "_COVERFLOW_%i";
-	}*/
 }

 void CMenu::_initCFThemeMenu()
--- a/source/menu/menu_gameinfo.cpp
+++ b/source/menu/menu_gameinfo.cpp
@ -262,7 +262,17 @@ void CMenu::_textGameInfo(void)
 		if(gametdb.GetRegion(GameID, TMP_Char))
 			m_btnMgr.setText(m_gameinfoLblRegion, wfmt(_fmt("gameinfo3",L"Region: %s"), TMP_Char), true);
 		if(gametdb.GetGenres(GameID, TMP_Char))
-			m_btnMgr.setText(m_gameinfoLblGenre, wfmt(_fmt("gameinfo5",L"Genre: %s"), TMP_Char), true);
+		{
+			vector<string> genres = stringToVector(TMP_Char, ',');
+			string s;
+			for(u32 i = 0; i < genres.size(); ++i)
+			{
+				if(i > 0)
+					s.append(", ");// add comma & space between genres
+				s.append(genres[i]);
+			}
+			m_btnMgr.setText(m_gameinfoLblGenre, wfmt(_fmt("gameinfo5",L"Genre: %s"), s.c_str()), true);
+		}

 		int PublishDate = gametdb.GetPublishDate(GameID);
 		int year = PublishDate >> 16;
--- a/source/menu/menu_home.cpp
+++ b/source/menu/menu_home.cpp
@ -59,16 +59,10 @@ bool CMenu::_Home(void)
 			min((float)wd[1]->battery_level, 100.f), min((float)wd[2]->battery_level, 100.f), min((float)wd[3]->battery_level, 100.f)));
 		if(BTN_A_PRESSED)
 		{
-			if(m_btnMgr.selected(m_homeBtnSettings))
+			if(m_btnMgr.selected(m_homeBtnSettings))//actually help guide btn
 			{
 				_hideHome();
-				_config(1);
-				if(prevTheme != m_cfg.getString("GENERAL", "theme") || m_reload == true)
-				{
-					m_exit = true;
-					m_reload = true;
-					break;
-				}
+				_about(true);
 				_showHome();
 			}
 			else if(m_btnMgr.selected(m_homeBtnReloadCache))
@ -334,7 +328,7 @@ void CMenu::_initHomeAndExitToMenu()
 void CMenu::_textHome(void)
 {
 	m_btnMgr.setText(m_homeLblTitle, VERSION_STRING);
-	m_btnMgr.setText(m_homeBtnSettings, _t("home1", L"Settings"));
+	m_btnMgr.setText(m_homeBtnSettings, _t("about10", L"Help Guide"));
 	m_btnMgr.setText(m_homeBtnReloadCache, _t("home2", L"Reload Cache"));
 	m_btnMgr.setText(m_homeBtnUpdate, _t("home3", L"Update"));
 	m_btnMgr.setText(m_homeBtnExplorer, _t("home8", L"File Explorer"));
--- a/source/menu/menu_main.cpp
+++ b/source/menu/menu_main.cpp
@ -31,7 +31,7 @@ void CMenu::_hideMain(bool instant)
 	m_btnMgr.hide(m_mainBtnNext, instant);
 	m_btnMgr.hide(m_mainBtnPrev, instant);
 	m_btnMgr.hide(m_mainBtnConfig, instant);
-	m_btnMgr.hide(m_mainBtnInfo, instant);
+	//m_btnMgr.hide(m_mainBtnInfo, instant);
 	m_btnMgr.hide(m_mainBtnQuit, instant);
 	m_btnMgr.hide(m_mainBtnHomebrew, instant);
 	m_btnMgr.hide(m_mainBtnChannel, instant);
@ -73,17 +73,17 @@ start_main:
 				m_btnMgr.show(m_mainBtnChannel);
 			else if(show_plugin)
 				m_btnMgr.show(m_mainBtnPlugin);
-			else if(show_homebrew)
-				m_btnMgr.show(m_mainBtnHomebrew);
+			//else if(show_homebrew)
+			//	m_btnMgr.show(m_mainBtnHomebrew);
 			else
 				m_btnMgr.show(m_mainBtnWii);
 			break;
 		case COVERFLOW_CHANNEL:
 			if(show_plugin)
 				m_btnMgr.show(m_mainBtnPlugin);
-			else if(show_homebrew)
-				m_btnMgr.show(m_mainBtnHomebrew);
-			else
+			//else if(show_homebrew)
+			//	m_btnMgr.show(m_mainBtnHomebrew);
+			//else
 				m_btnMgr.show(m_mainBtnWii);
 			break;
 		case COVERFLOW_MAX:
@ -91,9 +91,9 @@ start_main:
 			m_btnMgr.show(m_mainBtnWii);
 			break;
 		case COVERFLOW_PLUGIN:
-			if(show_homebrew)
-				m_btnMgr.show(m_mainBtnHomebrew);
-			else
+			//if(show_homebrew)
+			//	m_btnMgr.show(m_mainBtnHomebrew);
+			//else
 				m_btnMgr.show(m_mainBtnWii);
 			break;
 		default:
@ -103,8 +103,8 @@ start_main:
 				m_btnMgr.show(m_mainBtnChannel);
 			else if(show_plugin)
 				m_btnMgr.show(m_mainBtnPlugin);
-			else if(show_homebrew)
-				m_btnMgr.show(m_mainBtnHomebrew);
+			//else if(show_homebrew)
+			//	m_btnMgr.show(m_mainBtnHomebrew);
 			else
 				m_btnMgr.show(m_mainBtnWii);
 			break;
@ -315,7 +315,7 @@ int CMenu::main(void)
 		m_gametdb.CloseFile();
 	}
 	m_current_view = max(m_cfg.getInt("GENERAL", "last_view", 0), 0);
-	if(m_current_view > COVERFLOW_MAX)
+	if(m_current_view > COVERFLOW_MAX || m_current_view == COVERFLOW_HOMEBREW)
 	{
 		m_current_view = COVERFLOW_WII;
 		_clearSources();
@ -355,6 +355,12 @@ int CMenu::main(void)
 					LoadView();
 					continue;
 				}
+				if(m_current_view == COVERFLOW_HOMEBREW)
+				{
+					m_current_view = m_prev_view;
+					LoadView();
+					continue;
+				}
 				if(m_use_source)//if source_menu enabled
 				{
 					_hideMain();
@ -427,17 +433,17 @@ int CMenu::main(void)
 				else
 					_showMain();
 			}
-			else if(m_btnMgr.selected(m_mainBtnChannel) || m_btnMgr.selected(m_mainBtnWii) || m_btnMgr.selected(m_mainBtnGamecube) || m_btnMgr.selected(m_mainBtnHomebrew) || m_btnMgr.selected(m_mainBtnPlugin))
+			else if(m_btnMgr.selected(m_mainBtnChannel) || m_btnMgr.selected(m_mainBtnWii) || m_btnMgr.selected(m_mainBtnGamecube) || m_btnMgr.selected(m_mainBtnPlugin))
 			{
 				if(m_current_view == COVERFLOW_WII) 
-					m_current_view = show_gamecube ? COVERFLOW_GAMECUBE : (show_channel ? COVERFLOW_CHANNEL : (show_plugin ? COVERFLOW_PLUGIN : (show_homebrew ? COVERFLOW_HOMEBREW : COVERFLOW_WII)));
+					m_current_view = show_gamecube ? COVERFLOW_GAMECUBE : (show_channel ? COVERFLOW_CHANNEL : (show_plugin ? COVERFLOW_PLUGIN : COVERFLOW_WII));
 				else if(m_current_view == COVERFLOW_GAMECUBE)
-					m_current_view = show_channel ? COVERFLOW_CHANNEL : (show_plugin ? COVERFLOW_PLUGIN : (show_homebrew ? COVERFLOW_HOMEBREW : COVERFLOW_WII));
+					m_current_view = show_channel ? COVERFLOW_CHANNEL : (show_plugin ? COVERFLOW_PLUGIN : COVERFLOW_WII);
 				else if(m_current_view == COVERFLOW_CHANNEL)
-					m_current_view = show_plugin ? COVERFLOW_PLUGIN : (show_homebrew ? COVERFLOW_HOMEBREW : COVERFLOW_WII);
+					m_current_view = show_plugin ? COVERFLOW_PLUGIN : COVERFLOW_WII;
 				else if(m_current_view == COVERFLOW_PLUGIN)
-					m_current_view = show_homebrew ? COVERFLOW_HOMEBREW : COVERFLOW_WII;
-				else if(m_current_view == COVERFLOW_HOMEBREW || m_current_view == COVERFLOW_MAX)
+					m_current_view = COVERFLOW_WII;
+				else if(m_current_view == COVERFLOW_MAX)
 					m_current_view = COVERFLOW_WII;
 				_clearSources();
 				m_cfg.setBool(_domainFromView(), "source", true);
@ -487,13 +493,11 @@ int CMenu::main(void)
 				else
 					_showMain();
 			}
-			else if(m_btnMgr.selected(m_mainBtnInfo))
+			else if(m_btnMgr.selected(m_mainBtnHomebrew))
 			{
-				_hideMain();
-				_about(true);
-				_showMain();
-				if(BTN_B_HELD)
-					bUsed = true;
+				m_prev_view = m_current_view;
+				m_current_view = COVERFLOW_HOMEBREW;
+				LoadView();
 			}
 			else if(m_btnMgr.selected(m_mainBtnDVD))
 			{
@ -530,7 +534,7 @@ int CMenu::main(void)
 				}
 				else
 				{
-					_game(BTN_B_HELD);
+					_game(BTN_B_HELD || m_current_view == COVERFLOW_HOMEBREW);
 					if(m_exit)
 						break;
 					if(BTN_B_HELD)
@ -585,7 +589,7 @@ int CMenu::main(void)
 					m_btnMgr.show(m_mainLblNotice);
 				}
 			}
-			else if(m_btnMgr.selected(m_mainBtnInfo) && m_allow_random && !CoverFlow.empty())
+			else if(m_btnMgr.selected(m_mainBtnHomebrew) && m_allow_random && !CoverFlow.empty())
 			{
 				/* WiiFlow should boot a random game */
 				_hideMain();
@ -703,7 +707,7 @@ int CMenu::main(void)
 				m_btnMgr.setText(m_mainLblNotice, curSort);
 				m_btnMgr.show(m_mainLblNotice);
 			}
-			else if(BTN_MINUS_PRESSED && !m_locked  && !m_sourceflow)
+			else if(BTN_MINUS_PRESSED && !m_locked  && !m_sourceflow && m_current_view != COVERFLOW_HOMEBREW)
 			{
 				bUsed = true;
 				//const char *partition = NULL;
@ -735,19 +739,19 @@ int CMenu::main(void)
 			}
 		}
 		//zones, showing and hiding buttons
-		if(!m_gameList.empty() && m_show_zone_prev && !m_sourceflow)
+		if(!m_gameList.empty() && m_show_zone_prev && !m_sourceflow && m_current_view != COVERFLOW_HOMEBREW)
 			m_btnMgr.show(m_mainBtnPrev);
 		else
 			m_btnMgr.hide(m_mainBtnPrev);
-		if(!m_gameList.empty() && m_show_zone_next && !m_sourceflow)
+		if(!m_gameList.empty() && m_show_zone_next && !m_sourceflow && m_current_view != COVERFLOW_HOMEBREW)
 			m_btnMgr.show(m_mainBtnNext);
 		else
 			m_btnMgr.hide(m_mainBtnNext);
-		if(!m_gameList.empty() && m_show_zone_main && !m_sourceflow)
+		if(!m_gameList.empty() && m_show_zone_main && !m_sourceflow && m_current_view != COVERFLOW_HOMEBREW)
 		{
 			m_btnMgr.show(m_mainLblUser[0]);
 			m_btnMgr.show(m_mainLblUser[1]);
-			m_btnMgr.show(m_mainBtnInfo);
+			m_btnMgr.show(m_mainBtnHomebrew);
 			m_btnMgr.show(m_mainBtnConfig);
 			m_btnMgr.show(m_mainBtnQuit);
 			static bool change = m_favorites;
@ -760,12 +764,12 @@ int CMenu::main(void)
 			m_btnMgr.hide(m_mainLblUser[0]);
 			m_btnMgr.hide(m_mainLblUser[1]);
 			m_btnMgr.hide(m_mainBtnConfig);
-			m_btnMgr.hide(m_mainBtnInfo);
+			m_btnMgr.hide(m_mainBtnHomebrew);
 			m_btnMgr.hide(m_mainBtnQuit);
 			m_btnMgr.hide(m_mainBtnFavoritesOn);
 			m_btnMgr.hide(m_mainBtnFavoritesOff);
 		}
-		if((!m_cfg.getBool("GENERAL", "hideviews", false) && (m_gameList.empty() || m_show_zone_main2)) && !m_sourceflow)
+		if((!m_cfg.getBool("GENERAL", "hideviews", false) && (m_gameList.empty() || m_show_zone_main2)) && !m_sourceflow && m_current_view != COVERFLOW_HOMEBREW)
 		{
 			switch(m_current_view)
 			{
@ -774,26 +778,26 @@ int CMenu::main(void)
 						m_btnMgr.show(m_mainBtnChannel);
 					else if(show_plugin)
 						m_btnMgr.show(m_mainBtnPlugin);
-					else if(show_homebrew)
-						m_btnMgr.show(m_mainBtnHomebrew);
+					//else if(show_homebrew)
+					//	m_btnMgr.show(m_mainBtnHomebrew);
 					else 
 						m_btnMgr.show(m_mainBtnWii);
 					break;
 				case COVERFLOW_CHANNEL:
 					if(show_plugin)
 						m_btnMgr.show(m_mainBtnPlugin);
-					else if(show_homebrew)
-						m_btnMgr.show(m_mainBtnHomebrew);
+					//else if(show_homebrew)
+					//	m_btnMgr.show(m_mainBtnHomebrew);
 					else
 						m_btnMgr.show(m_mainBtnWii);
 					break;
 				case COVERFLOW_PLUGIN:
-					if(show_homebrew)
-						m_btnMgr.show(m_mainBtnHomebrew);
-					else
+					//if(show_homebrew)
+					//	m_btnMgr.show(m_mainBtnHomebrew);
+					//else
 						m_btnMgr.show(m_mainBtnWii);
 					break;
-				case COVERFLOW_HOMEBREW:
+				//case COVERFLOW_HOMEBREW:
 				case COVERFLOW_MAX:
 					m_btnMgr.show(m_mainBtnWii);
 					break;
@ -804,8 +808,8 @@ int CMenu::main(void)
 						m_btnMgr.show(m_mainBtnChannel);
 					else if(show_plugin)
 						m_btnMgr.show(m_mainBtnPlugin);
-					else if(show_homebrew)
-						m_btnMgr.show(m_mainBtnHomebrew);
+					//else if(show_homebrew)
+					//	m_btnMgr.show(m_mainBtnHomebrew);
 					else
 						m_btnMgr.show(m_mainBtnWii);
 			}
@ -874,8 +878,8 @@ void CMenu::_initMainMenu()
 {
 	TexData texQuit;
 	TexData texQuitS;
-	TexData texInfo;
-	TexData texInfoS;
+	//TexData texInfo;
+	//TexData texInfoS;
 	TexData texConfig;
 	TexData texConfigS;
 	TexData texGamecube;
@ -907,8 +911,8 @@ void CMenu::_initMainMenu()

 	TexHandle.fromImageFile(texQuit, fmt("%s/btnquit.png", m_imgsDir.c_str()));
 	TexHandle.fromImageFile(texQuitS, fmt("%s/btnquits.png", m_imgsDir.c_str()));
-	TexHandle.fromImageFile(texInfo, fmt("%s/btninfo.png", m_imgsDir.c_str()));
-	TexHandle.fromImageFile(texInfoS, fmt("%s/btninfos.png", m_imgsDir.c_str()));
+	//TexHandle.fromImageFile(texInfo, fmt("%s/btninfo.png", m_imgsDir.c_str()));
+	//TexHandle.fromImageFile(texInfoS, fmt("%s/btninfos.png", m_imgsDir.c_str()));
 	TexHandle.fromImageFile(texConfig, fmt("%s/btnconfig.png", m_imgsDir.c_str()));
 	TexHandle.fromImageFile(texConfigS, fmt("%s/btnconfigs.png", m_imgsDir.c_str()));
 	TexHandle.fromImageFile(texDVD, fmt("%s/btndvd.png", m_imgsDir.c_str()));
@ -934,11 +938,11 @@ void CMenu::_initMainMenu()

 	_addUserLabels(m_mainLblUser, ARRAY_SIZE(m_mainLblUser), "MAIN");

-	m_mainBtnInfo = _addPicButton("MAIN/INFO_BTN", texInfo, texInfoS, 20, 400, 48, 48);
+	//m_mainBtnInfo = _addPicButton("MAIN/INFO_BTN", texInfo, texInfoS, 20, 400, 48, 48);
 	m_mainBtnConfig = _addPicButton("MAIN/CONFIG_BTN", texConfig, texConfigS, 70, 400, 48, 48);
 	m_mainBtnQuit = _addPicButton("MAIN/QUIT_BTN", texQuit, texQuitS, 570, 400, 48, 48);
 	m_mainBtnChannel = _addPicButton("MAIN/CHANNEL_BTN", texChannel, texChannels, 520, 400, 48, 48);
-	m_mainBtnHomebrew = _addPicButton("MAIN/HOMEBREW_BTN", texHomebrew, texHomebrews, 520, 400, 48, 48);
+	m_mainBtnHomebrew = _addPicButton("MAIN/HOMEBREW_BTN", texHomebrew, texHomebrews, 20, 400, 48, 48);
 	m_mainBtnWii = _addPicButton("MAIN/USB_BTN", texWii, texWiis, 520, 400, 48, 48);
 	m_mainBtnGamecube = _addPicButton("MAIN/DML_BTN", texGamecube, texGamecubes, 520, 400, 48, 48);
 	m_mainBtnPlugin = _addPicButton("MAIN/EMU_BTN", texPlugin, texPlugins, 520, 400, 48, 48);