mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 07:51:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

gui/channellist.cpp: remove extra showChannelLogo(),

Browse Source 
fix channel logo - call paint() after paintHead(),
use enum values for channel list mode
This commit is contained in:
[CST] Focus
2012-10-22 12:24:55 +04:00
parent 755ddcb3da
commit 9a271191b6
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/channellist.cpp
View File

@@ -802,20 +802,19 @@ int CChannelList::show()
else if ( msg == CRCInput::RC_blue ) else if ( msg == CRCInput::RC_blue )
{ {
displayNext = !displayNext; displayNext = !displayNext;
paint();
paintHead(); // update button bar paintHead(); // update button bar
showChannelLogo(); paint();
} }
else if ( msg == CRCInput::RC_green ) else if ( msg == CRCInput::RC_green )
{ {
int mode = CNeutrinoApp::getInstance()->GetChannelMode(); int mode = CNeutrinoApp::getInstance()->GetChannelMode();
if(mode){ if(mode != LIST_MODE_FAV) {
g_settings.channellist_sort_mode++; g_settings.channellist_sort_mode++;
if(g_settings.channellist_sort_mode > 2) if(g_settings.channellist_sort_mode > 2)
g_settings.channellist_sort_mode = 0; g_settings.channellist_sort_mode = 0;
CNeutrinoApp::getInstance()->SetChannelMode(mode); CNeutrinoApp::getInstance()->SetChannelMode(mode);
paint();
paintHead(); // update button bar paintHead(); // update button bar
paint();
} }
} }
@@ -1624,7 +1623,7 @@ void CChannelList::paintButtonBar(bool is_current)
{ {
//printf("[neutrino channellist] %s...%d, selected %d\n", __FUNCTION__, __LINE__, selected); //printf("[neutrino channellist] %s...%d, selected %d\n", __FUNCTION__, __LINE__, selected);
unsigned int smode = CNeutrinoApp::getInstance()->GetChannelMode(); unsigned int smode = CNeutrinoApp::getInstance()->GetChannelMode();
int num_buttons = smode ? NUM_LIST_BUTTONS_SORT : NUM_LIST_BUTTONS; int num_buttons = smode != LIST_MODE_FAV ? NUM_LIST_BUTTONS_SORT : NUM_LIST_BUTTONS;
struct button_label Button[num_buttons]; struct button_label Button[num_buttons];
const neutrino_locale_t button_ids[] = {LOCALE_INFOVIEWER_NOW,LOCALE_INFOVIEWER_NEXT,LOCALE_MAINMENU_RECORDING,LOCALE_MAINMENU_RECORDING_STOP,NONEXISTANT_LOCALE, const neutrino_locale_t button_ids[] = {LOCALE_INFOVIEWER_NOW,LOCALE_INFOVIEWER_NEXT,LOCALE_MAINMENU_RECORDING,LOCALE_MAINMENU_RECORDING_STOP,NONEXISTANT_LOCALE,