-added user theme labels for menu_wad, menu_config_coverbnr and menu_home

-allowing the title when you go into the game info to get to a second line
-removed a redundant line from menu_nandemu

source/menu/menu_config_coverbnr.cpp

@@ -26,6 +26,8 @@ s16 m_coverbnrBtnDlCover;
 s16 m_coverbnrBtnDeleteCover;
 s16 m_coverbnrBtnDlBanner;
 s16 m_coverbnrBtnDeleteBanner;
+
+s16 m_coverbnrLblUser[4];
 TexData m_coverbnrBg;
 
 void CMenu::_hideCoverBanner(bool instant)
@@ -39,6 +41,10 @@ void CMenu::_hideCoverBanner(bool instant)
 	m_btnMgr.hide(m_coverbnrBtnDeleteCover, instant);
 	m_btnMgr.hide(m_coverbnrBtnDlBanner, instant);
 	m_btnMgr.hide(m_coverbnrBtnDeleteBanner, instant);
+
+	for(u8 i = 0; i < ARRAY_SIZE(m_coverbnrLblUser); ++i)
+		if(m_coverbnrLblUser[i] != -1)
+			m_btnMgr.hide(m_coverbnrLblUser[i], instant);
 }
 
 void CMenu::_showCoverBanner(void)
@@ -54,6 +60,10 @@ void CMenu::_showCoverBanner(void)
 	m_btnMgr.show(m_coverbnrBtnDeleteCover);
 	m_btnMgr.show(m_coverbnrBtnDlBanner);
 	m_btnMgr.show(m_coverbnrBtnDeleteBanner);
+
+	for(u8 i = 0; i < ARRAY_SIZE(m_coverbnrLblUser); ++i)
+		if(m_coverbnrLblUser[i] != -1)
+			m_btnMgr.show(m_coverbnrLblUser[i]);
 }
 
 void CMenu::_CoverBanner(void)
@@ -101,6 +111,8 @@ void CMenu::_CoverBanner(void)
 
 void CMenu::_initCoverBanner()
 {
+	_addUserLabels(m_coverbnrLblUser, ARRAY_SIZE(m_coverbnrLblUser), "COVERBNR");
+
 	m_coverbnrBg = _texture("COVERBNR/BG", "texture", theme.bg, false);
 	m_coverbnrLblDlCover = _addLabel("COVERBNR/DLCOVER", theme.lblFont, L"", 40, 130, 340, 56, theme.lblFontColor, FTGX_JUSTIFY_LEFT | FTGX_ALIGN_MIDDLE);
 	m_coverbnrBtnDlCover = _addButton("COVERBNR/DLCOVER_BTN", theme.btnFont, L"", 370, 130, 230, 56, theme.btnFontColor);

source/menu/menu_gameinfo.cpp

@@ -320,7 +320,7 @@ void CMenu::_textGameInfo(void)
 		if(gametdb.GetTitle(GameID, TMP_Char))
 		{
 			gameinfo_Title_w.fromUTF8(TMP_Char);
-			m_btnMgr.setText(m_gameinfoLblTitle, gameinfo_Title_w, true);
+			m_btnMgr.setText(m_gameinfoLblTitle, gameinfo_Title_w);
 		}
 		if(gametdb.GetSynopsis(GameID, TMP_Char))
 		{

source/menu/menu_home.cpp

@@ -24,6 +24,7 @@ s16 m_homeBtnExitToBootmii;
 s16 m_homeBtnExitToNeek;
 
 s16 m_homeLblBattery;
+s16 m_homeLblUser[4];
 
 TexData m_homeBg;
 
@@ -202,6 +203,10 @@ void CMenu::_showHome(void)
 	m_btnMgr.show(m_homeBtnSource);
 
 	m_btnMgr.show(m_homeLblBattery);
+
+	for(u8 i = 0; i < ARRAY_SIZE(m_homeLblUser); ++i)
+		if(m_homeLblUser[i] != -1)
+			m_btnMgr.show(m_homeLblUser[i]);
 }
 
 void CMenu::_showExitTo(void)
@@ -214,6 +219,10 @@ void CMenu::_showExitTo(void)
 	m_btnMgr.show(m_homeBtnExitToPriiloader);
 	m_btnMgr.show(m_homeBtnExitToBootmii);
 	m_btnMgr.show(m_homeBtnExitToNeek);
+
+	for(u8 i = 0; i < ARRAY_SIZE(m_homeLblUser); ++i)
+		if(m_homeLblUser[i] != -1)
+			m_btnMgr.show(m_homeLblUser[i]);
 }
 
 void CMenu::_hideHome(bool instant)
