update news client, l/r select server u/d select item

6 files changed, 90 insertions, 68 deletions

diff --git a/History b/History
index 37263e7..40f9cd6 100644
--- a/History
+++ b/History
@@ -13,7 +13,8 @@ VDR 1.7.29+
 	Get server ip from flash
 	Bugfix, removed delayed play (in case of error) when you already start to play a recording
 	Save old position before jump forward. In case of ongoing recording and jump position isn't recorded yet you don't start replay at 0
-	News info from nu.nl (nl), dw.de (en/de), spiegel.de (en/de) 
+	News info from nu.nl (nl), dw.de (en/de), spiegel.de (en/de)
+	News can be scrolled with up/down, left/right for server selection 
 	Powerserverdown shares now blue button with restart script (almost nobody uses powerserverdown)
 
 
diff --git a/javascript/channels.js b/javascript/channels.js
index 56c9d09..de3d98a 100644
--- a/javascript/channels.js
+++ b/javascript/channels.js
@@ -95,39 +95,39 @@ channels[53]="S28.2E-2-2009-6204";
 channelsnames[54]="Disc.History";
 channels[54]="S28.2E-2-2009-6207";
 channelsnames[55]="Disc.History+1";
-channels[55]="S28.2E-2-2315-52435";
+channels[55]="S28.2E-0-0-52435";
 channelsnames[56]="TLC";
 channels[56]="S28.2E-2-2009-6233";
 channelsnames[57]="TLC+1";
-channels[57]="S28.2E-2-2315-52446";
+channels[57]="S28.2E-0-0-52446";
 channelsnames[58]="Disc.Science";
 channels[58]="S28.2E-2-2009-6206";
 channelsnames[59]="Disc.Sci+1";
-channels[59]="S28.2E-2-2315-52410";
+channels[59]="S28.2E-0-0-52410";
 channelsnames[60]="Disc.Turbo";
 channels[60]="S28.2E-2-2009-6209";
 channelsnames[61]="Discovery Shed";
-channels[61]="S28.2E-2-2315-52440";
+channels[61]="S28.2E-2-2407-52440";
 channelsnames[62]="Home & Health";
 channels[62]="S28.2E-2-2009-6208";
 channelsnames[63]="Home&Health+";
-channels[63]="S28.2E-2-2315-52450";
+channels[63]="S28.2E-0-0-52450";
 channelsnames[64]="ID";
-channels[64]="S28.2E-2-2315-52400";
+channels[64]="S28.2E-0-0-52400";
 channelsnames[65]="ID+1";
-channels[65]="S28.2E-2-2315-52426";
+channels[65]="S28.2E-0-0-52426";
 channelsnames[66]="DMAX";
-channels[66]="S28.2E-2-2315-52415";
+channels[66]="S28.2E-0-0-52415";
 channelsnames[67]="DMAX+1";
-channels[67]="S28.2E-2-2315-52420";
+channels[67]="S28.2E-0-0-52420";
 channelsnames[68]="QUEST";
 channels[68]="S28.2E-2-2009-6211";
 channelsnames[69]="QUEST+1";
-channels[69]="S28.2E-2-2315-52430";
+channels[69]="S28.2E-0-0-52430";
 channelsnames[70]="Animal Planet";
 channels[70]="S28.2E-2-2009-6202";
 channelsnames[71]="Animal Plnt+1";
-channels[71]="S28.2E-2-2315-52405";
+channels[71]="S28.2E-0-0-52405";
 channelsnames[72]="Eden";
 channels[72]="S28.2E-2-2006-6502";
 channelsnames[73]="Eden+1";
@@ -158,6 +158,8 @@ channelsnames[85]="Real Time";
 channels[85]="S13.0E-64511-5700-4324";
 channelsnames[86]="Real Time +1";
 channels[86]="S13.0E-64511-800-1469";
+channelsnames[87]="EBRU TV";
+channels[87]="S19.2E-133-33-76";
 channelsnames[90]="TV Oost";
 channels[90]="S23.5E-3-3211-20814";
 channelsnames[91]="Omrop Fryslan Televisie";
@@ -190,11 +192,11 @@ channelsnames[104]="Sky Action";
 channels[104]="S28.2E-2-2007-4302";
 channelsnames[105]="Sky Family";
 channels[105]="S28.2E-2-2007-4403";
-channelsnames[106]="Sky Crime";
+channelsnames[106]="Sky Thriller";
 channels[106]="S28.2E-2-2007-4406";
-channelsnames[107]="Sky Valentine";
+channelsnames[107]="Sky DramaRom";
 channels[107]="S28.2E-2-2007-5502";
-channelsnames[108]="Sky ScFi/Horror";
+channelsnames[108]="Sky Monsters";
 channels[108]="S28.2E-2-2007-4304";
 channelsnames[109]="Sky Greats";
 channels[109]="S28.2E-2-2007-5650";
