mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-29 16:31:05 +02:00
neutrino personalize: don't use codlines for prevered keys
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2012 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: c1cb264231
Author: Thilo Graf <dbt@novatux.de>
Date: 2011-12-28 (Wed, 28 Dec 2011)
Origin message was:
------------------
*neutrino personalize: don't use codlines for prevered keys
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2012 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
@@ -357,11 +357,11 @@ void CPersonalizeGui::ShowUserMenu(CMenuWidget* p_widget, vector<CUserMenuSetup*
|
|||||||
|
|
||||||
v_umenu_fw.push_back(new CMenuForwarder(usermenu[i].menue_title, true, g_settings.usermenu_text[i], v_umenu[i], NULL, usermenu[i].DirectKey, usermenu[i].IconName));
|
v_umenu_fw.push_back(new CMenuForwarder(usermenu[i].menue_title, true, g_settings.usermenu_text[i], v_umenu[i], NULL, usermenu[i].DirectKey, usermenu[i].IconName));
|
||||||
}
|
}
|
||||||
|
#if 0
|
||||||
//feature keys
|
//feature keys
|
||||||
fkeyMenu = new CMenuWidget(LOCALE_PERSONALIZE_HEAD, NEUTRINO_ICON_PERSONALIZE, width, MN_WIDGET_ID_PERSONALIZE_FEATUREKEYS);
|
fkeyMenu = new CMenuWidget(LOCALE_PERSONALIZE_HEAD, NEUTRINO_ICON_PERSONALIZE, width, MN_WIDGET_ID_PERSONALIZE_FEATUREKEYS);
|
||||||
CMenuForwarder *fw_fkeys = new CMenuForwarder(LOCALE_PERSONALIZE_USERMENU_PREFERRED_BUTTONS, true, NULL, fkeyMenu, NULL, CRCInput::RC_1);
|
CMenuForwarder *fw_fkeys = new CMenuForwarder(LOCALE_PERSONALIZE_USERMENU_PREFERRED_BUTTONS, true, NULL, fkeyMenu, NULL, CRCInput::RC_1);
|
||||||
|
#endif
|
||||||
//enable/disable epg/features
|
//enable/disable epg/features
|
||||||
pers_notifier = new CPersonalizeNotifier(v_umenu_fw[0], v_umenu_fw[3]);
|
pers_notifier = new CPersonalizeNotifier(v_umenu_fw[0], v_umenu_fw[3]);
|
||||||
//red
|
//red
|
||||||
@@ -376,12 +376,12 @@ void CPersonalizeGui::ShowUserMenu(CMenuWidget* p_widget, vector<CUserMenuSetup*
|
|||||||
p_widget->addItem(v_umenu_fw[j]);
|
p_widget->addItem(v_umenu_fw[j]);
|
||||||
|
|
||||||
p_widget->addItem(GenericMenuSeparator);
|
p_widget->addItem(GenericMenuSeparator);
|
||||||
|
#if 0
|
||||||
//preverred keys
|
//preverred keys
|
||||||
p_widget->addItem(GenericMenuSeparatorLine);
|
p_widget->addItem(GenericMenuSeparatorLine);
|
||||||
p_widget->addItem(fw_fkeys);
|
p_widget->addItem(fw_fkeys);
|
||||||
ShowPreverredKeySetup(fkeyMenu);
|
ShowPreverredKeySetup(fkeyMenu);
|
||||||
|
#endif
|
||||||
p_widget->addItem(GenericMenuSeparatorLine);
|
p_widget->addItem(GenericMenuSeparatorLine);
|
||||||
p_widget->addItem(new CMenuOptionChooser(LOCALE_PERSONALIZE_USERMENU_SHOW_CANCEL, &g_settings.personalize[SNeutrinoSettings::P_UMENU_SHOW_CANCEL], OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
|
p_widget->addItem(new CMenuOptionChooser(LOCALE_PERSONALIZE_USERMENU_SHOW_CANCEL, &g_settings.personalize[SNeutrinoSettings::P_UMENU_SHOW_CANCEL], OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
|
||||||
}
|
}
|
||||||
|
@@ -97,7 +97,7 @@ enum
|
|||||||
MENU_MAX //3
|
MENU_MAX //3
|
||||||
};
|
};
|
||||||
|
|
||||||
#define MENU_WIDTH 40
|
#define MENU_WIDTH 35
|
||||||
|
|
||||||
const mn_widget_struct_t menu_widgets[MENU_MAX] =
|
const mn_widget_struct_t menu_widgets[MENU_MAX] =
|
||||||
{
|
{
|
||||||
@@ -294,6 +294,7 @@ void CNeutrinoApp::InitMenuSettings()
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* service menu*/
|
/* service menu*/
|
||||||
void CNeutrinoApp::InitMenuService()
|
void CNeutrinoApp::InitMenuService()
|
||||||
{
|
{
|
||||||
@@ -379,4 +380,3 @@ void CNeutrinoApp::InitServiceSettings(CMenuWidget &service)
|
|||||||
}
|
}
|
||||||
#endif//**************************************************************************************
|
#endif//**************************************************************************************
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user