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

CBEChannelWidget: use CComponentsInfoBox to paint text into infobox

Browse Source
This commit is contained in:
Thilo Graf
2012-08-25 01:42:48 +02:00
parent 200dce89c1
commit e6eb91f706
2 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/gui/bedit/bouqueteditor_channels.cpp
View File

@@ -106,7 +106,7 @@ void CBEChannelWidget::paintItem(int pos)
bgcolor = COL_MENUCONTENTSELECTED_PLUS_0;
if(current < Channels->size()) {
paintItem2DetailsLine (pos, current);
initItem2DetailsLine (pos, current);
paintDetails(current);
}
@@ -184,22 +184,37 @@ void CBEChannelWidget::paintFoot()
::paintButtons(x, y + (height-footerHeight), width, 4, CBEChannelWidgetButtons, footerHeight);
}
void CBEChannelWidget::paintDetails(int index)
std::string CBEChannelWidget::getInfoText(int index)
{
std::string res = "";
std::string satname = CServiceManager::getInstance()->GetSatelliteName((*Channels)[index]->getSatellitePosition());
transponder t;
CServiceManager::getInstance()->GetTransponder((*Channels)[index]->getTransponderId(), t);
std::string desc = t.description();
if((*Channels)[index]->pname)
desc = desc + " (" + std::string((*Channels)[index]->pname) + ")";
else
else
desc = desc + " (" + satname + ")";
g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->RenderString(x+ 10, y+ height+ 5+ fheight+INFO_BOX_Y_OFFSET, width - 30, satname.c_str(), COL_MENUCONTENTDARK, 0, true);
g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->RenderString(x+ 10, y+ height+ 5+ 2*fheight+INFO_BOX_Y_OFFSET, width - 30, desc.c_str(), COL_MENUCONTENTDARK, 0, true);
res = satname + "\n" + desc;
return res;
}
void CBEChannelWidget::paintItem2DetailsLine (int pos, int /*ch_index*/)
void CBEChannelWidget::paintDetails(int index)
{
//details line
dline->paint();
std::string str = getInfoText(index);
//info box
ibox->setText(str, CTextBox::AUTO_WIDTH | CTextBox::NO_AUTO_LINEBREAK, g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]);
ibox->paint(false);
}
void CBEChannelWidget::initItem2DetailsLine (int pos, int /*ch_index*/)
{
#define ConnectLineBox_Width 16
@@ -208,18 +223,17 @@ void CBEChannelWidget::paintItem2DetailsLine (int pos, int /*ch_index*/)
int ypos2 = y + height + INFO_BOX_Y_OFFSET;
int ypos1a = ypos1 + (fheight/2)-2;
int ypos2a = ypos2 + (info_height/2)-2;
if (dline)
dline->kill(); //kill details line
// paint Line if detail info (and not valid list pos)
// init Line if detail info (and not valid list pos)
if (pos >= 0)
{
if (dline == NULL)
dline = new CComponentsDetailLine(xpos, ypos1a, ypos2a, fheight/2+1, info_height-RADIUS_LARGE*2);
dline->setYPos(ypos1a);
dline->paint();
//infobox
if (ibox){
ibox->setDimensionsAll(x, ypos2, width, info_height);
@@ -228,11 +242,8 @@ void CBEChannelWidget::paintItem2DetailsLine (int pos, int /*ch_index*/)
ibox->paint(false,true);
#endif
ibox->setCornerRadius(RADIUS_LARGE);
ibox->syncSysColors();
ibox->setShadowOnOff(CC_SHADOW_OFF);
}
ibox->paint(false);
}
}

3
src/gui/bedit/bouqueteditor_channels.h
View File

@@ -84,7 +84,7 @@ class CBEChannelWidget : public CMenuTarget
void paintItem(int pos);
void paintDetails(int index);
void paintItem2DetailsLine (int pos, int ch_index);
void initItem2DetailsLine (int pos, int ch_index);
void clearItem2DetailsLine ();
void paint();
void paintHead();
@@ -99,6 +99,7 @@ class CBEChannelWidget : public CMenuTarget
void cancelMoveChannel();
void internalMoveChannel( unsigned int fromPosition, unsigned int toPosition);
std::string getInfoText(int index);
public:
CBEChannelWidget( const std::string & Caption, unsigned int Bouquet);
~CBEChannelWidget();