-small fixes for r852. completely removed all plugins source option. fixed display of buttons with multiple magic numbers (n64). fixed display of source icon on main screen when multiple sources are selected - it now displays usb instead of dml.

This commit is contained in:
fledge68 2013-01-15 17:24:42 +00:00
parent d5b16e66da
commit 73f0bd92a0
2 changed files with 5 additions and 5 deletions

View File

@ -112,8 +112,6 @@ void CMenu::_showMain(void)
m_btnMgr.show(m_mainBtnUsb); m_btnMgr.show(m_mainBtnUsb);
break; break;
case COVERFLOW_MAX: case COVERFLOW_MAX:
m_btnMgr.show(m_mainBtnUsb);
break;
case COVERFLOW_HOMEBREW: case COVERFLOW_HOMEBREW:
m_btnMgr.show(m_mainBtnUsb); m_btnMgr.show(m_mainBtnUsb);
break; break;
@ -780,6 +778,7 @@ int CMenu::main(void)
m_btnMgr.show(m_mainBtnUsb); m_btnMgr.show(m_mainBtnUsb);
break; break;
case COVERFLOW_HOMEBREW: case COVERFLOW_HOMEBREW:
case COVERFLOW_MAX:
m_btnMgr.show(m_mainBtnUsb); m_btnMgr.show(m_mainBtnUsb);
break; break;
default: default:

View File

@ -128,7 +128,8 @@ void CMenu::_updateSourceBtns(void)
domain = PLUGIN_DOMAIN; domain = PLUGIN_DOMAIN;
if(m_cfg.getBool(domain, "source", false)) if(m_cfg.getBool(domain, "source", false))
{ {
if(m_cfg.getBool("PLUGIN", m_source.getString(fmt("BUTTON_%i", i + j), "magic"), false)) vector<string> magicNums = m_source.getStrings(fmt("BUTTON_%i", i + j), "magic", ',');
if(m_cfg.getBool("PLUGIN", magicNums.at(0), false))
ImgName = m_source.getString(fmt("BUTTON_%i", i + j),"image_s", "").c_str(); ImgName = m_source.getString(fmt("BUTTON_%i", i + j),"image_s", "").c_str();
else else
ImgName = m_source.getString(fmt("BUTTON_%i", i + j),"image", "").c_str(); ImgName = m_source.getString(fmt("BUTTON_%i", i + j),"image", "").c_str();
@ -366,7 +367,7 @@ bool CMenu::_Source()
break; break;
} }
} }
if (source == "allplugins") /*if (source == "allplugins")
{ {
if (!show_emu) _showSourceNotice(); if (!show_emu) _showSourceNotice();
else else
@ -380,7 +381,7 @@ bool CMenu::_Source()
} }
break; break;
} }
} }*/
if (source == "plugin") if (source == "plugin")
{ {
if(!show_emu) if(!show_emu)