gui/channellist: make displaying channel numbers optional

Conflicts:
	data/locale/deutsch.locale
	src/gui/channellist.cpp
	src/gui/osd_setup.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 94e6cf9a25
Author: martii <m4rtii@gmx.de>
Date: 2014-07-19 (Sat, 19 Jul 2014)



------------------
This commit was generated by Migit
This commit is contained in:
martii
2014-07-19 20:09:13 +02:00
committed by [CST] Focus
parent 18b1cc817d
commit 821c34add7
8 changed files with 24 additions and 5 deletions

View File

@@ -991,6 +991,11 @@ void COsdSetup::showOsdChanlistSetup(CMenuWidget *menu_chanlist)
mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_SHOW_CHANNELLOGO, &g_settings.channellist_show_channellogo, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_SHOW_CHANNELLOGO);
menu_chanlist->addItem(mc);
//show numbers
mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_SHOW_CHANNELNUMBER, &g_settings.channellist_show_numbers, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_SHOW_CHANNELNUMBER);
menu_chanlist->addItem(mc);
}
//eventlist