mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 17:01:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cst-next' into nmp-cst-next

Browse Source 
Conflicts: src/gui/dboxinfo.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2175a0f327
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-29 (Fri, 29 Jan 2016)



------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2016-01-29 14:11:08 +01:00
parent 27f5e4bc98 4445b3ac79
commit fbbf3890ee
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/dboxinfo.cpp
View File

@@ -317,7 +317,6 @@ void CDBoxInfoWidget::paint()
nameWidth += diff; nameWidth += diff;
} }
height = h_max(height, 0); height = h_max(height, 0);
x = getScreenStartX(width);
y = getScreenStartY(height); y = getScreenStartY(height);
// fprintf(stderr, "CDBoxInfoWidget::CDBoxInfoWidget() x = %d, y = %d, width = %d height = %d\n", x, y, width, height); // fprintf(stderr, "CDBoxInfoWidget::CDBoxInfoWidget() x = %d, y = %d, width = %d height = %d\n", x, y, width, height);
@@ -348,15 +347,23 @@ void CDBoxInfoWidget::paint()
title += ": "; title += ": ";
title + cpuinfo["machine"]; title + cpuinfo["machine"];
} }
char ss[17];
sprintf(ss, "%016llx", cs_get_serial());
title += ", S/N ";
title += ss;
#endif #endif
title += ": "; title += ": ";
title += g_info.hw_caps->boxvendor; title += g_info.hw_caps->boxvendor;
title += " "; title += " ";
title += g_info.hw_caps->boxname; title += g_info.hw_caps->boxname;
#if HAVE_COOL_HARDWARE #if HAVE_COOL_HARDWARE
title += " - "; title += " (";
title += g_info.hw_caps->boxarch;
title += ") - ";
title += g_info.hw_caps->frontend; title += g_info.hw_caps->frontend;
#endif #endif
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); CComponentsHeader header(x, ypos, width, hheight, title, NEUTRINO_ICON_SHELL);
header.paint(CC_SAVE_SCREEN_NO); header.paint(CC_SAVE_SCREEN_NO);

4
src/nhttpd/web/languages/Deutsch
View File

@@ -74,7 +74,7 @@ main.info=Info
main.info_desc=Information &uuml;ber das yWeb, Version main.info_desc=Information &uuml;ber das yWeb, Version
main.live_tv_desc=LiveTV main.live_tv_desc=LiveTV
main.live_tv_popup_desc=LiveTV Popup 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.stream_to_vlc_client_desc=Live TV direkt im VLC Client
main.version=Version main.version=Version
@@ -85,7 +85,7 @@ bc.menue.control_desc=Box Funktionen (Neustart, Aufnahmemodus, ...)
bc.menue.control=Steuerung bc.menue.control=Steuerung
bc.menue.messages_desc=Nachricht an die Box senden bc.menue.messages_desc=Nachricht an die Box senden
bc.menue.messages=Nachrichten bc.menue.messages=Nachrichten
bc.menue.remote_desc=Fernbedinung bc.menue.remote_desc=Fernbedienung
bc.menue.remote=Fernbedienung bc.menue.remote=Fernbedienung
bc.menue.lcd_screenshot_desc=LCD Screenshot erstellen bc.menue.lcd_screenshot_desc=LCD Screenshot erstellen
bc.menue.lcd_screenshot=LCD Screenshot bc.menue.lcd_screenshot=LCD Screenshot

4
src/nhttpd/yhttpd_mods/mod_yparser.cpp
View File

@@ -528,10 +528,14 @@ std::string CyParser::YWeb_cgi_cmd(CyhookHandler *hh, std::string ycmd) {
} else } else
yresult = "ycgi-type unknown"; yresult = "ycgi-type unknown";
} else if (!hh->ParamList[ycmd].empty()) { } else if (!hh->ParamList[ycmd].empty()) {
#if 0
if ((hh->ParamList[ycmd]).find("script") == std::string::npos) if ((hh->ParamList[ycmd]).find("script") == std::string::npos)
yresult = hh->ParamList[ycmd]; yresult = hh->ParamList[ycmd];
else else
yresult = "<!--Not Allowed script in " + ycmd + " -->"; yresult = "<!--Not Allowed script in " + ycmd + " -->";
#else
yresult = hh->ParamList[ycmd];
#endif
} }
return yresult; return yresult;