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

Merge branch 'cst-next.pre' into cst-next

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: a58f1621b4
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-04-30 (Thu, 30 Apr 2015)


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

------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2015-04-30 09:20:43 +02:00
parent 2af16e6a08 2d1fb7b8ef
commit 946c0e8bc4
81 changed files with 909 additions and 477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/gui/eventlist.cpp
View File

@@ -851,71 +851,55 @@ void CEventList::paintDescription(int index)
void CEventList::paintHead(t_channel_id _channel_id, std::string _channelname, std::string _channelname_prev, std::string _channelname_next)
{
CComponentsHeader* header = NULL;
CComponentsChannelLogo* midLogo = NULL;
CComponentsText* midText = NULL;
CComponentsText* lText = NULL;
CComponentsText* rText = NULL;
int font_mid = SNeutrinoSettings::FONT_TYPE_EVENTLIST_TITLE;
int font_lr = SNeutrinoSettings::FONT_TYPE_EVENTLIST_ITEMLARGE;
header = new CComponentsHeader(x, y, full_width, theight);
header->paint(CC_SAVE_SCREEN_NO);
CComponentsFrmChain header(x, y, full_width, theight);
header.enableColBodyGradient(g_settings.theme.menu_Head_gradient);
header.setCorner(RADIUS_LARGE, CORNER_TOP);
int logo_w_max = full_width / 4;
int name_w = 0;
int x_off = 10;
int y_off = std::max((theight - g_Font[font_lr]->getHeight()) / 2, 0);
int x_pos = x;
int y_pos = y;
int mid_width = full_width * 40 / 100; // 40%
int side_width = ((full_width - mid_width) / 2) - (2 * x_off);
midLogo = new CComponentsChannelLogo(0, 0, logo_w_max, theight, _channelname, _channel_id);
//create an logo object
CComponentsChannelLogo* midLogo = new CComponentsChannelLogo(0, 0, _channelname, _channel_id, &header);
if (midLogo->hasLogo()) {
int logo_w = midLogo->getWidth();
midLogo->setXPos(x + (full_width - logo_w) / 2);
midLogo->setYPos(y + (theight - midLogo->getHeight()) / 2);
midLogo->paint();
//if logo object has found a logo and was ititialized, the hand it's size
int w_logo = midLogo->getWidth();
//scale image if required, TODO: move into an own handler, eg. header, so channel logo should be paint in header object
int h_logo = midLogo->getHeight();
if (h_logo > theight){
uint8_t h_ratio = uint8_t(theight*100/h_logo);
midLogo->setHeight(theight);
w_logo = h_ratio*w_logo/100;
midLogo->setWidth(w_logo);
}
midLogo->setPos(CC_CENTERED, CC_CENTERED);
// recalc widths
mid_width = logo_w;
side_width = ((full_width - mid_width) / 2) - (4 * x_off);
side_width = ((full_width - w_logo) / 2) - (4 * x_off);
}
else {
name_w = g_Font[font_mid]->getRenderWidth(_channelname);
x_pos = x + (full_width - std::min(name_w, mid_width))/2;
y_pos = y;
midText = new CComponentsText(x_pos, y_pos, mid_width, theight, _channelname, CTextBox::NO_AUTO_LINEBREAK, g_Font[font_mid]);
header.removeCCItem(midLogo); //remove/destroy logo object, if it is not available
CComponentsText *midText = new CComponentsText(CC_CENTERED, CC_CENTERED, mid_width, theight, _channelname, CTextBox::CENTER, g_Font[font_mid], &header, CC_SHADOW_OFF, COL_MENUHEAD_TEXT);
midText->doPaintBg(false);
midText->setTextColor(COL_MENUHEAD_TEXT);
midText->paint(CC_SAVE_SCREEN_NO);
}
if (!_channelname_prev.empty()) {
x_pos = x + x_off;
y_pos = y + y_off;
lText = new CComponentsText(x_pos, y_pos, side_width, theight, _channelname_prev, CTextBox::NO_AUTO_LINEBREAK, g_Font[font_lr]);
CComponentsText *lText = new CComponentsText(x_off, CC_CENTERED, side_width, theight, _channelname_prev, CTextBox::NO_AUTO_LINEBREAK, g_Font[font_lr], &header, CC_SHADOW_OFF, COL_MENUHEAD_TEXT);
lText->doPaintBg(false);
lText->setTextColor(COL_MENUHEAD_TEXT);
lText->paint(CC_SAVE_SCREEN_NO);
}
if (!_channelname_next.empty()) {
name_w = g_Font[font_lr]->getRenderWidth(_channelname_next);
x_pos = x + full_width - std::min(name_w, side_width) - x_off;
y_pos = y + y_off;
rText = new CComponentsText(x_pos, y_pos, std::min(name_w, side_width), theight, _channelname_next, CTextBox::NO_AUTO_LINEBREAK, g_Font[font_lr]);
int name_w = std::min(g_Font[font_lr]->getRenderWidth(_channelname_next), side_width);
int x_pos = full_width - name_w - x_off;
CComponentsText *rText = new CComponentsText(x_pos, CC_CENTERED, name_w, theight, _channelname_next, CTextBox::NO_AUTO_LINEBREAK, g_Font[font_lr], &header, CC_SHADOW_OFF, COL_MENUHEAD_TEXT);
rText->doPaintBg(false);
rText->setTextColor(COL_MENUHEAD_TEXT);
rText->paint(CC_SAVE_SCREEN_NO);
}
if (rText) delete rText;
if (lText) delete lText;
if (midText) delete midText;
if (midLogo) delete midLogo;
if (header) delete header;
header.paint(CC_SAVE_SCREEN_NO);
}
void CEventList::paint(t_channel_id channel_id)