-updated the default theme pngs and removed old stuff (thanks Ayatus)

-fixed the font bug if wiiflow finds a font of the same size it would ignore spacing and weight differences
-gave the file explorer the ability to bootup gc/wii iso/wbfs files
-you can now scroll through the explorer pages with +/- too

source/defines.h

@@ -38,7 +38,7 @@
 "Lustar, CedWii, Benjay, Domi78, Oops, \
 Celtiore, Jiiwah, FluffyKiwi, Roku93, Yardape8000, \
 Spayrosam, Bluescreen81, Chappy23, Fledge68, \
-BlindDude, Bubba, DJTaz, OggZee, entropy, \
+BlindDude, Bubba, DJTaz, OggZee, entropy, Ayatus, \
 Usptactical, WiiPower, Hermes, Spidy1000, megazig, \
 Dimok, Kovani, Drexyl, DvZ, Etheboss, stfour, \
 GaiaKnight, nibb, NJ7, Plasma, Pakatus, giantpune, \

source/menu/menu.cpp

@@ -526,12 +526,6 @@ void CMenu::_Theme_Cleanup(void)
 	TexHandle.Cleanup(theme.btnTexLS);
 	TexHandle.Cleanup(theme.btnTexRS);
 	TexHandle.Cleanup(theme.btnTexCS);
-	TexHandle.Cleanup(theme.btnTexLH);
-	TexHandle.Cleanup(theme.btnTexRH);
-	TexHandle.Cleanup(theme.btnTexCH);
-	TexHandle.Cleanup(theme.btnTexLSH);
-	TexHandle.Cleanup(theme.btnTexRSH);
-	TexHandle.Cleanup(theme.btnTexCSH);
 	TexHandle.Cleanup(theme.btnAUOn);
 	TexHandle.Cleanup(theme.btnAUOns);
 	TexHandle.Cleanup(theme.btnAUOff);
@@ -977,19 +971,6 @@ void CMenu::_buildMenus(void)
 	TexHandle.fromPNG(theme.btnTexCS, butscenter_png);
 	theme.btnTexCS = _texture("GENERAL", "button_texture_center_selected", theme.btnTexCS); 
 
-	TexHandle.fromPNG(theme.btnTexLH, buthleft_png);
-	theme.btnTexLH = _texture("GENERAL", "button_texture_hlleft", theme.btnTexLH); 
-	TexHandle.fromPNG(theme.btnTexRH, buthright_png);
-	theme.btnTexRH = _texture("GENERAL", "button_texture_hlright", theme.btnTexRH); 
-	TexHandle.fromPNG(theme.btnTexCH, buthcenter_png);
-	theme.btnTexCH = _texture("GENERAL", "button_texture_hlcenter", theme.btnTexCH); 
-	TexHandle.fromPNG(theme.btnTexLSH, buthsleft_png);
-	theme.btnTexLSH = _texture("GENERAL", "button_texture_hlleft_selected", theme.btnTexLSH); 
-	TexHandle.fromPNG(theme.btnTexRSH, buthsright_png);
-	theme.btnTexRSH = _texture("GENERAL", "button_texture_hlright_selected", theme.btnTexRSH); 
-	TexHandle.fromPNG(theme.btnTexCSH, buthscenter_png);
-	theme.btnTexCSH = _texture("GENERAL", "button_texture_hlcenter_selected", theme.btnTexCSH); 
-
 	/* Language Buttons */
 	TexHandle.fromPNG(theme.btnAUOn, butauon_png);
 	theme.btnAUOn = _texture("GENERAL", "button_au_on", theme.btnAUOn);
@@ -1207,12 +1188,13 @@ SFont CMenu::_font(CMenu::FontSet &fontSet, const char *domain, const char *key,
 		if(fonts[i].res <= 0)
 			fonts[i].res = (u32)m_theme.getInt("GENERAL", defValue);
 
-		fonts[i].res = min(max(fonts[i].min, fonts[i].res <= 0 ? fonts[i].def : fonts[i].res), fonts[i].max);		
+		fonts[i].res = min(max(fonts[i].min, fonts[i].res <= 0 ? fonts[i].def : fonts[i].res), fonts[i].max);
 	}
 
 	// Try to find the same font with the same size
 	CMenu::FontSet::iterator i = fontSet.find(CMenu::FontDesc(upperCase(filename.c_str()), fonts[0].res));
-	if (i != fontSet.end()) return i->second;
+	/* ONLY return the font if spacing and weight are the same */
+	if (i != fontSet.end() && i->second.lineSpacing == fonts[1].res && i->second.weight == fonts[2].res) return i->second;
 
 	// TTF not found in memory, load it to create a new font
 	SFont retFont;
