From 77f71f0ce456cebcf4c1b3103b2584b14012b7ca Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sat, 26 Aug 2017 13:09:32 +0200 Subject: [PATCH 1/2] epgplus: restore old KEY_epg behaviour Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/5944db95dd62f672ef8538cea5bf7ded976c89fc Author: Stefan Seyfried Date: 2017-08-26 (Sat, 26 Aug 2017) --- src/gui/epgplus.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/gui/epgplus.cpp b/src/gui/epgplus.cpp index 9bdc9c69b..6fbf07a9b 100644 --- a/src/gui/epgplus.cpp +++ b/src/gui/epgplus.cpp @@ -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(); From 7ff442ac0820d2edd1afdfc5fabe7c009fe6ad79 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sat, 26 Aug 2017 13:10:12 +0200 Subject: [PATCH 2/2] epgplus: restore white grid lines instead of invisible dark ones Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/1df104ecc9bad0b49bf85b8dabdb822a0d40ac67 Author: Stefan Seyfried Date: 2017-08-26 (Sat, 26 Aug 2017) --- src/gui/epgplus.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/gui/epgplus.cpp b/src/gui/epgplus.cpp index 6fbf07a9b..6cda52b95 100644 --- a/src/gui/epgplus.cpp +++ b/src/gui/epgplus.cpp @@ -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;