From dca157cc8f9e08d95d04961a162f7504da24b4ae Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Tue, 19 Sep 2017 12:40:02 +0200 Subject: [PATCH 1/4] fix start clock supplement to aecad369c16f4f8b1b18307d375e3fe7e6298286 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/b1f820aa441005aec791cd598e49e8a7b8ae971b Author: Jacek Jendrzej Date: 2017-09-19 (Tue, 19 Sep 2017) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/components/cc_timer.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/gui/components/cc_timer.cpp b/src/gui/components/cc_timer.cpp index a54c9bfc1..f3ef5b751 100644 --- a/src/gui/components/cc_timer.cpp +++ b/src/gui/components/cc_timer.cpp @@ -87,9 +87,6 @@ void* CComponentsTimer::initThreadAction(void *arg) //start up running timer with own thread, return true on succses void CComponentsTimer::initThread() { - if (!tm_enable) - return; - if(!tm_thread) { void *ptr = static_cast(this); From 7f09367d74b915f792ce88b80824b4ba8a921e53 Mon Sep 17 00:00:00 2001 From: max_10 Date: Mon, 18 Sep 2017 16:20:00 +0200 Subject: [PATCH 2/4] mediaplayer: fixes form Duckbox git Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/af3a61cb96e29ee0bd2259090e8b424775125831 Author: max_10 Date: 2017-09-18 (Mon, 18 Sep 2017) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/widget/menue.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp index 558e21b02..94761d072 100644 --- a/src/gui/widget/menue.cpp +++ b/src/gui/widget/menue.cpp @@ -1082,16 +1082,17 @@ void CMenuWidget::integratePlugins(int integration, const unsigned int shortcut, void CMenuWidget::hide() { - if(savescreen && background) + if(savescreen && background) { + ResetModules(); restoreScreen();//FIXME - else { + } else { if (header) header->kill(); if (info_box) info_box->kill(); if (details_line) details_line->hide(); - frameBuffer->paintBackgroundBoxRel(x, y, full_width, full_height + footer_height); + frameBuffer->paintBackgroundBoxRel(x, y, full_width, full_height/* + footer_height*/); // full_height includes footer_height : see calcSize //paintHint(-1); } paintHint(-1); @@ -1311,7 +1312,7 @@ void CMenuWidget::setMenuPos(const int& menu_width) int scr_y = frameBuffer->getScreenY(); int scr_w = frameBuffer->getScreenWidth(); int scr_h = frameBuffer->getScreenHeight(); - int real_h = full_height + footer_height + hint_height; + int real_h = full_height/* + footer_height*/ + hint_height; // full_height includes footer_height : see calcSize int x_old = x; int y_old = y; //configured positions @@ -1431,7 +1432,7 @@ void CMenuWidget::saveScreen() return; delete[] background; - saveScreen_height = full_height+footer_height; + saveScreen_height = full_height/* + footer_height*/; // full_height includes footer_height : see calcSize saveScreen_width = full_width; saveScreen_y = y; saveScreen_x = x; @@ -1464,7 +1465,7 @@ void CMenuWidget::enableSaveScreen(bool enable) void CMenuWidget::paintHint(int pos) { if (!g_settings.show_menu_hints){ - ResetModules(); //ensure clean up on changed setting + //ResetModules(); //ensure clean up on changed setting return; } From 257d3f3cfbdf7f99e2ce803394d667ec895d6428 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Mon, 18 Sep 2017 22:53:27 +0200 Subject: [PATCH 3/4] menue: use getItemColors() to get item colors Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/57a17472a69614c135e714199ef08de81de81e36 Author: vanhofen Date: 2017-09-18 (Mon, 18 Sep 2017) Origin message was: ------------------ - menue: use getItemColors() to get item colors ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/widget/menue.cpp | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp index 94761d072..3b5f75749 100644 --- a/src/gui/widget/menue.cpp +++ b/src/gui/widget/menue.cpp @@ -97,8 +97,8 @@ void CMenuItem::init(const int X, const int Y, const int DX, const int OFFX) dx = DX; offx = OFFX; name_start_x = x + offx + icon_frame_w; - item_color = COL_MENUCONTENT_TEXT; - item_bgcolor = COL_MENUCONTENT_PLUS_0; + + getItemColors(item_color, item_bgcolor); } void CMenuItem::setActive(const bool Active) @@ -184,26 +184,13 @@ void CMenuItem::setItemButton(const char * const icon_Name, const bool is_select void CMenuItem::initItemColors(const bool select_mode) { - if (select_mode) - { - item_color = COL_MENUCONTENTSELECTED_TEXT; - item_bgcolor = COL_MENUCONTENTSELECTED_PLUS_0; - } - else if (!active || inert) + getItemColors(item_color, item_bgcolor, select_mode, marked); + + if (!active || inert) { item_color = COL_MENUCONTENTINACTIVE_TEXT; item_bgcolor = COL_MENUCONTENTINACTIVE_PLUS_0; } - else if (marked) - { - item_color = COL_MENUCONTENT_TEXT; - item_bgcolor = COL_MENUCONTENT_PLUS_1; - } - else - { - item_color = COL_MENUCONTENT_TEXT; - item_bgcolor = COL_MENUCONTENT_PLUS_0; - } } void CMenuItem::paintItemCaption(const bool select_mode, const char * right_text, const fb_pixel_t right_bgcol) From 8296b295290439b9cec0c88a28c14ed860d3754e Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Tue, 19 Sep 2017 19:36:32 +0200 Subject: [PATCH 4/4] CKeyChooserItem: add missing 'timeoutbar' while waiting for pressed key Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/3e17b73df63dce443c98c4f2e277c034ed5eb371 Author: Thilo Graf Date: 2017-09-19 (Tue, 19 Sep 2017) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/widget/keychooser.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gui/widget/keychooser.cpp b/src/gui/widget/keychooser.cpp index 6d8f712ab..8473a4008 100644 --- a/src/gui/widget/keychooser.cpp +++ b/src/gui/widget/keychooser.cpp @@ -68,7 +68,7 @@ int CKeyChooserItem::exec(CMenuTarget* parent, const std::string &) int timeout = 10; CHintBox hintbox(name, LOCALE_KEYCHOOSER_TEXT, HINTBOX_MIN_WIDTH, NEUTRINO_ICON_SETTINGS, NEUTRINO_ICON_HINT_KEYS); - //hintbox.setTimeOut(timeout); + hintbox.setTimeOut(timeout); hintbox.paint(); CFrameBuffer::getInstance()->blit(); @@ -79,6 +79,7 @@ int CKeyChooserItem::exec(CMenuTarget* parent, const std::string &) timeoutEnd = CRCInput::calcTimeoutEnd(timeout); get_Message: + hintbox.enableTimeOutBar(); g_RCInput->getMsgAbsoluteTimeout( &msg, &data, &timeoutEnd ); if (msg != CRCInput::RC_timeout) @@ -92,6 +93,7 @@ int CKeyChooserItem::exec(CMenuTarget* parent, const std::string &) } g_RCInput->setLongPressAny(false); + hintbox.disableTimeOutBar(); hintbox.hide(); return res; }