From 9ba2ef814f0d7a97a3ea9dcfce456d85f06fe574 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Wed, 12 Oct 2016 09:16:36 +0200 Subject: [PATCH 1/5] CFrameBuffer: reduce debug spam possible error is already intercepted. Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/09d40a2ddb658cc780002e1d303a7f97d73291a4 Author: Thilo Graf Date: 2016-10-12 (Wed, 12 Oct 2016) ------------------ This commit was generated by Migit --- src/driver/framebuffer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/driver/framebuffer.cpp b/src/driver/framebuffer.cpp index c12d6a703..526e27371 100644 --- a/src/driver/framebuffer.cpp +++ b/src/driver/framebuffer.cpp @@ -819,7 +819,7 @@ void CFrameBuffer::paintBoxRel(const int x, const int y, const int dx, const int return; if (dx == 0 || dy == 0) { - dprintf(DEBUG_NORMAL, "[CFrameBuffer] [%s - %d]: radius %d, start x %d y %d end x %d y %d\n", __func__, __LINE__, radius, x, y, x+dx, y+dy); + dprintf(DEBUG_DEBUG, "[CFrameBuffer] [%s - %d]: radius %d, start x %d y %d end x %d y %d\n", __func__, __LINE__, radius, x, y, x+dx, y+dy); return; } if (radius < 0) From 8227b2d48201deb23f404bc909265afcd1e16868 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Wed, 12 Oct 2016 09:42:46 +0200 Subject: [PATCH 2/5] CComponentsScrollBar: fix trasnparent background arrow icons parameter was disabled Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/7b334f888305cce1493cc2d4b964b2793d6fd02d Author: Thilo Graf Date: 2016-10-12 (Wed, 12 Oct 2016) ------------------ This commit was generated by Migit --- src/gui/components/cc_frm_scrollbar.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/gui/components/cc_frm_scrollbar.cpp b/src/gui/components/cc_frm_scrollbar.cpp index a73cca5ca..85e6ffb65 100644 --- a/src/gui/components/cc_frm_scrollbar.cpp +++ b/src/gui/components/cc_frm_scrollbar.cpp @@ -111,6 +111,7 @@ void CComponentsScrollBar::initTopNaviIcon() //initialize icon object if (sb_up_obj == NULL){ sb_up_obj = new CComponentsPicture(CC_CENTERED, fr_thickness, sb_up_icon, this); + sb_up_obj->SetTransparent(CFrameBuffer::TM_BLACK); sb_up_obj->doPaintBg(false); } sb_up_obj->setWidth(width-2*fr_thickness); @@ -121,6 +122,7 @@ void CComponentsScrollBar::initBottomNaviIcon() //initialize icon object if (sb_down_obj == NULL){ sb_down_obj = new CComponentsPicture(CC_CENTERED, CC_APPEND, sb_down_icon, this); + sb_down_obj->SetTransparent(CFrameBuffer::TM_BLACK); sb_down_obj->doPaintBg(false); } sb_down_obj->setWidth(width-2*fr_thickness); From e160d121e69e23d42ff5acaf2e18683d0d161920 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Wed, 12 Oct 2016 10:08:18 +0200 Subject: [PATCH 3/5] CComponentsScrollBar: disable scrollbar color gradient Was for testing only, now usual properties used. Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/422f5872e4eee3ac704b93229184b9ade0fa10e9 Author: Thilo Graf Date: 2016-10-12 (Wed, 12 Oct 2016) ------------------ This commit was generated by Migit --- src/gui/components/cc_frm_scrollbar.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/gui/components/cc_frm_scrollbar.cpp b/src/gui/components/cc_frm_scrollbar.cpp index 85e6ffb65..953892245 100644 --- a/src/gui/components/cc_frm_scrollbar.cpp +++ b/src/gui/components/cc_frm_scrollbar.cpp @@ -167,13 +167,17 @@ void CComponentsScrollBar::initSegments() //set color for marked id if (sb_mark_id == id){ - item->setColorBody(COL_MENUCONTENTSELECTED_PLUS_0); + item->setColorBody(COL_SCROLLBAR_ACTIVE); +#if 0 item->enableColBodyGradient(CC_COLGRAD_COL_A_2_COL_B); item->setColBodyGradient(CColorGradient::gradientDark2Light2Dark, CFrameBuffer::gradientHorizontal); +#endif } else{ - item->setColorBody(COL_SCROLLBAR_PASSIVE_PLUS_0); + item->setColorBody(COL_SCROLLBAR_PASSIVE); +#if 0 item->disableColBodyGradient(); +#endif } } From d29b7185440747d344fe1a913e449795fe372c8b Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 12 Oct 2016 20:55:28 +0200 Subject: [PATCH 4/5] eventlist: remove unnecessary hide of footer Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/4b0b32833fb39615c8968010a08ed47659fc94a2 Author: vanhofen Date: 2016-10-12 (Wed, 12 Oct 2016) Origin message was: ------------------ - eventlist: remove unnecessary hide of footer ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/eventlist.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/gui/eventlist.cpp b/src/gui/eventlist.cpp index 0bb87482e..8659fcbae 100644 --- a/src/gui/eventlist.cpp +++ b/src/gui/eventlist.cpp @@ -363,14 +363,7 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna if (msg == CRCInput::RC_up || (int) msg == g_settings.key_pageup || msg == CRCInput::RC_down || (int) msg == g_settings.key_pagedown) { - bool paint_buttonbar = false; //function bar int prev_selected = selected; - // TODO: do we need this at all? Search button is always painted IIUC... - if ((g_settings.key_channelList_addremind != (int)CRCInput::RC_nokey) || - (g_settings.key_channelList_sort != (int)CRCInput::RC_nokey) || - ((g_settings.recording_type != CNeutrinoApp::RECORDING_OFF) && - (g_settings.key_channelList_addrecord != (int)CRCInput::RC_nokey))) - paint_buttonbar = true; int new_sel = UpDownKey(evtlist, msg, listmaxshow, selected); if (new_sel >= 0) { selected = new_sel; @@ -385,7 +378,7 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna else paintItem(selected - liststart, channel_id); - showFunctionBar(paint_buttonbar, channel_id); + showFunctionBar(true, channel_id); } //sort else if (!showfollow && (msg == (neutrino_msg_t)g_settings.key_channelList_sort)) From 2dc2849d4af681716dd4a84b771e9e8a2a5e5896 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 12 Oct 2016 20:55:28 +0200 Subject: [PATCH 5/5] eventlist: remove obsolete bool show from CEventList::showFunctionBar Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/f04493b7e5d311979d47d0d3f81e07e971b2c17c Author: vanhofen Date: 2016-10-12 (Wed, 12 Oct 2016) Origin message was: ------------------ - eventlist: remove obsolete bool show from CEventList::showFunctionBar ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/eventlist.cpp | 28 +++++++++++----------------- src/gui/eventlist.h | 2 +- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/src/gui/eventlist.cpp b/src/gui/eventlist.cpp index 8659fcbae..c3aa1059d 100644 --- a/src/gui/eventlist.cpp +++ b/src/gui/eventlist.cpp @@ -331,7 +331,7 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna bool dont_hide = false; paintHead(channel_id, channelname, channelname_prev, channelname_next); paint(channel_id); - showFunctionBar(true, channel_id); + showFunctionBar(channel_id); int oldselected = selected; @@ -378,7 +378,7 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna else paintItem(selected - liststart, channel_id); - showFunctionBar(true, channel_id); + showFunctionBar(channel_id); } //sort else if (!showfollow && (msg == (neutrino_msg_t)g_settings.key_channelList_sort)) @@ -436,7 +436,7 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna timerlist.clear(); g_Timerd->getTimerList (timerlist); paint(evtlist[selected].channelID); - showFunctionBar(true, evtlist[selected].channelID); + showFunctionBar(evtlist[selected].channelID); continue; } std::string recDir = g_settings.network_nfs_recordingdir; @@ -491,7 +491,7 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna timerlist.clear(); g_Timerd->getTimerList (timerlist); paint(used_id); - showFunctionBar(true, used_id); + showFunctionBar(used_id); } } else if ( msg == (neutrino_msg_t) g_settings.key_channelList_addremind )//add/remove zapto timer event @@ -503,7 +503,7 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna timerlist.clear(); g_Timerd->getTimerList (timerlist); paint(evtlist[selected].channelID); - showFunctionBar(true, evtlist[selected].channelID); + showFunctionBar(evtlist[selected].channelID); continue; } @@ -515,7 +515,7 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna timerlist.clear(); g_Timerd->getTimerList (timerlist); paint(evtlist[selected].channelID ); - showFunctionBar(true, evtlist[selected].channelID ); + showFunctionBar(evtlist[selected].channelID ); timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_EPG]); } else if (msg == (neutrino_msg_t)g_settings.key_channelList_cancel) @@ -526,7 +526,7 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna paintHead(channel_id, channelname); readEvents(epg_id); paint(channel_id); - showFunctionBar(true, channel_id); + showFunctionBar(channel_id); } else { selected = oldselected; if(fader.StartFadeOut()) { @@ -589,7 +589,7 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna oldEventID = -1; bgRightBoxPaint = false; paint(channel_id); - showFunctionBar(true, channel_id); + showFunctionBar(channel_id); timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_EPG]); } else if (msg == CRCInput::RC_epg) @@ -632,7 +632,7 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna oldEventID = -1; bgRightBoxPaint = false; paint(channel_id); - showFunctionBar(true, channel_id); + showFunctionBar(channel_id); timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_EPG]); } } @@ -938,19 +938,13 @@ void CEventList::paint(t_channel_id channel_id) } -void CEventList::showFunctionBar (bool show, t_channel_id channel_id) +void CEventList::showFunctionBar(t_channel_id channel_id) { int bx = x; int bw = full_width; int bh = iheight; int by = y + height - bh; - if (! show) { - // -- hide only? - frameBuffer->paintBackgroundBoxRel(bx,by,bw,bh); - return; - } - CColorKeyHelper keyhelper; //user_menue.h neutrino_msg_t dummy = CRCInput::RC_nokey; const char * icon = NULL; @@ -1160,7 +1154,7 @@ bool CEventList::findEvents(t_channel_id channel_id, std::string channelname) else paintHead(channel_id, channelname); paint(); - showFunctionBar(true, channel_id); + showFunctionBar(channel_id); return(res); } diff --git a/src/gui/eventlist.h b/src/gui/eventlist.h index 25e9e656e..2c47b63e3 100644 --- a/src/gui/eventlist.h +++ b/src/gui/eventlist.h @@ -114,7 +114,7 @@ class CEventList : public CListHelpers void paint(t_channel_id channel_id = 0); void paintHead(t_channel_id _channel_id, std::string _channelname, std::string _channelname_prev = "", std::string _channelname_next = ""); void hide(); - void showFunctionBar(bool show, t_channel_id channel_id); + void showFunctionBar(t_channel_id channel_id); int timerPre; int timerPost;