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

Merge branch 'check/pu-cc' into master

Browse Source 
needs buildfixing...

Conflicts:
	data/Makefile.am
	src/driver/framebuffer.h
	src/driver/volume.cpp
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/filebrowser.cpp
	src/gui/imageinfo.cpp
	src/gui/infoviewer.cpp
	src/gui/streaminfo2.cpp
	src/gui/widget/textbox.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ad0b6b6dc
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2013-04-06 11:21:55 +02:00
parent 655b50b603 27812f2df1
commit 7254e280e3
76 changed files with 4450 additions and 950 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/gui/epgview.cpp
View File

@@ -117,17 +117,8 @@ CEpgData::CEpgData()
void CEpgData::start()
{
/* This defines the size of the EPG window. We use 90% of the screen width and
* 90% of the screen height. It adjusts itself to the "visible screen" settings
*/
float epgwin_scale_factor = BIG_FONT_FAKTOR; /* stupid useless use of float */
if (g_settings.big_windows)
epgwin_scale_factor = 1;
ox = (frameBuffer->getScreenWidth() / 20 * 18) / (bigFonts ? 1 : epgwin_scale_factor);
oy = (frameBuffer->getScreenHeight() / 20 * 18) / (bigFonts ? 1 : epgwin_scale_factor);
sx = getScreenStartX(ox);
sy = getScreenStartY(oy);
ox = frameBuffer->getScreenWidthRel();
oy = frameBuffer->getScreenHeightRel();
topheight = g_Font[SNeutrinoSettings::FONT_TYPE_EPG_TITLE]->getHeight();
topboxheight = topheight + 6;
@@ -142,6 +133,9 @@ void CEpgData::start()
medlineheight = g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO1]->getHeight();
medlinecount = sb / medlineheight;
toph = topboxheight;
sx = getScreenStartX(ox);
sy = getScreenStartY(oy + buttonheight/2); /* button box is handled separately (why?) */
}
void CEpgData::addTextToArray(const std::string & text, int screening) // UTF-8