From 320d442435a4c3d37902f6d763f306e594fc5e14 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Fri, 29 Jan 2016 11:35:37 +0100 Subject: [PATCH 1/3] yWeb: fix typo in german language file Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/cf2056af329df7d75c4e7972d85329331e2f881d Author: vanhofen Date: 2016-01-29 (Fri, 29 Jan 2016) Origin message was: ------------------ - yWeb: fix typo in german language file ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/nhttpd/web/languages/Deutsch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nhttpd/web/languages/Deutsch b/src/nhttpd/web/languages/Deutsch index 8f5cf6c27..716ff9a4d 100644 --- a/src/nhttpd/web/languages/Deutsch +++ b/src/nhttpd/web/languages/Deutsch @@ -74,7 +74,7 @@ main.info=Info main.info_desc=Information über das yWeb, Version main.live_tv_desc=LiveTV main.live_tv_popup_desc=LiveTV Popup -main.remote_full_desc=Fernbedinung & OSD Vollbild +main.remote_full_desc=Fernbedienung & OSD Vollbild main.stream_to_vlc_client_desc=Live TV direkt im VLC Client main.version=Version @@ -85,7 +85,7 @@ bc.menue.control_desc=Box Funktionen (Neustart, Aufnahmemodus, ...) bc.menue.control=Steuerung bc.menue.messages_desc=Nachricht an die Box senden bc.menue.messages=Nachrichten -bc.menue.remote_desc=Fernbedinung +bc.menue.remote_desc=Fernbedienung bc.menue.remote=Fernbedienung bc.menue.lcd_screenshot_desc=LCD Screenshot erstellen bc.menue.lcd_screenshot=LCD Screenshot From 6f539a1c87ac1b6ee0fb12c98d15f04bdfa5b500 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Fri, 29 Jan 2016 12:27:02 +0100 Subject: [PATCH 2/3] yparser: remove useless halfhearted script-check Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/799fe4b78a8b83f20dfd3ff86413ecc142944027 Author: vanhofen Date: 2016-01-29 (Fri, 29 Jan 2016) Origin message was: ------------------ - yparser: remove useless halfhearted script-check ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/nhttpd/yhttpd_mods/mod_yparser.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/nhttpd/yhttpd_mods/mod_yparser.cpp b/src/nhttpd/yhttpd_mods/mod_yparser.cpp index fb42c643d..b75231fc7 100644 --- a/src/nhttpd/yhttpd_mods/mod_yparser.cpp +++ b/src/nhttpd/yhttpd_mods/mod_yparser.cpp @@ -528,10 +528,14 @@ std::string CyParser::YWeb_cgi_cmd(CyhookHandler *hh, std::string ycmd) { } else yresult = "ycgi-type unknown"; } else if (!hh->ParamList[ycmd].empty()) { +#if 0 if ((hh->ParamList[ycmd]).find("script") == std::string::npos) yresult = hh->ParamList[ycmd]; else yresult = ""; +#else + yresult = hh->ParamList[ycmd]; +#endif } return yresult; From 4445b3ac79f2a46cc33c43cf87e4a52eb3c0f2e1 Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Fri, 29 Jan 2016 14:40:59 +0300 Subject: [PATCH 3/3] gui/dboxinfo.cpp: try to fix missing s/n digits, fix x position Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/c79689116528687cd31cccd0877fe862b4ba30b8 Author: [CST] Focus Date: 2016-01-29 (Fri, 29 Jan 2016) ------------------ This commit was generated by Migit --- src/gui/dboxinfo.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/dboxinfo.cpp b/src/gui/dboxinfo.cpp index becaa68aa..5de8a1250 100644 --- a/src/gui/dboxinfo.cpp +++ b/src/gui/dboxinfo.cpp @@ -324,7 +324,6 @@ void CDBoxInfoWidget::paint() nameWidth += diff; } height = h_max(height, 0); - x = getScreenStartX(width); y = getScreenStartY(height); // fprintf(stderr, "CDBoxInfoWidget::CDBoxInfoWidget() x = %d, y = %d, width = %d height = %d\n", x, y, width, height); @@ -358,7 +357,8 @@ void CDBoxInfoWidget::paint() sprintf(ss, "%016llx", cs_get_serial()); title += ", S/N "; title += ss; - width = max(width, g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getRenderWidth(title, true)); + width = max(width, g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getRenderWidth(title, true) + 50); + x = getScreenStartX(width); CComponentsHeader header(x, ypos, width, hheight, title, NEUTRINO_ICON_SHELL); header.paint(CC_SAVE_SCREEN_NO);