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

Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox

Browse Source 
Conflicts:
	configure.ac
	src/driver/screenshot.cpp
	src/driver/streamts.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: a4fd09ecc2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-27 (Sun, 27 Aug 2017)
This commit is contained in:
vanhofen
2017-08-27 23:55:53 +02:00
parent 7330a4cd9d 7ff442ac08
commit 25a4911df4
4 changed files with 11 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/epgplus.cpp
View File

@@ -236,7 +236,7 @@ void EpgPlus::TimeLine::paintGrid()
for (int i = 0; i < numberOfTicks; ++i, xPos += tickDist)
{
// display a line for the tick
this->frameBuffer->paintVLineRel(xPos, this->y, this->font->getHeight(), COL_MENUCONTENTDARK_PLUS_0);
this->frameBuffer->paintVLineRel(xPos, this->y, this->font->getHeight(), COL_MENUCONTENT_TEXT);
}
}
@@ -292,7 +292,7 @@ void EpgPlus::TimeLine::paintMark(time_t _startTime, int pduration, int px, int
if (separationLineThickness > 0)
{
this->frameBuffer->paintBoxRel(this->x, this->y + this->font->getHeight() + this->font->getHeight(),
this->width, this->separationLineThickness, COL_MENUCONTENTDARK_PLUS_0);
this->width, this->separationLineThickness, COL_MENUCONTENT_TEXT);
}
}
@@ -305,7 +305,7 @@ void EpgPlus::TimeLine::clearMark()
if (separationLineThickness > 0)
{
this->frameBuffer->paintBoxRel(this->x, this->y + this->font->getHeight() + this->font->getHeight(),
this->width, this->separationLineThickness, COL_MENUCONTENTDARK_PLUS_0);
this->width, this->separationLineThickness, COL_MENUCONTENT_TEXT);
}
}
@@ -365,11 +365,11 @@ void EpgPlus::ChannelEventEntry::paint(bool pisSelected, bool toggleColor)
{
// left side
this->frameBuffer->paintBoxRel(this->x, this->y,
this->separationLineThickness, this->font->getHeight(), COL_MENUCONTENTDARK_PLUS_0);
this->separationLineThickness, this->font->getHeight(), COL_MENUCONTENT_TEXT);
// bottom
this->frameBuffer->paintBoxRel(this->x, this->y + this->font->getHeight(),
this->width, this->separationLineThickness, COL_MENUCONTENTDARK_PLUS_0);
this->width, this->separationLineThickness, COL_MENUCONTENT_TEXT);
}
if (pisSelected)
@@ -510,7 +510,7 @@ void EpgPlus::ChannelEntry::paint(bool isSelected, time_t _selectedTime)
if (separationLineThickness > 0)
{
this->frameBuffer->paintBoxRel(this->x, this->y + this->font->getHeight(),
this->width, this->separationLineThickness, COL_MENUCONTENTDARK_PLUS_0);
this->width, this->separationLineThickness, COL_MENUCONTENT_TEXT);
}
bool toggleColor = false;
@@ -960,10 +960,12 @@ int EpgPlus::exec(CChannelList * pchannelList, int selectedChannelIndex, CBouque
loop = false;
}
else if (msg == CRCInput::RC_epg)
#if 0
{
loop = false;
}
else if (msg == CRCInput::RC_help)
#endif
{
//fprintf(stderr, "RC_help, bigfont = %d\n", bigfont);
hide();