mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-31 01:11:06 +02:00
usermenu: formatting code using astyle; some manual code nicenings
Origin commit data
------------------
Branch: ni/coolstream
Commit: fc170d0cf2
Author: vanhofen <vanhofen@gmx.de>
Date: 2021-12-04 (Sat, 04 Dec 2021)
Origin message was:
------------------
- usermenu: formatting code using astyle; some manual code nicenings
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
@@ -60,7 +60,7 @@
|
||||
#include "movieplayer.h"
|
||||
#include "timerlist.h"
|
||||
#include "plugins.h"
|
||||
#include "imageinfo_ni.h" //NI
|
||||
#include "imageinfo_ni.h"
|
||||
#include "dboxinfo.h"
|
||||
#include "cam_menu.h"
|
||||
#include "pluginlist.h"
|
||||
@@ -73,13 +73,15 @@
|
||||
|
||||
#include <gui/widget/icons.h>
|
||||
#include <gui/adzap.h>
|
||||
#include <gui/infoicons.h>
|
||||
#include <gui/infoicons_setup.h>
|
||||
#include <gui/network_setup.h>
|
||||
#ifdef ENABLE_LCD4LINUX
|
||||
#include <gui/lcd4l_setup.h>
|
||||
#endif
|
||||
#include <gui/update_menue.h>
|
||||
#include <gui/hdd_menu.h>
|
||||
#include <gui/test_menu.h> //NI
|
||||
#include <gui/test_menu.h>
|
||||
#include <gui/webchannels_setup.h>
|
||||
#include <gui/miscsettings_menu.h>
|
||||
|
||||
@@ -87,23 +89,17 @@
|
||||
#include <driver/record.h>
|
||||
#include <driver/screen_max.h>
|
||||
|
||||
#include <system/debug.h>
|
||||
#include <system/helpers.h>
|
||||
#include <zapit/zapit.h>
|
||||
#include <hardware/video.h>
|
||||
|
||||
#include <daemonc/remotecontrol.h>
|
||||
extern CRemoteControl * g_RemoteControl; /* neutrino.cpp */
|
||||
extern CPlugins * g_Plugins; /* neutrino.cpp */
|
||||
extern cVideo * videoDecoder;
|
||||
extern CCAMMenuHandler * g_CamHandler;
|
||||
extern CRemoteControl *g_RemoteControl; /* neutrino.cpp */
|
||||
extern CPlugins *g_Plugins; /* neutrino.cpp */
|
||||
extern cVideo *videoDecoder;
|
||||
extern CCAMMenuHandler *g_CamHandler;
|
||||
std::string CUserMenu::tmp;
|
||||
//
|
||||
#include <system/debug.h>
|
||||
|
||||
//NI
|
||||
#include <gui/infoicons_setup.h>
|
||||
|
||||
#include <gui/infoicons.h>
|
||||
|
||||
CUserMenu::CUserMenu()
|
||||
{
|
||||
@@ -120,7 +116,8 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
|
||||
int dummy = 0;
|
||||
unsigned ums = g_settings.usermenu.size();
|
||||
for (unsigned int i = 0; i < ums; i++)
|
||||
if (g_settings.usermenu[i]->key == msg) {
|
||||
if (g_settings.usermenu[i]->key == msg)
|
||||
{
|
||||
button = i;
|
||||
break;
|
||||
}
|
||||
@@ -129,7 +126,8 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
|
||||
return false;
|
||||
|
||||
int pers = -1;
|
||||
switch(msg) {
|
||||
switch (msg)
|
||||
{
|
||||
case CRCInput::RC_red:
|
||||
pers = SNeutrinoSettings::P_MAIN_RED_BUTTON;
|
||||
button = SNeutrinoSettings::BUTTON_RED;
|
||||
@@ -150,27 +148,28 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
|
||||
|
||||
CNeutrinoApp::getInstance()->StopSubtitles();
|
||||
|
||||
if (pers > -1 && (g_settings.personalize[pers] != CPersonalizeGui::PERSONALIZE_ACTIVE_MODE_ENABLED)) {
|
||||
ShowHint(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_PERSONALIZE_MENUDISABLEDHINT),450, 10);
|
||||
if (pers > -1 && (g_settings.personalize[pers] != CPersonalizeGui::PERSONALIZE_ACTIVE_MODE_ENABLED))
|
||||
{
|
||||
ShowHint(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_PERSONALIZE_MENUDISABLEDHINT), 450, 10);
|
||||
CNeutrinoApp::getInstance()->StartSubtitles();
|
||||
return true;
|
||||
}
|
||||
|
||||
width = 40;
|
||||
|
||||
CMenuItem* menu_item = NULL;
|
||||
CMenuItem* last_menu_item = NULL;
|
||||
CMenuItem *menu_item = NULL;
|
||||
CMenuItem *last_menu_item = NULL;
|
||||
CColorKeyHelper keyhelper;
|
||||
|
||||
//set default feature key
|
||||
neutrino_msg_t key = feat_key[CPersonalizeGui::PERSONALIZE_FEAT_KEY_AUTO].key; //CRCInput::RC_nokey
|
||||
// set default feature key
|
||||
neutrino_msg_t key = feat_key[CPersonalizeGui::PERSONALIZE_FEAT_KEY_AUTO].key; // CRCInput::RC_nokey
|
||||
|
||||
const char * icon = NULL;
|
||||
const char *icon = NULL;
|
||||
int menu_items = 0;
|
||||
|
||||
// define classes
|
||||
CSubChannelSelectMenu subchanselect;
|
||||
CNeutrinoApp * neutrino = CNeutrinoApp::getInstance();
|
||||
CNeutrinoApp *neutrino = CNeutrinoApp::getInstance();
|
||||
|
||||
std::string txt = g_settings.usermenu[button]->title;
|
||||
if (button < COL_BUTTONMAX && txt.empty())
|
||||
@@ -191,7 +190,7 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
|
||||
if (button < COL_BUTTONMAX)
|
||||
menu->setSelected(user_menu[button].selected);
|
||||
|
||||
//show cancel button if configured
|
||||
// show cancel button if configured
|
||||
if (g_settings.personalize[SNeutrinoSettings::P_UMENU_SHOW_CANCEL])
|
||||
menu->addIntroItems(NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, CMenuWidget::BTN_TYPE_CANCEL);
|
||||
else
|
||||
@@ -208,7 +207,8 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
|
||||
std::string itemstr_last("1");
|
||||
|
||||
std::vector<std::string> items = ::split(g_settings.usermenu[button]->items, ',');
|
||||
for (std::vector<std::string>::iterator it = items.begin(); it != items.end(); ++it) {
|
||||
for (std::vector<std::string>::iterator it = items.begin(); it != items.end(); ++it)
|
||||
{
|
||||
if (it->empty())
|
||||
continue;
|
||||
if (*it == itemstr_last)
|
||||
@@ -230,47 +230,47 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
|
||||
}
|
||||
case SNeutrinoSettings::ITEM_EPG_LIST:
|
||||
{
|
||||
keyhelper.get(&key,&icon,CRCInput::RC_red);
|
||||
keyhelper.get(&key, &icon, CRCInput::RC_red);
|
||||
menu_item = new CMenuDForwarder(LOCALE_EPGMENU_EVENTLIST, true, NULL, new CEventListHandler, "-1", key, icon);
|
||||
// FIXME menu_item->setHint("", NONEXISTANT_LOCALE);
|
||||
break;
|
||||
}
|
||||
case SNeutrinoSettings::ITEM_EPG_SUPER:
|
||||
{
|
||||
keyhelper.get(&key,&icon,CRCInput::RC_green);
|
||||
keyhelper.get(&key, &icon, CRCInput::RC_green);
|
||||
menu_item = new CMenuDForwarder(LOCALE_EPGMENU_EPGPLUS, true, NULL, new CEPGplusHandler, "-1", key, icon);
|
||||
// FIXME menu_item->setHint("", NONEXISTANT_LOCALE);
|
||||
break;
|
||||
}
|
||||
case SNeutrinoSettings::ITEM_EPG_INFO:
|
||||
{
|
||||
keyhelper.get(&key,&icon,CRCInput::RC_yellow);
|
||||
keyhelper.get(&key, &icon, CRCInput::RC_yellow);
|
||||
menu_item = new CMenuDForwarder(LOCALE_EPGMENU_EVENTINFO, true, NULL, new CEPGDataHandler, "-1", key, icon);
|
||||
// FIXME menu_item->setHint("", NONEXISTANT_LOCALE);
|
||||
break;
|
||||
}
|
||||
case SNeutrinoSettings::ITEM_EPG_MISC:
|
||||
{
|
||||
keyhelper.get(&key,&icon);
|
||||
keyhelper.get(&key, &icon);
|
||||
menu_item = new CMenuDForwarder(LOCALE_MISCSETTINGS_EPG_READ_NOW, g_settings.epg_read, NULL, new CMiscMenue(), "epg_read_now_usermenu", key, icon);
|
||||
menu_item->setHint("", LOCALE_MENU_HINT_EPG_READ_NOW);
|
||||
menu->addItem(menu_item, false);
|
||||
|
||||
dummy = g_Sectionsd->getIsScanningActive();
|
||||
keyhelper.get(&key,&icon);
|
||||
menu_item = new CMenuOptionChooser(LOCALE_MAINMENU_PAUSESECTIONSD, &dummy, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this , key, icon );
|
||||
keyhelper.get(&key, &icon);
|
||||
menu_item = new CMenuOptionChooser(LOCALE_MAINMENU_PAUSESECTIONSD, &dummy, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this, key, icon);
|
||||
// FIXME menu_item->setHint("", NONEXISTANT_LOCALE);
|
||||
menu->addItem(menu_item, false);
|
||||
|
||||
keyhelper.get(&key,&icon);
|
||||
menu_item = new CMenuForwarder(LOCALE_MAINMENU_CLEARSECTIONSD, true, NULL, neutrino, "clearSectionsd", key,icon);
|
||||
keyhelper.get(&key, &icon);
|
||||
menu_item = new CMenuForwarder(LOCALE_MAINMENU_CLEARSECTIONSD, true, NULL, neutrino, "clearSectionsd", key, icon);
|
||||
// FIXME menu_item->setHint("", NONEXISTANT_LOCALE);
|
||||
break;
|
||||
}
|
||||
case SNeutrinoSettings::ITEM_AUDIO_SELECT:
|
||||
{
|
||||
keyhelper.get(&key,&icon);
|
||||
menu_item = new CMenuDForwarder(LOCALE_AUDIOSELECTMENUE_HEAD, !_mode_ts, NULL, new CAudioSelectMenuHandler, "-1", key,icon);
|
||||
keyhelper.get(&key, &icon);
|
||||
menu_item = new CMenuDForwarder(LOCALE_AUDIOSELECTMENUE_HEAD, !_mode_ts, NULL, new CAudioSelectMenuHandler, "-1", key, icon);
|
||||
// FIXME menu_item->setHint("", NONEXISTANT_LOCALE);
|
||||
break;
|
||||
}
|
||||
@@ -280,15 +280,15 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
|
||||
break;
|
||||
if (_mode_webtv)
|
||||
break;
|
||||
// NVOD/SubService- Kanal!
|
||||
// NVOD/SubService-Kanal
|
||||
CMenuWidget *tmpNVODSelector = new CMenuWidget(g_RemoteControl->are_subchannels ? LOCALE_NVODSELECTOR_SUBSERVICE : LOCALE_NVODSELECTOR_STARTTIME, NEUTRINO_ICON_VIDEO);
|
||||
if (!subchanselect.getNVODMenu(tmpNVODSelector))
|
||||
{
|
||||
delete tmpNVODSelector;
|
||||
break;
|
||||
}
|
||||
keyhelper.get(&key,&icon);
|
||||
menu_item = new CMenuDForwarder(g_RemoteControl->are_subchannels ? LOCALE_NVODSELECTOR_SUBSERVICE : LOCALE_NVODSELECTOR_STARTTIME, true, NULL, tmpNVODSelector, "-1", key,icon);
|
||||
keyhelper.get(&key, &icon);
|
||||
menu_item = new CMenuDForwarder(g_RemoteControl->are_subchannels ? LOCALE_NVODSELECTOR_SUBSERVICE : LOCALE_NVODSELECTOR_STARTTIME, true, NULL, tmpNVODSelector, "-1", key, icon);
|
||||
// FIXME menu_item->setHint("", NONEXISTANT_LOCALE);
|
||||
break;
|
||||
}
|
||||
@@ -296,7 +296,7 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
|
||||
{
|
||||
if (g_settings.recording_type == CNeutrinoApp::RECORDING_OFF)
|
||||
break;
|
||||
keyhelper.get(&key,&icon,CRCInput::RC_red);
|
||||
keyhelper.get(&key, &icon, CRCInput::RC_red);
|
||||
menu_item = new CMenuForwarder(LOCALE_RECORDINGMENU_MULTIMENU_REC_AKT, true, NULL, CRecordManager::getInstance(), "-1", key, icon);
|
||||
// FIXME menu_item->setHint("", NONEXISTANT_LOCALE);
|
||||
break;
|
||||
@@ -305,7 +305,7 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
|
||||
{
|
||||
if (g_settings.recording_type == CNeutrinoApp::RECORDING_OFF)
|
||||
break;
|
||||
keyhelper.get(&key,&icon,CRCInput::RC_red);
|
||||
keyhelper.get(&key, &icon, CRCInput::RC_red);
|
||||
menu_item = new CMenuForwarder(LOCALE_RECORDINGMENU_MULTIMENU_TIMESHIFT, !timeshift, NULL, CRecordManager::getInstance(), "Timeshift", key, icon);
|
||||
// FIXME menu_item->setHint("", NONEXISTANT_LOCALE);
|
||||
break;
|
||||
@@ -314,43 +314,43 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
|
||||
{
|
||||
if (g_settings.recording_type == CNeutrinoApp::RECORDING_OFF)
|
||||
break;
|
||||
keyhelper.get(&key,&icon,CRCInput::RC_green);
|
||||
keyhelper.get(&key, &icon, CRCInput::RC_green);
|
||||
menu_item = new CMenuForwarder(LOCALE_MOVIEBROWSER_HEAD, !_mode_ts, NULL, neutrino, "tsmoviebrowser", key, icon);
|
||||
menu_item->setHint(NEUTRINO_ICON_HINT_MB, LOCALE_MENU_HINT_MB);
|
||||
break;
|
||||
}
|
||||
case SNeutrinoSettings::ITEM_TIMERLIST:
|
||||
{
|
||||
keyhelper.get(&key,&icon,feat_key[g_settings.personalize[SNeutrinoSettings::P_FEAT_KEY_TIMERLIST]].key); //CRCInput::RC_yellow
|
||||
keyhelper.get(&key, &icon, feat_key[g_settings.personalize[SNeutrinoSettings::P_FEAT_KEY_TIMERLIST]].key); // CRCInput::RC_yellow
|
||||
menu_item = new CMenuDForwarder(LOCALE_TIMERLIST_NAME, true, NULL, new CTimerList, "-1", key, icon);
|
||||
menu_item->setHint(NEUTRINO_ICON_HINT_TIMERS, LOCALE_MENU_HINT_TIMERS);
|
||||
break;
|
||||
}
|
||||
case SNeutrinoSettings::ITEM_VTXT:
|
||||
{
|
||||
keyhelper.get(&key,&icon, feat_key[g_settings.personalize[SNeutrinoSettings::P_FEAT_KEY_VTXT]].key); //CRCInput::RC_blue
|
||||
keyhelper.get(&key, &icon, feat_key[g_settings.personalize[SNeutrinoSettings::P_FEAT_KEY_VTXT]].key); // CRCInput::RC_blue
|
||||
menu_item = new CMenuForwarder(LOCALE_USERMENU_ITEM_VTXT, true, NULL, CPluginsExec::getInstance(), "teletext", key, icon);
|
||||
menu_item->setHint(NEUTRINO_ICON_HINT_VTXT, LOCALE_USERMENU_ITEM_VTXT); //NI
|
||||
menu_item->setHint(NEUTRINO_ICON_HINT_VTXT, LOCALE_USERMENU_ITEM_VTXT);
|
||||
break;
|
||||
}
|
||||
case SNeutrinoSettings::ITEM_FAVORITS:
|
||||
{
|
||||
keyhelper.get(&key,&icon,feat_key[g_settings.personalize[SNeutrinoSettings::P_FEAT_KEY_FAVORIT]].key); //CRCInput::RC_green
|
||||
keyhelper.get(&key, &icon, feat_key[g_settings.personalize[SNeutrinoSettings::P_FEAT_KEY_FAVORIT]].key); // CRCInput::RC_green
|
||||
menu_item = new CMenuDForwarder(LOCALE_FAVORITES_MENUEADD, true, NULL, new CFavorites, "-1", key, icon);
|
||||
// FIXME menu_item->setHint("", NONEXISTANT_LOCALE);
|
||||
break;
|
||||
}
|
||||
case SNeutrinoSettings::ITEM_TECHINFO:
|
||||
{
|
||||
keyhelper.get(&key,&icon,CRCInput::RC_blue);
|
||||
menu_item = new CMenuDForwarder(LOCALE_EPGMENU_STREAMINFO, _mode_ts || !neutrino->channelList->isEmpty(), NULL, new CStreamInfo2, "-1", key, icon );
|
||||
keyhelper.get(&key, &icon, CRCInput::RC_blue);
|
||||
menu_item = new CMenuDForwarder(LOCALE_EPGMENU_STREAMINFO, _mode_ts || !neutrino->channelList->isEmpty(), NULL, new CStreamInfo2, "-1", key, icon);
|
||||
menu_item->setHint(NEUTRINO_ICON_HINT_STREAMINFO, LOCALE_MENU_HINT_STREAMINFO);
|
||||
break;
|
||||
}
|
||||
case SNeutrinoSettings::ITEM_REMOTE:
|
||||
{
|
||||
keyhelper.get(&key,&icon,feat_key[g_settings.personalize[SNeutrinoSettings::P_FEAT_KEY_RC_LOCK]].key); //CRCInput::RC_nokey);
|
||||
menu_item = new CMenuForwarder(LOCALE_RCLOCK_TITLE, true, NULL, CRCLock::getInstance(), "-1" , key, icon );
|
||||
keyhelper.get(&key, &icon, feat_key[g_settings.personalize[SNeutrinoSettings::P_FEAT_KEY_RC_LOCK]].key); // CRCInput::RC_nokey);
|
||||
menu_item = new CMenuForwarder(LOCALE_RCLOCK_TITLE, true, NULL, CRCLock::getInstance(), "-1", key, icon);
|
||||
// FIXME menu_item->setHint("", NONEXISTANT_LOCALE);
|
||||
break;
|
||||
}
|
||||
@@ -380,7 +380,7 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
|
||||
menu_items++;
|
||||
neutrino_msg_t d_key = g_Plugins->getKey(count);
|
||||
//printf("[neutrino usermenu] plugin %d, set key %d...\n", count, g_Plugins->getKey(count));
|
||||
keyhelper.get(&key,&icon, d_key);
|
||||
keyhelper.get(&key, &icon, d_key);
|
||||
menu_item = new CMenuForwarder(g_Plugins->getName(count), true, NULL, CPluginsExec::getInstance(), to_string(count).c_str(), key, icon);
|
||||
menu_item->setHint(g_Plugins->getHintIcon(count), g_Plugins->getDescription(count));
|
||||
|
||||
@@ -392,66 +392,63 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
|
||||
}
|
||||
case SNeutrinoSettings::ITEM_IMAGEINFO:
|
||||
{
|
||||
keyhelper.get(&key,&icon);
|
||||
menu_item = new CMenuDForwarder(LOCALE_SERVICEMENU_IMAGEINFO, true, NULL, new CImageInfoNI, NULL, key, icon); //NI
|
||||
keyhelper.get(&key, &icon);
|
||||
menu_item = new CMenuDForwarder(LOCALE_SERVICEMENU_IMAGEINFO, true, NULL, new CImageInfoNI, NULL, key, icon);
|
||||
menu_item->setHint(NEUTRINO_ICON_HINT_IMAGEINFO, LOCALE_MENU_HINT_IMAGEINFO);
|
||||
break;
|
||||
}
|
||||
case SNeutrinoSettings::ITEM_BOXINFO:
|
||||
{
|
||||
keyhelper.get(&key,&icon);
|
||||
keyhelper.get(&key, &icon);
|
||||
menu_item = new CMenuDForwarder(LOCALE_EXTRA_DBOXINFO, true, NULL, new CDBoxInfoWidget, NULL, key, icon);
|
||||
menu_item->setHint(NEUTRINO_ICON_HINT_DBOXINFO, LOCALE_MENU_HINT_DBOXINFO);
|
||||
break;
|
||||
}
|
||||
case SNeutrinoSettings::ITEM_CAM:
|
||||
{
|
||||
keyhelper.get(&key,&icon);
|
||||
keyhelper.get(&key, &icon);
|
||||
menu_item = new CMenuForwarder(LOCALE_CI_SETTINGS, true, NULL, g_CamHandler, NULL, key, icon);
|
||||
// FIXME menu_item->setHint("", NONEXISTANT_LOCALE);
|
||||
break;
|
||||
}
|
||||
case SNeutrinoSettings::ITEM_CLOCK:
|
||||
{
|
||||
keyhelper.get(&key,&icon);
|
||||
menu_item = new CMenuForwarder(!g_settings.mode_clock ? LOCALE_CLOCK_SWITCH_ON:LOCALE_CLOCK_SWITCH_OFF, true, NULL, neutrino, "clock_switch", key, icon);
|
||||
keyhelper.get(&key, &icon);
|
||||
menu_item = new CMenuForwarder(!g_settings.mode_clock ? LOCALE_CLOCK_SWITCH_ON : LOCALE_CLOCK_SWITCH_OFF, true, NULL, neutrino, "clock_switch", key, icon);
|
||||
menu_item->setHint("", LOCALE_MENU_HINT_CLOCK_MODE);
|
||||
break;
|
||||
}
|
||||
case SNeutrinoSettings::ITEM_GAMES:
|
||||
{
|
||||
keyhelper.get(&key,&icon);
|
||||
menu_item = new CMenuDForwarder(LOCALE_MAINMENU_GAMES, g_Plugins->hasPlugin(CPlugins::P_TYPE_GAME), NULL, new CPluginList(LOCALE_MAINMENU_GAMES,CPlugins::P_TYPE_GAME), "-1", key, icon );
|
||||
keyhelper.get(&key, &icon);
|
||||
menu_item = new CMenuDForwarder(LOCALE_MAINMENU_GAMES, g_Plugins->hasPlugin(CPlugins::P_TYPE_GAME), NULL, new CPluginList(LOCALE_MAINMENU_GAMES, CPlugins::P_TYPE_GAME), "-1", key, icon);
|
||||
menu_item->setHint(NEUTRINO_ICON_HINT_GAMES, LOCALE_MENU_HINT_GAMES);
|
||||
break;
|
||||
}
|
||||
case SNeutrinoSettings::ITEM_SCRIPTS:
|
||||
{
|
||||
keyhelper.get(&key,&icon);
|
||||
menu_item = new CMenuDForwarder(LOCALE_MAINMENU_SCRIPTS, g_Plugins->hasPlugin(CPlugins::P_TYPE_SCRIPT), NULL, new CPluginList(LOCALE_MAINMENU_SCRIPTS,CPlugins::P_TYPE_SCRIPT), "-1", key, icon );
|
||||
keyhelper.get(&key, &icon);
|
||||
menu_item = new CMenuDForwarder(LOCALE_MAINMENU_SCRIPTS, g_Plugins->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);
|
||||
keyhelper.get(&key, &icon);
|
||||
menu_item = new CMenuForwarder(LOCALE_ECMINFO_SHOW, file_size("/tmp/ecm.info"), NULL, neutrino, "ecmInfo", key, icon);
|
||||
// FIXME menu_item->setHint("", NONEXISTANT_LOCALE);
|
||||
break;
|
||||
}
|
||||
//NI
|
||||
case SNeutrinoSettings::ITEM_CAMD_RESET:
|
||||
{
|
||||
keyhelper.get(&key,&icon);
|
||||
keyhelper.get(&key, &icon);
|
||||
menu_item = new CMenuForwarder(LOCALE_CAMD_RESET, !rec_mode, NULL, neutrino, "camd_reset", key, icon);
|
||||
// FIXME menu_item->setHint("", NONEXISTANT_LOCALE);
|
||||
break;
|
||||
}
|
||||
//NI
|
||||
case SNeutrinoSettings::ITEM_INFOICONS:
|
||||
{
|
||||
keyhelper.get(&key,&icon);
|
||||
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;
|
||||
@@ -459,7 +456,7 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
|
||||
#if ENABLE_YOUTUBE_PLAYER
|
||||
case SNeutrinoSettings::ITEM_YOUTUBE:
|
||||
{
|
||||
keyhelper.get(&key,&icon);
|
||||
keyhelper.get(&key, &icon);
|
||||
menu_item = new CMenuForwarder(LOCALE_MOVIEPLAYER_YTPLAYBACK, !_mode_ts, NULL, neutrino, "ytplayback", key, icon);
|
||||
menu_item->setHint(NEUTRINO_ICON_HINT_YTPLAY, LOCALE_MENU_HINT_YTPLAY);
|
||||
break;
|
||||
@@ -467,64 +464,63 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
|
||||
#endif
|
||||
case SNeutrinoSettings::ITEM_FILEPLAY_VIDEO:
|
||||
{
|
||||
keyhelper.get(&key,&icon);
|
||||
keyhelper.get(&key, &icon);
|
||||
menu_item = new CMenuForwarder(LOCALE_MOVIEPLAYER_FILEPLAYBACK_VIDEO, !_mode_ts, NULL, neutrino, "fileplayback_video", key, icon);
|
||||
menu_item->setHint(NEUTRINO_ICON_HINT_FILEPLAY, LOCALE_MENU_HINT_FILEPLAY_VIDEO);
|
||||
break;
|
||||
}
|
||||
case SNeutrinoSettings::ITEM_FILEPLAY_AUDIO:
|
||||
{
|
||||
keyhelper.get(&key,&icon);
|
||||
keyhelper.get(&key, &icon);
|
||||
menu_item = new CMenuForwarder(LOCALE_MOVIEPLAYER_FILEPLAYBACK_AUDIO, !_mode_ts, NULL, neutrino, "fileplayback_audio", key, icon);
|
||||
menu_item->setHint(NEUTRINO_ICON_HINT_FILEPLAY, LOCALE_MENU_HINT_FILEPLAY_AUDIO);
|
||||
break;
|
||||
}
|
||||
case SNeutrinoSettings::ITEM_TOOLS:
|
||||
{
|
||||
keyhelper.get(&key,&icon);
|
||||
menu_item = new CMenuDForwarder(LOCALE_MAINMENU_TOOLS, g_Plugins->hasPlugin(CPlugins::P_TYPE_TOOL), NULL, new CPluginList(LOCALE_MAINMENU_TOOLS,CPlugins::P_TYPE_TOOL), "-1", key, icon );
|
||||
keyhelper.get(&key, &icon);
|
||||
menu_item = new CMenuDForwarder(LOCALE_MAINMENU_TOOLS, g_Plugins->hasPlugin(CPlugins::P_TYPE_TOOL), NULL, new CPluginList(LOCALE_MAINMENU_TOOLS, CPlugins::P_TYPE_TOOL), "-1", key, icon);
|
||||
// FIXME menu_item->setHint("", NONEXISTANT_LOCALE);
|
||||
break;
|
||||
}
|
||||
case SNeutrinoSettings::ITEM_LUA:
|
||||
{
|
||||
keyhelper.get(&key,&icon);
|
||||
menu_item = new CMenuDForwarder(LOCALE_MAINMENU_LUA, g_Plugins->hasPlugin(CPlugins::P_TYPE_LUA), NULL, new CPluginList(LOCALE_MAINMENU_LUA,CPlugins::P_TYPE_LUA), "-1", key, icon );
|
||||
keyhelper.get(&key, &icon);
|
||||
menu_item = new CMenuDForwarder(LOCALE_MAINMENU_LUA, g_Plugins->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);
|
||||
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);
|
||||
keyhelper.get(&key, &icon);
|
||||
menu_item = new CMenuForwarder(LOCALE_HDD_SETTINGS, true, NULL, CHDDMenuHandler::getInstance(), NULL, key, icon);
|
||||
menu_item->setHint(NEUTRINO_ICON_HINT_HDD, LOCALE_MENU_HINT_HDD);
|
||||
break;
|
||||
}
|
||||
case SNeutrinoSettings::ITEM_AUDIOPLAY:
|
||||
{
|
||||
keyhelper.get(&key,&icon);
|
||||
keyhelper.get(&key, &icon);
|
||||
menu_item = new CMenuForwarder(LOCALE_AUDIOPLAYER_NAME, true, NULL, neutrino, "audioplayer", key, icon);
|
||||
menu_item->setHint(NEUTRINO_ICON_HINT_APLAY, LOCALE_MENU_HINT_APLAY);
|
||||
break;
|
||||
}
|
||||
case SNeutrinoSettings::ITEM_INETPLAY:
|
||||
{
|
||||
keyhelper.get(&key,&icon);
|
||||
keyhelper.get(&key, &icon);
|
||||
menu_item = new CMenuForwarder(LOCALE_INETRADIO_NAME, true, NULL, neutrino, "inetplayer", key, icon);
|
||||
menu_item->setHint(NEUTRINO_ICON_HINT_INET_RADIO, LOCALE_MENU_HINT_INET_RADIO);
|
||||
break;
|
||||
}
|
||||
case SNeutrinoSettings::ITEM_NETSETTINGS:
|
||||
{
|
||||
keyhelper.get(&key,&icon);
|
||||
keyhelper.get(&key, &icon);
|
||||
menu_item = new CMenuForwarder(LOCALE_MAINSETTINGS_NETWORK, true, NULL, CNetworkSetup::getInstance(), NULL, key, icon);
|
||||
menu_item->setHint(NEUTRINO_ICON_HINT_NETWORK, LOCALE_MENU_HINT_NETWORK);
|
||||
break;
|
||||
@@ -532,7 +528,7 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
|
||||
#ifdef ENABLE_LCD4LINUX
|
||||
case SNeutrinoSettings::ITEM_LCD4LINUX:
|
||||
{
|
||||
keyhelper.get(&key,&icon);
|
||||
keyhelper.get(&key, &icon);
|
||||
menu_item = new CMenuForwarder(LOCALE_LCD4L_SUPPORT, !find_executable("lcd4linux").empty(), NULL, CLCD4lSetup::getInstance(), NULL, key, icon);
|
||||
menu_item->setHint(NEUTRINO_ICON_HINT_LCD4LINUX, LOCALE_MENU_HINT_LCD4L_SUPPORT);
|
||||
break;
|
||||
@@ -540,7 +536,7 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
|
||||
#endif
|
||||
case SNeutrinoSettings::ITEM_SWUPDATE:
|
||||
{
|
||||
keyhelper.get(&key,&icon);
|
||||
keyhelper.get(&key, &icon);
|
||||
menu_item = new CMenuDForwarder(LOCALE_SERVICEMENU_UPDATE, true, NULL, new CSoftwareUpdate(), NULL, key, icon);
|
||||
menu_item->setHint(NEUTRINO_ICON_HINT_SW_UPDATE, LOCALE_MENU_HINT_SW_UPDATE);
|
||||
break;
|
||||
@@ -549,22 +545,21 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
|
||||
{
|
||||
if (!_mode_webtv)
|
||||
break;
|
||||
keyhelper.get(&key,&icon);
|
||||
keyhelper.get(&key, &icon);
|
||||
menu_item = new CMenuDForwarder(LOCALE_LIVESTREAM_RESOLUTION, true, NULL, new CWebTVResolution(), NULL, key, icon);
|
||||
// FIXME menu_item->setHint("", NONEXISTANT_LOCALE);
|
||||
break;
|
||||
}
|
||||
case SNeutrinoSettings::ITEM_ADZAP:
|
||||
{
|
||||
keyhelper.get(&key,&icon,CRCInput::RC_blue);
|
||||
keyhelper.get(&key, &icon, CRCInput::RC_blue);
|
||||
menu_item = new CMenuForwarder(LOCALE_USERMENU_ITEM_ADZAP, true, adzap_active ? g_Locale->getText(LOCALE_OPTIONS_OFF) : NULL, CAdZapMenu::getInstance(), "adzap", key, icon);
|
||||
menu_item->setHint(NEUTRINO_ICON_HINT_ADZAP, adzap_active ? LOCALE_MENU_HINT_ADZAP_ACTIVE : LOCALE_MENU_HINT_ADZAP);
|
||||
break;
|
||||
}
|
||||
//NI
|
||||
case SNeutrinoSettings::ITEM_TESTMENU:
|
||||
{
|
||||
keyhelper.get(&key,&icon);
|
||||
keyhelper.get(&key, &icon);
|
||||
menu_item = new CMenuDForwarder(LOCALE_TESTMENU, true, NULL, new CTestMenu(), NULL, key, icon);
|
||||
// FIXME menu_item->setHint("", NONEXISTANT_LOCALE);
|
||||
break;
|
||||
@@ -575,11 +570,13 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
|
||||
if (!number_of_plugins)
|
||||
continue;
|
||||
int count = 0;
|
||||
for(; count < number_of_plugins; count++) {
|
||||
for (; count < number_of_plugins; count++)
|
||||
{
|
||||
const char *pname = g_Plugins->getFileName(count);
|
||||
if (pname && (std::string(pname) == *it) && !g_Plugins->isHidden(count)) {
|
||||
if (pname && (std::string(pname) == *it) && !g_Plugins->isHidden(count))
|
||||
{
|
||||
neutrino_msg_t d_key = g_Plugins->getKey(count);
|
||||
keyhelper.get(&key,&icon, d_key);
|
||||
keyhelper.get(&key, &icon, d_key);
|
||||
menu_item = new CMenuForwarder(g_Plugins->getName(count), true, NULL, CPluginsExec::getInstance(), to_string(count).c_str(), key, icon);
|
||||
menu_item->setHint(g_Plugins->getHintIcon(count), g_Plugins->getDescription(count));
|
||||
break;
|
||||
@@ -592,7 +589,8 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
|
||||
} // switch end
|
||||
|
||||
itemstr_last = *it;
|
||||
if (menu_item) {
|
||||
if (menu_item)
|
||||
{
|
||||
menu_items++;
|
||||
menu->addItem(menu_item, false);
|
||||
last_menu_item = menu_item;
|
||||
@@ -600,16 +598,16 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
|
||||
}
|
||||
|
||||
CInfoClock::getInstance()->enableInfoClock(false);
|
||||
CInfoIcons::getInstance()->enableInfoIcons(false); //NI
|
||||
CInfoIcons::getInstance()->enableInfoIcons(false);
|
||||
// show menu if there are more than 2 items only
|
||||
// otherwise, we start the item directly (must be the last one)
|
||||
if (menu_items > 1 )
|
||||
if (menu_items > 1)
|
||||
menu->exec(NULL, "");
|
||||
else if (last_menu_item)
|
||||
last_menu_item->exec( NULL );
|
||||
last_menu_item->exec(NULL);
|
||||
|
||||
CInfoClock::getInstance()->enableInfoClock(true);
|
||||
CInfoIcons::getInstance()->enableInfoIcons(true); //NI
|
||||
CInfoIcons::getInstance()->enableInfoIcons(true);
|
||||
CNeutrinoApp::getInstance()->StartSubtitles();
|
||||
|
||||
if (button < COL_BUTTONMAX)
|
||||
@@ -623,26 +621,31 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
|
||||
const char *CUserMenu::getUserMenuButtonName(int button, bool &active, bool return_title)
|
||||
{
|
||||
active = false;
|
||||
if(button < 0 || button >= (int) g_settings.usermenu.size())
|
||||
if (button < 0 || button >= (int) g_settings.usermenu.size())
|
||||
return "";
|
||||
|
||||
neutrino_locale_t loc = NONEXISTANT_LOCALE;
|
||||
const char *text = NULL;
|
||||
int mode = CNeutrinoApp::getInstance()->getMode();
|
||||
std::vector<std::string> items = ::split(g_settings.usermenu[button]->items, ',');
|
||||
for (std::vector<std::string>::iterator it = items.begin(); it != items.end(); ++it) {
|
||||
for (std::vector<std::string>::iterator it = items.begin(); it != items.end(); ++it)
|
||||
{
|
||||
int item = -1;
|
||||
if (it->find_first_not_of("0123456789") == std::string::npos)
|
||||
item = atoi(*it);
|
||||
|
||||
switch(item) {
|
||||
switch (item)
|
||||
{
|
||||
case -1:
|
||||
if(loc != NONEXISTANT_LOCALE || text)
|
||||
if (loc != NONEXISTANT_LOCALE || text)
|
||||
return_title = true;
|
||||
else {
|
||||
else
|
||||
{
|
||||
int nop = g_Plugins->getNumberOfPlugins();
|
||||
for(int count = 0; count < nop; count++) {
|
||||
if (std::string(g_Plugins->getFileName(count)) == *it) {
|
||||
for (int count = 0; count < nop; count++)
|
||||
{
|
||||
if (std::string(g_Plugins->getFileName(count)) == *it)
|
||||
{
|
||||
tmp = g_Plugins->getName(count);
|
||||
text = tmp.c_str();
|
||||
active = true;
|
||||
@@ -654,8 +657,10 @@ const char *CUserMenu::getUserMenuButtonName(int button, bool &active, bool retu
|
||||
case SNeutrinoSettings::ITEM_NONE:
|
||||
case SNeutrinoSettings::ITEM_BAR:
|
||||
case SNeutrinoSettings::ITEM_LIVESTREAM_RESOLUTION:
|
||||
if (mode == NeutrinoModes::mode_webtv && !CZapit::getInstance()->GetCurrentChannel()->getScriptName().empty()) {
|
||||
if(loc == NONEXISTANT_LOCALE && !text) {
|
||||
if (mode == NeutrinoModes::mode_webtv && !CZapit::getInstance()->GetCurrentChannel()->getScriptName().empty())
|
||||
{
|
||||
if (loc == NONEXISTANT_LOCALE && !text)
|
||||
{
|
||||
CWebTVResolution webtvres;
|
||||
tmp = webtvres.getResolutionValue();
|
||||
if (!(videoDecoder->getBlank()))
|
||||
@@ -671,10 +676,13 @@ const char *CUserMenu::getUserMenuButtonName(int button, bool &active, bool retu
|
||||
text = tmp.c_str();
|
||||
}
|
||||
}
|
||||
}else{
|
||||
}
|
||||
else
|
||||
{
|
||||
text = tmp.c_str();
|
||||
}
|
||||
} else
|
||||
}
|
||||
else
|
||||
return_title = true;
|
||||
active = true;
|
||||
}
|
||||
@@ -684,8 +692,9 @@ const char *CUserMenu::getUserMenuButtonName(int button, bool &active, bool retu
|
||||
active = true;
|
||||
continue;
|
||||
case SNeutrinoSettings::ITEM_SUBCHANNEL:
|
||||
if (!g_RemoteControl->subChannels.empty()) {
|
||||
if(loc == NONEXISTANT_LOCALE && !text)
|
||||
if (!g_RemoteControl->subChannels.empty())
|
||||
{
|
||||
if (loc == NONEXISTANT_LOCALE && !text)
|
||||
loc = g_RemoteControl->are_subchannels ? LOCALE_NVODSELECTOR_SUBSERVICE : LOCALE_NVODSELECTOR_STARTTIME;
|
||||
else
|
||||
return_title = true;
|
||||
@@ -696,29 +705,32 @@ const char *CUserMenu::getUserMenuButtonName(int button, bool &active, bool retu
|
||||
return_title = true;
|
||||
continue;
|
||||
case SNeutrinoSettings::ITEM_CLOCK:
|
||||
if(loc == NONEXISTANT_LOCALE && !text)
|
||||
if (loc == NONEXISTANT_LOCALE && !text)
|
||||
loc = g_settings.mode_clock ? LOCALE_CLOCK_SWITCH_OFF : LOCALE_CLOCK_SWITCH_ON;
|
||||
else
|
||||
return_title = true;
|
||||
active = true;
|
||||
continue;
|
||||
case SNeutrinoSettings::ITEM_AUDIO_SELECT:
|
||||
if(loc == NONEXISTANT_LOCALE && !text) {
|
||||
if (mode == NeutrinoModes::mode_webtv){
|
||||
if (loc == NONEXISTANT_LOCALE && !text)
|
||||
{
|
||||
if (mode == NeutrinoModes::mode_webtv)
|
||||
{
|
||||
tmp = CMoviePlayerGui::getInstance(true).CurrentAudioName(); // use instance_bg.
|
||||
text = tmp.c_str();
|
||||
}
|
||||
else if (!g_RemoteControl->current_PIDs.APIDs.empty()){
|
||||
tmp = g_RemoteControl->current_PIDs.APIDs[
|
||||
g_RemoteControl->current_PIDs.PIDs.selected_apid].desc;
|
||||
else if (!g_RemoteControl->current_PIDs.APIDs.empty())
|
||||
{
|
||||
tmp = g_RemoteControl->current_PIDs.APIDs[g_RemoteControl->current_PIDs.PIDs.selected_apid].desc;
|
||||
text = tmp.c_str();
|
||||
}
|
||||
} else
|
||||
}
|
||||
else
|
||||
return_title = true;
|
||||
active = true;
|
||||
continue;
|
||||
default:
|
||||
if(loc == NONEXISTANT_LOCALE && !text)
|
||||
if (loc == NONEXISTANT_LOCALE && !text)
|
||||
loc = CUserMenuSetup::getLocale(item);
|
||||
else
|
||||
return_title = true;
|
||||
@@ -729,12 +741,15 @@ const char *CUserMenu::getUserMenuButtonName(int button, bool &active, bool retu
|
||||
break;
|
||||
}
|
||||
|
||||
if (return_title) {
|
||||
if (return_title)
|
||||
{
|
||||
if (!g_settings.usermenu[button]->title.empty())
|
||||
return g_settings.usermenu[button]->title.c_str();
|
||||
if (button < USERMENU_ITEMS_COUNT)
|
||||
return g_Locale->getText(usermenu[button].def_name);
|
||||
} else {
|
||||
}
|
||||
else
|
||||
{
|
||||
if (text)
|
||||
return text;
|
||||
if (loc != NONEXISTANT_LOCALE)
|
||||
@@ -744,12 +759,10 @@ const char *CUserMenu::getUserMenuButtonName(int button, bool &active, bool retu
|
||||
return "";
|
||||
}
|
||||
|
||||
/**************************************************************************************
|
||||
* changeNotify - features menu recording start / stop *
|
||||
**************************************************************************************/
|
||||
bool CUserMenu::changeNotify(const neutrino_locale_t OptionName, void * Data)
|
||||
bool CUserMenu::changeNotify(const neutrino_locale_t OptionName, void *Data)
|
||||
{
|
||||
if (ARE_LOCALES_EQUAL(OptionName, LOCALE_MAINMENU_PAUSESECTIONSD)) {
|
||||
if (ARE_LOCALES_EQUAL(OptionName, LOCALE_MAINMENU_PAUSESECTIONSD))
|
||||
{
|
||||
g_Sectionsd->setPauseScanning((*((int *)Data)) == 0);
|
||||
}
|
||||
|
||||
|
||||
@@ -49,8 +49,8 @@ typedef struct user_menu_data_t
|
||||
{
|
||||
neutrino_locale_t caption;
|
||||
const neutrino_msg_t key_helper_msg_def;
|
||||
const char * key_helper_icon_def;
|
||||
const char * menu_icon_def;
|
||||
const char *key_helper_icon_def;
|
||||
const char *menu_icon_def;
|
||||
int selected;
|
||||
} user_menu_data_struct;
|
||||
|
||||
@@ -63,8 +63,8 @@ static user_menu_data_t user_menu[COL_BUTTONMAX] =
|
||||
{LOCALE_USERMENU_TITLE_BLUE , CRCInput::RC_blue , NEUTRINO_ICON_BUTTON_BLUE , NEUTRINO_ICON_BLUE, -1}
|
||||
};
|
||||
|
||||
// const neutrino_msg_t col_key_helper_msg_def[COL_BUTTONMAX]={CRCInput::RC_red,CRCInput::RC_green,CRCInput::RC_yellow,CRCInput::RC_blue};
|
||||
// const char * col_key_helper_icon_def[COL_BUTTONMAX]={NEUTRINO_ICON_BUTTON_RED,NEUTRINO_ICON_BUTTON_GREEN,NEUTRINO_ICON_BUTTON_YELLOW,NEUTRINO_ICON_BUTTON_BLUE};
|
||||
// const neutrino_msg_t col_key_helper_msg_def[COL_BUTTONMAX]={ CRCInput::RC_red, CRCInput::RC_green, CRCInput::RC_yellow, CRCInput::RC_blue };
|
||||
// const char *col_key_helper_icon_def[COL_BUTTONMAX]={ NEUTRINO_ICON_BUTTON_RED, NEUTRINO_ICON_BUTTON_GREEN, NEUTRINO_ICON_BUTTON_YELLOW, NEUTRINO_ICON_BUTTON_BLUE };
|
||||
|
||||
class CUserMenu : public CChangeObserver
|
||||
{
|
||||
@@ -80,7 +80,6 @@ class CUserMenu : public CChangeObserver
|
||||
static const char *getUserMenuButtonName(int button, bool &active, bool return_title = false);
|
||||
};
|
||||
|
||||
|
||||
// This is just a quick helper for the usermenu and pluginlist.
|
||||
class CColorKeyHelper
|
||||
{
|
||||
@@ -96,16 +95,18 @@ class CColorKeyHelper
|
||||
void reset(void)
|
||||
{
|
||||
number_key = 1;
|
||||
for (int i= 0; i < COL_BUTTONMAX; i++ )
|
||||
for (int i = 0; i < COL_BUTTONMAX; i++)
|
||||
color_key_used[i] = false;
|
||||
};
|
||||
|
||||
/* Returns the next available button, to be used in menu as 'direct' keys. Appropriate
|
||||
/*
|
||||
* Returns the next available button, to be used in menu as 'direct' keys. Appropriate
|
||||
* definitions are returnd in msp and icon
|
||||
* A color button could be requested as prefered button (other buttons are not supported yet).
|
||||
* If the appropriate button is already in used, the next number_key button is returned instead
|
||||
* (first 1-9 and than 0). */
|
||||
bool get(neutrino_msg_t* msg, const char** icon, neutrino_msg_t prefered_key = CRCInput::RC_nokey)
|
||||
* (first 1-9 and than 0).
|
||||
*/
|
||||
bool get(neutrino_msg_t *msg, const char **icon, neutrino_msg_t prefered_key = CRCInput::RC_nokey)
|
||||
{
|
||||
bool result = false;
|
||||
int button = -1;
|
||||
@@ -121,8 +122,9 @@ class CColorKeyHelper
|
||||
*msg = CRCInput::RC_nokey;
|
||||
*icon = "";
|
||||
if (button >= 0 && button < COL_BUTTONMAX)
|
||||
{ // try to get color button
|
||||
if ( color_key_used[button] == false)
|
||||
{
|
||||
// try to get color button
|
||||
if (color_key_used[button] == false)
|
||||
{
|
||||
color_key_used[button] = true;
|
||||
*msg = user_menu[button].key_helper_msg_def;
|
||||
@@ -131,7 +133,7 @@ class CColorKeyHelper
|
||||
}
|
||||
}
|
||||
|
||||
if ( result == false && number_key < 10) // no key defined yet, at least try to get a numbered key
|
||||
if (result == false && number_key < 10) // no key defined yet, at least try to get a numbered key
|
||||
{
|
||||
// there is still a available number_key
|
||||
*msg = CRCInput::convertDigitToKey(number_key);
|
||||
|
||||
Reference in New Issue
Block a user