From 345a07b04f12e262c7335c3cdebb23c5a6a9f97f Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 13 Dec 2016 11:39:09 +0100 Subject: [PATCH] usermenu: sort NI code to original code Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/224c4b6774302891c060fe4d5c7c18dfb6f8f907 Author: vanhofen Date: 2016-12-13 (Tue, 13 Dec 2016) Origin message was: ------------------ - usermenu: sort NI code to original code --- src/gui/user_menue.cpp | 42 +++++++++++++++++++++--------------- src/gui/user_menue_setup.cpp | 11 +++++----- 2 files changed, 30 insertions(+), 23 deletions(-) diff --git a/src/gui/user_menue.cpp b/src/gui/user_menue.cpp index bd7db22da..77ec29141 100644 --- a/src/gui/user_menue.cpp +++ b/src/gui/user_menue.cpp @@ -369,6 +369,24 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg) menu_item = new CMenuDForwarder(LOCALE_MAINMENU_SCRIPTS, g_PluginList->hasPlugin(CPlugins::P_TYPE_SCRIPT), NULL, new CPluginList(LOCALE_MAINMENU_SCRIPTS,CPlugins::P_TYPE_SCRIPT), "-1", key, icon ); menu_item->setHint(NEUTRINO_ICON_HINT_SCRIPTS, LOCALE_MENU_HINT_SCRIPTS); break; + //NI + case SNeutrinoSettings::ITEM_ECMINFO: + keyhelper.get(&key,&icon); + menu_item = new CMenuForwarder(LOCALE_ECMINFO_SHOW, file_size("/tmp/ecm.info"), NULL, ni_menu, "ecmInfo", key, icon); + // FIXME menu_item->setHint("", NONEXISTANT_LOCALE); + break; + //NI + case SNeutrinoSettings::ITEM_CAMD_RESET: + keyhelper.get(&key,&icon); + menu_item = new CMenuForwarder(LOCALE_CAMD_RESET, true, NULL, ni_menu, "camd_reset", key, icon); + // FIXME menu_item->setHint("", NONEXISTANT_LOCALE); + break; + //NI + case SNeutrinoSettings::ITEM_INFOICONS: + keyhelper.get(&key,&icon); + menu_item = new CMenuForwarder(!g_settings.mode_icons ? LOCALE_INFOICONS_SWITCH_ON : LOCALE_INFOICONS_SWITCH_OFF, g_settings.mode_icons_skin != INFOICONS_INFOVIEWER, NULL, new CInfoIconsSetup, "infoicons_switch", key, icon); + // FIXME menu_item->setHint("", NONEXISTANT_LOCALE); + break; case SNeutrinoSettings::ITEM_YOUTUBE: keyhelper.get(&key,&icon); menu_item = new CMenuForwarder(LOCALE_MOVIEPLAYER_YTPLAYBACK, !_mode_ts, NULL, neutrino, "ytplayback", key, icon); @@ -389,6 +407,12 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg) menu_item = new CMenuDForwarder(LOCALE_MAINMENU_LUA, g_PluginList->hasPlugin(CPlugins::P_TYPE_LUA), NULL, new CPluginList(LOCALE_MAINMENU_LUA,CPlugins::P_TYPE_LUA), "-1", key, icon ); // FIXME menu_item->setHint("", NONEXISTANT_LOCALE); break; + //NI + case SNeutrinoSettings::ITEM_TUNER_RESTART: + keyhelper.get(&key,&icon); + menu_item = new CMenuForwarder(LOCALE_SERVICEMENU_RESTART_TUNER, true, NULL, neutrino, "restarttuner", key, icon); + menu_item->setHint(NEUTRINO_ICON_HINT_RELOAD_CHANNELS, LOCALE_MENU_HINT_RESTART_TUNER); + break; case SNeutrinoSettings::ITEM_HDDMENU: keyhelper.get(&key,&icon); menu_item = new CMenuForwarder(LOCALE_HDD_SETTINGS, true, NULL, CHDDMenuHandler::getInstance(), NULL, key, icon); @@ -427,26 +451,10 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg) menu_item->setHint(NEUTRINO_ICON_HINT_ADZAP, adzap_active ? LOCALE_MENU_HINT_ADZAP_ACTIVE : LOCALE_MENU_HINT_ADZAP); break; //NI - case SNeutrinoSettings::ITEM_CAMD_RESET: - keyhelper.get(&key,&icon); - menu_item = new CMenuForwarder(LOCALE_CAMD_RESET, true, NULL, ni_menu, "camd_reset", key, icon); - break; - case SNeutrinoSettings::ITEM_ECMINFO: - keyhelper.get(&key,&icon); - menu_item = new CMenuForwarder(LOCALE_ECMINFO_SHOW, file_size("/tmp/ecm.info"), NULL, ni_menu, "ecmInfo", key, icon); - break; - case SNeutrinoSettings::ITEM_INFOICONS: - keyhelper.get(&key,&icon); - menu_item = new CMenuForwarder(!g_settings.mode_icons ? LOCALE_INFOICONS_SWITCH_ON : LOCALE_INFOICONS_SWITCH_OFF, g_settings.mode_icons_skin != INFOICONS_INFOVIEWER, NULL, new CInfoIconsSetup, "infoicons_switch", key, icon); - break; - case SNeutrinoSettings::ITEM_TUNER_RESTART: - keyhelper.get(&key,&icon); - menu_item = new CMenuForwarder(LOCALE_SERVICEMENU_RESTART_TUNER, true, NULL, neutrino, "restarttuner", key, icon); - menu_item->setHint(NEUTRINO_ICON_HINT_RELOAD_CHANNELS, LOCALE_MENU_HINT_RESTART_TUNER); - break; case SNeutrinoSettings::ITEM_TESTMENU: keyhelper.get(&key,&icon); menu_item = new CMenuDForwarder(LOCALE_TESTMENU, true, NULL, new CTestMenu(), NULL, key, icon); + // FIXME menu_item->setHint("", NONEXISTANT_LOCALE); break; case -1: // plugin { diff --git a/src/gui/user_menue_setup.cpp b/src/gui/user_menue_setup.cpp index dd530154e..2b079a8c9 100644 --- a/src/gui/user_menue_setup.cpp +++ b/src/gui/user_menue_setup.cpp @@ -88,10 +88,14 @@ static keyvals usermenu_items[] = { SNeutrinoSettings::ITEM_CLOCK, LOCALE_CLOCK_SWITCH_ON, usermenu_show }, { SNeutrinoSettings::ITEM_GAMES, LOCALE_MAINMENU_GAMES, usermenu_show }, { SNeutrinoSettings::ITEM_SCRIPTS, LOCALE_MAINMENU_SCRIPTS, usermenu_show }, + { SNeutrinoSettings::ITEM_ECMINFO, LOCALE_ECMINFO_SHOW, usermenu_show }, //NI + { SNeutrinoSettings::ITEM_CAMD_RESET, LOCALE_CAMD_RESET, usermenu_show }, //NI + { SNeutrinoSettings::ITEM_INFOICONS, LOCALE_INFOICONS_SWITCH_ON, usermenu_show }, //NI { SNeutrinoSettings::ITEM_YOUTUBE, LOCALE_MOVIEPLAYER_YTPLAYBACK, usermenu_show }, { SNeutrinoSettings::ITEM_FILEPLAY, LOCALE_MOVIEPLAYER_FILEPLAYBACK, usermenu_show }, { SNeutrinoSettings::ITEM_TOOLS, LOCALE_MAINMENU_TOOLS, usermenu_show }, { SNeutrinoSettings::ITEM_LUA, LOCALE_MAINMENU_LUA, usermenu_show }, + { SNeutrinoSettings::ITEM_TUNER_RESTART, LOCALE_SERVICEMENU_RESTART_TUNER, usermenu_show }, //NI { SNeutrinoSettings::ITEM_HDDMENU, LOCALE_HDD_SETTINGS, usermenu_show }, { SNeutrinoSettings::ITEM_AUDIOPLAY, LOCALE_AUDIOPLAYER_NAME, usermenu_show }, { SNeutrinoSettings::ITEM_INETPLAY, LOCALE_INETRADIO_NAME, usermenu_show }, @@ -99,12 +103,7 @@ static keyvals usermenu_items[] = { SNeutrinoSettings::ITEM_SWUPDATE, LOCALE_SERVICEMENU_UPDATE, usermenu_show }, { SNeutrinoSettings::ITEM_LIVESTREAM_RESOLUTION,LOCALE_LIVESTREAM_RESOLUTION, usermenu_show }, { SNeutrinoSettings::ITEM_ADZAP, LOCALE_USERMENU_ITEM_ADZAP, usermenu_show }, - //NI - { SNeutrinoSettings::ITEM_CAMD_RESET, LOCALE_CAMD_RESET, usermenu_show }, - { SNeutrinoSettings::ITEM_ECMINFO, LOCALE_ECMINFO_SHOW, usermenu_show }, - { SNeutrinoSettings::ITEM_INFOICONS, LOCALE_INFOICONS_SWITCH_ON, usermenu_show }, - { SNeutrinoSettings::ITEM_TUNER_RESTART, LOCALE_SERVICEMENU_RESTART_TUNER, usermenu_show }, - { SNeutrinoSettings::ITEM_TESTMENU, LOCALE_TESTMENU, usermenu_show }, + { SNeutrinoSettings::ITEM_TESTMENU, LOCALE_TESTMENU, usermenu_show }, //NI { SNeutrinoSettings::ITEM_MAX, NONEXISTANT_LOCALE, usermenu_show } };