summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--History1
-rw-r--r--index.html31
-rwxr-xr-xlang_dut.js14
-rwxr-xr-xlang_eng.js15
4 files changed, 35 insertions, 26 deletions
diff --git a/History b/History
index f96ceb5..4a64419 100644
--- a/History
+++ b/History
@@ -11,6 +11,7 @@ VDR 1.7.29
Save position when poweroff during playback // Resume on poweron
hide/display schedule with same button (yellow)
Dynamic OSD/Menu language selection
+ Removed action 'display EPG/Info' from key 'back', use 'blue' for epg/info
0.22 Updated EPG filter for 42E, canal sat (tid 1088), canal+ (tid 1060), CDS (veronica, iConcerts, Animax)
diff --git a/index.html b/index.html
index 34ab6e9..1931292 100644
--- a/index.html
+++ b/index.html
@@ -751,10 +751,10 @@ function onKeyDown(event) {
if(isFullscreen) {
//SHOW epg info
if(!epgactive) {
- SetOsdInfo();
- osdepginfo.style.opacity = 1;
- osdepginfonext.style.opacity = 0;
- epgactive = 1;
+// SetOsdInfo();
+// osdepginfo.style.opacity = 1;
+// osdepginfonext.style.opacity = 0;
+// epgactive = 1;
} else {
osdepginfo.style.opacity = 0;
osdepginfonext.style.opacity = 0;
@@ -2397,19 +2397,19 @@ osdepginfo.style.opacity = 0;
if(menu == 0) { // Main Menu
MainMenu = 0;
- mainmenu.innerHTML = "<h1><center style='font-size:" + fsMenuMain + ";" + color_main_head + ";'>" + Lang[9] + "\n ( " + Version + " )</center></h1><pre style='" + color_main_font + ";font-size:" + fsMenu + ";'> 1 -" + Lang[10] + "\n 2 -" + Lang[7] + "\n 3 -" + Lang[11] + "\n 4 -" + Lang[12] + "\n 5 -" + Lang[13] + "\n 6 -" + Lang[14] + "\n 7 -" + Lang[15] + "\n 8 -" + Lang[16] + "\n 9 -" + Lang[17] + "\n\n <font style='color:yellow;'>\u25CF<font style='" + color_main_font + ";'> -" + Lang[28] + " <font style='color:blue;'>\u25CF<font style='" + color_main_font + ";'> -" + Lang[18] + "</pre>";
+ mainmenu.innerHTML = "<h1><center style='font-size:" + fsMenuMain + ";" + color_main_head + ";'>" + Lang[9] + "\n ( " + Version + " )</center></h1><pre style='" + color_main_font + ";font-size:" + fsMenu + ";'> 1 -" + Lang[10] + "\n 2 -" + Lang[7] + "\n 3 -" + Lang[11] + "\n 4 -" + Lang[12] + "\n 5 -" + Lang[13] + "\n 6 -" + Lang[14] + "\n 7 -" + Lang[15] + "\n 8 -" + Lang[16] + "\n 9 -" + Lang[17] + "\n\n\n <font style='color:red;'>\u25CF<font style='" + color_main_font + ";'> -" + Lang[19] + "<font style='color:green;'>\u25CF<font style='" + color_main_font + ";'> -" + Lang[19] + "<font style='color:yellow;'>\u25CF<font style='" + color_main_font + ";'> -" + Lang[35] + " <font style='color:blue;'>\u25CF<font style='" + color_main_font + ";'> -" + Lang[18] + "</pre>";
}
if(menu == 6) { // Main Menu when watching recording
MainMenu = 6;
- mainmenu.innerHTML = "<h1><center style='font-size:" + fsMenuMain + ";" + color_main_head + ";'>" + Lang[9] + "\n ( " + Version + " )</center></h1><pre style='" + color_main_font + ";font-size:" + fsMenu + ";'> 1 -" + Lang[10] + "\n 2 -" + Lang[7] + "\n\n\n 5 -" + Lang[13] + "\n\n\n 8 -" + Lang[16] + "\n\n\n <font style='color:yellow;'>\u25CF<font style='" + color_main_font + ";'> -" + Lang[28] + "</pre>";
+ mainmenu.innerHTML = "<h1><center style='font-size:" + fsMenuMain + ";" + color_main_head + ";'>" + Lang[9] + "\n ( " + Version + " )</center></h1><pre style='" + color_main_font + ";font-size:" + fsMenu + ";'> 1 -" + Lang[10] + "\n 2 -" + Lang[7] + "\n\n\n 5 -" + Lang[13] + "\n\n\n 8 -" + Lang[16] + "\n\n\n\n <font style='color:red;'>\u25CF<font style='" + color_main_font + ";'> -" + Lang[19] + "<font style='color:green;'>\u25CF<font style='" + color_main_font + ";'> -" + Lang[19] + "<font style='color:yellow;'>\u25CF<font style='" + color_main_font + ";'> -" + Lang[35] + " <font style='color:blue;'>\u25CF<font style='" + color_main_font + ";'> -" + Lang[19] + "</pre>";
}
if(menu == 1) { // settings menu
var htmltext = "<h1><center style='font-size:" + fsMenuMain + ";" + color_main_head + ";'>" + Lang[10] + "</center></h1><pre style='" + color_main_font + ";font-size:" + fsMenu + ";'> 1 - ";
if (ShowSubs) { htmltext += "\uE017"; } else { htmltext += "\uE016"; }
- htmltext += Lang[20] + "\n 2 - \uE003" + Lang[22] + "\uE003\uE003\uE003: " + (toi.informationService.getObject("cfg.media.subtitling.modepriority")) + "\n 3 - \uE003" + Lang[24] + "\uE003\uE003\uE003: " + (toi.informationService.getObject("cfg.media.audio.languagepriority")) + "\n 4 - " + Lang[82] + "\n 5 - VDR : " + server_ip + "\n 6 - ";
+ htmltext += Lang[20] + "\n 2 - \uE003" + Lang[22] + (toi.informationService.getObject("cfg.media.subtitling.modepriority")) + "\n 3 - \uE003" + Lang[24] + (toi.informationService.getObject("cfg.media.audio.languagepriority")) + "\n 4 - " + Lang[82] + "\n 5 - VDR : " + server_ip + "\n 6 - ";
if (showClock) { htmltext += "\uE017"; } else { htmltext += "\uE016"; }
htmltext += Lang[25] + "\n 7 - ";
if (ShowProtectedChannels) { htmltext += "\uE017"; } else { htmltext += "\uE016"; }
@@ -2426,7 +2426,8 @@ if(menu == 1) { // settings menu
}
if(menu == 2) { // Timers menu
- booking = "<center>" + Lang[32] + "</center>";
+// booking = "<center>" + Lang[32] + "</center>";
+ booking = "";
var x = timerID - 1;
var y = toi.schedulerService.getBookingIds("*", 0, 0);
if (y.length !== 0) {
@@ -2448,7 +2449,7 @@ if(menu == 2) { // Timers menu
}
- mainmenu.innerHTML = "<h1><center style='font-size:" + fsMenuMain + ";" + color_main_head + ";'>" + Lang[7] + "</center></h1><pre style='" + color_main_font + ";font-size:" + fsMenu + ";'>\n 0 -" + Lang[9] + "\n" + booking + "</pre>";
+ mainmenu.innerHTML = "<h1><center style='font-size:" + fsMenuMain + ";" + color_main_head + ";'>" + Lang[7] + "</center></h1><pre style='" + color_main_font + ";font-size:" + fsMenu + ";'>\n 0 -" + Lang[9] + "\n" + booking + "\n <font style='color:red;'>\u25CF<font style='" + color_main_font + ";'> -" + Lang[48] + "<font style='color:green;'>\u25CF<font style='" + color_main_font + ";'> -" + Lang[19] + "<font style='color:yellow;'>\u25CF<font style='" + color_main_font + ";'> -" + Lang[19] + " <font style='color:blue;'>\u25CF<font style='" + color_main_font + ";'> -" + Lang[19] + "</pre>";
}
if(menu == 3) { // MPD Menu
@@ -2487,12 +2488,12 @@ if(menu == 5) { // Timers from Server
// booking = "<center>" + Lang[32] + "</center>";
booking = "<font style='background:" + color_bg + ";-webkit-border-radius:25px;" + color_main_font + ";font-size:" + fsMenu + ";'>";
var x = timerID - 1;
- for (var i=0;i<11;i++) {
+ for (var i=0;i<10;i++) {
if (maxTimers !== 0) { do { x = x + 1; } while (!timers[x] && (x < maxTimers)) }
if (maxTimers > x) { booking = booking + timers[x]; } else { booking = booking +"\n"; }
if (i == 0) { booking = booking + "</font>"; }
}
- mainmenu.innerHTML = "<h1><center style='font-size:" + fsMenuMain + ";" + color_main_head + ";'>" + Lang[7] + "</center></h1><pre style='" + color_main_font + ";font-size:" + fsMenu + ";'>\n" + booking + "</pre>";
+ mainmenu.innerHTML = "<h1><center style='font-size:" + fsMenuMain + ";" + color_main_head + ";'>" + Lang[7] + "</center></h1><pre style='" + color_main_font + ";font-size:" + fsMenu + ";'>\n" + booking + "\n <font style='color:red;'>\u25CF<font style='" + color_main_font + ";'> -" + Lang[48] + "<font style='color:green;'>\u25CF<font style='" + color_main_font + ";'> -" + Lang[49] + "<font style='color:yellow;'>\u25CF<font style='" + color_main_font + ";'> -" + Lang[19] + " <font style='color:blue;'>\u25CF<font style='" + color_main_font + ";'> -" + Lang[28] + "</pre>";
}
}
@@ -2503,12 +2504,12 @@ if(menu == 7) { // SearchTimers from Server
// booking = "<center>" + Lang[32] + "</center>";
booking = "<font style='background:" + color_bg + ";-webkit-border-radius:25px;" + color_main_font + ";font-size:" + fsMenu + ";'>";
var x = timerID - 1;
- for (var i=0;i<11;i++) {
+ for (var i=0;i<10;i++) {
if (maxTimers !== 0) { do { x = x + 1; } while (!searchtimers[x] && (x < maxTimers)) }
if (maxTimers > x) { booking = booking + searchtimers[x]; } else { booking = booking +"\n"; }
if (i == 0) { booking = booking + "</font>"; }
}
- mainmenu.innerHTML = "<h1><center style='font-size:" + fsMenuMain + ";" + color_main_head + ";'>" + Lang[8] + "</center></h1><pre style='" + color_main_font + ";font-size:" + fsMenu + ";'>\n" + booking + "</pre>";
+ mainmenu.innerHTML = "<h1><center style='font-size:" + fsMenuMain + ";" + color_main_head + ";'>" + Lang[8] + "</center></h1><pre style='" + color_main_font + ";font-size:" + fsMenu + ";'>\n" + booking + "\n <font style='color:red;'>\u25CF<font style='" + color_main_font + ";'> -" + Lang[19] + "<font style='color:green;'>\u25CF<font style='" + color_main_font + ";'> -" + Lang[19] + "<font style='color:yellow;'>\u25CF<font style='" + color_main_font + ";'> -" + Lang[19] + " <font style='color:blue;'>\u25CF<font style='" + color_main_font + ";'> -" + Lang[28] + "</pre>";
}
}
@@ -3073,8 +3074,8 @@ if (DelisOK) {
} else {
switch(keyCode) {
case "BrowserBack":
- ShowInfo();
- osdepginfo.style.opacity = 1 - osdepginfo.style.opacity;
+// ShowInfo();
+// osdepginfo.style.opacity = 1 - osdepginfo.style.opacity;
break;
case "TV":
setResume();
diff --git a/lang_dut.js b/lang_dut.js
index 35e76f6..fe881b3 100755
--- a/lang_dut.js
+++ b/lang_dut.js
@@ -50,25 +50,26 @@ Lang[14] = " Server : EPG ";
Lang[15] = " Server : Media Directory ";
Lang[16] = " Server : ZoekTimers ";
Lang[17] = " Server : MPD Verbinding ";
-Lang[18] = " Herstart Portal ";
+Lang[18] = " Herstart ";
+Lang[19] = " \uE003\uE003\uE003\uE003\uE003\uE003\uE003\uE003 ";
//Settings menu
Lang[20] = " Ondertiteling ";
Lang[21] = " Ondertiteling Type Prio ";
-Lang[22] = " Ondertiteling Prio ";
+Lang[22] = " Ondertiteling Prio : ";
Lang[23] = " Menu Taal : ";
-Lang[24] = " Voorkeurstaal ";
+Lang[24] = " AudioVoorkeurstaal : ";
Lang[25] = " Frontdisplay Klok ";
Lang[26] = " Protection ";
Lang[27] = " Preview guide ";
-Lang[28] = " Toon INFO ";
+Lang[28] = " INFO ";
Lang[29] = " SlaapTimer : ";
Lang[30] = " minuten ";
Lang[31] = "UIT";
Lang[32] = " DRUK OP ROOD OM TE WISSEN ";
Lang[33] = " MPD Verbinding ";
Lang[34] = " MENU om te beeindigen ";
-Lang[35] = " INFO ";
+Lang[35] = " BOX-INFO ";
Lang[36] = " Problemen met het opvragen van de timers van ";
Lang[37] = " GEEN INFO ";
Lang[38] = " OPNAMES ";
@@ -83,6 +84,9 @@ Lang[47] = "Gebruik dag van de week";
Lang[44] = " OK om te wissen ";
Lang[45] = " andere toets om dit niet te doen ";
Lang[46] = "vrij ";
+//Lang[47]
+Lang[48] = " Wissen ";
+Lang[49] = " In/Active ";
Lang[50] = " Server EPG ";
Lang[51] = " Problemen met het opvragen van de EPG !!! ";
diff --git a/lang_eng.js b/lang_eng.js
index e5d7f76..0208135 100755
--- a/lang_eng.js
+++ b/lang_eng.js
@@ -50,25 +50,26 @@ Lang[14] = " Server : EPG ";
Lang[15] = " Server : Media Directory ";
Lang[16] = " Server : SearchTimers ";
Lang[17] = " Server : MPD Connection ";
-Lang[18] = " Restart Portal ";
+Lang[18] = " Restart ";
+Lang[19] = " \uE003\uE003\uE003\uE003\uE003\uE003\uE003\uE003 ";
//Settings menu
Lang[20] = " Show Subs ";
Lang[21] = " Subs Type Prio ";
-Lang[22] = " Subs Mode Prio ";
+Lang[22] = " Subs Mode Prio : ";
Lang[23] = " Menu Language : ";
-Lang[24] = " Prio audio track ";
+Lang[24] = " Prio audio track : ";
Lang[25] = " Frontdisplay Clock ";
Lang[26] = " Protection ";
Lang[27] = " Preview guide ";
-Lang[28] = " Show INFO ";
+Lang[28] = " INFO ";
Lang[29] = " SleepTimer : ";
Lang[30] = " minutes ";
Lang[31] = "OFF";
Lang[32] = " PRESS RED-KEY TO REMOVE ";
Lang[33] = " MPD Connection ";
Lang[34] = " MENU to exit ";
-Lang[35] = " INFO ";
+Lang[35] = " BOX-INFO ";
Lang[36] = " ERROR Getting Timers from ";
Lang[37] = " NO INFO ";
Lang[38] = " RECORDINGS ";
@@ -83,7 +84,9 @@ Lang[47] = "Use day of the week";
Lang[44] = " OK to delete ";
Lang[45] = " other to abort ";
Lang[46] = "free ";
-
+//Lang[47]
+Lang[48] = " Delete ";
+Lang[49] = " Un/Active ";
Lang[50] = " Server EPG ";
Lang[51] = " ERROR getting Server EPG !!! ";
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-19 05:33:19 +0000