@@ -662,7 +664,7 @@ channelsnames[483]="Sky Nostalgie,Nostalgie";
 channels[483]="S19.2E-133-3-516";
 channelsnames[484]="Sky Sport 1,Sport1";
 channels[484]="S19.2E-133-4-221";
-channelsnames[485]="Sky Sport 2,Sport2";
+channelsnames[485]="INTER - WOL";
 channels[485]="S19.2E-133-4-222";
 channelsnames[486]="N24 Austria";
 channels[486]="S19.2E-133-7-53";
@@ -1164,7 +1166,7 @@ channelsnames[1012]="Travel Channel HD WE";
 channels[1012]="S23.5E-3-3221-5056";
 channelsnames[1013]="NGC HD";
 channels[1013]="S23.5E-3-3222-20965";
-channelsnames[1014]="Viasat HD";
+channelsnames[1014]="Viasat HD OBSOLETE";
 channels[1014]="S23.5E-3-3208-7040";
 channelsnames[1015]="Nat Geo Wild HD DUT";
 channels[1015]="S23.5E-3-3226-709";
@@ -1544,25 +1546,25 @@ channelsnames[2066]="R. Musicales";
 channels[2066]="S30.0W-49-2-364";
 channelsnames[2067]="RADIO MARIA";
 channels[2067]="S30.0W-40-13-8";
-channelsnames[2068]="Cadena 100";
+channelsnames[2068]="Cadena 100 OBSOLETE";
 channels[2068]="S30.0W-40-13-10";
 channelsnames[2069]="HIT FM";
 channels[2069]="S30.0W-40-13-26";
 channelsnames[2070]="Radio MARCA";
 channels[2070]="S30.0W-40-13-29";
-channelsnames[2071]="COPE";
+channelsnames[2071]="COPE OBSOLETE";
 channels[2071]="S30.0W-40-13-37";
-channelsnames[2072]="INTERECONOMIA";
+channelsnames[2072]="INTERECONOMIA OBSOLETE";
 channels[2072]="S30.0W-40-13-38";
-channelsnames[2073]="MegaStar";
+channelsnames[2073]="MegaStar OBSOLETE";
 channels[2073]="S30.0W-40-13-39";
-channelsnames[2074]="ROCK FM";
+channelsnames[2074]="ROCK FM OBSOLETE";
 channels[2074]="S30.0W-40-13-52";
 channelsnames[2075]="EMA RADIO";
 channels[2075]="S30.0W-40-13-54";
 channelsnames[2076]="TSF ON M";
 channels[2076]="S30.0W-40-13-55";
-channelsnames[2077]="RADIO HIT";
+channelsnames[2077]="RADIO HIT OBSOLETE";
 channels[2077]="S30.0W-40-13-58";
 channelsnames[2078]="Disney Channel";
 channels[2078]="S30.0W-40-13-900";
@@ -2430,7 +2432,7 @@ channelsnames[3519]="PLS TV";
 channels[3519]="S42.0E-66-3-1333";
 channelsnames[3520]="KRM TV";
 channels[3520]="S42.0E-66-3-1335";
-channelsnames[3521]="HZN TV";
+channelsnames[3521]="MÜZİK TÜRK";
 channels[3521]="S42.0E-66-3-1337";
 channelsnames[3522]="NİSA TV";
 channels[3522]="S42.0E-66-3-1339";
@@ -3250,7 +3252,7 @@ channelsnames[6015]="PRIVATE TV";
 channels[6015]="S13.0E-318-13300-4960";
 channelsnames[6016]="FL TV";
 channels[6016]="S13.0E-318-15400-13512";
-channelsnames[6017]="Venus";
+channelsnames[6017]="Venus OLD";
 channels[6017]="S30.0W-83-105-502";
 channelsnames[6018]="Leo TV";
 channels[6018]="S23.5E-3-3219-13142";
@@ -3278,7 +3280,7 @@ channelsnames[6029]="Penthouse 3D";
 channels[6029]="S23.5E-3-3204-5311";
 channelsnames[6030]="EROXXX";
 channels[6030]="S23.5E-3-3212-14055";
-channelsnames[6031]="Brazzers.tv";
+channelsnames[6031]="Brazzers.tv OBSOLETE";
 channels[6031]="S23.5E-3-3202-6072";
 channelsnames[6032]="Hustler HD-3D";
 channels[6032]="S13.0E-318-15800-16933";
@@ -3288,7 +3290,7 @@ channelsnames[6034]="PENTHOUSE HD";
 channels[6034]="S19.2E-1-1086-9907";
 channelsnames[6035]="PLAYBOY TV";
 channels[6035]="S19.2E-1-1060-30603";
