From fb6cef0f77286f95c8d85d44be023a9a3e52f3da Mon Sep 17 00:00:00 2001 From: "fix94.1" Date: Fri, 17 Feb 2012 16:46:05 +0000 Subject: [PATCH] -re-added deleted textures from r122 since they are still used (some things were not working properly without) --- source/menu/menu.cpp | 15 ++++++++++++++- source/menu/menu_config_adv.cpp | 8 ++++---- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/source/menu/menu.cpp b/source/menu/menu.cpp index 3909750e..62392cbc 100644 --- a/source/menu/menu.cpp +++ b/source/menu/menu.cpp @@ -802,7 +802,20 @@ void CMenu::_buildMenus(void) theme.btnTexRS = _texture(theme.texSet, "GENERAL", "button_texture_right_selected", theme.btnTexRS); theme.btnTexCS.fromPNG(butscenter_png); theme.btnTexCS = _texture(theme.texSet, "GENERAL", "button_texture_center_selected", theme.btnTexCS); - + + theme.btnTexLH.fromPNG(buthleft_png); + theme.btnTexLH = _texture(theme.texSet, "GENERAL", "button_texture_hlleft", theme.btnTexLH); + theme.btnTexRH.fromPNG(buthright_png); + theme.btnTexRH = _texture(theme.texSet, "GENERAL", "button_texture_hlright", theme.btnTexRH); + theme.btnTexCH.fromPNG(buthcenter_png); + theme.btnTexCH = _texture(theme.texSet, "GENERAL", "button_texture_hlcenter", theme.btnTexCH); + theme.btnTexLSH.fromPNG(buthsleft_png); + theme.btnTexLSH = _texture(theme.texSet, "GENERAL", "button_texture_hlleft_selected", theme.btnTexLSH); + theme.btnTexRSH.fromPNG(buthsright_png); + theme.btnTexRSH = _texture(theme.texSet, "GENERAL", "button_texture_hlright_selected", theme.btnTexRSH); + theme.btnTexCSH.fromPNG(buthscenter_png); + theme.btnTexCSH = _texture(theme.texSet, "GENERAL", "button_texture_hlcenter_selected", theme.btnTexCSH); + theme.btnAUOn.fromPNG(butauon_png); theme.btnAUOn = _texture(theme.texSet, "GENERAL", "button_au_on", theme.btnAUOn); theme.btnAUOns.fromPNG(butauons_png); diff --git a/source/menu/menu_config_adv.cpp b/source/menu/menu_config_adv.cpp index e88704da..0873f97b 100644 --- a/source/menu/menu_config_adv.cpp +++ b/source/menu/menu_config_adv.cpp @@ -24,7 +24,7 @@ void CMenu::_hideConfigAdv(bool instant) m_btnMgr.hide(m_configLblPage, instant); m_btnMgr.hide(m_configBtnPageM, instant); m_btnMgr.hide(m_configBtnPageP, instant); - // + m_btnMgr.hide(m_configAdvLblInstall, instant); m_btnMgr.hide(m_configAdvBtnInstall, instant); m_btnMgr.hide(m_configAdvLblTheme, instant); @@ -50,7 +50,7 @@ void CMenu::_showConfigAdv(void) m_btnMgr.show(m_configLblPage); m_btnMgr.show(m_configBtnPageM); m_btnMgr.show(m_configBtnPageP); - // + m_btnMgr.show(m_configAdvLblCurTheme); m_btnMgr.show(m_configAdvBtnCurThemeM); m_btnMgr.show(m_configAdvBtnCurThemeP); @@ -69,7 +69,7 @@ void CMenu::_showConfigAdv(void) for (u32 i = 0; i < ARRAY_SIZE(m_configAdvLblUser); ++i) if (m_configAdvLblUser[i] != -1u) m_btnMgr.show(m_configAdvLblUser[i]); - // + m_btnMgr.setText(m_configLblPage, wfmt(L"%i / %i", g_curPage, m_locked ? g_curPage : CMenu::_nbCfgPages)); m_btnMgr.setText(m_configAdvLblCurLanguage, m_curLanguage); m_btnMgr.setText(m_configAdvLblCurTheme, m_cfg.getString("GENERAL", "theme")); @@ -225,7 +225,7 @@ void CMenu::_initConfigAdvMenu(CMenu::SThemeData &theme) m_configAdvBtnCFTheme = _addButton(theme, "CONFIG_ADV/CUSTOMIZE_CF_BTN", theme.btnFont, L"", 330, 250, 270, 56, theme.btnFontColor); m_configAdvLblInstall = _addLabel(theme, "CONFIG_ADV/INSTALL", theme.lblFont, L"", 40, 310, 290, 56, theme.lblFontColor, FTGX_JUSTIFY_LEFT | FTGX_ALIGN_MIDDLE); m_configAdvBtnInstall = _addButton(theme, "CONFIG_ADV/INSTALL_BTN", theme.btnFont, L"", 330, 310, 270, 56, theme.btnFontColor); - // + _setHideAnim(m_configAdvLblTheme, "CONFIG_ADV/THEME", 100, 0, -2.f, 0.f); _setHideAnim(m_configAdvLblCurTheme, "CONFIG_ADV/THEME_BTN", 0, 0, 1.f, -1.f); _setHideAnim(m_configAdvBtnCurThemeM, "CONFIG_ADV/THEME_MINUS", 0, 0, 1.f, -1.f);