- cleanup for last commit

source/menu/menu.cpp

@@ -1262,14 +1262,8 @@ void CMenu::_buildMenus(void)
 	_initErrorMenu();
 	_initWad();
 	_initWBFSMenu();
-	//_initConfigAdvMenu();
-	//_initConfigSndMenu();
-	//_initConfig4Menu();
-	//_initConfigScreenMenu();
-	//_initConfig3Menu();
 	_initConfigMenu();
 	_initConfigGCMenu();
-	//_initConfig7Menu();
 	_initPartitionsCfgMenu();
 	_initGameMenu();
 	_initDownloadMenu();
@@ -1982,12 +1976,6 @@ void CMenu::_updateText(void)
 	_textPluginSettings();
 	_textCategorySettings();
 	_textCheatSettings();
-	//_textConfig();
-	//_textConfig3();
-	//_textConfigScreen();
-	//_textConfig4();
-	//_textConfigAdv();
-	//_textConfigSnd();
 	_textConfigGC();
 	_textPartitionsCfg();
 	_textCfgHB();

source/menu/menu.hpp

@@ -189,12 +189,6 @@ private:
 	//
 	TexData m_errorBg;
 	TexData m_configBg;
-	//TexData m_config3Bg;
-	//TexData m_configScreenBg;
-	//TexData m_config4Bg;
-	//TexData m_configAdvBg;
-	//TexData m_configSndBg;
-	//TexData m_config7Bg;
 	TexData m_cheatBg;
 	TexData m_downloadBg;
 	TexData m_gameinfoBg;
@@ -271,113 +265,7 @@ private:
 	s16 m_configLbl4Val;
 	s16 m_configBtn4M;
 	s16 m_configBtn4P;
-/*	
-	s16 m_configLblDownload;
-	s16 m_configBtnDownload; 
-	s16 m_configLblParental;
-	s16 m_configBtnUnlock;
-	s16 m_configBtnSetCode;
-	s16 m_configLblPartition;
-	s16 m_configBtnPartition;
-	s16 m_configLblCfg4;
-	s16 m_configBtnCfg4;
 
-	s16 m_configAdvLblTheme;
-	s16 m_configAdvLblCurTheme;
-	s16 m_configAdvBtnCurThemeM;
-	s16 m_configAdvBtnCurThemeP;
-	s16 m_configAdvLblLanguage;
-	s16 m_configAdvLblCurLanguage;
-	s16 m_configAdvBtnCurLanguageM;
-	s16 m_configAdvBtnCurLanguageP;
-	s16 m_configAdvLblCFTheme;
-	s16 m_configAdvBtnCFTheme;
-	s16 m_configAdvLblBootChange;
-	s16 m_configAdvBtnBootChange;
-	s16 m_configAdvLblUser[4];
-	
-	s16 m_config3LblGameLanguage;
-	s16 m_config3LblLanguage;
-	s16 m_config3BtnLanguageP;
-	s16 m_config3BtnLanguageM;
-	s16 m_config3LblGameVideo;
-	s16 m_config3LblVideo;
-	s16 m_config3BtnVideoP;
-	s16 m_config3BtnVideoM;
-	s16 m_config3LblGCDefaults;
-	s16 m_config3BtnGCDefaults;
-	s16 m_config3LblChannelsType;
-	s16 m_config3LblChannelsTypeVal;
-	s16 m_config3BtnChannelsTypeP;
-	s16 m_config3BtnChannelsTypeM;
-	s16 m_config3LblUser[4];
-	
-	s16 m_config4LblReturnTo;
-	s16 m_config4LblReturnToVal;
-	s16 m_config4BtnReturnToM;
-	s16 m_config4BtnReturnToP;
-	s16 m_config4LblHome;
-	s16 m_config4BtnHome;
-	s16 m_config4LblSaveFavMode;
-	s16 m_config4BtnSaveFavMode;
-	s16 m_config4LblPathManager;
-	s16 m_config4BtnPathManager;
-	s16 m_config4LblUser[4];
-	
-	s16 m_configSndLblBnrVol;
-	s16 m_configSndLblBnrVolVal;
-	s16 m_configSndBtnBnrVolP;
-	s16 m_configSndBtnBnrVolM;
-	s16 m_configSndLblMusicVol;
-	s16 m_configSndLblMusicVolVal;
-	s16 m_configSndBtnMusicVolP;
-	s16 m_configSndBtnMusicVolM;
-	s16 m_configSndLblGuiVol;
-	s16 m_configSndLblGuiVolVal;
-	s16 m_configSndBtnGuiVolP;
-	s16 m_configSndBtnGuiVolM;
-	s16 m_configSndLblCFVol;
-	s16 m_configSndLblCFVolVal;
-	s16 m_configSndBtnCFVolP;
-	s16 m_configSndBtnCFVolM;
-	s16 m_configSndLblUser[4];
-	
-	s16 m_configScreenLblTVHeight;
-	s16 m_configScreenLblTVHeightVal;
-	s16 m_configScreenBtnTVHeightP;
-	s16 m_configScreenBtnTVHeightM;
-	s16 m_configScreenLblTVWidth;
-	s16 m_configScreenLblTVWidthVal;
-	s16 m_configScreenBtnTVWidthP;
-	s16 m_configScreenBtnTVWidthM;
-	s16 m_configScreenLblTVX;
-	s16 m_configScreenLblTVXVal;
-	s16 m_configScreenBtnTVXM;
-	s16 m_configScreenBtnTVXP;
-	s16 m_configScreenLblTVY;
-	s16 m_configScreenLblTVYVal;
-	s16 m_configScreenBtnTVYM;
-	s16 m_configScreenBtnTVYP;
-	s16 m_configScreenLblUser[4];
-
-	s16 m_config7Lbl1;
-	s16 m_config7Lbl2;
-	s16 m_config7Lbl3;
-	s16 m_config7Lbl4;
-	s16 m_config7Btn1;
-	s16 m_config7Btn2;
-
-	s16 m_config7Btn3;
-	s16 m_config7Lbl3Val;
-	s16 m_config7Btn3M;
-	s16 m_config7Btn3P;
-
-	s16 m_config7Btn4;
-	s16 m_config7Lbl4Val;
-	s16 m_config7Btn4M;
-	s16 m_config7Btn4P;
-	s16 m_config7LblUser[4];
-*/
 //Download menu
 	s16 m_downloadPrioVal;
 	enum CoverPrio
