From 9dc2ef58bc5e9e60accf6c23278e4ec4df8dd2d9 Mon Sep 17 00:00:00 2001 From: thilo Date: Wed, 28 Dec 2011 00:19:44 +0000 Subject: [PATCH] *neutrino: add timer list item to main menu Games are moved to number shortcut. git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2015 e54a6e83-5905-42d5-8d5c-058d10e6a962 --- src/neutrino_menue.cpp | 20 ++++++++++---------- src/system/settings.cpp | 4 +++- src/system/settings.h | 4 +++- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp index c6356f10d..3b594b9a3 100644 --- a/src/neutrino_menue.cpp +++ b/src/neutrino_menue.cpp @@ -150,23 +150,23 @@ void CNeutrinoApp::InitMenuMain() CMenuItem *radioswitch = new CMenuForwarder(LOCALE_MAINMENU_RADIOMODE, true, NULL, this, "radio", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN); personalize.addItem(MENU_MAIN, radioswitch, &g_settings.personalize[SNeutrinoSettings::P_MAIN_RADIO_MODE]); - //games - bool show_games = g_PluginList->hasPlugin(CPlugins::P_TYPE_GAME); - personalize.addItem(MENU_MAIN, new CMenuForwarder(LOCALE_MAINMENU_GAMES, show_games, NULL, new CPluginList(LOCALE_MAINMENU_GAMES,CPlugins::P_TYPE_GAME), NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW), &g_settings.personalize[SNeutrinoSettings::P_MAIN_GAMES]); - -// //TODO: timer -// CMenuItem *timerlist = new CMenuForwarder(LOCALE_TIMERLIST_NAME, true, NULL, new CTimerList(), NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW); -// personalize.addItem(MENU_MAIN, timerlist, &g_settings.personalize[SNeutrinoSettings::P_MAIN_TIMER]); - + //timer + CMenuItem *timerlist = new CMenuForwarder(LOCALE_TIMERLIST_NAME, true, NULL, new CTimerList(), NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW); + personalize.addItem(MENU_MAIN, timerlist, &g_settings.personalize[SNeutrinoSettings::P_MAIN_TIMER]); + //multimedia menu CMenuItem *media = new CMenuForwarder(LOCALE_MAINMENU_MEDIA, true, NULL, CMediaPlayerMenu::getInstance(), NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE); personalize.addItem(MENU_MAIN, media, &g_settings.personalize[SNeutrinoSettings::P_MAIN_MEDIA]); - - + //separator personalize.addSeparator(MENU_MAIN); + //2nd section*************************************************************************************************** + + //games + bool show_games = g_PluginList->hasPlugin(CPlugins::P_TYPE_GAME); + personalize.addItem(MENU_MAIN, new CMenuForwarder(LOCALE_MAINMENU_GAMES, show_games, NULL, new CPluginList(LOCALE_MAINMENU_GAMES,CPlugins::P_TYPE_GAME)), &g_settings.personalize[SNeutrinoSettings::P_MAIN_GAMES]); //scripts bool show_scripts = g_PluginList->hasPlugin(CPlugins::P_TYPE_SCRIPT); diff --git a/src/system/settings.cpp b/src/system/settings.cpp index 21e7dd606..56b904006 100644 --- a/src/system/settings.cpp +++ b/src/system/settings.cpp @@ -40,8 +40,10 @@ const struct personalize_settings_t personalize_settings[SNeutrinoSettings::P_SE //main menu {"personalize_tv_mode" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE}, {"personalize_radio_mode" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE}, - {"personalize_games" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE}, + {"personalize_timer" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE}, {"personalize_media" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE}, + + {"personalize_games" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE}, {"personalize_scripts" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE}, {"personalize_settings" , CPersonalizeGui::PERSONALIZE_PROTECT_MODE_NOT_PROTECTED}, {"personalize_service" , CPersonalizeGui::PERSONALIZE_PROTECT_MODE_NOT_PROTECTED}, diff --git a/src/system/settings.h b/src/system/settings.h index 7a153d3f4..56a698e21 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -139,8 +139,10 @@ struct SNeutrinoSettings //main menu P_MAIN_TV_MODE, P_MAIN_RADIO_MODE, - P_MAIN_GAMES, + P_MAIN_TIMER, P_MAIN_MEDIA, + + P_MAIN_GAMES, P_MAIN_SCRIPTS, P_MAIN_SETTINGS, P_MAIN_SERVICE,