channellist: allow show/hide bottom infobox

Origin commit data
------------------
Branch: ni/coolstream
Commit: 7f35a67426
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-04-14 (Tue, 14 Apr 2015)

Origin message was:
------------------
- channellist: allow show/hide bottom infobox

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2015-04-14 11:08:24 +02:00
parent 764ca42629
commit 21b3e320aa
10 changed files with 45 additions and 9 deletions

View File

@@ -73,6 +73,7 @@ COsdSetup::COsdSetup(bool wizard_mode)
fontsizenotifier = new CFontSizeNotifier;
colorInfoclockNotifier = NULL;
screensaverNotifier = NULL;
channellistNotifier = NULL;
osd_menu = NULL;
submenu_menus = NULL;
mfFontFile = NULL;
@@ -639,6 +640,7 @@ int COsdSetup::showOsdSetup()
delete colorInfoclockNotifier;
delete screensaverNotifier;
delete channellistNotifier;
delete osd_menu;
return res;
}
@@ -997,6 +999,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);
@@ -1013,10 +1016,16 @@ void COsdSetup::showOsdChanlistSetup(CMenuWidget *menu_chanlist)
mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_EXTENDED);
menu_chanlist->addItem(mc);
// 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);
// foot
mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_FOOT, &g_settings.channellist_foot, CHANNELLIST_FOOT_OPTIONS, CHANNELLIST_FOOT_OPTIONS_COUNT, true);
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);
// 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);