mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 16:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'cst-next'

Browse Source
This commit is contained in:
Stefan Seyfried
2016-01-08 19:52:41 +01:00
parent f99c3ebc37 11e480b6e8
commit b53fbaf327
25 changed files with 194 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/channellist.cpp
View File

@@ -1392,6 +1392,9 @@ int CChannelList::numericZap(int key)
CZapitChannel* CChannelList::getPrevNextChannel(int key, unsigned int &sl)
{
if(sl >= (*chanlist).size())
sl = (*chanlist).size()-1;
CZapitChannel* channel = (*chanlist)[sl];
int bsize = bouquetList->Bouquets.size();
int bactive = bouquetList->getActiveBouquetNumber();
@@ -1714,7 +1717,7 @@ void CChannelList::showChannelLogo() //TODO: move into an own handler, eg. heade
#define NUM_LIST_BUTTONS_SORT 9
struct button_label SChannelListButtons_SMode[NUM_LIST_BUTTONS_SORT] =
{
{ NEUTRINO_ICON_BUTTON_RED, LOCALE_INFOVIEWER_EVENTLIST},
{ NEUTRINO_ICON_BUTTON_RED, LOCALE_MISCSETTINGS_EPG_HEAD},
{ NEUTRINO_ICON_BUTTON_GREEN, LOCALE_CHANNELLIST_FOOT_SORT_ALPHA},
{ NEUTRINO_ICON_BUTTON_YELLOW, LOCALE_BOUQUETLIST_HEAD},
{ NEUTRINO_ICON_BUTTON_BLUE, LOCALE_INFOVIEWER_NEXT},