-channelsnames[6036]="Brazzers.tv CZ";
+channelsnames[6036]="Brazzers.tv CZ OBSOLETE";
 channels[6036]="S23.5E-3-3202-6073";
 channelsnames[6037]="Penthouse";
 channels[6037]="S23.5E-3-3222-20917";
@@ -3310,7 +3312,7 @@ channelsnames[6045]="Penthouse HD1";
 channels[6045]="S23.5E-3-3236-5712";
 channelsnames[6046]="Penthouse HD2";
 channels[6046]="S23.5E-3-3236-5713";
-channelsnames[6047]="Service 13015";
+channelsnames[6047]="Mei Musi TV";
 channels[6047]="S19.2E-1-1117-13015";
 channelsnames[8001]="NPO 1";
 channels[8001]="T-8720-2214-1101";
@@ -3498,7 +3500,7 @@ channelsnames[9050]="Arrow Classic Rock";
 channels[9050]="S23.5E-3-3211-20892";
 channelsnames[9051]="ROCK ANTENNE,ROCK ANT";
 channels[9051]="S19.2E-133-7-160";
-channelsnames[9052]="Planet Rock";
+channelsnames[9052]="Planet Rock OBSOLETE";
 channels[9052]="S28.2E-2-2407-9575";
 channelsnames[9053]="Radio Beat";
 channels[9053]="S23.5E-3-3209-13120";
@@ -3608,4 +3610,4 @@ defChan[6] = minChan[6]; protChn[6] = 1;
 defChan[7] = minChan[7]; protChn[7] = 0;
 defChan[8] = minChan[8]; protChn[8] = 0;
 defChan[9] = minChan[9]; protChn[9] = 0;
-Chan_Ver = "02/06/15 13:58:04" ;
+Chan_Ver = "03/22/15 17:01:38" ;
diff --git a/javascript/main.js b/javascript/main.js
index a76f984..95d4793 100644
--- a/javascript/main.js
+++ b/javascript/main.js
@@ -2322,8 +2322,18 @@ function onKeyMenu(keyCode) {
     break;
 
     case KEY_LEFT:
+	if (menu == 12) {
+		newsID = 0;
+		newssiteID -= 1;
+		InitMenu(menu);
+	} 
     break;
     case KEY_RIGHT:
+	if (menu == 12) {
+		newsID = 0;
+		newssiteID += 1;
+		InitMenu(menu);
+	} 
     break;
     case KEY_UP:
 	if (menu == 2) {
@@ -2332,7 +2342,11 @@ function onKeyMenu(keyCode) {
 	} else 	if (menu == 5 || menu == 7 || menu == 10) {
 	    timerID -= 1;
 		    if (timerID < 0) { timerID = 0; }
-	}
+	} else	if (menu == 12) {
+		newsID -= 1;
+		InitMenu(menu);
+	} 
+
 	epg_unactive();
 	InitMenu(menu);
     break;
@@ -2344,7 +2358,11 @@ function onKeyMenu(keyCode) {
 	} else 	if (menu == 5 || menu == 7 || menu == 10) {
 	    timerID++;
 			if (timerID > (maxTimers - 1) && maxTimers !== 0) { timerID = maxTimers - 1; }
-	}
+	} else	if (menu == 12) {
+		newsID += 1;
+		InitMenu(menu);
+	} 
+
 	epg_unactive();
 	InitMenu(menu);
     break;
@@ -2623,8 +2641,6 @@ function onKeyMenu(keyCode) {
 		 is.setObject("vip.showsubs",ShowSubs.toString(),is.STORAGE_PERMANENT);
 		} else	if (menu == 8) {
 			SetGroup(1);
-		} else	if (menu == 12) {
-			newsID = 1;
 		}
 	InitMenu(menu);
 	break;
