From e6ff1c946a92a82bc5ab7e80fff53ca4edc988d4 Mon Sep 17 00:00:00 2001 From: "M. Voerman" Date: Fri, 14 Nov 2014 23:39:06 +0100 Subject: Make skin also ready for 576p & 720p --- javascript/main.js | 140 ++++++++++++++++++++---------------------------- javascript/settings.js | 18 ++----- javascript/settings2.js | 40 ++++++++++++-- 3 files changed, 100 insertions(+), 98 deletions(-) (limited to 'javascript') diff --git a/javascript/main.js b/javascript/main.js index 5feafb7..47e87f3 100644 --- a/javascript/main.js +++ b/javascript/main.js @@ -66,7 +66,7 @@ function onLoad() { showOSD(); videoplane.subtitles = Boolean(ShowSubs); colorkeys.innerHTML = " " + NN[4] + " " + NN[1] + " " + NN[2] + " " + NN[5] + " "; - medialist.innerHTML = "

" + Lang[0] + "

"; + medialist.innerHTML = "

" + Lang[0] + "

"; } @@ -610,7 +610,7 @@ function ExtraStuff(){ { //Show info if set nonfree switchtimer.style.background = "red"; - switchtimer.innerHTML = "
\n" + Lang[90] +"\n\n
"; // Non free channel message + switchtimer.innerHTML = "
\n" + Lang[90] +"\n\n
"; // Non free channel message switchtimer.style.opacity = 1; CAdelayID = setTimeout("switchtimer.style.opacity = 0;",ShowSetTimer); } @@ -962,32 +962,9 @@ function onKeyDown(event) { case KEY_FAV: case "Scroll": if(isFullscreen) { - NowNext = 0; - videoplane.style.width = (320*Xfactor[Set_Res])+"px"; - videoplane.style.height = (240*Yfactor[Set_Res])+"px"; - videoplane.style.left = (380*Xfactor[Set_Res])+"px"; - videoplane.style.top = (300*Yfactor[Set_Res])+"px"; - isFullscreen = 0; - ClearScreen(); - channellist.style.opacity = 1; - colorkeys.innerHTML = " " + NN[3 + (1 - NowNext)] + " " - + NN[1 - NowNext] + " " + NN[2] + " " - + NN[5] + " "; - colorkeys.style.opacity = 1; - showChannelList(); - if(!SwitchGuide) { - preChan = currChan; - preGrp = ChanGroup; - } + GuideView_start(); } else { - isSchedule = 0; - schedule.style.opacity = 0; - isFullscreen = 1; - FullScreen(); - if(!SwitchGuide) { - currChan = preChan; - ChanGroup = preGrp; - } + GuideView_end(); } break; case "TV": @@ -1398,7 +1375,8 @@ function OSDchannr(channr) { if (experimental) { // osdnr.innerHTML = ""; } - osdnr.innerHTML = Right(channr,3); + osdnr.innerHTML = "" + Right(channr,3) + ""; + alert(cssres[css_nr][Set_Res]); } function OSDhtml(){ @@ -2240,7 +2218,7 @@ function onKeyMenu(keyCode) { if (menu == 7) { // Show more info Current SearchTimer osdepginfo.style.opacity = 1 - osdepginfo.style.opacity; - osdepginfo.innerHTML = "

" + searchtimersSearch[timerID] + "\n\n\n\n" + Lang[0] + "

" ; + osdepginfo.innerHTML = "

" + searchtimersSearch[timerID] + "\n\n\n\n" + Lang[0] + "

" ; setTimeout("ShowSearchTimerInfo();",100); } @@ -2288,7 +2266,7 @@ function onKeyMenu(keyCode) { } } else if (menu == 5 && smartTVplugin) { osdepginfo.style.opacity = 0; - mainmenu.innerHTML = "

" + Lang[7] + "

\n\n\n" + Lang[0] + "
"; + mainmenu.innerHTML = "

" + Lang[7] + "

\n\n\n" + Lang[0] + "
"; DeleteTimers(); setTimeout("LoadTimersServer();InitMenu(menu);",100); } else if (menu == 10) { @@ -2519,7 +2497,7 @@ function onKeyMenu(keyCode) { break; case KEY_5: if (menu == MainMenu && (Restfulapiplugin || smartTVplugin)) { - mainmenu.innerHTML = "

" + Lang[7] + "

\n\n\n" + Lang[0] + "
"; + mainmenu.innerHTML = "

" + Lang[7] + "

\n\n\n" + Lang[0] + "
"; timerID = 0; menu = 5; setTimeout("LoadTimersServer();InitMenu(menu);",200); @@ -2595,7 +2573,7 @@ function onKeyMenu(keyCode) { break; case KEY_8: if (menu == MainMenu && Restfulapiplugin) { - mainmenu.innerHTML = "

" + Lang[8] + "

\n\n\n" + Lang[0] + "
"; + mainmenu.innerHTML = "

" + Lang[8] + "

\n\n\n" + Lang[0] + "
"; timerID = 0; menu = 7; setTimeout("LoadSearchTimersServer();InitMenu(menu);",200); @@ -2692,7 +2670,7 @@ osdepginfo.style.opacity = 0; if(menu == 0) { // Main Menu MainMenu = 0; - var htmltext = "

" + Lang[9] + "\n ( " + Version + " )

   1 -" + Lang[10] + "\n   2 -" + Lang[7] + "\n   3 -" + Lang[11];
+	var htmltext = "
" + Lang[9] + "\n ( " + Version + " )
   1 -" + Lang[10] + "\n   2 -" + Lang[7] + "\n   3 -" + Lang[11];
 	htmltext += "\n   4 -" + Lang[12]; 
 	if (Restfulapiplugin) { 
 		htmltext += "\n   5 -" + Lang[13]; 
@@ -2720,18 +2698,18 @@ if(menu == 0) { // Main Menu
 		htmltext += "" + "\n   9 -" + Lang[17] + "" ; 
 	}
 
-	htmltext += "\n   0 - " + Lang[83] + "\n\n   \u25CF -" + Lang[19] + "\u25CF -" + Lang[19] + "\u25CF -" + Lang[35] + "   \u25CF -" + Lang[18] + "
";
+	htmltext += "\n   0 - " + Lang[83] + "\n\n   \u25CF -" + Lang[19] + "\u25CF -" + Lang[19] + "\u25CF -" + Lang[35] + "   \u25CF -" + Lang[18] + "
"; mainmenu.innerHTML = htmltext; } if(menu == 6) { // Main Menu when watching recording MainMenu = 6; - mainmenu.innerHTML = "

" + Lang[9] + "\n ( " + Version + " )

   1 -" + Lang[10] + "\n   2 -" + Lang[7] + "\n\n\n   5 -" + Lang[13] + "\n\n\n   8 -" + Lang[16] + "\n\n\n\n   \u25CF -" + Lang[19] + "\u25CF -" + Lang[19] + "\u25CF -" + Lang[35] + "   \u25CF -" + Lang[19] + "
"; + mainmenu.innerHTML = "

" + Lang[9] + "\n ( " + Version + " )

   1 -" + Lang[10] + "\n   2 -" + Lang[7] + "\n\n\n   5 -" + Lang[13] + "\n\n\n   8 -" + Lang[16] + "\n\n\n\n   \u25CF -" + Lang[19] + "\u25CF -" + Lang[19] + "\u25CF -" + Lang[35] + "   \u25CF -" + Lang[19] + "
"; } if(menu == 1) { // settings menu - var htmltext = "

" + Lang[10] + "

   1 - ";
+	var htmltext = "
" + Lang[10] + "
   1 - ";
 	if (ShowSubs) { htmltext += "\uE017"; } else { htmltext += "\uE016"; }
 	htmltext += Lang[20] + ": " + (is.getObject("cfg.media.subtitling.languagepriority"));
 	if (subs_prio_dyn.length > 0) { htmltext += " (" + (subs_dyn + 1 ) + "/" + subs_prio_dyn.length + ") "; }
@@ -2747,10 +2725,10 @@ if(menu == 1) { // settings menu
 
 	if (SleepTimer) { htmltext += SleepTimer + Lang[30]; } else { htmltext += Lang[31]; }
 
-	htmltext += "\n\n   \u25CF -" + Lang[20];
-	htmltext += "\u25CF - " + VideoOutputModes_txt[VideoOutputModes[Set_Res]] + " ";  
-	htmltext += "\u25CF -" + Lang[35];
-	htmltext += "\u25CF - " + Left(cssfile[css_nr].split(".")[0],8) +"
";
+	htmltext += "\n\n   \u25CF -" + Lang[20];
+	htmltext += "\u25CF - " + VideoOutputModes_txt[VideoOutputModes[Set_Res]] + " ";  
+	htmltext += "\u25CF -" + Lang[35];
+	htmltext += "\u25CF - " + Left(cssfile[css_nr].split(".")[0],8) +"
"; // htmltext += "\n 0 -" + Lang[9] +""; mainmenu.innerHTML = htmltext; } @@ -2764,7 +2742,7 @@ if(menu == 2) { // Timers menu if (timer.length !== 0) { do { x += 1; } while (!timer[x] && (x < timer.length)) } if (i == 0) { - booking += ""; + booking += ""; } else if (i == 1) { booking += ""; } @@ -2790,15 +2768,15 @@ if(menu == 2) { // Timers menu } } if (mediaRecorder) { var x = NN[3]; } else { var x = Lang[19]; } - mainmenu.innerHTML = "

" + Lang[7] + "

\n   0 -" + Lang[9] + "\n" + booking + "   \u25CF -" + Lang[48] + "\u25CF - " + x + "  \u25CF -" + Lang[19] + "\u25CF - " + NN[5] + "
"; + mainmenu.innerHTML = "

" + Lang[7] + "

\n   0 -" + Lang[9] + "\n" + booking + "   \u25CF -" + Lang[48] + "\u25CF - " + x + "  \u25CF -" + Lang[19] + "\u25CF - " + NN[5] + "
"; } if(menu == 3) { // MPD Menu - mainmenu.innerHTML = "

" + Lang[33] + "

" + Lang[34] + "\n 0 -" + Lang[9] + "
"; + mainmenu.innerHTML = "

" + Lang[33] + "

" + Lang[34] + "\n 0 -" + Lang[9] + "
"; } if(menu == 4) { // INFO Menu - var htmltext = "

" + Lang[35] + "

";
+	var htmltext = "
" + Lang[35] + "
";
 	try {
 		htmltext += "\n   Product name: " + is.getObject("config.productdisplayname");
 		htmltext += "\n   Build date : " + is.getObject("config.build.date");
@@ -2825,7 +2803,7 @@ if(menu == 4) { // INFO Menu
 if(menu == 5) { // Timers from Server
 	if (timerOK) {
 	//	booking = "
" + Lang[32] + "
";
-	booking = "";
+	booking = "";
 	var x = timerID - 1;
 	for (var i=0;i<10;i++) {
 		if (maxTimers !== 0) { do { x += 1; } while (!timers[x] && (x < maxTimers)) }
@@ -2833,9 +2811,9 @@ if(menu == 5) { // Timers from Server
 		if (i == 0) { booking += ""; } 
 	}
 	if (get_timer) {
-	mainmenu.innerHTML = "
" + Lang[7] + "
\n" + booking + "\n   \u25CF -" + Lang[48] + "\u25CF -" + Lang[49] + "\u25CF -" + Lang[19] + "   \u25CF -" + Lang[28] + "
";
+	mainmenu.innerHTML = "
" + Lang[7] + "
\n" + booking + "\n   \u25CF -" + Lang[48] + "\u25CF -" + Lang[49] + "\u25CF -" + Lang[19] + "   \u25CF -" + Lang[28] + "
";
 	 } else {
-	mainmenu.innerHTML = "
" + Lang[7] + "
\n" + booking + "\n   \u25CF -" + Lang[19] + "\u25CF -" + Lang[19] + "\u25CF -" + Lang[19] + "   \u25CF -" + Lang[28] + "
";
+	mainmenu.innerHTML = "
" + Lang[7] + "
\n" + booking + "\n   \u25CF -" + Lang[19] + "\u25CF -" + Lang[19] + "\u25CF -" + Lang[19] + "   \u25CF -" + Lang[28] + "
";
 	 }
 	}
 }
@@ -2844,20 +2822,20 @@ if(menu == 5) { // Timers from Server
 if(menu == 7) { // SearchTimers from Server
 	if (timerOK) {
 	// 	booking = "
" + Lang[32] + "
";
-	booking = "";
+	booking = "";
 	var x = timerID - 1;
 	for (var i=0;i<10;i++) {
 		if (maxTimers !== 0) { do { x += 1; } while (!searchtimers[x] && (x < maxTimers)) }
 		if (maxTimers > x) { booking += searchtimers[x]; } else { booking += "\n"; }
 		if (i == 0) { booking += ""; } 
 	}
-	mainmenu.innerHTML = "
" + Lang[8] + "
\n" + booking + "\n   \u25CF -" + Lang[19] + "\u25CF -" + Lang[19] + "\u25CF -" + Lang[19] + "   \u25CF -" + Lang[28] + "
";
+	mainmenu.innerHTML = "
" + Lang[8] + "
\n" + booking + "\n   \u25CF -" + Lang[19] + "\u25CF -" + Lang[19] + "\u25CF -" + Lang[19] + "   \u25CF -" + Lang[28] + "
";
 
 	}
 }
 
 if(menu == 8) { // ChannelGroups enable/disable
-	var htmltext = "
" + Lang[80] + "
\n";
+	var htmltext = "
" + Lang[80] + "
\n";
 	for (var i=0;i<10;i++) {
 		if (maxChan[i]) { } else { htmltext += ""; }
 		htmltext += "\uE003" + i + "\uE003-\uE003";
@@ -2870,7 +2848,7 @@ if(menu == 8) { // ChannelGroups enable/disable
 	}
 
 if(menu == 9) { // INFO2 Menu
-	var htmltext = "
" + Lang[35] + "
";
+	var htmltext = "
" + Lang[35] + "
";
 	try {
 		if (fullupdate !== 0) { htmltext += "\n \uE017 "; } else { htmltext += "\n \uE016 "; }
 		htmltext += "Full EPG Update ";
@@ -2912,21 +2890,21 @@ if(menu == 9) { // INFO2 Menu
 }
 
 if(menu == 10) { // Favorite edit Menu
-	var htmltext = "
" + Lang[83]
-	htmltext += "
\n"
-	htmltext += "";
+	var htmltext = "
" + Lang[83]
+	htmltext += "
\n"
+	htmltext += "";
 	var x = timerID;
 	for (var i=0;i<10;i++) {
 		if (maxTimers !== 0) { x += 1;}
 		if (maxTimers >= x && x !== 0) { htmltext += " \u0003\u0003 " + x + " \u0003\u0003 " + channelsnames[(x + Fav_base)] + " \u0003\u0003\u0003 \n"; } else { htmltext += "\n"; }
 		if (i == 0) { htmltext += ""; } 
 	}
-	htmltext += "\n   \u25CF -" + Lang[87]; 
-	htmltext += "\u25CF -"
+	htmltext += "\n   \u25CF -" + Lang[87]; 
+	htmltext += "\u25CF -"
 	if (timerID == 0) { htmltext += Lang[19] } else { htmltext += Lang[84] } //no move up
-	htmltext += "\u25CF -"
+	htmltext += "\u25CF -"
 	if (timerID == (maxTimers - 1) || x == 0) { htmltext += Lang[19] } else { htmltext += Lang[85] } //no move down
-	htmltext += "\u25CF -" + Fav_key1 + "
";
+	htmltext += "\u25CF -" + Fav_key1 + "
";
 	mainmenu.innerHTML = htmltext;
 }
 
@@ -3052,7 +3030,7 @@ try {
   } catch(e) {
     timerOK = 0;
     alert("Get Timers problem: " + e);
-    mainmenu.innerHTML = "
" + Lang[7] + "
\n  " + Lang[36] + ": \n " + server_ip + "
";
+    mainmenu.innerHTML = "
" + Lang[7] + "
\n  " + Lang[36] + ": \n " + server_ip + "
";
   }
 }
 
@@ -3161,7 +3139,7 @@ try {
 	  }
 
 		// Extended INFO
-		SearchTimer[i] = "
" + x[i].getElementsByTagName("search")[0].childNodes[0].nodeValue + "\n 
";
+		SearchTimer[i] = "
" + x[i].getElementsByTagName("search")[0].childNodes[0].nodeValue + "\n 
";
 		if ((x[i].getElementsByTagName("use_as_searchtimer")[0].childNodes[0].nodeValue) == 0) {
 			SearchTimer[i]  += "\uE003\uE016\uE003" + Lang[40] + "\n";
 		} else {
@@ -3211,7 +3189,7 @@ try {
   } catch(e) {
     timerOK = 0;
     alert("Get SearchTimers problem: " + e);
-    mainmenu.innerHTML = "
" + Lang[8] + "
\n  " + Lang[43] + ": \n " + server_ip + RestFulAPI + "
";
+    mainmenu.innerHTML = "
" + Lang[8] + "
\n  " + Lang[43] + ": \n " + server_ip + RestFulAPI + "
";
   }
 }
 
@@ -3268,7 +3246,7 @@ function ShowSearchTimerInfo() {
 
 	  }
 
-       	osdepginfo.innerHTML = "
" + searchtimersSearch[timerID] + "\n 
" + info1 + "
" ;
+       	osdepginfo.innerHTML = "
" + searchtimersSearch[timerID] + "\n 
" + info1 + "
" ;
 
 }
 
@@ -3300,16 +3278,16 @@ if (MPDListener == 0) {
 } else {
 	if ( ev.state == 6 && ev.reason == "HostUnreachable" ) {
 	    showDisplay("ERRR", false, 100, 0 );
-	mainmenu.innerHTML = "
" + Lang[60] + "
" + Lang[34] + "\n   0 -" + Lang[9] + "\n   9 -" + Lang[61] + "\n\n
" + Lang[62] + ": \n" + server_ip + MPDAddress + "
";
+	mainmenu.innerHTML = "
" + Lang[60] + "
" + Lang[34] + "\n   0 -" + Lang[9] + "\n   9 -" + Lang[61] + "\n\n
" + Lang[62] + ": \n" + server_ip + MPDAddress + "
";
 	  } else if ( ev.state == 2 ) { // && ev.reason == "PositionEnd" ) {
 	    showDisplay("STOP", false, 100, 0 );
-	mainmenu.innerHTML = "
" + Lang[60] + "
" + Lang[34] + "\n   0 -" + Lang[9] + "\n   9 -" + Lang[63] + "\n\n
" + Lang[64] + ": \n" + server_ip + MPDAddress + "\n" + Lang[65] + "
";
+	mainmenu.innerHTML = "
" + Lang[60] + "
" + Lang[34] + "\n   0 -" + Lang[9] + "\n   9 -" + Lang[63] + "\n\n
" + Lang[64] + ": \n" + server_ip + MPDAddress + "\n" + Lang[65] + "
";
 	  } else if ( ev.state == 3 && ev.reason == "CommandPlay" ) {
 	showDisplay("MPD", false, 100, 0 );
-	mainmenu.innerHTML = "
" + Lang[60] + "
" + Lang[34] + "\n   0 -" + Lang[9] + "\n\n\n
" + Lang[64] + ": \n" + server_ip + MPDAddress + "
";
+	mainmenu.innerHTML = "
" + Lang[60] + "
" + Lang[34] + "\n   0 -" + Lang[9] + "\n\n\n
" + Lang[64] + ": \n" + server_ip + MPDAddress + "
";
 	  } else {
 	    showDisplay("ERRR", false, 100, 0 );
-	mainmenu.innerHTML = "
" + Lang[60] + "
" + Lang[34] + "\n   0 -" + Lang[9] + "\n   9 -" + Lang[63] + "\n\n
Error : " + ev.state + "\n" + Lang[66] + ": " + ev.reason + "
";
+	mainmenu.innerHTML = "
" + Lang[60] + "
" + Lang[34] + "\n   0 -" + Lang[9] + "\n   9 -" + Lang[63] + "\n\n
Error : " + ev.state + "\n" + Lang[66] + ": " + ev.reason + "
";
 	}
 }
 
@@ -3353,7 +3331,7 @@ function UnloadMediaSettings() {
 	osdmedia.style.opacity = 0;
 	osdmediatime.style.opacity = 0;
 	osdepginfo.style.opacity = 0;
-	medialist.innerHTML = "
" + Lang[0] + "
";
+	medialist.innerHTML = "
" + Lang[0] + "
";
 	showDisplay(currChan.toString(), false, 100, 0 );
 	isMediaMenu = 0;
 	isFullscreen = 1;
@@ -3371,7 +3349,7 @@ function onKeyMedia(keyCode) {
 if (DelisOK) {
 	switch(keyCode) {
 	case KEY_OK:
-	  medialist.innerHTML = "
" + Lang[0] + "
";
+	  medialist.innerHTML = "
" + Lang[0] + "
";
 	  switchtimer.style.opacity = 0;
 	  setTimeout("DelRec2(); getRecList(); showMediaList();",100)
 	default:
@@ -4033,13 +4011,13 @@ try {
 	}
 	if (nrMedia!==0) { getRecOK = 1; } else {
 	getRecOK = 0;
-	medialist.innerHTML = "
" + Lang[38] + "
\n\n\n" + Lang[37] + "
";
+	medialist.innerHTML = "
" + Lang[38] + "
\n\n\n" + Lang[37] + "
";
 	}
 
   } catch(e) {
     alert("Get Recordings problem: " + e);
 	getRecOK = 0;
-	medialist.innerHTML = "
" + Lang[38] + "
\n\n\n" + Lang[39] + "
";
+	medialist.innerHTML = "
" + Lang[38] + "
\n\n\n" + Lang[39] + "
";
   }
 }
 
@@ -4210,7 +4188,7 @@ try {
 	//popup for confirm
 	switchtimer.style.background = "red";
 	switchtimer.style.opacity = 1;
-	switchtimer.innerHTML = "
" + Lang[44] +"\n" + Lang[45] + "\n\n " + Left(recTitl[currMed],30) + "
"; // Recording Name
+	switchtimer.innerHTML = "
" + Lang[44] +"\n" + Lang[45] + "\n\n " + Left(recTitl[currMed],30) + "
"; // Recording Name
 	DelisOK = 1
   } catch(e) {
     alert("Delete Recordings problem: " + e);
@@ -4484,10 +4462,10 @@ function showMediaList() {
 	var MaxMed = -1;
 
 	if (getRecOK == 1) {
-		var htmlstring = "
" + Lang[38] + "(" + Lang[46] + (100 - perc_space) + "%, " + (free_space/1024).toFixed(0) + " GB) 
";
+		var htmlstring = "
" + Lang[38] + "(" + Lang[46] + (100 - perc_space) + "%, " + (free_space/1024).toFixed(0) + " GB) 
";
 
 		if (subgroup) {
-			htmlstring = "
" + Group_Header[Number(recGroup[currMed])] + "
";
+			htmlstring = "
" + Group_Header[Number(recGroup[currMed])] + "
";
 			if (MaxInGroup < 14){ MaxMed = MaxInGroup; } else {MaxMed = 14; }
 		}
 		if (!subgroup) { 
@@ -4499,7 +4477,7 @@ function showMediaList() {
 	} else {
 
 		if (nrMedia < 14) {MaxMed = nrMedia; } else {MaxMed = 14; }
-		var htmlstring = "
" + Lang[11] + channelsnames[currChan] + " 
";
+		var htmlstring = "
" + Lang[11] + channelsnames[currChan] + " 
";
 	}
 
 	if (MaxMed > 14) { MaxMed = 14; }
@@ -4519,7 +4497,7 @@ function showMediaList() {
 		if (listMed > nrMedia) { recList[listMed] = ""; }
 
 		if (recList[listMed]) { //Solves empty string at the end.
-			if ( listMed == currMed) { htmlstring += ""; }
+			if ( listMed == currMed) { htmlstring += ""; }
 			htmlstring += "\uE003" + Left(recList[listMed],60) + "\uE003\uE003\n";
 			if ( listMed == currMed) { htmlstring += "";}
 		}
@@ -4594,7 +4572,7 @@ try {
   } catch(e) {
     alert("Get EPG problem: " + e);
 	getRecOK = 0;
-	medialist.innerHTML = "
" + Lang[50] + "
\n\n\n" + Lang[51] + "
";
+	medialist.innerHTML = "
" + Lang[50] + "
\n\n\n" + Lang[51] + "
";
   }
 }
 
@@ -4648,16 +4626,16 @@ function getSchedule(schchan){
 	} else {
 	getRecOK = 0;
 
-	medialist.innerHTML = "
" + Lang[11] + "
\n\n\n" + Lang[52] + "
";
+	medialist.innerHTML = "
" + Lang[11] + "
\n\n\n" + Lang[52] + "
";
 
 	if (experimental) {
-	medialist.innerHTML += "";
+	medialist.innerHTML += "";
 	}
 
 	}
   } catch(e) {
 	getRecOK = 0;
-	medialist.innerHTML = "
" + Lang[11] + "
\n\n\n" + Lang[53] + "
";
+	medialist.innerHTML = "
" + Lang[11] + "
\n\n\n" + Lang[53] + "
";
   }
 
 }
@@ -4906,12 +4884,12 @@ if (get_recordings == 1) {
 	date_time();
 	osdmediatime.innerHTML = result;
 	date_time_rec();
-	osdmedia.innerHTML = "
 \n  " + (pos/60).toFixed(0) + " / " + x + "  " + Left(recTitl[currMed],40) + "\n  " + pos4 + "\n " + result + " 
";
+	osdmedia.innerHTML = "
 \n  " + (pos/60).toFixed(0) + " / " + x + "  " + Left(recTitl[currMed],40) + "\n  " + pos4 + "\n " + result + " 
";
 } else if ( get_recordings == 2) {
 	var pos = position + (mediaPlayer.getPosition()/1000);
 	date_time();
 	osdmediatime.innerHTML = result;
-	osdmedia.innerHTML = "
 \n  " + (pos/60).toFixed(0) + " \n " + Left(recTitl[currMed],40) + "\n  \n " + recStrt[currMed] + " 
";
+	osdmedia.innerHTML = "
 \n  " + (pos/60).toFixed(0) + " \n " + Left(recTitl[currMed],40) + "\n  \n " + recStrt[currMed] + " 
";
 }
 }
 
diff --git a/javascript/settings.js b/javascript/settings.js
index 450d693..eece108 100644
--- a/javascript/settings.js
+++ b/javascript/settings.js
@@ -15,6 +15,10 @@ langfile = new Array ("languages/lang_eng.js", "languages/lang_dut.js","language
 lang_prio = new Array("dut,eng,und","ger,deu,eng","eng,und","fre,fra,eng");
 
 cssfile = new Array ("blue.css","black.css");
+cssres = new Array();
+cssres[0] = new Array ("576","720","1080"); //blue.css
+cssres[1] = new Array ("","",""); //black.css
+
 var css_nr;
 
 var subs_prio = "dut,eng"; //Subtitle prio
@@ -106,20 +110,6 @@ VideoOutputModes_txt = new Array("NO_VIDEO_MODE","480I60","576I50","480P60","576
 
 var videoConfig;
 var Set_Res;
-var Xfactor = new Array();
-var Yfactor = new Array();
-
-// keep scale compliant with Videooutputmodes!!
-//  720x576
-Xfactor[0] = 720 / 720;
-Yfactor[0] = 576 / 576;
-// 1280x720
-Xfactor[1] = 1280 / 720; 
-Yfactor[1] = 720 / 576;
-// 1920x1080
-Xfactor[2] = 1920 / 720;
-Yfactor[2] = 1080 / 576;
-
 
 var audio = 0;
 var audio_dyn = 0;
diff --git a/javascript/settings2.js b/javascript/settings2.js
index 9348b31..c173f7a 100644
--- a/javascript/settings2.js
+++ b/javascript/settings2.js
@@ -10,11 +10,45 @@ var color_progress2 = "";
 
 
 function setOSDscale() {
-	fsList = (18*Yfactor[Set_Res]) + "px"; //1080 = 34, 720 = 23, 576 = 18
-	fsSchedList = (18*Yfactor[Set_Res]) + "px"; //1080 = 34, 720 = 23, 576 = 18
-	fsSched = (26*Yfactor[Set_Res]) + "px"; //1080 = 49, 720 = 33, 576 = 26
+	fsList = "34px"; //1080 = 34, 720 = 23, 576 = 18
+	fsSchedList = "34px"; //1080 = 34, 720 = 23, 576 = 18
+	fsSched = "49px"; //1080 = 49, 720 = 33, 576 = 26
 }
 
+
+function GuideView_start() {
+			NowNext = 0;
+			videoplane.style.width = "44%";
+			videoplane.style.height = "42%";
+			videoplane.style.left = "53%";
+			videoplane.style.top = "52%";
+			isFullscreen = 0;
+			ClearScreen();
+			channellist.style.opacity = 1;
+			colorkeys.innerHTML = " " +  NN[3 + (1 - NowNext)] + "  " 
+				+ NN[1 - NowNext] + "  " + NN[2] + "  " 
+				+ NN[5] + " ";
+			colorkeys.style.opacity = 1;
+			showChannelList();
+			if(!SwitchGuide) {
+			preChan = currChan;
+			preGrp = ChanGroup;
+			}
+}
+
+function GuideView_end() {
+			isSchedule = 0;
+			schedule.style.opacity = 0;
+			isFullscreen = 1;
+			FullScreen();
+			if(!SwitchGuide) {
+			currChan = preChan;
+			ChanGroup = preGrp;
+			}
+}
+
+
+
 function GetSchedule(schchan,tablelength){
 	//Old style Schedule, used in Guide View.
 	SI = "";
-- 
cgit v1.2.3