mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-30 00:41:09 +02:00
Merge remote-tracking branch 'uncool/cst-next'
This need buildfixes and some functional updates...
Origin commit data
------------------
Branch: ni/coolstream
Commit: eeee5bacab
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)
------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
@@ -69,13 +69,15 @@ extern CRemoteControl * g_RemoteControl;
|
||||
extern const char * locale_real_names[];
|
||||
extern std::string ttx_font_file;
|
||||
|
||||
COsdSetup::COsdSetup(bool wizard_mode)
|
||||
COsdSetup::COsdSetup(int wizard_mode)
|
||||
{
|
||||
frameBuffer = CFrameBuffer::getInstance();
|
||||
colorSetupNotifier = new CColorSetupNotifier();
|
||||
fontsizenotifier = new CFontSizeNotifier;
|
||||
colorInfoclockNotifier = NULL;
|
||||
screensaverNotifier = NULL;
|
||||
channellistNotifier = NULL;
|
||||
infobarHddNotifier = NULL;
|
||||
osd_menu = NULL;
|
||||
submenu_menus = NULL;
|
||||
mfFontFile = NULL;
|
||||
@@ -83,9 +85,12 @@ COsdSetup::COsdSetup(bool wizard_mode)
|
||||
mfWindowSize = NULL;
|
||||
win_demo = NULL;
|
||||
|
||||
ca_dotmatrix = NULL;
|
||||
ca_frame = NULL;
|
||||
|
||||
is_wizard = wizard_mode;
|
||||
|
||||
width = w_max (40, 10); //%
|
||||
width = 40;
|
||||
show_menu_hints = 0;
|
||||
show_tuner_icon = 0;
|
||||
}
|
||||
@@ -501,7 +506,7 @@ int COsdSetup::showOsdSetup()
|
||||
osd_menu->addItem(mf);
|
||||
|
||||
//fonts
|
||||
CMenuWidget osd_menu_fonts(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_COLORS, w_max(50, 10), MN_WIDGET_ID_OSDSETUP_FONT);
|
||||
CMenuWidget osd_menu_fonts(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_COLORS, 50, MN_WIDGET_ID_OSDSETUP_FONT);
|
||||
showOsdFontSizeSetup(&osd_menu_fonts);
|
||||
mf = new CMenuForwarder(LOCALE_FONTMENU_HEAD, true, NULL, &osd_menu_fonts, NULL, CRCInput::RC_green);
|
||||
mf->setHint("", LOCALE_MENU_HINT_FONTS);
|
||||
@@ -611,11 +616,6 @@ int COsdSetup::showOsdSetup()
|
||||
mfWindowSize->setHint("", LOCALE_MENU_HINT_WINDOW_SIZE);
|
||||
osd_menu->addItem(mfWindowSize);
|
||||
|
||||
// color gradient
|
||||
mc = new CMenuOptionChooser(LOCALE_COLOR_GRADIENT, &g_settings.gradiant, MESSAGEBOX_NO_YES_OPTIONS, MESSAGEBOX_NO_YES_OPTION_COUNT, true, this );
|
||||
mc->setHint("", LOCALE_MENU_HINT_COLOR_GRADIENT);
|
||||
osd_menu->addItem(mc);
|
||||
|
||||
osd_menu->addItem(GenericMenuSeparatorLine);
|
||||
|
||||
// scrambled
|
||||
@@ -647,6 +647,8 @@ int COsdSetup::showOsdSetup()
|
||||
|
||||
delete colorInfoclockNotifier;
|
||||
delete screensaverNotifier;
|
||||
delete channellistNotifier;
|
||||
delete infobarHddNotifier;
|
||||
delete osd_menu;
|
||||
return res;
|
||||
}
|
||||
@@ -661,6 +663,7 @@ void COsdSetup::showOsdMenueColorSetup(CMenuWidget *menu_colors)
|
||||
menu_colors->addItem(mf);
|
||||
|
||||
SNeutrinoTheme &t = g_settings.theme;
|
||||
sigc::slot0<void> slot_repaint = sigc::mem_fun(menu_colors, &CMenuWidget::paint); //we want to repaint after changed Option
|
||||
|
||||
CColorChooser* chHeadcolor = new CColorChooser(LOCALE_COLORMENU_BACKGROUND, &t.menu_Head_red, &t.menu_Head_green, &t.menu_Head_blue,
|
||||
&t.menu_Head_alpha, colorSetupNotifier);
|
||||
@@ -683,6 +686,13 @@ void COsdSetup::showOsdMenueColorSetup(CMenuWidget *menu_colors)
|
||||
|
||||
menu_colors->addItem( new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_COLORMENUSETUP_MENUHEAD));
|
||||
|
||||
CMenuOptionChooser *oj;
|
||||
oj = new CMenuOptionChooser(LOCALE_COLOR_GRADIENT_C2C, &g_settings.theme.gradient_c2c, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true );
|
||||
oj->OnAfterChangeOption.connect(slot_repaint);
|
||||
oj->setHint("", LOCALE_MENU_HINT_COLOR_GRADIENT_C2C);
|
||||
menu_colors->addItem(oj);
|
||||
menu_colors->addItem( new CMenuSeparator(CMenuSeparator::LINE));
|
||||
|
||||
mf = new CMenuDForwarder(LOCALE_COLORMENU_BACKGROUND, true, NULL, chHeadcolor );
|
||||
mf->setHint("", LOCALE_MENU_HINT_HEAD_BACK);
|
||||
menu_colors->addItem(mf);
|
||||
@@ -691,6 +701,12 @@ void COsdSetup::showOsdMenueColorSetup(CMenuWidget *menu_colors)
|
||||
mf->setHint("", LOCALE_MENU_HINT_HEAD_TEXTCOLOR);
|
||||
menu_colors->addItem(mf);
|
||||
|
||||
// head color gradient
|
||||
oj = new CMenuOptionChooser(LOCALE_COLOR_GRADIENT, &g_settings.theme.menu_Head_gradient, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true );
|
||||
oj->OnAfterChangeOption.connect(slot_repaint);
|
||||
oj->setHint("", LOCALE_MENU_HINT_COLOR_GRADIENT);
|
||||
menu_colors->addItem(oj);
|
||||
|
||||
menu_colors->addItem( new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_COLORMENUSETUP_MENUCONTENT));
|
||||
mf = new CMenuDForwarder(LOCALE_COLORMENU_BACKGROUND, true, NULL, chContentcolor );
|
||||
mf->setHint("", LOCALE_MENU_HINT_CONTENT_BACK);
|
||||
@@ -718,10 +734,20 @@ void COsdSetup::showOsdMenueColorSetup(CMenuWidget *menu_colors)
|
||||
mf->setHint("", LOCALE_MENU_HINT_SELECTED_TEXT);
|
||||
menu_colors->addItem(mf);
|
||||
|
||||
// hintbox color gradient
|
||||
menu_colors->addItem( new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_COLORTHEMEMENU_MENU_HINTS));
|
||||
oj = new CMenuOptionChooser(LOCALE_COLOR_GRADIENT, &t.menu_Hint_gradient, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
|
||||
oj->OnAfterChangeOption.connect(slot_repaint);
|
||||
oj->setHint("", LOCALE_MENU_HINT_COLOR_GRADIENT);
|
||||
menu_colors->addItem(oj);
|
||||
|
||||
// infoviewer color
|
||||
CColorChooser* chInfobarcolor = new CColorChooser(LOCALE_COLORMENU_BACKGROUND, &t.infobar_red,
|
||||
&t.infobar_green, &t.infobar_blue, &t.infobar_alpha, colorSetupNotifier);
|
||||
CColorChooser* chInfobarTextcolor = new CColorChooser(LOCALE_COLORMENU_TEXTCOLOR, &t.infobar_Text_red,
|
||||
&t.infobar_Text_green, &t.infobar_Text_blue, NULL, colorSetupNotifier);
|
||||
CColorChooser* chInfobarCASystem = new CColorChooser(LOCALE_COLORMENU_BACKGROUND, &t.infobar_casystem_red,
|
||||
&t.infobar_casystem_green, &t.infobar_casystem_blue, &t.infobar_casystem_alpha, colorSetupNotifier);
|
||||
|
||||
menu_colors->addItem( new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_COLORSTATUSBAR_TEXT));
|
||||
mf = new CMenuDForwarder(LOCALE_COLORMENU_BACKGROUND, true, NULL, chInfobarcolor );
|
||||
@@ -732,13 +758,39 @@ void COsdSetup::showOsdMenueColorSetup(CMenuWidget *menu_colors)
|
||||
mf->setHint("", LOCALE_MENU_HINT_INFOBAR_TEXTCOLOR);
|
||||
menu_colors->addItem(mf);
|
||||
|
||||
mf = new CMenuDForwarder(LOCALE_MISCSETTINGS_INFOBAR_CASYSTEM_DISPLAY, g_settings.casystem_display < 2, NULL, chInfobarCASystem );
|
||||
mf->setHint("", LOCALE_MENU_HINT_INFOBAR_CASYS_COLOR);
|
||||
menu_colors->addItem(mf);
|
||||
|
||||
// infoviewer gradient top
|
||||
oj = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_GRADIENT_TOP, &t.infobar_gradient_top, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
|
||||
oj->setHint("", LOCALE_MENU_HINT_COLOR_GRADIENT);
|
||||
menu_colors->addItem(oj);
|
||||
|
||||
// infoviewer gradient bottom
|
||||
oj = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_GRADIENT_BOTTOM, &t.infobar_gradient_bottom, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
|
||||
oj->setHint("", LOCALE_MENU_HINT_COLOR_GRADIENT);
|
||||
menu_colors->addItem(oj);
|
||||
|
||||
// colored events
|
||||
CColorChooser* chColored_Events = new CColorChooser(LOCALE_COLORMENU_TEXTCOLOR, &t.colored_events_red,
|
||||
&t.colored_events_green, &t.colored_events_blue, NULL, colorSetupNotifier);
|
||||
|
||||
menu_colors->addItem( new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_MISCSETTINGS_INFOBAR_COLORED_EVENTS));
|
||||
menu_colors->addItem( new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_MISCSETTINGS_COLORED_EVENTS));
|
||||
|
||||
mf = new CMenuDForwarder(LOCALE_COLORMENU_TEXTCOLOR, true, NULL, chColored_Events );
|
||||
mf->setHint("", LOCALE_MENU_HINT_EVENT_TEXTCOLOR);
|
||||
mf->setHint("", LOCALE_MENU_HINT_COLORED_EVENTS_TEXTCOLOR);
|
||||
menu_colors->addItem(mf);
|
||||
|
||||
// colored events channellist
|
||||
oj = new CMenuOptionChooser(LOCALE_MISCSETTINGS_COLORED_EVENTS_CHANNELLIST, &t.colored_events_channellist, OPTIONS_COLORED_EVENTS_OPTIONS, OPTIONS_COLORED_EVENTS_OPTION_COUNT, true);
|
||||
oj->setHint("", LOCALE_MENU_HINT_COLORED_EVENTS);
|
||||
menu_colors->addItem(oj);
|
||||
|
||||
// colored events infobar
|
||||
oj = new CMenuOptionChooser(LOCALE_MISCSETTINGS_COLORED_EVENTS_INFOBAR, &t.colored_events_infobar, OPTIONS_COLORED_EVENTS_OPTIONS, OPTIONS_COLORED_EVENTS_OPTION_COUNT, true);
|
||||
oj->setHint("", LOCALE_MENU_HINT_COLORED_EVENTS);
|
||||
menu_colors->addItem(oj);
|
||||
}
|
||||
|
||||
/* for font size setup */
|
||||
@@ -929,59 +981,67 @@ void COsdSetup::showOsdInfobarSetup(CMenuWidget *menu_infobar)
|
||||
{
|
||||
menu_infobar->addIntroItems(LOCALE_MISCSETTINGS_INFOBAR);
|
||||
|
||||
infobarHddNotifier = new COnOffNotifier();
|
||||
|
||||
CMenuOptionChooser * mc;
|
||||
CMenuForwarder * mf;
|
||||
|
||||
// show on epg change
|
||||
mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SHOW, &g_settings.infobar_show, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
|
||||
mc->setHint("", LOCALE_MENU_HINT_INFOBAR_ON_EPG);
|
||||
menu_infobar->addItem(mc);
|
||||
|
||||
// radiotext
|
||||
mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_RADIOTEXT, &g_settings.radiotext_enable, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this);
|
||||
mc->setHint("", LOCALE_MENU_HINT_INFOBAR_RADIOTEXT);
|
||||
menu_infobar->addItem(mc);
|
||||
|
||||
menu_infobar->addItem(GenericMenuSeparator);
|
||||
|
||||
// display options
|
||||
mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_DISP, &g_settings.infobar_show_channellogo, LOCALE_MISCSETTINGS_INFOBAR_DISP_OPTIONS, LOCALE_MISCSETTINGS_INFOBAR_DISP_OPTIONS_COUNT, true);
|
||||
mc->setHint("", LOCALE_MENU_HINT_INFOBAR_LOGO);
|
||||
menu_infobar->addItem(mc);
|
||||
|
||||
// logo directory
|
||||
mf = new CMenuForwarder(LOCALE_MISCSETTINGS_INFOBAR_LOGO_HDD_DIR, true, g_settings.logo_hdd_dir, this, "logo_dir");
|
||||
mf->setHint("", LOCALE_MENU_HINT_INFOBAR_LOGO_DIR);
|
||||
menu_infobar->addItem(mf);
|
||||
|
||||
// satellite/cable provider
|
||||
mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SAT_DISPLAY, &g_settings.infobar_sat_display, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
|
||||
mc->setHint("", LOCALE_MENU_HINT_INFOBAR_SAT);
|
||||
menu_infobar->addItem(mc);
|
||||
|
||||
menu_infobar->addItem(GenericMenuSeparator);
|
||||
|
||||
// CA system
|
||||
mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_CASYSTEM_DISPLAY, &g_settings.casystem_display, INFOBAR_CASYSTEM_MODE_OPTIONS, INFOBAR_CASYSTEM_MODE_OPTION_COUNT, true, this);
|
||||
mc->setHint("", LOCALE_MENU_HINT_INFOBAR_CASYS);
|
||||
menu_infobar->addItem(mc);
|
||||
|
||||
// logo
|
||||
mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_DISP_LOG, &g_settings.infobar_show_channellogo, LOCALE_MISCSETTINGS_INFOBAR_DISP_OPTIONS, LOCALE_MISCSETTINGS_INFOBAR_DISP_OPTIONS_COUNT, true);
|
||||
mc->setHint("", LOCALE_MENU_HINT_INFOBAR_LOGO);
|
||||
menu_infobar->addItem(mc);
|
||||
// CA system dotmatrix
|
||||
ca_dotmatrix = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_CASYSTEM_DOTMATRIX, &g_settings.casystem_dotmatrix, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, g_settings.casystem_display < 2);
|
||||
ca_dotmatrix->setHint("", LOCALE_MENU_HINT_INFOBAR_CASYS_DOTMATRIX);
|
||||
menu_infobar->addItem(ca_dotmatrix);
|
||||
|
||||
// logo directory
|
||||
CMenuForwarder * mf = new CMenuForwarder(LOCALE_MISCSETTINGS_INFOBAR_LOGO_HDD_DIR, true, g_settings.logo_hdd_dir, this, "logo_dir");
|
||||
mf->setHint("", LOCALE_MENU_HINT_INFOBAR_LOGO_DIR);
|
||||
menu_infobar->addItem(mf);
|
||||
// CA system frame
|
||||
ca_frame = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_CASYSTEM_FRAME, &g_settings.casystem_frame, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, g_settings.casystem_display < 2);
|
||||
ca_frame->setHint("", LOCALE_MENU_HINT_INFOBAR_CASYS_FRAME);
|
||||
menu_infobar->addItem(ca_frame);
|
||||
|
||||
// satellite
|
||||
mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SAT_DISPLAY, &g_settings.infobar_sat_display, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
|
||||
mc->setHint("", LOCALE_MENU_HINT_INFOBAR_SAT);
|
||||
menu_infobar->addItem(mc);
|
||||
menu_infobar->addItem(GenericMenuSeparator);
|
||||
|
||||
#ifdef CHECK_MERGE
|
||||
// infobar progress
|
||||
mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_PROGRESSBAR, &g_settings.infobar_progressbar, LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_OPTIONS, LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_COUNT, true);
|
||||
mc->setHint("", LOCALE_MENU_HINT_INFOBAR_PROGRESSBAR);
|
||||
menu_infobar->addItem(mc);
|
||||
#endif
|
||||
//infobar position
|
||||
CMenuOptionChooser *infobar_position;
|
||||
infobar_position = new CMenuOptionChooser(LOCALE_MISCSETTINGS_PROGRESSBAR_INFOBAR_POSITION, &g_settings.infobar_progressbar, PROGRESSBAR_INFOBAR_POSITION_OPTIONS, PROGRESSBAR_INFOBAR_POSITION_COUNT, true);
|
||||
infobar_position->setHint("", LOCALE_MENU_HINT_PROGRESSBAR_INFOBAR_POSITION);
|
||||
menu_infobar->addItem(infobar_position);
|
||||
|
||||
// flash/hdd progress
|
||||
mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SHOW_SYSFS_HDD, &g_settings.infobar_show_sysfs_hdd, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
|
||||
// flash/hdd statfs
|
||||
mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SHOW_SYSFS_HDD, &g_settings.infobar_show_sysfs_hdd, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, infobarHddNotifier);
|
||||
mc->setHint("", LOCALE_MENU_HINT_INFOBAR_FILESYS);
|
||||
menu_infobar->addItem(mc);
|
||||
|
||||
// hdd update
|
||||
mc = new CMenuOptionChooser(LOCALE_HDD_STATFS, &g_settings.hdd_statfs_mode, HDD_STATFS_OPTIONS, HDD_STATFS_OPTION_COUNT, true);
|
||||
// hdd statfs update
|
||||
mc = new CMenuOptionChooser(LOCALE_HDD_STATFS, &g_settings.hdd_statfs_mode, HDD_STATFS_OPTIONS, HDD_STATFS_OPTION_COUNT, g_settings.infobar_show_sysfs_hdd);
|
||||
mc->setHint("", LOCALE_MENU_HINT_HDD_STATFS);
|
||||
menu_infobar->addItem(mc);
|
||||
|
||||
// resolution
|
||||
mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SHOW_RES, &g_settings.infobar_show_res, INFOBAR_SHOW_RES_MODE_OPTIONS, INFOBAR_SHOW_RES_MODE_OPTION_COUNT, true);
|
||||
mc->setHint("", LOCALE_MENU_HINT_INFOBAR_RES);
|
||||
menu_infobar->addItem(mc);
|
||||
|
||||
// DD icon
|
||||
mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SHOW_DD_AVAILABLE, &g_settings.infobar_show_dd_available, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
|
||||
mc->setHint("", LOCALE_MENU_HINT_INFOBAR_DD);
|
||||
menu_infobar->addItem(mc);
|
||||
infobarHddNotifier->addItem(mc);
|
||||
|
||||
// tuner icon
|
||||
bool mc_active = false;
|
||||
@@ -997,19 +1057,20 @@ void COsdSetup::showOsdInfobarSetup(CMenuWidget *menu_infobar)
|
||||
mc->setHint("", LOCALE_MENU_HINT_INFOBAR_TUNER);
|
||||
menu_infobar->addItem(mc);
|
||||
|
||||
// show on epg change
|
||||
mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SHOW, &g_settings.infobar_show, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
|
||||
mc->setHint("", LOCALE_MENU_HINT_INFOBAR_ON_EPG);
|
||||
// resolution
|
||||
mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SHOW_RES, &g_settings.infobar_show_res, INFOBAR_SHOW_RES_MODE_OPTIONS, INFOBAR_SHOW_RES_MODE_OPTION_COUNT, true);
|
||||
mc->setHint("", LOCALE_MENU_HINT_INFOBAR_RES);
|
||||
menu_infobar->addItem(mc);
|
||||
|
||||
// colored event
|
||||
mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_COLORED_EVENTS, &g_settings.colored_events_infobar, OPTIONS_COLORED_EVENTS_OPTIONS, OPTIONS_COLORED_EVENTS_OPTION_COUNT, true);
|
||||
mc->setHint("", LOCALE_MENU_HINT_INFOBAR_COLORED_EVENT);
|
||||
// DD icon
|
||||
mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SHOW_DD_AVAILABLE, &g_settings.infobar_show_dd_available, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
|
||||
mc->setHint("", LOCALE_MENU_HINT_INFOBAR_DD);
|
||||
menu_infobar->addItem(mc);
|
||||
|
||||
// radiotext
|
||||
mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_RADIOTEXT, &g_settings.radiotext_enable, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this);
|
||||
mc->setHint("", LOCALE_MENU_HINT_INFOBAR_RADIOTEXT);
|
||||
menu_infobar->addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_MISCSETTINGS_PROGRESSBAR));
|
||||
// progressbar position
|
||||
mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_PROGRESSBAR_INFOBAR_POSITION, &g_settings.infobar_progressbar, PROGRESSBAR_INFOBAR_POSITION_OPTIONS, PROGRESSBAR_INFOBAR_POSITION_COUNT, true);
|
||||
mc->setHint("", LOCALE_MENU_HINT_PROGRESSBAR_INFOBAR_POSITION);
|
||||
menu_infobar->addItem(mc);
|
||||
}
|
||||
|
||||
@@ -1019,6 +1080,7 @@ void COsdSetup::showOsdChanlistSetup(CMenuWidget *menu_chanlist)
|
||||
CMenuOptionChooser * mc;
|
||||
|
||||
menu_chanlist->addIntroItems(LOCALE_MISCSETTINGS_CHANNELLIST);
|
||||
channellistNotifier = new COnOffNotifier();
|
||||
|
||||
// channellist additional
|
||||
mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_ADDITIONAL, &g_settings.channellist_additional, CHANNELLIST_ADDITIONAL_OPTIONS, CHANNELLIST_ADDITIONAL_OPTION_COUNT, true);
|
||||
@@ -1035,15 +1097,16 @@ void COsdSetup::showOsdChanlistSetup(CMenuWidget *menu_chanlist)
|
||||
mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_EXTENDED);
|
||||
menu_chanlist->addItem(mc);
|
||||
|
||||
// foot
|
||||
mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_FOOT, &g_settings.channellist_foot, CHANNELLIST_FOOT_OPTIONS, CHANNELLIST_FOOT_OPTIONS_COUNT, true);
|
||||
mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_FOOT);
|
||||
// show infobox
|
||||
mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_SHOW_INFOBOX, &g_settings.channellist_show_infobox, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, channellistNotifier);
|
||||
mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_SHOW_INFOBOX);
|
||||
menu_chanlist->addItem(mc);
|
||||
|
||||
// colored event
|
||||
mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_CHANNELLIST_COLORED_EVENTS, &g_settings.colored_events_channellist, OPTIONS_COLORED_EVENTS_OPTIONS, OPTIONS_COLORED_EVENTS_OPTION_COUNT, true);
|
||||
mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_COLORED);
|
||||
// foot
|
||||
mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_FOOT, &g_settings.channellist_foot, CHANNELLIST_FOOT_OPTIONS, CHANNELLIST_FOOT_OPTIONS_COUNT, g_settings.channellist_show_infobox);
|
||||
mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_FOOT);
|
||||
menu_chanlist->addItem(mc);
|
||||
channellistNotifier->addItem(mc);
|
||||
|
||||
//show channel logo
|
||||
mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_SHOW_CHANNELLOGO, &g_settings.channellist_show_channellogo, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
|
||||
@@ -1155,12 +1218,14 @@ bool COsdSetup::changeNotify(const neutrino_locale_t OptionName, void * data)
|
||||
if (g_InfoViewer == NULL)
|
||||
g_InfoViewer = new CInfoViewer;
|
||||
g_InfoViewer->changePB();
|
||||
if (ARE_LOCALES_EQUAL(OptionName, LOCALE_MISCSETTINGS_INFOBAR_CASYSTEM_DISPLAY))
|
||||
{
|
||||
ca_dotmatrix->setActive(g_settings.casystem_display < 2);
|
||||
ca_frame->setActive(g_settings.casystem_display < 2);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
else if(ARE_LOCALES_EQUAL(OptionName, LOCALE_COLOR_GRADIENT)) {
|
||||
osd_menu->hide();
|
||||
return true;
|
||||
}
|
||||
else if(ARE_LOCALES_EQUAL(OptionName, LOCALE_COLORMENU_OSD_PRESET)) {
|
||||
int preset = * (int *) data;
|
||||
printf("preset %d (setting %d)\n", preset, g_settings.screen_preset);
|
||||
|
||||
Reference in New Issue
Block a user