From 994888144281c48f7c327bc8f0638334b87cf24d Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 16 May 2017 15:47:26 +0200 Subject: [PATCH 01/21] align existing g_settings.movieplayer_bisection_jump to new value Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/d657f993c40909984ab10c573985a8930e98ec32 Author: vanhofen Date: 2017-05-16 (Tue, 16 May 2017) Origin message was: ------------------ - align existing g_settings.movieplayer_bisection_jump to new value --- src/neutrino.cpp | 6 ++++++ version_pseudo.h | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index ad5f455bf..c45aa540a 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -1143,6 +1143,12 @@ void CNeutrinoApp::upgradeSetup(const char * fname) configfile.deleteKey("screen_width"); configfile.deleteKey("screen_height"); } + //NI + if (g_settings.version_pseudo < "20170516150000") + { + if (g_settings.movieplayer_bisection_jump == 1) + g_settings.movieplayer_bisection_jump = 5; + } g_settings.version_pseudo = NEUTRINO_VERSION_PSEUDO; configfile.setString("version_pseudo", g_settings.version_pseudo); diff --git a/version_pseudo.h b/version_pseudo.h index f72f31607..3cd859b22 100644 --- a/version_pseudo.h +++ b/version_pseudo.h @@ -1 +1 @@ -#define NEUTRINO_VERSION_PSEUDO "20170209181002" +#define NEUTRINO_VERSION_PSEUDO "20170516150000" From ce5eb71ba1b421cdec50a3896338153dea3bdaeb Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 16 May 2017 15:59:04 +0200 Subject: [PATCH 02/21] locale: clearify hints for bisection jumps Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/22d36d3e830f4d97257e992879a8af6155c22cf8 Author: vanhofen Date: 2017-05-16 (Tue, 16 May 2017) Origin message was: ------------------ - locale: clearify hints for bisection jumps --- data/locale/deutsch.locale | 2 +- data/locale/english.locale | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 0626d9b40..b686e5dc5 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -1352,7 +1352,7 @@ menu.hint_misc_zapit Verwaltung der Start-Kanäle für den TV/Radio-Modus menu.hint_movie Wiedergabe von Filmen menu.hint_moviebrowser_fonts Ändern Sie die Schriftgrößen im Moviebrowser (Meine Aufnahmen) menu.hint_moviebrowser_setup Legen Sie Auswahl- und Anzeigeoptionen des Moviebrowsers fest -menu.hint_movieplayer_bisection_jump Für das Vor- und Zurückspringen mit Seite hoch/runter wird ein bisektionaler Modus verwendet +menu.hint_movieplayer_bisection_jump Startwert für den bisektionalen Modus um mit Seite hoch/runter vor- bzw. zurückzuspringen. menu.hint_movieplayer_plugin Wählen Sie ein Plugin, das mit einer Schnellstart-Taste im Movieplayer-Modus gestartet wird menu.hint_net_broadcast Ändern Sie die Broadcast-Adresse.\nWenn Sie unsicher sind, verwenden Sie zuletzt .255 menu.hint_net_dhcp Verwenden Sie einen DHCP-Server für die automatische Vergabe einer IP-Adresse im Netzwerk diff --git a/data/locale/english.locale b/data/locale/english.locale index f2848a9a0..eb15d259c 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -1352,7 +1352,7 @@ menu.hint_misc_zapit Initial TV/Radio channels menu.hint_movie Play movies menu.hint_moviebrowser_fonts Change moviebrowser (My recordings) font sizes menu.hint_moviebrowser_setup Set selection and display options. -menu.hint_movieplayer_bisection_jump Use bisectional mode to jump forward/backward with page up/down +menu.hint_movieplayer_bisection_jump Start value for bisectional mode to jump forward/backward with page up/down. menu.hint_movieplayer_plugin Choose a plugin that's executed with the one touch key in movieplayer mode menu.hint_net_broadcast Enter broadcast address\nif unsure, use IP address with last .255 menu.hint_net_dhcp Use DHCP server to auto-configure From 3f96fc3aa4417e9f39f4600c54dddcf69748baf9 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 16 May 2017 16:43:10 +0200 Subject: [PATCH 03/21] locale: more minor changes Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/af1e89e656dedb9a7168ebafd0894b5b2e055886 Author: vanhofen Date: 2017-05-16 (Tue, 16 May 2017) Origin message was: ------------------ - locale: more minor changes --- data/locale/deutsch.locale | 2 +- data/locale/english.locale | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index b686e5dc5..8e1c8f0d6 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -1352,7 +1352,7 @@ menu.hint_misc_zapit Verwaltung der Start-Kanäle für den TV/Radio-Modus menu.hint_movie Wiedergabe von Filmen menu.hint_moviebrowser_fonts Ändern Sie die Schriftgrößen im Moviebrowser (Meine Aufnahmen) menu.hint_moviebrowser_setup Legen Sie Auswahl- und Anzeigeoptionen des Moviebrowsers fest -menu.hint_movieplayer_bisection_jump Startwert für den bisektionalen Modus um mit Seite hoch/runter vor- bzw. zurückzuspringen. +menu.hint_movieplayer_bisection_jump Startwert für den bisektionalen Modus, um mit Seite hoch/runter vor- bzw. zurückzuspringen menu.hint_movieplayer_plugin Wählen Sie ein Plugin, das mit einer Schnellstart-Taste im Movieplayer-Modus gestartet wird menu.hint_net_broadcast Ändern Sie die Broadcast-Adresse.\nWenn Sie unsicher sind, verwenden Sie zuletzt .255 menu.hint_net_dhcp Verwenden Sie einen DHCP-Server für die automatische Vergabe einer IP-Adresse im Netzwerk diff --git a/data/locale/english.locale b/data/locale/english.locale index eb15d259c..04f6b5eee 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -1352,7 +1352,7 @@ menu.hint_misc_zapit Initial TV/Radio channels menu.hint_movie Play movies menu.hint_moviebrowser_fonts Change moviebrowser (My recordings) font sizes menu.hint_moviebrowser_setup Set selection and display options. -menu.hint_movieplayer_bisection_jump Start value for bisectional mode to jump forward/backward with page up/down. +menu.hint_movieplayer_bisection_jump Start value for bisectional mode to jump forward/backward with page up/down menu.hint_movieplayer_plugin Choose a plugin that's executed with the one touch key in movieplayer mode menu.hint_net_broadcast Enter broadcast address\nif unsure, use IP address with last .255 menu.hint_net_dhcp Use DHCP server to auto-configure From 3f417116a585117f7da83af6302c2363e323ca06 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 17 May 2017 17:23:22 +0200 Subject: [PATCH 04/21] cables.xml: update Antennengemeinschaft "Goeltzschtalbruecke" Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/b7ef6e47fe0e9b909988b75a73636c55f104b94b Author: vanhofen Date: 2017-05-17 (Wed, 17 May 2017) Origin message was: ------------------ - cables.xml: update Antennengemeinschaft "Goeltzschtalbruecke" --- data/cables.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/cables.xml b/data/cables.xml index e05516a44..fa4baec60 100644 --- a/data/cables.xml +++ b/data/cables.xml @@ -534,7 +534,7 @@ - + From 44af471dd9ae0b8e1ba0900a56c9c5e61d56a34f Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Wed, 17 May 2017 20:08:50 +0200 Subject: [PATCH 05/21] CHintBox: fix position in case of missing text Without text, position was not complete calculated. Only default position was used. Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/e48cc87b6fa93c38783cfc791c8bff94fd6ecd8c Author: Thilo Graf Date: 2017-05-17 (Wed, 17 May 2017) --- src/gui/widget/hintbox.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/gui/widget/hintbox.cpp b/src/gui/widget/hintbox.cpp index 45ef2b6ed..47d0e474c 100644 --- a/src/gui/widget/hintbox.cpp +++ b/src/gui/widget/hintbox.cpp @@ -162,6 +162,8 @@ void CHintBox::init(const std::string& Text, const int& Width, const std::string if (!Text.empty()) addHintItem(Text, text_mode, Picon, COL_MENUCONTENT_TEXT, hb_font); + else + ReSize(); } CHintBox::~CHintBox() @@ -312,13 +314,8 @@ void CHintBox::addHintItem(const std::string& Text, const int& text_mode, const info_box->setPicture(Picon); info_box->doPaintBg(false); - /* recalculate new hintbox height */ + /* recalculate new hintbox dimensions and position*/ ReSize(); - - /* set hint box position general to center and refresh window */ - setCenterPos(CC_ALONG_X); - y = frameBuffer->getScreenY() + ((frameBuffer->getScreenHeight() - height) >> 2), - Refresh(); } void CHintBox::setMsgText(const std::string& Text, const uint& hint_id, const int& mode, Font* font_text, const fb_pixel_t& color_text, const int& style) @@ -350,6 +347,10 @@ void CHintBox::ReSize() h += item->getHeight(); } height = min(HINTBOX_MAX_HEIGHT, max(HINTBOX_MIN_HEIGHT, max(height,h))); + + /* set hint box position general to center and refresh window */ + setCenterPos(CC_ALONG_X); + y = frameBuffer->getScreenY() + ((frameBuffer->getScreenHeight() - height) >> 2), Refresh(); } From da1903c11d1254f97fdab56756faecc25011d873 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Wed, 17 May 2017 22:15:15 +0200 Subject: [PATCH 06/21] src/gui/lua/lua_cc_text.cpp avoid segfault Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/ffe986f36ba3bee015f22cbb46c9628253ffb44f Author: Jacek Jendrzej Date: 2017-05-17 (Wed, 17 May 2017) --- src/gui/lua/lua_cc_text.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/gui/lua/lua_cc_text.cpp b/src/gui/lua/lua_cc_text.cpp index 461164e1a..2cbaa45d3 100644 --- a/src/gui/lua/lua_cc_text.cpp +++ b/src/gui/lua/lua_cc_text.cpp @@ -208,10 +208,11 @@ int CLuaInstCCText::CCTextSetText(lua_State *L) std::string text = ""; lua_Integer mode = D->mode; lua_Integer font_text = D->font_text; - tableLookup(L, "text", text); - tableLookup(L, "mode", mode); - tableLookup(L, "font_text", font_text); - + if (lua_istable(L, -1)){ + tableLookup(L, "text", text); + tableLookup(L, "mode", mode); + tableLookup(L, "font_text", font_text); + } D->ct->setText(text, mode, g_Font[font_text]); return 0; } From 551807d7b1ea6f4afb29e9e17110f37c3a2634ba Mon Sep 17 00:00:00 2001 From: gixxpunk Date: Thu, 18 May 2017 08:40:33 +0200 Subject: [PATCH 07/21] CVFD: do not show "save epg" in standby Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/1f221f13e639d80191dd373f8f4a025f8eee9070 Author: gixxpunk Date: 2017-05-18 (Thu, 18 May 2017) Origin message was: ------------------ - CVFD: do not show "save epg" in standby --- src/neutrino.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 702df0427..42d4f51c0 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -4029,9 +4029,11 @@ void CNeutrinoApp::saveEpg(bool cvfd_mode) } printf("[neutrino] Saving EPG to %s...\n", g_settings.epg_dir.c_str()); - CVFD::getInstance()->Clear(); - //NI CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO); - CVFD::getInstance()->ShowText(g_Locale->getText(LOCALE_EPG_SAVING)); + if(!cvfd_mode){ + CVFD::getInstance()->Clear(); + //NI CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO); + CVFD::getInstance()->ShowText(g_Locale->getText(LOCALE_EPG_SAVING)); + } g_Sectionsd->writeSI2XML(g_settings.epg_dir.c_str()); From e1837412edc52bb3dc76db2c5b97809f982a539b Mon Sep 17 00:00:00 2001 From: vanhofen Date: Fri, 19 May 2017 10:14:51 +0200 Subject: [PATCH 08/21] flashtool: add some maybe usefull console output to reboot call Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/68ce922da881bd17a1d22e071b77e9c115338383 Author: vanhofen Date: 2017-05-19 (Fri, 19 May 2017) Origin message was: ------------------ - flashtool: add some maybe usefull console output to reboot call --- src/system/flashtool.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/system/flashtool.cpp b/src/system/flashtool.cpp index 2dcf5f005..994d83f74 100644 --- a/src/system/flashtool.cpp +++ b/src/system/flashtool.cpp @@ -457,7 +457,9 @@ bool CFlashTool::check_md5( const std::string & filename, const std::string & sm void CFlashTool::reboot() { + printf("CFlashTool::reboot: start\n"); //NI ::reboot(RB_AUTOBOOT); + printf("CFlashTool::reboot: done\n"); //NI ::exit(0); } From 1fff9dbad3db68d19547affd8d1df52275c70bf9 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Sun, 21 May 2017 18:00:21 +0200 Subject: [PATCH 09/21] CHintBox: use less colors time scale mode for visual timeout Otherwise probably in this context to much colored with default settings. Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/8c29b8e68f3886ead091d1a4f7e50dd99d727ff4 Author: Thilo Graf Date: 2017-05-21 (Sun, 21 May 2017) --- src/gui/widget/hintbox.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gui/widget/hintbox.cpp b/src/gui/widget/hintbox.cpp index 47d0e474c..e0eec64f8 100644 --- a/src/gui/widget/hintbox.cpp +++ b/src/gui/widget/hintbox.cpp @@ -188,6 +188,7 @@ void CHintBox::enableTimeOutBar(bool enable) timeout_pb->setValues(timeout_pb->getValue()+1, 100*timeout); }else{ timeout_pb = new CProgressBar(); + timeout_pb->setType(CProgressBar::PB_TIMESCALE); timeout_pb->setDimensionsAll(ccw_body->getRealXPos(), ccw_body->getRealYPos(), ccw_body->getWidth(), TIMEOUT_BAR_HEIGHT); timeout_pb->setValues(0, 100*timeout); if (!timeout_pb_timer) { From 9729665f4988c328c4b4f51e0cb6fcaef32b5c48 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Sun, 21 May 2017 18:00:21 +0200 Subject: [PATCH 10/21] CMsgBox: fix paint of footer buttons Only paint of button container is required. Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/37387a3e690dd6684c9713a30325626a88cc8d48 Author: Thilo Graf Date: 2017-05-21 (Sun, 21 May 2017) --- src/gui/widget/msgbox.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/widget/msgbox.cpp b/src/gui/widget/msgbox.cpp index eb40539cb..c1cdbfe30 100644 --- a/src/gui/widget/msgbox.cpp +++ b/src/gui/widget/msgbox.cpp @@ -335,7 +335,7 @@ int CMsgBox::exec() void CMsgBox::refreshFoot(void) { - ccw_footer->paint(false); + ccw_footer->getButtonChainObject()->paint(); } From f4fa6e2cf972a4637779432047eff614bef3c28c Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Sun, 21 May 2017 18:00:21 +0200 Subject: [PATCH 11/21] cc_item.h/cc_frm.h/cc_frm_button.h: use pre defined frame color as default Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/9132e7de8262e4930c8b18b8890d04016525ae4c Author: Thilo Graf Date: 2017-05-21 (Sun, 21 May 2017) --- src/gui/components/cc_frm.h | 4 ++-- src/gui/components/cc_frm_button.h | 24 ++++++++++++------------ src/gui/components/cc_item.h | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/gui/components/cc_frm.h b/src/gui/components/cc_frm.h index 59f488fdb..f1aba0a9c 100644 --- a/src/gui/components/cc_frm.h +++ b/src/gui/components/cc_frm.h @@ -157,7 +157,7 @@ class CComponentsForm : public CComponentsItem ///select a definied item, parameter1 as size_t virtual void setSelectedItem( int item_id, const fb_pixel_t& sel_frame_col = COL_MENUCONTENTSELECTED_PLUS_0, - const fb_pixel_t& frame_col = COL_SHADOW_PLUS_0, + const fb_pixel_t& frame_col = COL_FRAME_PLUS_0, const fb_pixel_t& sel_body_col = COL_MENUCONTENT_PLUS_0, const fb_pixel_t& body_col = COL_MENUCONTENT_PLUS_0, const int& frame_w = 3, @@ -165,7 +165,7 @@ class CComponentsForm : public CComponentsItem ///select a definied item, parameter1 as CComponentsItem* virtual void setSelectedItem( CComponentsItem* cc_item, const fb_pixel_t& sel_frame_col = COL_MENUCONTENTSELECTED_PLUS_0, - const fb_pixel_t& frame_col = COL_SHADOW_PLUS_0, + const fb_pixel_t& frame_col = COL_FRAME_PLUS_0, const fb_pixel_t& sel_body_col = COL_MENUCONTENT_PLUS_0, const fb_pixel_t& body_col = COL_MENUCONTENT_PLUS_0, const int& frame_w = 3, diff --git a/src/gui/components/cc_frm_button.h b/src/gui/components/cc_frm_button.h index 1e36bd826..c85777ff7 100644 --- a/src/gui/components/cc_frm_button.h +++ b/src/gui/components/cc_frm_button.h @@ -103,7 +103,7 @@ class CComponentsButton : public CComponentsFrmChain, public CCTextScreen bool selected = false, bool enabled = true, int shadow_mode = CC_SHADOW_OFF, - fb_pixel_t color_frame = COL_SHADOW_PLUS_0, fb_pixel_t color_body = COL_BUTTON_BODY, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0); + fb_pixel_t color_frame = COL_FRAME_PLUS_0, fb_pixel_t color_body = COL_BUTTON_BODY, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0); CComponentsButton( const int& x_pos, const int& y_pos, const int& w, const int& h, const neutrino_locale_t& caption_locale, @@ -112,7 +112,7 @@ class CComponentsButton : public CComponentsFrmChain, public CCTextScreen bool selected = false, bool enabled = true, int shadow_mode = CC_SHADOW_OFF, - fb_pixel_t color_frame = COL_SHADOW_PLUS_0, fb_pixel_t color_body = COL_BUTTON_BODY, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0); + fb_pixel_t color_frame = COL_FRAME_PLUS_0, fb_pixel_t color_body = COL_BUTTON_BODY, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0); CComponentsButton( const int& x_pos, const int& y_pos, const int& w, const int& h, const neutrino_locale_t& caption_locale, @@ -121,7 +121,7 @@ class CComponentsButton : public CComponentsFrmChain, public CCTextScreen bool selected = false, bool enabled = true, int shadow_mode = CC_SHADOW_OFF, - fb_pixel_t color_frame = COL_SHADOW_PLUS_0, fb_pixel_t color_body = COL_BUTTON_BODY, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0); + fb_pixel_t color_frame = COL_FRAME_PLUS_0, fb_pixel_t color_body = COL_BUTTON_BODY, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0); CComponentsButton( const int& x_pos, const int& y_pos, const int& w, const int& h, const std::string& caption, @@ -130,7 +130,7 @@ class CComponentsButton : public CComponentsFrmChain, public CCTextScreen bool selected = false, bool enabled = true, int shadow_mode = CC_SHADOW_OFF, - fb_pixel_t color_frame = COL_SHADOW_PLUS_0, fb_pixel_t color_body = COL_BUTTON_BODY, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0); + fb_pixel_t color_frame = COL_FRAME_PLUS_0, fb_pixel_t color_body = COL_BUTTON_BODY, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0); ///set text color void setButtonTextColor(fb_pixel_t caption_color){cc_btn_text_col = caption_color;}; @@ -246,7 +246,7 @@ class CComponentsButtonRed : public CComponentsButton bool selected = false, bool enabled = true, int shadow_mode = CC_SHADOW_OFF, - fb_pixel_t color_frame = COL_SHADOW_PLUS_0, fb_pixel_t color_body = COL_BUTTON_BODY, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0) + fb_pixel_t color_frame = COL_FRAME_PLUS_0, fb_pixel_t color_body = COL_BUTTON_BODY, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0) :CComponentsButton(x_pos, y_pos, w, h, caption, NEUTRINO_ICON_BUTTON_RED, parent, selected, enabled, shadow_mode, color_frame, color_body, color_shadow) { cc_item_type = CC_ITEMTYPE_BUTTON_RED; @@ -257,7 +257,7 @@ class CComponentsButtonRed : public CComponentsButton bool selected = false, bool enabled = true, int shadow_mode = CC_SHADOW_OFF, - fb_pixel_t color_frame = COL_SHADOW_PLUS_0, fb_pixel_t color_body = COL_BUTTON_BODY, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0) + fb_pixel_t color_frame = COL_FRAME_PLUS_0, fb_pixel_t color_body = COL_BUTTON_BODY, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0) :CComponentsButton(x_pos, y_pos, w, h, caption_locale, NEUTRINO_ICON_BUTTON_RED, parent, selected, enabled, shadow_mode, color_frame, color_body, color_shadow) { cc_item_type = CC_ITEMTYPE_BUTTON_RED; @@ -277,7 +277,7 @@ class CComponentsButtonGreen : public CComponentsButton bool selected = false, bool enabled = true, int shadow_mode = CC_SHADOW_OFF, - fb_pixel_t color_frame = COL_SHADOW_PLUS_0, fb_pixel_t color_body = COL_BUTTON_BODY, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0) + fb_pixel_t color_frame = COL_FRAME_PLUS_0, fb_pixel_t color_body = COL_BUTTON_BODY, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0) :CComponentsButton(x_pos, y_pos, w, h, caption, NEUTRINO_ICON_BUTTON_GREEN, parent, selected, enabled, shadow_mode, color_frame, color_body, color_shadow) { cc_item_type = CC_ITEMTYPE_BUTTON_GREEN; @@ -289,7 +289,7 @@ class CComponentsButtonGreen : public CComponentsButton bool selected = false, bool enabled = true, int shadow_mode = CC_SHADOW_OFF, - fb_pixel_t color_frame = COL_SHADOW_PLUS_0, fb_pixel_t color_body = COL_BUTTON_BODY, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0) + fb_pixel_t color_frame = COL_FRAME_PLUS_0, fb_pixel_t color_body = COL_BUTTON_BODY, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0) :CComponentsButton(x_pos, y_pos, w, h, caption_locale, NEUTRINO_ICON_BUTTON_GREEN, parent, selected, enabled, shadow_mode, color_frame, color_body, color_shadow) { cc_item_type = CC_ITEMTYPE_BUTTON_GREEN; @@ -309,7 +309,7 @@ class CComponentsButtonYellow : public CComponentsButton bool selected = false, bool enabled = true, int shadow_mode = CC_SHADOW_OFF, - fb_pixel_t color_frame = COL_SHADOW_PLUS_0, fb_pixel_t color_body = COL_BUTTON_BODY, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0) + fb_pixel_t color_frame = COL_FRAME_PLUS_0, fb_pixel_t color_body = COL_BUTTON_BODY, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0) :CComponentsButton(x_pos, y_pos, w, h, caption, NEUTRINO_ICON_BUTTON_YELLOW, parent, selected, enabled, shadow_mode, color_frame, color_body, color_shadow) { cc_item_type = CC_ITEMTYPE_BUTTON_YELLOW; @@ -320,7 +320,7 @@ class CComponentsButtonYellow : public CComponentsButton bool selected = false, bool enabled = true, int shadow_mode = CC_SHADOW_OFF, - fb_pixel_t color_frame = COL_SHADOW_PLUS_0, fb_pixel_t color_body = COL_BUTTON_BODY, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0) + fb_pixel_t color_frame = COL_FRAME_PLUS_0, fb_pixel_t color_body = COL_BUTTON_BODY, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0) :CComponentsButton(x_pos, y_pos, w, h, caption_locale, NEUTRINO_ICON_BUTTON_YELLOW, parent, selected, enabled, shadow_mode, color_frame, color_body, color_shadow) { cc_item_type = CC_ITEMTYPE_BUTTON_YELLOW; @@ -340,7 +340,7 @@ class CComponentsButtonBlue : public CComponentsButton bool selected = false, bool enabled = true, int shadow_mode = CC_SHADOW_OFF, - fb_pixel_t color_frame = COL_SHADOW_PLUS_0, fb_pixel_t color_body = COL_BUTTON_BODY, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0) + fb_pixel_t color_frame = COL_FRAME_PLUS_0, fb_pixel_t color_body = COL_BUTTON_BODY, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0) :CComponentsButton(x_pos, y_pos, w, h, caption, NEUTRINO_ICON_BUTTON_BLUE, parent, selected, enabled, shadow_mode, color_frame, color_body, color_shadow) { cc_item_type = CC_ITEMTYPE_BUTTON_BLUE; @@ -351,7 +351,7 @@ class CComponentsButtonBlue : public CComponentsButton bool selected = false, bool enabled = true, int shadow_mode = CC_SHADOW_OFF, - fb_pixel_t color_frame = COL_SHADOW_PLUS_0, fb_pixel_t color_body = COL_BUTTON_BODY, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0) + fb_pixel_t color_frame = COL_FRAME_PLUS_0, fb_pixel_t color_body = COL_BUTTON_BODY, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0) :CComponentsButton(x_pos, y_pos, w, h, caption_locale, NEUTRINO_ICON_BUTTON_BLUE, parent, selected, enabled, shadow_mode, color_frame, color_body, color_shadow) { cc_item_type = CC_ITEMTYPE_BUTTON_BLUE; diff --git a/src/gui/components/cc_item.h b/src/gui/components/cc_item.h index 37677a813..9d633ad62 100644 --- a/src/gui/components/cc_item.h +++ b/src/gui/components/cc_item.h @@ -110,7 +110,7 @@ class CComponentsItem : public CComponents ///set select mode virtual void setSelected(bool selected, const fb_pixel_t& sel_frame_col = COL_MENUCONTENTSELECTED_PLUS_0, - const fb_pixel_t& frame_col = COL_SHADOW_PLUS_0, + const fb_pixel_t& frame_col = COL_FRAME_PLUS_0, const fb_pixel_t& sel_body_col = COL_MENUCONTENT_PLUS_0, const fb_pixel_t& body_col = COL_MENUCONTENT_PLUS_0, const int& frame_w = 3, From b4e653a109ac080185fce9a2501c515292eb67a1 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Sun, 21 May 2017 18:00:21 +0200 Subject: [PATCH 12/21] CComponentsButton: add missing init of col_body_old Some changes on runtime were ignored on runtime. Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/36c8f4c24f45d2c97b48f8bccb3f2b923333792a Author: Thilo Graf Date: 2017-05-21 (Sun, 21 May 2017) --- src/gui/components/cc_frm_button.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/components/cc_frm_button.cpp b/src/gui/components/cc_frm_button.cpp index b7e964356..c7215b4fc 100644 --- a/src/gui/components/cc_frm_button.cpp +++ b/src/gui/components/cc_frm_button.cpp @@ -106,7 +106,7 @@ void CComponentsButton::initVarButton( const int& x_pos, const int& y_pos, const cc_body_gradient_enable = CC_COLGRAD_OFF/*g_settings.gradiant*/; //TODO: gradient is prepared for use but disabled at the moment till some other parts of gui parts are provide gradient setColBodyGradient(cc_body_gradient_enable/*CColorGradient::gradientLight2Dark*/, CFrameBuffer::gradientVertical, CColorGradient::light); col_frame = color_frame; - col_body = cc_body_gradient_enable? COL_DARK_GRAY : color_body; + col_body = col_body_old = cc_body_gradient_enable? COL_DARK_GRAY : color_body; col_shadow = color_shadow; cc_item_enabled = enabled; From 057544f3d15eb28bc7c72220410b943cc6af3bf4 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 23 May 2017 09:49:28 +0200 Subject: [PATCH 13/21] yconfig.h: use LOGODIR define Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/dc673d6daec039194b386504f18747e0b0c12862 Author: vanhofen Date: 2017-05-23 (Tue, 23 May 2017) Origin message was: ------------------ - yconfig.h: use LOGODIR define --- src/nhttpd/yconfig.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nhttpd/yconfig.h b/src/nhttpd/yconfig.h index b06d6e385..d3444671a 100644 --- a/src/nhttpd/yconfig.h +++ b/src/nhttpd/yconfig.h @@ -116,7 +116,7 @@ #define EXTRASDOCUMENTROOT HOSTED_HTTPDDIR"/extras" #define EXTRASDOCUMENTURL "/hosted/extras" #define ZAPITXMLPATH CONFIGDIR"/zapit" -#define TUXBOX_LOGOS_URL ICONSDIR"/logo" +#define TUXBOX_LOGOS_URL LOGODIR //NI // switch for Box differences #ifdef CONFIG_SYSTEM_TUXBOX From 1a323fbbdc70c67cd538160d0c86e1ea47986302 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 23 May 2017 17:58:53 +0200 Subject: [PATCH 14/21] osd_setup: add channellogo-setup menu Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/e9297bcc1c0ff80e6bce907db5c209a42476b5e5 Author: vanhofen Date: 2017-05-23 (Tue, 23 May 2017) Origin message was: ------------------ - osd_setup: add channellogo-setup menu --- data/locale/deutsch.locale | 2 ++ data/locale/english.locale | 2 ++ src/gui/osd_setup.cpp | 25 ++++++++++++++++++++++++- src/gui/osd_setup.h | 1 + src/neutrino_menue.h | 1 + src/system/locals.h | 2 ++ src/system/locals_intern.h | 2 ++ 7 files changed, 34 insertions(+), 1 deletion(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 8e1c8f0d6..1465cd678 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -1134,6 +1134,7 @@ menu.hint_channellist_show_channellogo Zeigt Senderlogos in der Kanalliste. menu.hint_channellist_show_channelnumber Zeigt Kanalnummer in der Kanalliste. menu.hint_channellist_show_empty_favs Zeigt oder versteckt leere Bouquets in den Favoriten menu.hint_channellist_show_infobox Zeigt oder versteckt das untere Sendungsfenster +menu.hint_channellogos_setup Wählen Sie die globalen Optionen für die Senderlogos aus menu.hint_channels Kanalliste öffnen menu.hint_ci Conditional-Access-Menü zum Einrichten Ihres CI-Moduls oder der eingebetteten Conax-Karte menu.hint_ci_mode Zu diesen Kanälen kann bei einer laufenden CI-Aufnahme gewechselt werden. @@ -1669,6 +1670,7 @@ messagebox.ok OK messagebox.yes Ja miscsettings.channellist Kanalliste miscsettings.channellist_epgtext_align Event-Text ausrichten +miscsettings.channellogos Senderlogos miscsettings.colored_events Sendung hervorheben miscsettings.colored_events_0 keine miscsettings.colored_events_1 aktuelle diff --git a/data/locale/english.locale b/data/locale/english.locale index 04f6b5eee..85add3379 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -1134,6 +1134,7 @@ menu.hint_channellist_show_channellogo Show channel logos in channel list menu.hint_channellist_show_channelnumber Show channel number in channel list menu.hint_channellist_show_empty_favs Show or hide empty bouquets in favorites menu.hint_channellist_show_infobox Show or hide bottom infobox of channellist +menu.hint_channellogos_setup Configure global channelogos options menu.hint_channels Open channel list menu.hint_ci Conditional access menu\nto setup your CI CAM or embeded Conax card menu.hint_ci_mode Allow switching to these channels while CI recording @@ -1669,6 +1670,7 @@ messagebox.ok Ok messagebox.yes Yes miscsettings.channellist Channellist miscsettings.channellist_epgtext_align Programtext Align +miscsettings.channellogos Channellogos miscsettings.colored_events Program colored miscsettings.colored_events_0 none miscsettings.colored_events_1 current diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index 0d8d66204..13013ee20 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -614,6 +614,13 @@ int COsdSetup::showOsdSetup() mf->setHint("", LOCALE_MENU_HINT_PROGRESSBAR); osd_menu->addItem(mf); + //NI channellogos + CMenuWidget osd_menu_channellogos(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_OSDSETUP_CHANNELLOGOS); + showOsdChannellogosSetup(&osd_menu_channellogos); + mf = new CMenuForwarder(LOCALE_MISCSETTINGS_CHANNELLOGOS, true, NULL, &osd_menu_channellogos, NULL, CRCInput::convertDigitToKey(shortcut++)); + mf->setHint("", LOCALE_MENU_HINT_CHANNELLOGOS_SETUP); + osd_menu->addItem(mf); + //infobar CMenuWidget osd_menu_infobar(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_OSDSETUP_INFOBAR); showOsdInfobarSetup(&osd_menu_infobar); @@ -1193,6 +1200,19 @@ const CMenuOptionChooser::keyval INFOVIEWER_ECMINFO_OPTIONS[] = }; #define INFOVIEWER_ECMINFO_OPTION_COUNT (sizeof(INFOVIEWER_ECMINFO_OPTIONS)/sizeof(CMenuOptionChooser::keyval)) +//NI channellogos +void COsdSetup::showOsdChannellogosSetup(CMenuWidget *menu_channellogos) +{ + menu_channellogos->addIntroItems(LOCALE_MISCSETTINGS_CHANNELLOGOS); + + CMenuForwarder * mf; + + // logo directory + mf = new CMenuForwarder(LOCALE_MISCSETTINGS_INFOBAR_LOGO_HDD_DIR, true, g_settings.logo_hdd_dir, this, "logo_dir"); + mf->setHint("", LOCALE_MENU_HINT_INFOBAR_LOGO_DIR); + menu_channellogos->addItem(mf); +} + //infobar void COsdSetup::showOsdInfobarSetup(CMenuWidget *menu_infobar) { @@ -1202,7 +1222,7 @@ void COsdSetup::showOsdInfobarSetup(CMenuWidget *menu_infobar) sigc::slot0 slot_ibar = sigc::mem_fun(g_InfoViewer, &CInfoViewer::ResetModules); CMenuOptionChooser * mc; - CMenuForwarder * mf; + //NI CMenuForwarder * mf; // show on epg change mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SHOW, &g_settings.infobar_show, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); @@ -1232,10 +1252,13 @@ void COsdSetup::showOsdInfobarSetup(CMenuWidget *menu_infobar) mc->setHint("", LOCALE_MENU_HINT_INFOBAR_LOGO); menu_infobar->addItem(mc); +//NI +#if 0 // logo directory mf = new CMenuForwarder(LOCALE_MISCSETTINGS_INFOBAR_LOGO_HDD_DIR, true, g_settings.logo_hdd_dir, this, "logo_dir"); mf->setHint("", LOCALE_MENU_HINT_INFOBAR_LOGO_DIR); menu_infobar->addItem(mf); +#endif // satellite/cable provider mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SAT_DISPLAY, &g_settings.infobar_sat_display, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); diff --git a/src/gui/osd_setup.h b/src/gui/osd_setup.h index 6322aa770..0c5dd9587 100644 --- a/src/gui/osd_setup.h +++ b/src/gui/osd_setup.h @@ -75,6 +75,7 @@ class COsdSetup : public CMenuTarget, public CChangeObserver void showOsdFontSizeSetup(CMenuWidget *menu_fonts); void showOsdTimeoutSetup(CMenuWidget *menu_timeout); void showOsdMenusSetup(CMenuWidget *menu_menus); + void showOsdChannellogosSetup(CMenuWidget *menu_channellogos); //NI void showOsdInfobarSetup(CMenuWidget *menu_infobar); void showOsdChanlistSetup(CMenuWidget *menu_chanlist); void showOsdEventlistSetup(CMenuWidget *menu_eventlist); diff --git a/src/neutrino_menue.h b/src/neutrino_menue.h index 85948491f..cf4147586 100644 --- a/src/neutrino_menue.h +++ b/src/neutrino_menue.h @@ -58,6 +58,7 @@ enum MN_WIDGET_ID MN_WIDGET_ID_OSDSETUP_EVENTLIST, MN_WIDGET_ID_OSDSETUP_FONT, MN_WIDGET_ID_OSDSETUP_FONTSCALE, + MN_WIDGET_ID_OSDSETUP_CHANNELLOGOS, //NI MN_WIDGET_ID_OSDSETUP_INFOBAR, MN_WIDGET_ID_OSDSETUP_MENUCOLORS, MN_WIDGET_ID_OSDSETUP_TIMEOUT, diff --git a/src/system/locals.h b/src/system/locals.h index 9c9e5081e..47f92d4c5 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -1161,6 +1161,7 @@ typedef enum LOCALE_MENU_HINT_CHANNELLIST_SHOW_CHANNELNUMBER, LOCALE_MENU_HINT_CHANNELLIST_SHOW_EMPTY_FAVS, LOCALE_MENU_HINT_CHANNELLIST_SHOW_INFOBOX, + LOCALE_MENU_HINT_CHANNELLOGOS_SETUP, LOCALE_MENU_HINT_CHANNELS, LOCALE_MENU_HINT_CI, LOCALE_MENU_HINT_CI_MODE, @@ -1696,6 +1697,7 @@ typedef enum LOCALE_MESSAGEBOX_YES, LOCALE_MISCSETTINGS_CHANNELLIST, LOCALE_MISCSETTINGS_CHANNELLIST_EPGTEXT_ALIGN, + LOCALE_MISCSETTINGS_CHANNELLOGOS, LOCALE_MISCSETTINGS_COLORED_EVENTS, LOCALE_MISCSETTINGS_COLORED_EVENTS_0, LOCALE_MISCSETTINGS_COLORED_EVENTS_1, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index d391c083e..e6fd5a2d9 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -1161,6 +1161,7 @@ const char * locale_real_names[] = "menu.hint_channellist_show_channelnumber", "menu.hint_channellist_show_empty_favs", "menu.hint_channellist_show_infobox", + "menu.hint_channellogos_setup", "menu.hint_channels", "menu.hint_ci", "menu.hint_ci_mode", @@ -1696,6 +1697,7 @@ const char * locale_real_names[] = "messagebox.yes", "miscsettings.channellist", "miscsettings.channellist_epgtext_align", + "miscsettings.channellogos", "miscsettings.colored_events", "miscsettings.colored_events_0", "miscsettings.colored_events_1", From ed4afb62c82a8bcd218c1253100330daa99a0c3d Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 23 May 2017 17:58:53 +0200 Subject: [PATCH 15/21] cc_frm_header.h: change default logo alignment; center => right Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/19e1f370df5220ce5b9f46dee55e88558ffe6d95 Author: vanhofen Date: 2017-05-23 (Tue, 23 May 2017) Origin message was: ------------------ - cc_frm_header.h: change default logo alignment; center => right --- src/gui/components/cc_frm_header.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/components/cc_frm_header.h b/src/gui/components/cc_frm_header.h index e26d28ff2..586772e77 100644 --- a/src/gui/components/cc_frm_header.h +++ b/src/gui/components/cc_frm_header.h @@ -32,7 +32,7 @@ #include "cc_frm_clock.h" #include -#define DEFAULT_LOGO_ALIGN CCHeaderTypes::CC_LOGO_CENTER +#define DEFAULT_LOGO_ALIGN CCHeaderTypes::CC_LOGO_RIGHT //NI #define DEFAULT_TITLE_ALIGN CCHeaderTypes::CC_TITLE_LEFT class CCHeaderTypes @@ -328,9 +328,9 @@ class CComponentsHeader : public CComponentsForm, public CCTextScreen, CCHeaderT * @param[in] alignment * @li optional alingment parameter as cc_logo_alignment_t (enum)\n * Possible values are:\n - * CC_LOGO_RIGHT \n - * CC_LOGO_CENTER (default)\n - * CC_LOGO_RIGHT \n + * CC_LOGO_LEFT \n + * CC_LOGO_CENTER \n + * CC_LOGO_RIGHT (default)\n * @param[in] dy * @li optional logo height, default = -1 (auto) * @note In auto mode, logo use full height minus inner offset but not larger than original logo height. From 6e4b9acf5046f3ff9fa3b5dc64e420db1a865283 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 23 May 2017 17:58:53 +0200 Subject: [PATCH 16/21] moviebrowser: bind display of channelogo to g_settings.channellist_show_channellogo Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/d2da458a94a62fb66ef8e20590d01eaefc1dc37e Author: vanhofen Date: 2017-05-23 (Tue, 23 May 2017) Origin message was: ------------------ - moviebrowser: bind display of channelogo to g_settings.channellist_show_channellogo --- src/gui/moviebrowser/mb.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/gui/moviebrowser/mb.cpp b/src/gui/moviebrowser/mb.cpp index b2df460bd..4a012c0d6 100644 --- a/src/gui/moviebrowser/mb.cpp +++ b/src/gui/moviebrowser/mb.cpp @@ -1393,6 +1393,18 @@ std::string CMovieBrowser::getScreenshotName(std::string movie, bool is_dir) void CMovieBrowser::refreshChannelLogo(void) { + //NI + if (!g_settings.channellist_show_channellogo) + { + if (m_channelLogo) + { + m_channelLogo->hide(); + delete m_channelLogo; + m_channelLogo = NULL; + } + return; + } + TRACE("[mb]->%s:%d\n", __func__, __LINE__); int w_logo_max = m_cBoxFrameTitleRel.iWidth / 4; From a38a0b0e1d2aafd17725f978eab3212a9e2afc68 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 23 May 2017 17:58:53 +0200 Subject: [PATCH 17/21] eventlist: bind display of channelogo to g_settings.channellist_show_channellogo Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/af59d90248487d4ec4a85f7ddd214c5f5ace7119 Author: vanhofen Date: 2017-05-23 (Tue, 23 May 2017) Origin message was: ------------------ - eventlist: bind display of channelogo to g_settings.channellist_show_channellogo --- src/gui/eventlist.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/gui/eventlist.cpp b/src/gui/eventlist.cpp index d64ff7c71..7b41520cf 100644 --- a/src/gui/eventlist.cpp +++ b/src/gui/eventlist.cpp @@ -895,8 +895,9 @@ void CEventList::paintHead(t_channel_id _channel_id, std::string _channelname, s if (header->isPainted()) header->getChannelLogoObject()->hide(); - header->setChannelLogo(_channel_id,_channelname); - header->setCaption(_channelname, CCHeaderTypes::CC_TITLE_CENTER); + if (g_settings.channellist_show_channellogo) //NI + header->setChannelLogo(_channel_id,_channelname); + header->setCaption(_channelname); //NI header->paint(CC_SAVE_SCREEN_NO); From 24b24b3e4ac9a5743c1acb60bd2d9f1969dcb2e3 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 23 May 2017 17:58:53 +0200 Subject: [PATCH 18/21] epgview: bind display of channelogo to g_settings.channellist_show_channellogo Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/c9015d7bbe6be7e58d345b88cc0d3bc7a56c076c Author: vanhofen Date: 2017-05-23 (Tue, 23 May 2017) Origin message was: ------------------ - epgview: bind display of channelogo to g_settings.channellist_show_channellogo --- src/gui/epgview.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gui/epgview.cpp b/src/gui/epgview.cpp index 2d49f9b28..76ce70f9e 100644 --- a/src/gui/epgview.cpp +++ b/src/gui/epgview.cpp @@ -901,7 +901,8 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start header->hideCCItems(); // set channel logo - header->setChannelLogo(channel_id, channel_name); + if (g_settings.channellist_show_channellogo) //NI + header->setChannelLogo(channel_id, channel_name); //paint head header->paint(CC_SAVE_SCREEN_NO); From 0983e4002b42c3517928078a3bd1e9aa4d965098 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 23 May 2017 17:58:53 +0200 Subject: [PATCH 19/21] epgview: use default header font; ... now FONT_TYPE_EPG_TITLE is obsolete and can be removed Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/deed324a985ce5203575a320aed6a068a936828e Author: vanhofen Date: 2017-05-23 (Tue, 23 May 2017) Origin message was: ------------------ - epgview: use default header font; ... now FONT_TYPE_EPG_TITLE is obsolete and can be removed --- src/gui/epgview.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/epgview.cpp b/src/gui/epgview.cpp index 76ce70f9e..4968ae486 100644 --- a/src/gui/epgview.cpp +++ b/src/gui/epgview.cpp @@ -146,7 +146,7 @@ void CEpgData::start() ox = frameBuffer->getScreenWidthRel(bigFonts ? false /* big */ : true /* small */); oy = frameBuffer->getScreenHeightRel(bigFonts ? false /* big */ : true /* small */); - font_title = g_Font[SNeutrinoSettings::FONT_TYPE_EPG_TITLE]; + font_title = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]; //NI topheight = font_title->getHeight(); topboxheight = topheight + 6; botboxheight = g_Font[SNeutrinoSettings::FONT_TYPE_EPG_DATE]->getHeight() + 6; From 4965e8a8459d69b8954aafcb2d410b81359d3e70 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 23 May 2017 17:58:53 +0200 Subject: [PATCH 20/21] osd_setup: move channellist_show_channellogo to new logo menu; ... align locales Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/fe50c85a3b32a6fa9e0d5034fcbb25dc49741d08 Author: vanhofen Date: 2017-05-23 (Tue, 23 May 2017) Origin message was: ------------------ - osd_setup: move channellist_show_channellogo to new logo menu; ... align locales --- data/locale/deutsch.locale | 2 +- data/locale/english.locale | 2 +- src/gui/osd_setup.cpp | 11 +++++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 1465cd678..80b77ca28 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -1130,7 +1130,7 @@ menu.hint_channellist_foot Definiert, welche Informationen im unteren Sendungsfe menu.hint_channellist_mode Wählen Sie die Start-Kanalliste im TV-Modus menu.hint_channellist_mode_radio Wählen Sie die Start-Kanalliste im Radio-Modus menu.hint_channellist_setup Wählen Sie die Anzeigeoptionen für die Kanalliste -menu.hint_channellist_show_channellogo Zeigt Senderlogos in der Kanalliste. +menu.hint_channellist_show_channellogo Zeigt Senderlogos in Kanalliste, Eventliste, EPG-Plus, EPG-Ansicht und Moviebrowser. menu.hint_channellist_show_channelnumber Zeigt Kanalnummer in der Kanalliste. menu.hint_channellist_show_empty_favs Zeigt oder versteckt leere Bouquets in den Favoriten menu.hint_channellist_show_infobox Zeigt oder versteckt das untere Sendungsfenster diff --git a/data/locale/english.locale b/data/locale/english.locale index 85add3379..abd504807 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -1130,7 +1130,7 @@ menu.hint_channellist_foot Show additional information\nin bottom box menu.hint_channellist_mode Use the selected channel list mode on startup if last mode is TV menu.hint_channellist_mode_radio Use the selected channel list mode on startup if last mode is Radio menu.hint_channellist_setup Configure channel list GUI options -menu.hint_channellist_show_channellogo Show channel logos in channel list +menu.hint_channellist_show_channellogo Show channel logos in channellist, eventlist, EPG Plus, EPG-viewer and moviebrowser menu.hint_channellist_show_channelnumber Show channel number in channel list menu.hint_channellist_show_empty_favs Show or hide empty bouquets in favorites menu.hint_channellist_show_infobox Show or hide bottom infobox of channellist diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index 13013ee20..32e7c31e7 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -1205,12 +1205,20 @@ void COsdSetup::showOsdChannellogosSetup(CMenuWidget *menu_channellogos) { menu_channellogos->addIntroItems(LOCALE_MISCSETTINGS_CHANNELLOGOS); + CMenuOptionChooser * mc; CMenuForwarder * mf; // logo directory mf = new CMenuForwarder(LOCALE_MISCSETTINGS_INFOBAR_LOGO_HDD_DIR, true, g_settings.logo_hdd_dir, this, "logo_dir"); mf->setHint("", LOCALE_MENU_HINT_INFOBAR_LOGO_DIR); menu_channellogos->addItem(mf); + + menu_channellogos->addItem(GenericMenuSeparatorLine); + + // show channellogos + mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_SHOW_CHANNELLOGO, &g_settings.channellist_show_channellogo, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); + mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_SHOW_CHANNELLOGO); + menu_channellogos->addItem(mc); } //infobar @@ -1381,10 +1389,13 @@ void COsdSetup::showOsdChanlistSetup(CMenuWidget *menu_chanlist) menu_chanlist->addItem(mc); channellistNotifier->addItem(mc); +//NI +#if 0 //show channel logo mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_SHOW_CHANNELLOGO, &g_settings.channellist_show_channellogo, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_SHOW_CHANNELLOGO); menu_chanlist->addItem(mc); +#endif //show numbers mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_SHOW_CHANNELNUMBER, &g_settings.channellist_show_numbers, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); From b7e59b8b6271b4204f0501e11a6e261fd4b428eb Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 23 May 2017 17:58:53 +0200 Subject: [PATCH 21/21] locale: clearify locales for external channellogo directory Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/b4484f759a2c5cea92e829c0e8e09c7b1b9e7ae1 Author: vanhofen Date: 2017-05-23 (Tue, 23 May 2017) Origin message was: ------------------ - locale: clearify locales for external channellogo directory --- data/locale/deutsch.locale | 4 ++-- data/locale/english.locale | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 80b77ca28..49aeb4fb8 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -1225,7 +1225,7 @@ menu.hint_infobar_filesys Zeigen den vom Flash- und einer HDD verwendeten Speich menu.hint_infobar_fonts Ändern Sie die Schriftgrößen in der Infobar menu.hint_infobar_iconset Auswahl der Iconsets für die CA-Anzeige menu.hint_infobar_logo Logo-, Kanalnummer- und Signal-Anzeige; Optionen in [Klammern] erscheinen in der kleinen Infobox -menu.hint_infobar_logo_dir Wählen Sie das Verzeichnis für die Senderlogos +menu.hint_infobar_logo_dir Wählen Sie das externe Verzeichnis für die Senderlogos menu.hint_infobar_on_epg Zeigt einen Hinweis bei EPG-Änderungen menu.hint_infobar_radiotext Zeigt Radiotext in einen Fenster, wenn verfügbar menu.hint_infobar_res Zeige die gesendete Auflösung in Symbolen @@ -1728,7 +1728,7 @@ miscsettings.infobar_disp_6 Kanalnummer, Logo [Signalbalken] miscsettings.infobar_gradient_body Farbverlauf EPG-Bereich miscsettings.infobar_gradient_bottom Farbverlauf unten miscsettings.infobar_gradient_top Farbverlauf oben -miscsettings.infobar_logo_hdd_dir Logo-Verzeichnis +miscsettings.infobar_logo_hdd_dir Externes Logo-Verzeichnis miscsettings.infobar_sat_display Kabel-/Satellitenanbieter miscsettings.infobar_show Info bei EPG Änderungen miscsettings.infobar_show_dd_available DD-Verfügbarkeit anzeigen diff --git a/data/locale/english.locale b/data/locale/english.locale index abd504807..d6f8b77a5 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -1225,7 +1225,7 @@ menu.hint_infobar_filesys Show flash and HDD used space levels menu.hint_infobar_fonts Change infobar font sizes menu.hint_infobar_iconset Iconset selection for CA-Bar menu.hint_infobar_logo Logo, channelnumber and signal display; Options in [brackets] will be displayed in small infobox -menu.hint_infobar_logo_dir Select directory to search for channels logo +menu.hint_infobar_logo_dir Select external directory to search for channels logo menu.hint_infobar_on_epg Show infobar on current EPG event change menu.hint_infobar_radiotext Show radiotext window menu.hint_infobar_res Show channel resolution icons @@ -1728,7 +1728,7 @@ miscsettings.infobar_disp_6 Channelnumber, Logo [Signal] miscsettings.infobar_gradient_body Gradient EPG-area miscsettings.infobar_gradient_bottom Gradient bottom miscsettings.infobar_gradient_top Gradient top -miscsettings.infobar_logo_hdd_dir Logo directory +miscsettings.infobar_logo_hdd_dir External logo directory miscsettings.infobar_sat_display Satellite display on infobar miscsettings.infobar_show show Info on EPG change miscsettings.infobar_show_dd_available show DD availability