@@ -983,13 +871,7 @@ private:
 	void _initMainMenu();
 	void _initErrorMenu();
 	void _initConfigMenu();
-	//void _initConfigAdvMenu();
-	//void _initConfig3Menu();
-	//void _initConfig4Menu();
-	//void _initConfigSndMenu();
-	//void _initConfigScreenMenu();
 	void _initConfigGCMenu();
-	//void _initConfig7Menu();
 	void _initPartitionsCfgMenu();
 	void _initGameMenu();
 	void _initDownloadMenu();
@@ -1021,11 +903,6 @@ private:
 	void _textCheatSettings(void);
 	void _textError(void);
 	void _textConfig(void);
-	//void _textConfig3(void);
-	//void _textConfigScreen(void);
-	//void _textConfig4(void);
-	//void _textConfigAdv(void);
-	//void _textConfigSnd(void);
 	void _textConfigGC(void);
 	void _textPartitionsCfg(void);
 	void _textGame(void);
@@ -1049,16 +926,9 @@ private:
 	void _hideCheatSettings(bool instant = false);
 	void _hideError(bool instant = false);
 	void _hideMain(bool instant = false);
-	//void _hideConfigCommon(bool instant = false);
 	void _hideConfigMain(bool instant = false);
-	//void _hideConfig3(bool instant = false);
-	//void _hideConfigScreen(bool instant = false);
-	//void _hideConfig4(bool instant = false);
-	//void _hideConfigAdv(bool instant = false);
-	//void _hideConfigSnd(bool instant = false);
 	void _hideConfigGC(bool instant = false);
 	void _hideConfigGCPage(bool instant = false);
-	//void _hideConfig7(bool instant = false);
 	void _hidePartitionsCfg(bool instant = false);
 	void _hideGame(bool instant = false);
 	void _hideDownload(bool instant = false);
@@ -1088,16 +958,9 @@ private:
 	//
 	void _showError(void);
 	void _showMain(void);
-	//void _showConfigCommon(const TexData & bg, int page);
 	void _showConfigMain(int curPage);
-	//void _showConfig3(void);
-	//void _showConfigScreen(void);
-	//void _showConfig4(void);
-	//void _showConfigAdv(void);
-	//void _showConfigSnd(void);
 	void _showConfigGC(void);
 	void _showConfigGCPage(void);
-	//void _showConfig7(int curPage);
 	void _showPartitionsCfg(void);
 	void _showNandEmu(void);
 	void _showGame(void);
@@ -1146,18 +1009,9 @@ private:
 	void _setCFVersion(int version);
 	int _getCFVersion(void);
 	//
-	//void _config(void);
 	void _configMain(void);
-	//int _configCommon(void);
 	wstringEx _getChannelName(void);
-	//int _config1(void);
-	//int _config3(void);
-	//int _configScreen(void);
-	//int _config4(void);
-	//int _configAdv(void);
-	//int _configSnd(void);
 	void _configGC(void);