@@ -2649,9 +2665,6 @@ function onKeyMenu(keyCode) {
 		if (menu == 8) {
 			SetGroup(2);
 		} 
-		if (menu == 12) {
-			newsID = 2;
-		}
 		InitMenu(menu);
 	break;
 	case KEY_3:
@@ -2668,9 +2681,6 @@ function onKeyMenu(keyCode) {
 	} else	if (menu == 8) {
 		SetGroup(3);
 		InitMenu(menu);
-	} else	if (menu == 12) {
-		newsID = 3;
-		InitMenu(menu);
 	} 
 
 	break;
@@ -2688,9 +2698,6 @@ function onKeyMenu(keyCode) {
 		} else if (menu == 8) {
 		SetGroup(4);
 		InitMenu(menu);
-		} else	if (menu == 12) {
-		newsID = 4;
-		InitMenu(menu);
 		}
 
 	break;
@@ -2719,11 +2726,6 @@ function onKeyMenu(keyCode) {
 		InitMenu(menu);
 	}
 
-	if (menu == 12) {
-		newsID = 5;
-		InitMenu(menu);
-	}
-
 	break;
 	case KEY_6:
 	if (menu == 0 && Restfulapiplugin) {
@@ -2747,10 +2749,6 @@ function onKeyMenu(keyCode) {
 		SetGroup(6);
 		InitMenu(menu);
 	}
-	if (menu == 12) {
-		newsID = 6;
-		InitMenu(menu);
-	}
 
 	break;
 	case KEY_7:
@@ -2777,10 +2775,6 @@ function onKeyMenu(keyCode) {
 		SetGroup(7);
 		InitMenu(menu);
 		}
-	if (menu == 12) {
-		newsID = 7;
-		InitMenu(menu);
-	}
 
 	break;
 	case KEY_8:
@@ -2802,11 +2796,6 @@ function onKeyMenu(keyCode) {
 		SetGroup(8);
 		InitMenu(menu);
 	}
-	if (menu == 12) {
-		newsID = 8;
-		InitMenu(menu);
-	}
-
 
 	break;
 	case KEY_9:
@@ -2820,8 +2809,6 @@ function onKeyMenu(keyCode) {
 			setTimeout("InitMenu(menu);",100);
 		} else if (menu == 8) {
 			SetGroup(9);
-		} else if (menu == 12) {
-			newsID = 9;
 		}
 		InitMenu(menu);
 	break;
diff --git a/javascript/news.js b/javascript/news.js
index be89b79..be19420 100644
--- a/javascript/news.js
+++ b/javascript/news.js
@@ -1,5 +1,8 @@
 
 function NewsInfo() {
+   if (newssiteID > (newssite.length - 1)) { newssiteID = (newssite.length - 1) }
+   if (newssiteID < 0) { newssiteID = 0 }
+
    var htmltext = "<h1 class=mainmenu" + cssres[css_nr][Set_Res] + ">";
 
    xmlhttp=new XMLHttpRequest();
@@ -11,14 +14,21 @@ function NewsInfo() {
    htmltext += xmlDoc.getElementsByTagName("channel")[0].getElementsByTagName("title")[0].childNodes[0].nodeValue;
    htmltext += "</h1><pre class=newsmenu" + cssres[css_nr][Set_Res] + ">\n";
    var x=xmlDoc.getElementsByTagName("item");
+
+   if (newsID > x.length) { newsID = x.length }
+   if (newsID > 9) { newsID = 9 }
+   if (newsID < 0) { newsID = 0 }
+
    for (var i=0;i<x.length && i<10;i++) {
 	 if (x.length !== 0) {
-		if (i !== 0) {
-			htmltext += " \u0003 " + i; 
-		} else {
-			htmltext += " \u0003 - ";
+		if (i == newsID) {
+			//hi light selection
+			htmltext += "<span class=newsselect" + cssres[css_nr][Set_Res] + ">";
 		} 
 		htmltext += " \u0003 " + x[i].getElementsByTagName("title")[0].childNodes[0].nodeValue + " \u0003 \n";
+		if (i == newsID) {
+			htmltext += "</span>";
+		} 
 	 } else { 
 		htmltext += "\n";
 	 }
diff --git a/javascript/settings.js b/javascript/settings.js
index c8753ef..3d7b646 100644
--- a/javascript/settings.js
+++ b/javascript/settings.js
@@ -7,7 +7,7 @@ var Version = "0.27.5";
 //weather
 var city = "Almelo";
 //news
-newssite = new Array("http://www.nu.nl/rss/Algemeen","http://www.spiegel.de/international/index.rss","http://www.spiegel.de/schlagzeilen/index.rss","http://rss.dw.de/rdf/rss-en-all","http://rss.dw.de/rdf/rss-de-all");
+newssite = new Array("http://www.nu.nl/rss/Algemeen","http://www.nu.nl/rss/Economie","http://www.nu.nl/rss/Internet","http://www.spiegel.de/international/index.rss","http://www.spiegel.de/schlagzeilen/index.rss","http://rss.dw.de/rdf/rss-en-all","http://rss.dw.de/rdf/rss-de-all");
 var newssiteID = 0;
 var newsID = 0;
 
diff --git a/skins/blue.css b/skins/blue.css
index ce6e2f9..da5f302 100644
--- a/skins/blue.css
+++ b/skins/blue.css
@@ -224,6 +224,28 @@
 	overflow:hidden;
 	}
 
+	.newsselect576 {
+	background	:#fc5;
+	-webkit-border-radius:25px;
+	color:black;
+	font-size:20px;
+	}
+
+	.newsselect720 {
+	background	:#fc5;
+	-webkit-border-radius:25px;
+	color:black;
+	font-size:27px;
+	}
+
+	.newsselect1080 {
+	background	:#fc5;
+	-webkit-border-radius:25px;
+	color:black;
+	font-size:40px;
+	}
+
+
 	.select576 {
 	background	:#fc5;
 	-webkit-border-radius:25px;