@@ -1382,37 +1364,6 @@ s16 CMenu::_addButton(const char *domain, SFont font, const wstringEx &text, int
 	return m_btnMgr.addButton(font, text, x, y, width, height, c, btnTexSet, clickSound, hoverSound);
 }
 
-s16 CMenu::_addSelButton(const char *domain, SFont font, const wstringEx &text, int x, int y, u32 width, u32 height, const CColor &color)
-{
-	SButtonTextureSet btnTexSet;
-	CColor c(color);
-
-	c = m_theme.getColor(domain, "color", c);
-	x = m_theme.getInt(domain, "x", x);
-	y = m_theme.getInt(domain, "y", y);
-	width = m_theme.getInt(domain, "width", width);
-	height = m_theme.getInt(domain, "height", height);
-	btnTexSet.left = _texture(domain, "texture_left", theme.btnTexLH, false);
-	btnTexSet.right = _texture(domain, "texture_right", theme.btnTexRH, false);
-	btnTexSet.center = _texture(domain, "texture_center", theme.btnTexCH, false);
-	btnTexSet.leftSel = _texture(domain, "texture_left_selected", theme.btnTexLSH, false);
-	btnTexSet.rightSel = _texture(domain, "texture_right_selected", theme.btnTexRSH, false);
-	btnTexSet.centerSel = _texture(domain, "texture_center_selected", theme.btnTexCSH, false);
-
-	font = _font(theme.fontSet, domain, "font", BUTTONFONT);
-
-	GuiSound *clickSound = _sound(theme.soundSet, domain, "click_sound", theme.clickSound->GetName());
-	GuiSound *hoverSound = _sound(theme.soundSet, domain, "hover_sound", theme.hoverSound->GetName());
-
-	u16 btnPos = _textStyle(domain, "elmstyle", FTGX_JUSTIFY_LEFT | FTGX_ALIGN_TOP);
-	if (btnPos & FTGX_JUSTIFY_RIGHT)
-		x = m_vid.width() - x - width;
-	if (btnPos & FTGX_ALIGN_BOTTOM)
-		y = m_vid.height() - y - height;
-
-	return m_btnMgr.addButton(font, text, x, y, width, height, c, btnTexSet, clickSound, hoverSound);
-}
-
 s16 CMenu::_addPicButton(const char *domain, TexData &texNormal, TexData &texSelected, int x, int y, u32 width, u32 height)
 {
 	x = m_theme.getInt(domain, "x", x);

source/menu/menu.hpp

@@ -715,12 +715,6 @@ private:
 		TexData btnTexLS;
 		TexData btnTexRS;
 		TexData btnTexCS;
-		TexData btnTexLH;
-		TexData btnTexRH;
-		TexData btnTexCH;
-		TexData btnTexLSH;
-		TexData btnTexRSH;
-		TexData btnTexCSH;
 		TexData btnAUOn;
 		TexData btnAUOns;
 		TexData btnAUOff;
@@ -1043,7 +1037,6 @@ private:
 	GuiSound *_sound(CMenu::SoundSet &soundSet, const char *domain, const char *key, const char *name);
 	u16 _textStyle(const char *domain, const char *key, u16 def);
 	s16 _addButton(const char *domain, SFont font, const wstringEx &text, int x, int y, u32 width, u32 height, const CColor &color);
-	s16 _addSelButton(const char *domain, SFont font, const wstringEx &text, int x, int y, u32 width, u32 height, const CColor &color);
 	s16 _addPicButton(const char *domain, TexData &texNormal, TexData &texSelected, int x, int y, u32 width, u32 height);
 	s16 _addTitle(const char *domain, SFont font, const wstringEx &text, int x, int y, u32 width, u32 height, const CColor &color, s16 style);
 	s16 _addText(const char *domain, SFont font, const wstringEx &text, int x, int y, u32 width, u32 height, const CColor &color, s16 style);

source/menu/menu_cheat.cpp

@@ -337,7 +337,7 @@ void CMenu::_initCheatSettingsMenu()
 {
 	_addUserLabels(m_cheatLblUser, ARRAY_SIZE(m_cheatLblUser), "CHEAT");
 	m_cheatBg = _texture("CHEAT/BG", "texture", theme.bg, false);
-	m_cheatLblTitle = _addLabel("CHEAT/TITLE", theme.titleFont, L"Cheats", 20, 30, 600, 60, theme.titleFontColor, FTGX_JUSTIFY_CENTER | FTGX_ALIGN_MIDDLE);
+	m_cheatLblTitle = _addTitle("CHEAT/TITLE", theme.titleFont, L"Cheats", 20, 30, 600, 60, theme.titleFontColor, FTGX_JUSTIFY_CENTER | FTGX_ALIGN_MIDDLE);
 	m_cheatBtnBack = _addButton("CHEAT/BACK_BTN", theme.btnFont, L"", 460, 400, 150, 56, theme.btnFontColor);
 	m_cheatBtnApply = _addButton("CHEAT/APPLY_BTN", theme.btnFont, L"", 240, 400, 150, 56, theme.btnFontColor);
 	m_cheatBtnDownload = _addButton("CHEAT/DOWNLOAD_BTN", theme.btnFont, L"", 240, 400, 200, 56, theme.btnFontColor);

source/menu/menu_explorer.cpp

@@ -27,6 +27,8 @@ s16 entries[8];
 s16 entries_sel[8];
 char dir[MAX_FAT_PATH];
 char entries_char[7][NAME_MAX+1];
+u8 explorer_partition = 0;
+
 void CMenu::_hideExplorer(bool instant)
 {
 	for(u8 i = 0; i < 8; ++i)
@@ -61,6 +63,14 @@ void CMenu::_Explorer(void)
 		_mainLoopCommon();
 		if(BTN_HOME_PRESSED || BTN_B_PRESSED)
 			break;
+		else if(BTN_PLUS_PRESSED)
+		{
+			_refreshExplorer(1);
+		}
+		else if(BTN_MINUS_PRESSED)
+		{
+			_refreshExplorer(-1);
+		}
 		else if(BTN_A_PRESSED)
 		{
 			if(m_btnMgr.selected(m_mainBtnNext))
@@ -93,6 +103,7 @@ void CMenu::_Explorer(void)
 				{
 					if(dir[0] == '\0')
 					{
+						explorer_partition = i-1;
 						if(DeviceHandle.IsInserted(i-1))
 							strcpy(dir, fmt("%s:/", DeviceName[i-1]));
 						_refreshExplorer();
@@ -107,8 +118,31 @@ void CMenu::_Explorer(void)
 					else
 					{
 						const char *file = fmt("%s%s", dir, entries_char[i-1]);
-						if(strstr(file, ".mp3") != NULL || strstr(file, ".ogg") != NULL)
+						if(strcasestr(file, ".mp3") != NULL || strcasestr(file, ".ogg") != NULL)
 							MusicPlayer.LoadFile(file, false);
+						else if(strcasestr(file, ".iso") != NULL || strcasestr(file, ".wbfs") != NULL)
+						{
+							/* create header for id and path */
+							dir_discHdr tmpHdr;
+							memset(&tmpHdr, 0, sizeof(dir_discHdr));
+							memcpy(tmpHdr.path, file, 255);
+							/* check wii or gc */
+							FILE *fp = fopen(file, "rb");
+							fseek(fp, strcasestr(file, ".wbfs") != NULL ? 512 : 0, SEEK_SET);
+							fread((void*)&wii_hdr, 1, sizeof(discHdr), fp);
+							fclose(fp);
+							memcpy(tmpHdr.id, wii_hdr.id, 6);
+							if(wii_hdr.magic == WII_MAGIC)
+							{
+								currentPartition = explorer_partition;
+								_launchGame(&tmpHdr, false);
+							}
+							else if(wii_hdr.gc_magic == GC_MAGIC)
+							{
+								currentPartition = explorer_partition;
+								_launchGC(&tmpHdr, false);
+							}
+						}
 					}
 				}
 			}

source/menu/menu_gameinfo.cpp

@@ -272,7 +272,7 @@ void CMenu::_initGameInfoMenu()
 	_addUserLabels(m_gameinfoLblUser, 1, 1, "GAMEINFO");
 	_addUserLabels(m_gameinfoLblUser, 3, 2, "GAMEINFO");
 
-	m_gameinfoLblTitle = _addLabel("GAMEINFO/TITLE", theme.titleFont, L"", 20, 30, 600, 60, theme.titleFontColor, FTGX_JUSTIFY_CENTER | FTGX_ALIGN_MIDDLE);
+	m_gameinfoLblTitle = _addTitle("GAMEINFO/TITLE", theme.titleFont, L"", 20, 30, 600, 60, theme.titleFontColor, FTGX_JUSTIFY_CENTER | FTGX_ALIGN_MIDDLE);
 
 	for(u8 i = 0; i < ARRAY_SIZE(m_gameinfoLblControlsReq); ++i)
 	{