mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 17:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

neutrino usermenu: rework manage of usermenu name

Browse Source 
TODO:
- fix handling of menu names on changed buttons in infoviewer
- fix handling in user menu setup, if no item was defined
...just to name a few

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2036 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0db7df99bd
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-01-06 (Fri, 06 Jan 2012)

Origin message was:
------------------
*neutrino usermenu: rework manage of usermenu name

TODO:
- fix handling of menu names on changed buttons in infoviewer
- fix handling in user menu setup, if no item was defined
...just to name a few

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2036 e54a6e83-5905-42d5-8d5c-058d10e6a962


------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2012-01-05 23:38:54 +00:00
parent 42c72c18af
commit 331e35a3af
9 changed files with 106 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/personalize.cpp
View File

@@ -354,8 +354,10 @@ void CPersonalizeGui::ShowUserMenu(CMenuWidget* p_widget, vector<CUserMenuSetup*
for (uint i = 0; i<USERMENU_ITEMS_COUNT; i++)
{
v_umenu.push_back(new CUserMenuSetup(usermenu[i].menue_title, usermenu[i].menue_button));
//ensure correct default string, e.g: required after settings reset
g_settings.usermenu_text[i] = g_settings.usermenu_text[i].empty() ? g_Locale->getText(usermenu[i].def_name) : g_settings.usermenu_text[i].c_str();
if (v_umenu[i]->getUsedItemsCount() > 0)
g_settings.usermenu_text[i] = g_settings.usermenu_text[i].empty() ? g_Locale->getText(usermenu[i].def_name) : g_settings.usermenu_text[i].c_str();
v_umenu_fw.push_back(new CMenuForwarder(usermenu[i].menue_title, true, g_settings.usermenu_text[i], v_umenu[i], NULL, usermenu[i].DirectKey, usermenu[i].IconName));
}