neutrino games: move games into features menu

...games are still available in main menue, but not default visible.
If user wants to use games as usual, he can customize it in the
personalize setup.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2093 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: bca7b50726
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-02-15 (Wed, 15 Feb 2012)

Origin message was:
------------------
*neutrino games: move games into features menu

...games are still available in main menue, but not default visible.
If user wants to use games as usual, he can customize it in the
personalize setup.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2093 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
2012-02-15 18:21:25 +00:00
parent 05c395710d
commit ceaade1726
5 changed files with 17 additions and 4 deletions

View File

@@ -54,6 +54,7 @@
#include "gui/imageinfo.h" #include "gui/imageinfo.h"
#include "gui/dboxinfo.h" #include "gui/dboxinfo.h"
#include "gui/cam_menu.h" #include "gui/cam_menu.h"
#include "gui/pluginlist.h"
#include <global.h> #include <global.h>
#include <neutrino.h> #include <neutrino.h>
@@ -125,6 +126,7 @@ bool CUserMenu::showUserMenu(int button)
CImageInfo *imageinfo = NULL; CImageInfo *imageinfo = NULL;
CDBoxInfoWidget *boxinfo = NULL; CDBoxInfoWidget *boxinfo = NULL;
CNeutrinoApp * neutrino = NULL; CNeutrinoApp * neutrino = NULL;
CPluginList * games = NULL;
std::string txt = g_settings.usermenu_text[button]; std::string txt = g_settings.usermenu_text[button];
neutrino_locale_t caption = user_menu[button].caption; neutrino_locale_t caption = user_menu[button].caption;
@@ -288,6 +290,14 @@ bool CUserMenu::showUserMenu(int button)
menu_item = new CMenuForwarder(LOCALE_EPGMENU_STREAMINFO, true, NULL, streamInfo, "-1", key, icon ); menu_item = new CMenuForwarder(LOCALE_EPGMENU_STREAMINFO, true, NULL, streamInfo, "-1", key, icon );
menu->addItem(menu_item, false); menu->addItem(menu_item, false);
break; break;
case SNeutrinoSettings::ITEM_GAMES:
menu_items++;
menu_prev = SNeutrinoSettings::ITEM_GAMES;
games = new CPluginList(LOCALE_MAINMENU_GAMES,CPlugins::P_TYPE_GAME);
keyhelper.get(&key,&icon);
menu_item = new CMenuForwarder(LOCALE_MAINMENU_GAMES, g_PluginList->hasPlugin(CPlugins::P_TYPE_GAME), NULL, games, "-1", key, icon );
menu->addItem(menu_item, false);
break;
case SNeutrinoSettings::ITEM_PLUGIN: case SNeutrinoSettings::ITEM_PLUGIN:
{ {
char id[5]; char id[5];
@@ -434,6 +444,7 @@ bool CUserMenu::showUserMenu(int button)
if (StreamFeaturesChanger) delete StreamFeaturesChanger; if (StreamFeaturesChanger) delete StreamFeaturesChanger;
if (imageinfo) delete imageinfo; if (imageinfo) delete imageinfo;
if (boxinfo) delete boxinfo; if (boxinfo) delete boxinfo;
if (games) delete games;
if (menu) delete menu; if (menu) delete menu;
return 0; return 0;
} }

View File

@@ -89,7 +89,8 @@ const CMenuOptionChooser::keyval USERMENU_ITEM_OPTIONS[USERMENU_ITEM_OPTION_COUN
{ SNeutrinoSettings::ITEM_IMAGEINFO, LOCALE_SERVICEMENU_IMAGEINFO }, { SNeutrinoSettings::ITEM_IMAGEINFO, LOCALE_SERVICEMENU_IMAGEINFO },
{ SNeutrinoSettings::ITEM_BOXINFO, LOCALE_EXTRA_DBOXINFO }, { SNeutrinoSettings::ITEM_BOXINFO, LOCALE_EXTRA_DBOXINFO },
{ SNeutrinoSettings::ITEM_CAM, LOCALE_CI_SETTINGS }, { SNeutrinoSettings::ITEM_CAM, LOCALE_CI_SETTINGS },
{ SNeutrinoSettings::ITEM_CLOCK, LOCALE_CLOCK_SWITCH_ON } { SNeutrinoSettings::ITEM_CLOCK, LOCALE_CLOCK_SWITCH_ON },
{ SNeutrinoSettings::ITEM_GAMES, LOCALE_MAINMENU_GAMES }
}; };
int CUserMenuSetup::exec(CMenuTarget* parent, const std::string &) int CUserMenuSetup::exec(CMenuTarget* parent, const std::string &)

View File

@@ -695,8 +695,8 @@ int CNeutrinoApp::loadSetup(const char * fname)
const char* usermenu_default[SNeutrinoSettings::BUTTON_MAX]={ const char* usermenu_default[SNeutrinoSettings::BUTTON_MAX]={
"2,3,4,13", // RED "2,3,4,13", // RED
"6", // GREEN "6", // GREEN
"7", // YELLOW "7", // YELLOW
"12,10,11,19,14,15" // BLUE "12,10,11,20,19,14,15" // BLUE
}; };
char txt1[81]; char txt1[81];
std::string txt2; std::string txt2;

View File

@@ -44,7 +44,7 @@ const struct personalize_settings_t personalize_settings[SNeutrinoSettings::P_SE
{"personalize_timer" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE}, {"personalize_timer" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE},
{"personalize_media" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE}, {"personalize_media" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE},
{"personalize_games" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE}, {"personalize_games" , CPersonalizeGui::PERSONALIZE_MODE_NOTVISIBLE},
{"personalize_scripts" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE}, {"personalize_scripts" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE},
{"personalize_settings" , CPersonalizeGui::PERSONALIZE_PROTECT_MODE_NOT_PROTECTED}, {"personalize_settings" , CPersonalizeGui::PERSONALIZE_PROTECT_MODE_NOT_PROTECTED},
{"personalize_service" , CPersonalizeGui::PERSONALIZE_PROTECT_MODE_NOT_PROTECTED}, {"personalize_service" , CPersonalizeGui::PERSONALIZE_PROTECT_MODE_NOT_PROTECTED},

View File

@@ -568,6 +568,7 @@ struct SNeutrinoSettings
ITEM_BOXINFO = 17, ITEM_BOXINFO = 17,
ITEM_CAM = 18, ITEM_CAM = 18,
ITEM_CLOCK = 19, ITEM_CLOCK = 19,
ITEM_GAMES = 20,
#if 0 #if 0
ITEM_MOVIEPLAYER_TS, ITEM_MOVIEPLAYER_TS,
#endif #endif