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

Merge branch 'dvbsi++' into next

Browse Source 
Conflicts:
	src/neutrino.cpp
	src/zapit/src/femanager.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp
This commit is contained in:
[CST] Focus
2013-02-28 16:39:34 +04:00
parent cddfcf3bf9 e74f1db278
commit 026592e8fe
70 changed files with 544 additions and 417 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/gui/infoviewer.cpp
View File

@@ -734,7 +734,10 @@ void CInfoViewer::showTitle (const int ChanNum, const std::string & Channel, con
prov_name=prov_name.substr(prov_name.find_first_of("]")+1);
int chname_width = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME]->getRenderWidth (ChannelName, true);// UTF-8
chname_width += (chname_width/(ChannelName.size()-1)/2);
unsigned int chann_size = ChannelName.size();
if(ChannelName.empty())
chann_size = 1;
chname_width += (chname_width/chann_size/2);
g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO]->RenderString(
ChanNameX + 10 + ChanNumWidth + chname_width, ChanNameY + time_height -SHADOW_OFFSET/2,
BoxEndX - (ChanNameX + 20) - time_width - LEFT_OFFSET - 5 - ChanNumWidth - chname_width,
@@ -1472,12 +1475,12 @@ void CInfoViewer::display_Info(const char *current, const char *next,
pb_starty = CurrInfoY - ((pb_h * 2) + (pb_h / 6)) ;
pb_h = (pb_h/3);
pb_color = COL_INFOBAR_SHADOW_PLUS_0;
pb_color = 0;
break;
case 2:
pb_starty = CurrInfoY - ((pb_h * 2) + (pb_h / 5)) ;
pb_h = (pb_h/5);
pb_color = COL_INFOBAR_SHADOW_PLUS_0;
pb_color = 0;
break;
case 3:
pb_starty = CurrInfoY + ((pb_h / 3)-(pb_h/5)) ;
@@ -1758,7 +1761,7 @@ void CInfoViewer::showInfoFile()
/*if (recordModeActive)
return;*/
char infotext[80];
int fd, xStart, xOffset, yStart, width, height, tWidth, tIndent;
int fd, xStart, yStart, width, height, iOffset, oOffset, tWidth, tIndent, pb_w;
ssize_t cnt;
fd = open("/tmp/infobar.txt", O_RDONLY); //read textcontent from this file
@@ -1774,14 +1777,16 @@ void CInfoViewer::showInfoFile()
}
infotext[cnt-1] = '\0';
xStart = BoxStartX + ChanWidth + 140; //140px space for the little rec/ts-bar
xOffset = 5; //same value as the used RADIUS_SMALL
iOffset = RADIUS_SMALL; // inner left/right offset
oOffset = 140; // outer left/right offset
pb_w = 112; // same value as int pb_w in display_Info()
xStart = BoxStartX + ChanWidth + oOffset;
yStart = BoxStartY;
width = BoxEndX - xStart - 225; //225px space for the progress-bar
width = BoxEndX - xStart - (g_settings.infobar_progressbar ? oOffset : oOffset + pb_w);
height = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO]->getHeight() + 2;
tWidth = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO]->getRenderWidth(infotext);
if (tWidth < (width - (xOffset * 2)) )
tIndent = (width - (xOffset * 2) - tWidth) / 2;
if (tWidth < (width - (iOffset * 2)) )
tIndent = (width - (iOffset * 2) - tWidth) / 2;
else
tIndent = 0;
//shadow
@@ -1790,7 +1795,7 @@ void CInfoViewer::showInfoFile()
frameBuffer->paintBoxRel(xStart, yStart, width, height, COL_INFOBAR_PLUS_0, RADIUS_SMALL, CORNER_ALL);
//content
g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO]->RenderString(
xStart + xOffset + tIndent, yStart + height, width - xOffset, (std::string)infotext, COL_INFOBAR, height, false);
xStart + iOffset + tIndent, yStart + height, width - iOffset, (std::string)infotext, COL_INFOBAR, height, false);
}
void CInfoViewer::killTitle()