mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 00:41:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next

Browse Source 
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: afb6e0d4a1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-04 (Thu, 04 Aug 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-08-04 12:02:35 +02:00
parent 9a737d7526 875a08f014
commit 10fec22ab4
8 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/osd_setup.cpp
View File

@@ -1292,6 +1292,11 @@ void COsdSetup::showOsdEventlistSetup(CMenuWidget *menu_eventlist)
mc = new CMenuOptionChooser(LOCALE_EVENTLIST_ADDITIONAL, &g_settings.eventlist_additional, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
mc->setHint("", LOCALE_MENU_HINT_EVENTLIST_ADDITIONAL);
menu_eventlist->addItem(mc);
// epgplus in eventlist
mc = new CMenuOptionChooser(LOCALE_EVENTLIST_EPGPLUS, &g_settings.eventlist_epgplus, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
mc->setHint("", LOCALE_MENU_HINT_EVENTLIST_EPGPLUS);
menu_eventlist->addItem(mc);
}
// volume