@@ -231,6 +240,10 @@ void CMenu::_hideHome(bool instant)
 	m_btnMgr.hide(m_homeBtnSource, instant);
 
 	m_btnMgr.hide(m_homeLblBattery, instant);
+
+	for(u8 i = 0; i < ARRAY_SIZE(m_homeLblUser); ++i)
+		if(m_homeLblUser[i] != -1)
+			m_btnMgr.hide(m_homeLblUser[i], instant);
 }
 
 void CMenu::_hideExitTo(bool instant)
@@ -242,10 +255,16 @@ void CMenu::_hideExitTo(bool instant)
 	m_btnMgr.hide(m_homeBtnExitToPriiloader, instant);
 	m_btnMgr.hide(m_homeBtnExitToBootmii, instant);
 	m_btnMgr.hide(m_homeBtnExitToNeek, instant);
+
+	for(u8 i = 0; i < ARRAY_SIZE(m_homeLblUser); ++i)
+		if(m_homeLblUser[i] != -1)
+			m_btnMgr.hide(m_homeLblUser[i], instant);
 }
 
 void CMenu::_initHomeAndExitToMenu()
 {
+	_addUserLabels(m_homeLblUser, ARRAY_SIZE(m_homeLblUser), "HOME");
+
 	//Home Menu
 	m_homeBg = _texture("HOME/BG", "texture", theme.bg, false);
 

source/menu/menu_nandemu.cpp

@@ -899,7 +899,6 @@ void CMenu::_initNandEmuMenu()
 	m_nandemuLblPage = _addLabel("NANDEMU/PAGE_BTN", theme.btnFont, L"", 62, 400, 98, 56, theme.btnFontColor, FTGX_JUSTIFY_CENTER | FTGX_ALIGN_MIDDLE, theme.btnTexC);
 	m_nandemuBtnPageM = _addPicButton("NANDEMU/PAGE_MINUS", theme.btnTexMinus, theme.btnTexMinusS, 10, 400, 52, 56);
 	m_nandemuBtnPageP = _addPicButton("NANDEMU/PAGE_PLUS", theme.btnTexPlus, theme.btnTexPlusS, 160, 400, 52, 56);
-	m_nandemuBtnBack = _addButton("NANDEMU/BACK_BTN", theme.btnFont, L"", 420, 400, 200, 56, theme.btnFontColor);
 
 	m_nandemuBtnExtract = _addButton("NANDEMU/EXTRACT", theme.titleFont, L"", 72, 180, 496, 56, theme.titleFontColor);
 	m_nandemuBtnDisable = _addButton("NANDEMU/DISABLE", theme.titleFont, L"", 72, 270, 496, 56, theme.titleFontColor);

source/menu/menu_wad.cpp

@@ -271,6 +271,7 @@ int installWad(const char *path)
 s16 m_wadBtnInstall;
 s16 m_wadLblTitle;
 s16 m_wadLblDialog;
+s16 m_wadLblUser[4];
 
 void CMenu::_showWad()
 {
@@ -286,6 +287,10 @@ void CMenu::_showWad()
 		m_btnMgr.show(m_configBtnPartitionP);
 		m_btnMgr.show(m_configBtnPartitionM);
 	}
+
+	for(u8 i = 0; i < ARRAY_SIZE(m_wadLblUser); ++i)
+		if(m_wadLblUser[i] != -1)
+			m_btnMgr.show(m_wadLblUser[i]);
 }
 
 void CMenu::_hideWad(bool instant)
@@ -301,6 +306,10 @@ void CMenu::_hideWad(bool instant)
 		m_btnMgr.hide(m_configBtnPartitionP);
 		m_btnMgr.hide(m_configBtnPartitionM);
 	}
+
+	for(u8 i = 0; i < ARRAY_SIZE(m_wadLblUser); ++i)
+		if(m_wadLblUser[i] != -1)
+			m_btnMgr.hide(m_wadLblUser[i], instant);
 }
 
 int getTID(const char *path, u64 *tid)
@@ -408,6 +417,8 @@ void CMenu::_Wad(const char *wad_path)
 
 void CMenu::_initWad()
 {
+	_addUserLabels(m_wadLblUser, ARRAY_SIZE(m_wadLblUser), "WAD");
+
 	m_wadBg = _texture("WAD/BG", "texture", theme.bg, false);
 	m_wadLblTitle = _addTitle("WAD/TITLE", theme.titleFont, L"", 20, 30, 600, 60, theme.titleFontColor, FTGX_JUSTIFY_CENTER | FTGX_ALIGN_MIDDLE);
 	m_wadLblDialog = _addLabel("WAD/DIALOG", theme.lblFont, L"", 40, 90, 560, 200, theme.lblFontColor, FTGX_JUSTIFY_LEFT | FTGX_ALIGN_MIDDLE);