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

bouquetlist: only show active buttons

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: d6260e3862
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-10 (Sun, 10 Mar 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2013-03-10 00:04:23 +01:00
parent 8258b38a53
commit ae1bbd7cd0
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/bouquetlist.cpp
View File

@@ -62,6 +62,7 @@ CBouquetList::CBouquetList(const char * const Name)
frameBuffer = CFrameBuffer::getInstance(); frameBuffer = CFrameBuffer::getInstance();
selected = 0; selected = 0;
liststart = 0; liststart = 0;
favonly = false;
if(Name == NULL) if(Name == NULL)
name = g_Locale->getText(LOCALE_BOUQUETLIST_HEAD); name = g_Locale->getText(LOCALE_BOUQUETLIST_HEAD);
else else
@@ -325,6 +326,7 @@ int CBouquetList::show(bool bShowChannelList)
int icol_w, icol_h; int icol_w, icol_h;
int w_max_text = 0; int w_max_text = 0;
int w_max_icon = 0; int w_max_icon = 0;
favonly = !bShowChannelList;
for(unsigned int count = 0; count < sizeof(CBouquetListButtons)/sizeof(CBouquetListButtons[0]);count++){ for(unsigned int count = 0; count < sizeof(CBouquetListButtons)/sizeof(CBouquetListButtons[0]);count++){
int w_text = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getRenderWidth(g_Locale->getText (CBouquetListButtons[count].locale),true); int w_text = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getRenderWidth(g_Locale->getText (CBouquetListButtons[count].locale),true);
@@ -599,7 +601,10 @@ void CBouquetList::paint()
frameBuffer->paintBoxRel(x, y+theight, width, height - theight - footerHeight, COL_MENUCONTENT_PLUS_0); frameBuffer->paintBoxRel(x, y+theight, width, height - theight - footerHeight, COL_MENUCONTENT_PLUS_0);
::paintButtons(x, y + (height - footerHeight), width, sizeof(CBouquetListButtons)/sizeof(CBouquetListButtons[0]), CBouquetListButtons, width, footerHeight); int numbuttons = sizeof(CBouquetListButtons)/sizeof(CBouquetListButtons[0]);
if (favonly) /* this actually shows favorites and providers button, but both are active anyway */
numbuttons = 2;
::paintButtons(x, y + (height - footerHeight), width, numbuttons, CBouquetListButtons, width, footerHeight);
if(!Bouquets.empty()) if(!Bouquets.empty())
{ {

2
src/gui/bouquetlist.h
View File

@@ -94,6 +94,8 @@ class CBouquetList
int x; int x;
int y; int y;
bool favonly;
void paintItem(int pos); void paintItem(int pos);
void paint(); void paint();
void paintHead(); void paintHead();