*neutrino: rework clock and radio/tv switch functionality

- move clock function from red button (main menu) into features menu
- ...so it's customizable in all user menus
- switching between tv and radio only with red button (main menu) depend of current mode
- add timerlist into main menu

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1985 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
thilo
2011-12-20 21:56:44 +00:00
parent b2aa68e063
commit ed0166e600
10 changed files with 72 additions and 54 deletions

View File

@@ -119,7 +119,8 @@ bool CUserMenu::showUserMenu(int button)
CRCLock *rcLock = NULL;
CStreamFeaturesChangeExec *StreamFeaturesChanger = NULL;
CImageInfo *imageinfo = NULL;
CDBoxInfoWidget *boxinfo = NULL;
CDBoxInfoWidget *boxinfo = NULL;
CNeutrinoApp * neutrino = NULL;
std::string txt = g_settings.usermenu_text[button];
neutrino_locale_t caption = user_menu[button].caption;
@@ -335,6 +336,16 @@ bool CUserMenu::showUserMenu(int button)
menu->addItem(new CMenuForwarder(LOCALE_CI_SETTINGS, true, NULL, g_CamHandler, NULL, key, icon));
}
break;
case SNeutrinoSettings::ITEM_CLOCK:
{
menu_items++;
menu_prev = SNeutrinoSettings::ITEM_CLOCK;
keyhelper.get(&key,&icon, CRCInput::RC_green);
neutrino = CNeutrinoApp::getInstance();
menu_item = new CMenuForwarder(!g_settings.mode_clock ? LOCALE_CLOCK_SWITCH_ON:LOCALE_CLOCK_SWITCH_OFF, true, NULL, neutrino, "clock_switch", key, icon);
menu->addItem(menu_item, false);
}
break;
#if 0 // FIXME not supported yet
case SNeutrinoSettings::ITEM_MOVIEPLAYER_TS: