diff --git a/data/y-web/Y_Main.css b/data/y-web/Y_Main.css index 23b2ef9a2..316c10c2d 100644 --- a/data/y-web/Y_Main.css +++ b/data/y-web/Y_Main.css @@ -86,14 +86,14 @@ div { margin:0; padding:0; } -input[type="text"]:focus,input[type="password"]:focus{ +input[type="text"]:focus,input[type="number"]:focus,input[type="password"]:focus{ border-top: 1px solid #666666; border-left: 1px solid #666666; margin: 0px; background: #ffffcc; } -input[type="text"],input[type="password"],select{ +input[type="text"],input[type="number"],input[type="password"],select{ border: 1px solid #aaaaaa; margin: 0px; diff --git a/data/y-web/Y_Tools_Boxcontrol.yhtm b/data/y-web/Y_Tools_Boxcontrol.yhtm index c1723b6d5..701da8e01 100644 --- a/data/y-web/Y_Tools_Boxcontrol.yhtm +++ b/data/y-web/Y_Tools_Boxcontrol.yhtm @@ -15,10 +15,24 @@ function goUrl(_url){ } $("out").update(res); } +function set_btn_standby(){ + var res = trim(loadSyncURL("/control/standby")); + var color = "red"; + switch(res){ + case "off": color = "green"; break; + } + $("btn_standby").setStyle({borderColor: color}); +} function standby(_standby){ var _cec = (document.getElementById('checkCEC').checked == true) ? "on" : "off"; goUrl("/control/standby?"+_standby+"&cec="+_cec); } +function init() { + set_btn_standby(); +} +function get_data() { + set_btn_standby(); +} //]]> @@ -38,7 +52,7 @@ function standby(_standby){ - + CEC: @@ -91,5 +105,10 @@ function standby(_standby){
+ @@ -113,7 +122,8 @@ function do_switchrc_txt(){
- {=L:filename=}: + Reload: + {=L:filename=}: OSD: TV:
@@ -125,7 +135,6 @@ function do_switchrc_txt(){ {=L:bc.screenshot.wait_text=}
-
@@ -138,5 +147,16 @@ function do_switchrc_txt(){
+ diff --git a/data/y-web/languages/Deutsch b/data/y-web/languages/Deutsch index fdd02bcd2..ca14350e7 100644 --- a/data/y-web/languages/Deutsch +++ b/data/y-web/languages/Deutsch @@ -150,6 +150,7 @@ bc.screenshot.delete=Schnappschuss löschen bc.screenshot.zoom=Schnappschuss zoomen bc.screenshot.wait_text=Schnappschuss wird erstellt bc.screenshot.checkenable=OSD und/oder TV muss aktiviert sein! +bc.screenshot.reload_desc=Reload-Intervall in Sekunden ========= Boxcontrol - Others bc.channels=Sender diff --git a/data/y-web/languages/English b/data/y-web/languages/English index d8bc53303..9469b377c 100644 --- a/data/y-web/languages/English +++ b/data/y-web/languages/English @@ -152,6 +152,7 @@ bc.screenshot.delete=Delete screenshot bc.screenshot.zoom=Zoom screenshot bc.screenshot.wait_text=Create screenshot bc.screenshot.checkenable=OSD and/or TV must be enabled! +bc.screenshot.reload_desc=Reload interval in seconds ========= Boxcontrol - Others bc.channels=Channels diff --git a/lib/libdvbsub/dvbsubtitle.cpp b/lib/libdvbsub/dvbsubtitle.cpp index 5ec75dded..897f9fc49 100644 --- a/lib/libdvbsub/dvbsubtitle.cpp +++ b/lib/libdvbsub/dvbsubtitle.cpp @@ -139,7 +139,6 @@ void cDvbSubtitleBitmaps::Draw(int &min_x, int &min_y, int &max_x, int &max_y) #endif CFrameBuffer::getInstance()->blit2FB(newdata, nw, nh, xoff, yoff, 0, 0); - free(newdata); if(min_x > xoff) min_x = xoff;