From 8f6835364de70a521b91285afc7c25c902c5ddfa Mon Sep 17 00:00:00 2001 From: satbaby Date: Sat, 6 Feb 2010 07:26:42 +0000 Subject: [PATCH] bla->blau for VTXT git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@267 e54a6e83-5905-42d5-8d5c-058d10e6a962 --- src/neutrino_menue.cpp | 8 ++++---- src/system/settings.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp index 8a2cd94d0..b6357813e 100644 --- a/src/neutrino_menue.cpp +++ b/src/neutrino_menue.cpp @@ -2769,7 +2769,6 @@ bool CNeutrinoApp::showUserMenu(int button) case SNeutrinoSettings::ITEM_NONE: // do nothing break; - case SNeutrinoSettings::ITEM_BAR: if (menu_prev == -1 || menu_prev == SNeutrinoSettings::ITEM_BAR ) break; @@ -2819,7 +2818,7 @@ bool CNeutrinoApp::showUserMenu(int button) case SNeutrinoSettings::ITEM_REMOTE: menu_items++; menu_prev = SNeutrinoSettings::ITEM_REMOTE; - keyhelper.get(&key,&icon); + keyhelper.get(&key,&icon,CRCInput::RC_red); menu_item = new CMenuForwarder(LOCALE_RCLOCK_MENUEADD, true, NULL, this->rcLock, "-1" , key, icon ); menu->addItem(menu_item, false); break; @@ -2923,14 +2922,15 @@ bool CNeutrinoApp::showUserMenu(int button) } } break; + case SNeutrinoSettings::ITEM_VTXT: menu_items++; menu_prev = SNeutrinoSettings::ITEM_VTXT; - keyhelper.get(&key,&icon); + keyhelper.get(&key,&icon,CRCInput::RC_blue); menu_item = new CMenuForwarder(LOCALE_USERMENU_ITEM_VTXT, true, NULL, StreamFeaturesChanger, "teletext", key, icon); menu->addItem(menu_item, 0); - break; + #if 0 // FIXME not supported yet case SNeutrinoSettings::ITEM_MOVIEPLAYER_TS: menu_items++; diff --git a/src/system/settings.h b/src/system/settings.h index a718cd4b8..09a3b37b8 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -451,8 +451,8 @@ struct SNeutrinoSettings ITEM_REMOTE = 11, ITEM_FAVORITS = 12, ITEM_TECHINFO = 13, - ITEM_PLUGIN = 14, - ITEM_VTXT = 15, + ITEM_VTXT = 14, + ITEM_PLUGIN = 15, #if 0 ITEM_MOVIEPLAYER_TS = 16, ITEM_RESTART_CAMD = 17,