From 94fdc06b38f4e65844ac3e473e0f6bc9aff06dc6 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Thu, 22 Dec 2016 23:09:07 +0100 Subject: [PATCH 1/7] src/gui/lua/lua_curl.cpp ACCEPT_ENCODING for gzip compressed data, need build libcurl with --with-zlib Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/7fee7784aefe4b596752ae647b79adf3cc092340 Author: Jacek Jendrzej Date: 2016-12-22 (Thu, 22 Dec 2016) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/lua/lua_curl.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/gui/lua/lua_curl.cpp b/src/gui/lua/lua_curl.cpp index 389aad1f9..9bcf47ef5 100644 --- a/src/gui/lua/lua_curl.cpp +++ b/src/gui/lua/lua_curl.cpp @@ -265,6 +265,8 @@ Example: curl_easy_setopt(curl_handle, CURLOPT_CONNECTTIMEOUT, (long)connectTimeout); curl_easy_setopt(curl_handle, CURLOPT_NOSIGNAL, 1L); curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, 0L); + /* enable all supported built-in compressions */ + curl_easy_setopt(curl_handle, CURLOPT_ACCEPT_ENCODING, ""); if (!userAgent.empty()) curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, userAgent.c_str()); From 5bbb994250fd56e0b90a1b1cc31e9128eecdfb40 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Thu, 22 Dec 2016 23:49:01 +0100 Subject: [PATCH 2/7] CMenuWidget: add menu name reinit Ensures correct display of menu name while runtime. For example: it's required on changed language settings, otherwise we have old language in menu head. Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/114bba2ab7895644f5faadc8f3f034246060671b Author: Thilo Graf Date: 2016-12-22 (Thu, 22 Dec 2016) ------------------ This commit was generated by Migit --- src/gui/widget/menue.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp index 38aef6c58..4a990afb1 100644 --- a/src/gui/widget/menue.cpp +++ b/src/gui/widget/menue.cpp @@ -1248,6 +1248,7 @@ void CMenuWidget::paint() header->enableShadow(CC_SHADOW_RIGHT | CC_SHADOW_CORNER_TOP_RIGHT | CC_SHADOW_CORNER_BOTTOM_RIGHT); header->setOffset(10); } + header->setCaption(getName()); header->setColorAll(COL_FRAME_PLUS_0, COL_MENUHEAD_PLUS_0, COL_SHADOW_PLUS_0); header->setCaptionColor(COL_MENUHEAD_TEXT); header->enableColBodyGradient(g_settings.theme.menu_Head_gradient, COL_MENUCONTENT_PLUS_0); From 9ba1fed3acf71904c3499d51eca85499c4e4d8d7 Mon Sep 17 00:00:00 2001 From: Marc Szymkowiak Date: Fri, 23 Dec 2016 14:12:46 +0100 Subject: [PATCH 3/7] fix link to developer forum Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/44177324624ef617fad8bf0fdeb45fa851218678 Author: Marc Szymkowiak Date: 2016-12-23 (Fri, 23 Dec 2016) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- data/y-web/Y_Info_Help.yhtm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/y-web/Y_Info_Help.yhtm b/data/y-web/Y_Info_Help.yhtm index 39f457636..d9cecd04d 100644 --- a/data/y-web/Y_Info_Help.yhtm +++ b/data/y-web/Y_Info_Help.yhtm @@ -10,7 +10,7 @@
  • Tuxbox-Wiki Help
  • Tuxbox Forum
  • CST User Forum
    • -
  • CST Developer Forum
    • +
  • CST Developer Forum
    • From 6f664ef754d386636f428532d1df925d267db879 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Fri, 23 Dec 2016 20:46:30 +0100 Subject: [PATCH 4/7] menue.cpp: CChangeObserver add overloaded changeNotify() with string param Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/c92fa3f0f4721093cb9d0c1108e846f12fc9ddf7 Author: Thilo Graf Date: 2016-12-23 (Fri, 23 Dec 2016) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/widget/menue.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/gui/widget/menue.h b/src/gui/widget/menue.h index 5da3cc3f5..5cfa58da2 100644 --- a/src/gui/widget/menue.h +++ b/src/gui/widget/menue.h @@ -88,6 +88,10 @@ class CChangeObserver { return false; } + virtual bool changeNotify(const std::string & /*OptionName*/, void * /*Data*/) + { + return false; + } virtual bool changeNotify(lua_State * /*L*/, const std::string & /*luaId*/, const std::string & /*luaAction*/, void * /*Data*/) { return false; From d6ef204f50e0f7f36c30b7d4e826c1e7762dbce4 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Fri, 23 Dec 2016 20:51:39 +0100 Subject: [PATCH 5/7] megbox.cpp/h: add overloaded version of ShowMsg() with string/locale combination Constellation was missed. Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/22a7006644530841aa2b28951883fe34b956c4f6 Author: Thilo Graf Date: 2016-12-23 (Fri, 23 Dec 2016) ------------------ This commit was generated by Migit --- src/gui/widget/msgbox.cpp | 16 ++++++++++++++++ src/gui/widget/msgbox.h | 11 +++++++++++ 2 files changed, 27 insertions(+) diff --git a/src/gui/widget/msgbox.cpp b/src/gui/widget/msgbox.cpp index 5f6e375e0..b5144fa97 100644 --- a/src/gui/widget/msgbox.cpp +++ b/src/gui/widget/msgbox.cpp @@ -528,6 +528,22 @@ int ShowMsg( const std::string & Title, return (result); } +int ShowMsg( const std::string & Title, + const neutrino_locale_t Text, + const CMsgBox::msg_result_t Default, + const uint32_t ShowButtons, + const char * const Icon, + const int Width, + const int Timeout, + bool returnDefaultOnTimeout, + const int& Text_mode, + fb_pixel_t color_frame) +{ + int result = ShowMsg2UTF(Title.c_str(), g_Locale->getText(Text), Default, ShowButtons, Icon, Width, Timeout, returnDefaultOnTimeout, Text_mode, color_frame); + + return (result); +} + void DisplayErrorMessage(const char * const ErrorMsg, const neutrino_locale_t& caption, const int& Text_mode) { ShowMsg(caption, ErrorMsg, CMsgBox::mbrCancel, CMsgBox::mbBack, NEUTRINO_ICON_ERROR, 500, NO_TIMEOUT, false, Text_mode, COL_RED); diff --git a/src/gui/widget/msgbox.h b/src/gui/widget/msgbox.h index 5325bd764..f20083296 100644 --- a/src/gui/widget/msgbox.h +++ b/src/gui/widget/msgbox.h @@ -392,6 +392,17 @@ int ShowMsg( const std::string & Title, const int& Text_mode = DEFAULT_MSGBOX_TEXT_MODE, fb_pixel_t color_frame = HINTBOX_DEFAULT_FRAME_COLOR); // UTF-8 +int ShowMsg( const std::string & Title, + const neutrino_locale_t Text, + const CMsgBox::msg_result_t Default, + const uint32_t ShowButtons, + const char * const Icon = NULL, + const int Width = MSGBOX_MIN_WIDTH, + const int Timeout = NO_TIMEOUT, + bool returnDefaultOnTimeout = false, + const int& Text_mode = DEFAULT_MSGBOX_TEXT_MODE, + fb_pixel_t color_frame = HINTBOX_DEFAULT_FRAME_COLOR); // UTF-8 + void DisplayErrorMessage(const char * const ErrorMsg, const int& Text_mode = DEFAULT_MSGBOX_TEXT_MODE); // UTF-8 void DisplayErrorMessage(const char * const ErrorMsg, const neutrino_locale_t& caption, const int& Text_mode = DEFAULT_MSGBOX_TEXT_MODE); // UTF-8 void DisplayErrorMessage(const char * const ErrorMsg, const std::string& caption, const int& Text_mode = DEFAULT_MSGBOX_TEXT_MODE); // UTF-8 From c25ecd2b48e5cf1be5ddc56e64a3f9e0c61a83a6 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Fri, 23 Dec 2016 21:03:11 +0100 Subject: [PATCH 6/7] CStringInput: remove possible display of NONEXISTANT_LOCALE This should fix possible incorrect titles with content of NONEXISTANT_LOCALE with lua script handler Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/4e853d98c2b2b289f0dce1c7dc9fed53eb317ce1 Author: Thilo Graf Date: 2016-12-23 (Fri, 23 Dec 2016) ------------------ This commit was generated by Migit --- src/gui/widget/stringinput.cpp | 16 +++++++--------- src/gui/widget/stringinput.h | 3 +-- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/gui/widget/stringinput.cpp b/src/gui/widget/stringinput.cpp index 8301a0a99..09e847322 100644 --- a/src/gui/widget/stringinput.cpp +++ b/src/gui/widget/stringinput.cpp @@ -47,8 +47,7 @@ CStringInput::CStringInput(const neutrino_locale_t Name, std::string* Value, int Size, const neutrino_locale_t Hint_1, const neutrino_locale_t Hint_2, const char * const Valid_Chars, CChangeObserver* Observ, const char * const Icon) { - name = Name; - head = g_Locale->getText(Name); + title = g_Locale->getText(Name); valueString = Value; lower_bound = -1; upper_bound = -1; @@ -65,8 +64,7 @@ CStringInput::CStringInput(const neutrino_locale_t Name, std::string* Value, int CStringInput::CStringInput(const std::string &Name, std::string *Value, int Size, const neutrino_locale_t Hint_1, const neutrino_locale_t Hint_2, const char * const Valid_Chars, CChangeObserver* Observ, const char * const Icon) { - name = NONEXISTANT_LOCALE; - head = Name; + title = Name; valueString = Value; lower_bound = -1; upper_bound = -1; @@ -115,7 +113,7 @@ void CStringInput::init() width = std::max(size*input_w + 2*offset, (int) frameBuffer->getScreenWidth() / 100 * 45); - int tmp_w = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getRenderWidth(head); + int tmp_w = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getRenderWidth(title); if (!(iconfile.empty())) { @@ -497,7 +495,7 @@ int CStringInput::exec( CMenuTarget* parent, const std::string & ) else if ( (msg==CRCInput::RC_home) || (msg==CRCInput::RC_timeout) ) { if ((*valueString != oldval) && - (ShowMsg(name, LOCALE_MESSAGEBOX_DISCARD, CMsgBox::mbrYes, CMsgBox::mbYes | CMsgBox::mbCancel) == CMsgBox::mbrCancel)) { + (ShowMsg(title, LOCALE_MESSAGEBOX_DISCARD, CMsgBox::mbrYes, CMsgBox::mbYes | CMsgBox::mbCancel) == CMsgBox::mbrCancel)) { timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_MENU]); continue; } @@ -542,7 +540,7 @@ int CStringInput::exec( CMenuTarget* parent, const std::string & ) if ( (observ) && (msg==CRCInput::RC_ok) ) { - observ->changeNotify(name, (void *) valueString->c_str()); + observ->changeNotify(title, (void *) valueString->c_str()); } return res; } @@ -563,7 +561,7 @@ void CStringInput::paint(bool sms) frameBuffer->paintBoxRel(x + OFFSET_SHADOW, y + OFFSET_SHADOW, width, height, COL_SHADOW_PLUS_0, RADIUS_LARGE, CORNER_ALL); //round frameBuffer->paintBoxRel(x, y + hheight, width, bheight, COL_MENUCONTENT_PLUS_0, sms ? 0 : RADIUS_LARGE, CORNER_BOTTOM); - CComponentsHeader header(x, y, width, hheight, head, iconfile); + CComponentsHeader header(x, y, width, hheight, title, iconfile); header.paint(CC_SAVE_SCREEN_NO); int tmp_y = y+ hheight+ offset+ input_h+ offset; @@ -861,7 +859,7 @@ int CPINInput::exec( CMenuTarget* parent, const std::string & ) if ( (observ) && (msg==CRCInput::RC_ok) ) { - observ->changeNotify(name, (void *) valueString->c_str()); + observ->changeNotify(title, (void *) valueString->c_str()); } return res; diff --git a/src/gui/widget/stringinput.h b/src/gui/widget/stringinput.h index d435a7f84..8b0f69b5c 100644 --- a/src/gui/widget/stringinput.h +++ b/src/gui/widget/stringinput.h @@ -53,8 +53,7 @@ class CStringInput : public CMenuTarget uint32_t smstimer; - std::string head; - neutrino_locale_t name; + std::string title; neutrino_locale_t hint_1, hint_2; std::string iconfile; const char * validchars; From 9b339107ffd5ca9d001e376ab6ac297b262614c0 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Fri, 23 Dec 2016 21:05:15 +0100 Subject: [PATCH 7/7] CKeyboardInput: remove possible display of NONEXISTANT_LOCALE This should fix possible incorrect titles with content of NONEXISTANT_LOCALE with lua script handler Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/3d6a0c381a1cebf88e48bfd477cf1cc0531fd5fb Author: Thilo Graf Date: 2016-12-23 (Fri, 23 Dec 2016) ------------------ This commit was generated by Migit --- src/gui/widget/keyboard_input.cpp | 17 +++++++---------- src/gui/widget/keyboard_input.h | 3 +-- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/gui/widget/keyboard_input.cpp b/src/gui/widget/keyboard_input.cpp index 92b5efaeb..7e910d618 100644 --- a/src/gui/widget/keyboard_input.cpp +++ b/src/gui/widget/keyboard_input.cpp @@ -181,8 +181,7 @@ const char* CInputString::c_str() CKeyboardInput::CKeyboardInput(const neutrino_locale_t Name, std::string* Value, int Size, CChangeObserver* Observ, const char * const Icon, const neutrino_locale_t Hint_1, const neutrino_locale_t Hint_2) { - name = Name; - head = g_Locale->getText(Name); + title = g_Locale->getText(Name); valueString = Value; inputSize = Size; @@ -205,8 +204,7 @@ CKeyboardInput::CKeyboardInput(const neutrino_locale_t Name, std::string* Value, CKeyboardInput::CKeyboardInput(const std::string &Name, std::string *Value, int Size, CChangeObserver* Observ, const char * const Icon, const neutrino_locale_t Hint_1, const neutrino_locale_t Hint_2) { - name = NONEXISTANT_LOCALE; - head = Name; + title = Name; valueString = Value; inputSize = Size; @@ -229,8 +227,7 @@ CKeyboardInput::CKeyboardInput(const std::string &Name, std::string *Value, int CKeyboardInput::CKeyboardInput(const std::string &Name, std::string *Value, int Size, CChangeObserver* Observ, const char * const Icon, std::string HintText_1, std::string HintText_2) { - name = NONEXISTANT_LOCALE; - head = Name; + title = Name; valueString = Value; inputSize = Size; @@ -286,7 +283,7 @@ void CKeyboardInput::init() } inputString = new CInputString(inputSize); - int tmp_w = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getRenderWidth(head); + int tmp_w = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getRenderWidth(title); if (!(iconfile.empty())) { int icol_w, icol_h; @@ -637,7 +634,7 @@ int CKeyboardInput::exec(CMenuTarget* parent, const std::string &) else if ((msg == CRCInput::RC_home) || (msg == CRCInput::RC_timeout)) { if ((inputString->getValue() != oldval) && - (ShowMsg(name, LOCALE_MESSAGEBOX_DISCARD, CMsgBox::mbrYes, CMsgBox::mbYes | CMsgBox::mbCancel) == CMsgBox::mbrCancel)) { + (ShowMsg(title, LOCALE_MESSAGEBOX_DISCARD, CMsgBox::mbrYes, CMsgBox::mbYes | CMsgBox::mbCancel) == CMsgBox::mbrCancel)) { timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_MENU]); continue; } @@ -675,7 +672,7 @@ int CKeyboardInput::exec(CMenuTarget* parent, const std::string &) inputString = NULL; if ((observ) && (msg == CRCInput::RC_red)) - observ->changeNotify(name, (void *) valueString->c_str()); + observ->changeNotify(title, (void *) valueString->c_str()); return res; } @@ -709,7 +706,7 @@ void CKeyboardInput::paint() frameBuffer->paintBoxRel(x + OFFSET_SHADOW, y + OFFSET_SHADOW, width, height, COL_SHADOW_PLUS_0, RADIUS_LARGE, CORNER_ALL); //round frameBuffer->paintBoxRel(x, y + hheight, width, bheight, COL_MENUCONTENT_PLUS_0); - CComponentsHeader header(x, y, width, hheight, head, iconfile); + CComponentsHeader header(x, y, width, hheight, title, iconfile); header.paint(CC_SAVE_SCREEN_NO); key_y = y+ hheight+ offset+ input_h+ offset; diff --git a/src/gui/widget/keyboard_input.h b/src/gui/widget/keyboard_input.h index 7af5c1c17..23a3b3601 100644 --- a/src/gui/widget/keyboard_input.h +++ b/src/gui/widget/keyboard_input.h @@ -92,8 +92,7 @@ class CKeyboardInput : public CMenuTarget std::string (*keyboard)[KEY_COLUMNS]; CInputString * inputString; - std::string head; - neutrino_locale_t name; + std::string title; neutrino_locale_t hint_1, hint_2; std::string hintText_1, hintText_2; std::string iconfile;