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

Mute-Zap switch channel list

Browse Source 
- Mute-Zap Icon remove from the channel list
- Moved Mute-Zap switch in the Misc Settings menu
- Mute function restored in the channel list


git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1840 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
micha-bbg
2011-11-09 01:02:27 +00:00
parent fa2f642e4f
commit d837bbbbaf
9 changed files with 21 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/gui/channellist.cpp
View File

@@ -104,7 +104,6 @@ CChannelList::CChannelList(const char * const pName, bool phistoryMode, bool _vl
this->historyMode = phistoryMode;
vlist = _vlist;
selected_chid = 0;
this->new_mode_active = false;
footerHeight = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight()+6; //initial height value for buttonbar
//printf("************ NEW LIST %s : %x\n", name.c_str(), this);fflush(stdout);
}
@@ -468,7 +467,6 @@ int CChannelList::show()
return res;
}
this->new_mode_active = 0;
int fw = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getWidth();
width = w_max (((g_settings.channellist_extended)?(frameBuffer->getScreenWidth() / 20 * (fw+6)):(frameBuffer->getScreenWidth() / 20 * (fw+5))), 100);
height = h_max ((frameBuffer->getScreenHeight() / 20 * 16), (frameBuffer->getScreenHeight() / 20 * 2));
@@ -489,9 +487,6 @@ int CChannelList::show()
frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_MENU, &icol_w, &icol_h);
theight = std::max(theight, icol_h);
frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_MUTE_ZAP_ACTIVE, &icol_w, &icol_h);
theight = std::max(theight, icol_h);
fheight = g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->getHeight();
if (fheight == 0)
fheight = 1; /* avoid crash on invalid font */
@@ -644,7 +639,7 @@ int CChannelList::show()
selected=0;
liststart = (selected/listmaxshow)*listmaxshow;
paint();
if(this->new_mode_active && SameTP()) {
if(g_settings.channellist_new_zap_mode && SameTP()) {
actzap = true;
zapTo(selected);
}
@@ -653,7 +648,7 @@ int CChannelList::show()
selected=chanlist.size()-1;
liststart = (selected/listmaxshow)*listmaxshow;
paint();
if(this->new_mode_active && SameTP()) {
if(g_settings.channellist_new_zap_mode && SameTP()) {
actzap = true;
zapTo(selected);
}
@@ -682,7 +677,7 @@ int CChannelList::show()
showChannelLogo();
}
if(this->new_mode_active && SameTP()) {
if(g_settings.channellist_new_zap_mode && SameTP()) {
actzap = true;
zapTo(selected);
}
@@ -714,7 +709,7 @@ int CChannelList::show()
showChannelLogo();
}
if(this->new_mode_active && SameTP()) {
if(g_settings.channellist_new_zap_mode && SameTP()) {
actzap = true;
zapTo(selected);
}
@@ -771,11 +766,6 @@ int CChannelList::show()
loop=false;
}
}
else if ( msg == CRCInput::RC_spkr ) {
this->new_mode_active = (this->new_mode_active ? 0 : 1);
paintHead();
showChannelLogo();
}
else if (CRCInput::isNumeric(msg) && (this->historyMode || g_settings.sms_channel)) {
if (this->historyMode) { //numeric zap
switch (msg) {
@@ -907,7 +897,6 @@ int CChannelList::show()
printf("CChannelList:: bouquetList->exec res %d\n", res);
}
CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO);
this->new_mode_active = 0;
if(NeutrinoMessages::mode_ts == CNeutrinoApp::getInstance()->getMode())
return -1;
@@ -1160,11 +1149,11 @@ void CChannelList::zapTo(int pos, bool /* forceStoreToLastChannels */)
if (bouquetList != NULL) {
CNeutrinoApp::getInstance()->channelList->adjustToChannelID(chan->channel_id);
}
if(this->new_mode_active)
if(g_settings.channellist_new_zap_mode)
selected_in_new_mode = pos;
}
if(!this->new_mode_active) {
if(!g_settings.channellist_new_zap_mode) {
selected = pos;
#if 0
/* TODO lastChList.store also called in adjustToChannelID, which is called
@@ -2054,26 +2043,22 @@ void CChannelList::paintHead()
timestr_len = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getRenderWidth(timestr, true); // UTF-8
}
int iw1, iw2, iw3, ih = 0;
frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_HELP, &iw1, &ih);
int iw1, iw2, ih = 0;
frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_INFO, &iw1, &ih);
frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_MENU, &iw2, &ih);
frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_MUTE_ZAP_ACTIVE, &iw3, &ih);
// head
frameBuffer->paintBoxRel(x,y, width,theight+0, COL_MENUHEAD_PLUS_0, RADIUS_LARGE, CORNER_TOP);//round
frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_HELP, x + width - iw1 - 4, y, theight); //y+ 5 );
frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_INFO, x + width - iw1 - 4, y, theight); //y+ 5 );
frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_MENU, x + width - iw1 - iw2 - 8, y, theight);//y + 5); // icon for bouquet list button
frameBuffer->paintIcon(this->new_mode_active ?
NEUTRINO_ICON_BUTTON_MUTE_ZAP_ACTIVE : NEUTRINO_ICON_BUTTON_MUTE_ZAP_INACTIVE,
x + width - iw1 - iw2 - iw3 - 12, y, theight);
if (gotTime) {
g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->RenderString(x + width - iw1 - iw2 - iw3 - 16 -timestr_len,
g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->RenderString(x + width - iw1 - iw2 - 16 -timestr_len,
y+theight, timestr_len, timestr, COL_MENUHEAD, 0, true); // UTF-8
timestr_len += 4;
}
timestr_len += iw1 + iw2 + iw3 + 16;
timestr_len += iw1 + iw2 + 16;
logo_off = timestr_len + 4;
g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->RenderString(x+10,y+theight+0, width - timestr_len, name, COL_MENUHEAD, 0, true); // UTF-8
}