From 82f17f954de4d419f0a0dfdf33c06fe64efb10d1 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Sat, 27 Nov 2010 23:16:56 +0000 Subject: [PATCH] usermenu class removed, now found in it's own module git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@897 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/b202813b62916db3207a81a4be5c623bae3c4e01 Author: Thilo Graf Date: 2010-11-28 (Sun, 28 Nov 2010) ------------------ This commit was generated by Migit --- src/system/setting_helpers.cpp | 56 ---------------------------------- src/system/setting_helpers.h | 20 ++++++------ 2 files changed, 10 insertions(+), 66 deletions(-) diff --git a/src/system/setting_helpers.cpp b/src/system/setting_helpers.cpp index 174907499..bac802953 100644 --- a/src/system/setting_helpers.cpp +++ b/src/system/setting_helpers.cpp @@ -838,63 +838,7 @@ uint64_t getcurrenttime() gettimeofday( &tv, NULL ); return (uint64_t) tv.tv_usec + (uint64_t)((uint64_t) tv.tv_sec * (uint64_t) 1000000); } -// USERMENU -#define USERMENU_ITEM_OPTION_COUNT SNeutrinoSettings::ITEM_MAX -const CMenuOptionChooser::keyval USERMENU_ITEM_OPTIONS[USERMENU_ITEM_OPTION_COUNT] = -{ - { SNeutrinoSettings::ITEM_NONE, LOCALE_USERMENU_ITEM_NONE }, - { SNeutrinoSettings::ITEM_BAR, LOCALE_USERMENU_ITEM_BAR }, - { SNeutrinoSettings::ITEM_EPG_LIST, LOCALE_EPGMENU_EVENTLIST }, - { SNeutrinoSettings::ITEM_EPG_SUPER, LOCALE_EPGMENU_EPGPLUS }, - { SNeutrinoSettings::ITEM_EPG_INFO, LOCALE_EPGMENU_EVENTINFO }, - { SNeutrinoSettings::ITEM_EPG_MISC, LOCALE_USERMENU_ITEM_EPG_MISC }, - { SNeutrinoSettings::ITEM_AUDIO_SELECT, LOCALE_AUDIOSELECTMENUE_HEAD }, - { SNeutrinoSettings::ITEM_SUBCHANNEL, LOCALE_INFOVIEWER_SUBSERVICE }, - { SNeutrinoSettings::ITEM_RECORD, LOCALE_TIMERLIST_TYPE_RECORD }, - { SNeutrinoSettings::ITEM_MOVIEPLAYER_MB, LOCALE_MOVIEBROWSER_HEAD }, - { SNeutrinoSettings::ITEM_TIMERLIST, LOCALE_TIMERLIST_NAME }, - { SNeutrinoSettings::ITEM_REMOTE, LOCALE_RCLOCK_MENUEADD }, - { SNeutrinoSettings::ITEM_FAVORITS, LOCALE_FAVORITES_MENUEADD }, - { SNeutrinoSettings::ITEM_TECHINFO, LOCALE_EPGMENU_STREAMINFO }, - { SNeutrinoSettings::ITEM_PLUGIN, LOCALE_TIMERLIST_PLUGIN }, - { SNeutrinoSettings::ITEM_VTXT, LOCALE_USERMENU_ITEM_VTXT }, - { SNeutrinoSettings::ITEM_IMAGEINFO, LOCALE_SERVICEMENU_IMAGEINFO }, - { SNeutrinoSettings::ITEM_BOXINFO, LOCALE_DBOXINFO }, - { SNeutrinoSettings::ITEM_CAM, LOCALE_CAM_SETTINGS }, -#if 0 - { SNeutrinoSettings::ITEM_MOVIEPLAYER_TS, LOCALE_MAINMENU_MOVIEPLAYER } , - { SNeutrinoSettings::ITEM_RESTART_CAMD, LOCALE_EXTRA_RESTARTCAMD } -#endif -}; - -int CUserMenuMenu::exec(CMenuTarget* parent, const std::string & /*actionKey*/) -{ - if(parent != NULL) - parent->hide(); - - CMenuWidget menu (local , NEUTRINO_ICON_KEYBINDING); - menu.addItem(GenericMenuSeparator); - menu.addItem(GenericMenuBack); - menu.addItem(GenericMenuSeparatorLine); - - CStringInputSMS name(LOCALE_USERMENU_NAME, &g_settings.usermenu_text[button], 11, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz��/- "); - menu.addItem(new CMenuForwarder(LOCALE_USERMENU_NAME, true, g_settings.usermenu_text[button],&name)); - menu.addItem(GenericMenuSeparatorLine); - - char text[10]; - for(int item = 0; item < SNeutrinoSettings::ITEM_MAX && item <13; item++) // Do not show more than 13 items - { - snprintf(text,10,"%d:",item); - text[9]=0;// terminate for sure - //menu.addItem( new CMenuOptionChooser(text, &g_settings.usermenu[button][item], USERMENU_ITEM_OPTIONS, USERMENU_ITEM_OPTION_COUNT,true )); - menu.addItem( new CMenuOptionChooser(text, &g_settings.usermenu[button][item], USERMENU_ITEM_OPTIONS, USERMENU_ITEM_OPTION_COUNT,true, NULL, CRCInput::RC_nokey, "", true )); - } - - menu.exec(NULL,""); - - return menu_return::RETURN_REPAINT; -} bool CTZChangeNotifier::changeNotify(const neutrino_locale_t, void * Data) { diff --git a/src/system/setting_helpers.h b/src/system/setting_helpers.h index 6c878b0bd..f4459dd61 100644 --- a/src/system/setting_helpers.h +++ b/src/system/setting_helpers.h @@ -271,16 +271,16 @@ class CUCodeCheckExec : public CMenuTarget void testNetworkSettings(const char* ip, const char* netmask, const char* broadcast, const char* gateway, const char* nameserver, bool dhcp); void showCurrentNetworkSettings(); -// USERMENU -class CUserMenuMenu : public CMenuTarget -{ - private: - int button; - neutrino_locale_t local; - public: - CUserMenuMenu(neutrino_locale_t _local, int _button){local = _local;button = _button;}; - int exec(CMenuTarget* parent, const std::string & actionKey); -}; +// // USERMENU +// class CUserMenuMenu : public CMenuTarget +// { +// private: +// int button; +// neutrino_locale_t local; +// public: +// CUserMenuMenu(neutrino_locale_t _local, int _button){local = _local;button = _button;}; +// int exec(CMenuTarget* parent, const std::string & actionKey); +// }; class CTZChangeNotifier : public CChangeObserver {