-	//int _config7(int curPage);
 	void _partitionsCfg(void);
 	int _NandEmuCfg(void);
 	int _AutoExtractSave(string gameId);

source/menu/menu_config_main.cpp

@@ -2,76 +2,8 @@
 #include <algorithm>
 #include "menu.hpp"
 
-//using namespace std;
-
 const int CMenu::_nbCfgPages = 14;
-/*
-void CMenu::_hideConfigCommon(bool instant)
-{
-	m_btnMgr.hide(m_configLblTitle, instant);
-	m_btnMgr.hide(m_configBtnBack, instant);
-	m_btnMgr.hide(m_configLblPage, instant);
-	m_btnMgr.hide(m_configBtnPageM, instant);
-	m_btnMgr.hide(m_configBtnPageP, instant);
-}
 
-void CMenu::_showConfigCommon(const TexData &bg, int page)
-{
-	_setBg(bg, bg);
-	m_btnMgr.show(m_configLblTitle);
-	m_btnMgr.show(m_configBtnBack);
-	m_btnMgr.show(m_configLblPage);
-	m_btnMgr.show(m_configBtnPageM);
-	m_btnMgr.show(m_configBtnPageP);
-	m_btnMgr.setText(m_configLblPage, wfmt(L"%i / %i", page, m_locked ? page : _nbCfgPages));
-	m_btnMgr.setText(m_configLblTitle, _t("cfg1", L"Settings"));
-	m_btnMgr.setText(m_configBtnBack, _t("cfg10", L"Back"));
-}
-
-int CMenu::_configCommon(void)
-{
-	_mainLoopCommon();
-	if (BTN_HOME_PRESSED || BTN_B_PRESSED || (BTN_A_PRESSED && m_btnMgr.selected(m_configBtnBack)))
-		return CONFIG_PAGE_BACK;
-	else if (BTN_UP_PRESSED)
-		m_btnMgr.up();
-	else if (BTN_DOWN_PRESSED)
-		m_btnMgr.down();
-	else if (BTN_LEFT_PRESSED || BTN_MINUS_PRESSED || (BTN_A_PRESSED && m_btnMgr.selected(m_configBtnPageM)))
-	{
-		if(BTN_LEFT_PRESSED || BTN_MINUS_PRESSED) m_btnMgr.click(m_configBtnPageM);
-		return CONFIG_PAGE_DEC;
-	}
-	else if (BTN_RIGHT_PRESSED || BTN_PLUS_PRESSED || (BTN_A_PRESSED && m_btnMgr.selected(m_configBtnPageP)))
-	{
-		if(BTN_RIGHT_PRESSED || BTN_PLUS_PRESSED) m_btnMgr.click(m_configBtnPageP);
-		return CONFIG_PAGE_INC;
-	}
-	return CONFIG_PAGE_NO_CHANGE;
-}
-
-void CMenu::_config()
-{
-	int page = 1;
-	int change = CONFIG_PAGE_NO_CHANGE;
-	while(!m_exit)
-	{
-		change = _configMain(page);
-
-		if(change == CONFIG_PAGE_BACK)
-			break;
-		if(!m_locked)
-		{
-			// assumes change is in the range of CONFIG_PAGE_DEC to CONFIG_PAGE_INC
-			page += change;
-			if (page > _nbCfgPages)
-				page = 1;
-			else if (page < 1)
-				page = _nbCfgPages;
-		}
-	}
-}
-*/
 template <class T> static inline T loopNum(T i, T s)
 {
 	return (i + s) % s;
@@ -147,7 +79,6 @@ wstringEx CMenu::_getChannelName()
 
 void CMenu::_hideConfigMain(bool instant)
 {
-	//_hideConfigCommon(instant);
 	m_btnMgr.hide(m_configLblTitle, instant);
 	m_btnMgr.hide(m_configBtnBack, instant);
 	m_btnMgr.hide(m_configLblPage, instant);
@@ -186,7 +117,6 @@ void CMenu::_hideConfigMain(bool instant)
 
 void CMenu::_showConfigMain(int curPage)
 {
-	//_showConfigCommon(m_configBg,curPage);
 	_setBg(m_configBg,m_configBg);
 	m_btnMgr.show(m_configLblTitle);
 	m_btnMgr.show(m_configBtnBack);
@@ -441,8 +371,6 @@ void CMenu::_showConfigMain(int curPage)
 		m_btnMgr.show(m_configLbl4Val);
 		m_btnMgr.show(m_configBtn4M);
 		m_btnMgr.show(m_configBtn4P);
-		//m_btnMgr.setText(m_configLbl1, _t("cfg713", L"Use HQ covers"));
-		//m_btnMgr.setText(m_configBtn1, m_cfg.getBool("GENERAL", "cover_use_hq") ? _t("yes", L"Yes") : _t("no", L"No"));
 		m_btnMgr.setText(m_configLbl1, _t("cfg728", L"Upsample music to 48khz"));
 		m_btnMgr.setText(m_configBtn1, m_cfg.getBool("general", "resample_to_48khz", true) ?  _t("yes", L"Yes") : _t("no", L"No"));
 		m_btnMgr.setText(m_configLbl2, _t("cfg714", L"Display music title"));
@@ -460,8 +388,6 @@ void CMenu::_showConfigMain(int curPage)
 		m_btnMgr.show(m_configBtn4);
 		m_btnMgr.setText(m_configLbl1, _t("cfg717", L"Random game boot or select"));
 		m_btnMgr.setText(m_configBtn1, m_cfg.getBool("GENERAL", "random_select") ? _t("select", L"Select") : _t("boot", L"Boot"));
-		//m_btnMgr.setText(m_configLbl2, _t("cfg718", L"Source Menu on start"));
-		//m_btnMgr.setText(m_configBtn2, m_cfg.getBool("GENERAL", "source_on_start") ? _t("yes", L"Yes") : _t("no", L"No"));
 		m_btnMgr.setText(m_configLbl2, _t("cfg725", L"Shutdown to idle standby"));
 		m_btnMgr.setText(m_configBtn2, m_cfg.getBool("general", "idle_standby", false) ? _t("yes", L"Yes") : _t("no", L"No"));
 		m_btnMgr.setText(m_configLbl3, _t("cfg720", L"Play GC banner sound"));
@@ -529,8 +455,6 @@ void CMenu::_configMain(void)
 	vector<string> themes;
 	string prevLanguage;
 	
-	//if(curPage == 2)
-	//{
 	string prevTheme = m_cfg.getString("GENERAL", "theme");
 	listThemes(m_themeDir.c_str(), themes);
 	for(u32 i = 0; i < themes.size(); ++i)
@@ -556,8 +480,6 @@ void CMenu::_configMain(void)
 		}
 	}
 	prevLanguage = languages_available[curLanguage];
-	//}
-	//int change = CONFIG_PAGE_NO_CHANGE;
 	_showConfigMain(curPage);
 	
 	while(!m_exit)
@@ -905,11 +827,6 @@ void CMenu::_configMain(void)
 			}
 			if(curPage == 10)
 			{
-				/*if(m_btnMgr.selected(m_configBtn1))
-				{
-					m_cfg.setBool("GENERAL", "cover_use_hq", !m_cfg.getBool("GENERAL", "cover_use_hq"));
-					m_btnMgr.setText(m_configBtn1, m_cfg.getBool("GENERAL", "cover_use_hq") ? _t("yes", L"Yes") : _t("no", L"No"));
-				}*/
 				if(m_btnMgr.selected(m_configBtn1))
 				{
 					bool val = !m_cfg.getBool("general", "resample_to_48khz");
@@ -946,11 +863,6 @@ void CMenu::_configMain(void)
 					m_cfg.setBool("GENERAL", "random_select", !m_cfg.getBool("GENERAL", "random_select"));
 					m_btnMgr.setText(m_configBtn1, m_cfg.getBool("GENERAL", "random_select") ? _t("select", L"Select") : _t("boot", L"Boot"));
 				}
-				/*else if(m_btnMgr.selected(m_configBtn2))
-				{
-					m_cfg.setBool("GENERAL", "source_on_start", !m_cfg.getBool("GENERAL", "source_on_start"));
-					m_btnMgr.setText(m_configBtn2, m_cfg.getBool("GENERAL", "source_on_start") ?  _t("yes", L"Yes") : _t("no", L"No"));
-				}*/
 				else if(m_btnMgr.selected(m_configBtn2))
 				{
 					bool val = !m_cfg.getBool("general", "idle_standby");
@@ -1070,7 +982,6 @@ void CMenu::_configMain(void)
 	if(!m_refreshGameList && (hq_covers != m_cfg.getBool("GENERAL", "cover_use_hq") || box_mode != m_cfg.getBool("general", "box_mode")))
 		_initCF();
 	_hideConfigMain();
-	//return change;
 }
 
 void CMenu::_initConfigMenu()

source/menu/menu_error.cpp

@@ -11,12 +11,6 @@ void CMenu::error(const wstringEx &msg)
 	_hideAbout();
 	_hideCode();
 	_hideConfigMain();
-	//_hideConfig();
-	//_hideConfigAdv();
-	//_hideConfig3();
-	//_hideConfig4();
-	//_hideConfigScreen();
-	//_hideConfigSnd();
 	_hideDownload();
 	_hideExitTo();
 	_hideGame();