Index: ipk/source/swapinfos_aaftipprunde_0_6/CONTROL/control
===================================================================
--- ipk/source/swapinfos_aaftipprunde_0_6/CONTROL/control	(revision 5393)
+++ ipk/source/swapinfos_aaftipprunde_0_6/CONTROL/control	(revision 5395)
@@ -1,6 +1,6 @@
 Package: enigma2-plugin-swapinfos-aaf.bundesliga.tipprunde
-Version: 0.6
+Version: 0.61
 Architecture: sh4
-OE: Tipprunde v0.6
+OE: Tipprunde v0.61
 Section: extra
 Priority: optional
Index: ipk/source/swapinfos_aaftipprunde_0_6/var/swap/extensions/Tipprunde/plugin.py
===================================================================
--- ipk/source/swapinfos_aaftipprunde_0_6/var/swap/extensions/Tipprunde/plugin.py	(revision 5393)
+++ ipk/source/swapinfos_aaftipprunde_0_6/var/swap/extensions/Tipprunde/plugin.py	(revision 5395)
@@ -137,5 +137,5 @@
 	if current_w == 1280:
 		skin = """
-			<screen name="Tipprunde" position="{tip.pos}" size="{tip.size}" title="AAF Bundesliga Tippspiel   V 0.6" backgroundColor="#1f1a21" >
+			<screen name="Tipprunde" position="{tip.pos}" size="{tip.size}" title="AAF Bundesliga Tippspiel   V 0.61" backgroundColor="#1f1a21" >
 				<widget name="StartPic" position="0,0" zPosition="3" size="1024,681" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/Tipprunde/fussball1.jpg" transparent="1" alphatest="on" />
 				<ePixmap pixmap="skin_default/buttons/button_red.png" position="80,480"  zPosition="2" size="15,16" alphatest="on" />
@@ -168,5 +168,5 @@
 	else:
 		skin = """
-			<screen name="Tipprunde" position="{tip.pos}" size="{tip.size}" title="AAF Bundesliga Tippspiel   V 0.6" backgroundColor="#1f1a21" >
+			<screen name="Tipprunde" position="{tip.pos}" size="{tip.size}" title="AAF Bundesliga Tippspiel   V 0.61" backgroundColor="#1f1a21" >
 				<widget name="StartPic" position="0,0" zPosition="3" size="824,681" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/Tipprunde/fussball1.jpg" transparent="1" alphatest="on" />
 				<ePixmap pixmap="skin_default/buttons/button_red.png" position="45,430"  zPosition="2" size="15,16" alphatest="on" />
@@ -221,5 +221,5 @@
 				feed_size = size_w - 20
 		else:
-				size_w = 817
+				size_w = 617
 				size_h = 470
 				kopf_pos = 0
@@ -277,14 +277,14 @@
 		if current_w == 1280:
 			if config.plugins.tipprunde.spalte.value == "0":
-				self["Kopfzeile"].setText("Nr  Name       Fr 1  2  3  4  5  6  7  8  9  10 11 12 13 14 15 16 17 18 Sg  Pkt")
-			else:
-				self["Kopfzeile"].setText("Nr  Name       Fr 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34       Sg  Pkt")
+				self["Kopfzeile"].setText("Nr  Name   18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34    Sg  Pkt")
+			#else:
+				#self["Kopfzeile"].setText("Nr  Name       Fr 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34       Sg  Pkt")
 		else:
 			if config.plugins.tipprunde.spalte.value == "0":
-				self["Kopfzeile"].setText(" Nr  Name        Fr 1  2  3  4  5  6  7  8  9 10 11   Sg   Pkt")
+				self["Kopfzeile"].setText(" Nr  Name        18 19 20 21 22 23 24 Sg   Pkt")
 			if config.plugins.tipprunde.spalte.value == "1":
-				self["Kopfzeile"].setText(" Nr  Name        Fr 12 13 14 15 16 17 18 19 20 21 22  Sg   Pkt")
+				self["Kopfzeile"].setText(" Nr  Name        25 26 27 28 29 30 31 Sg   Pkt")
 			if config.plugins.tipprunde.spalte.value == "2":
-				self["Kopfzeile"].setText(" Nr  Name        Fr 23 25 26 27 28 29 30 31 32 33 34  Sg   Pkt")
+				self["Kopfzeile"].setText(" Nr  Name        32 33 34             Sg   Pkt")
 
 
@@ -314,12 +314,12 @@
 		self.liste_load(liste)
 		if current_w == 1280:
-			self["Kopfzeile"].setText("Nr  Name       Fr 1  2  3  4  5  6  7  8  9  10 11 12 13 14 15 16 17 18 Sg  Pkt")
+			self["Kopfzeile"].setText("Nr  Name   18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34    Sg  Pkt")
 		else:
 			if self.list == 1:
-				self["Kopfzeile"].setText(" Nr  Name        Fr 1  2  3  4  5  6  7  8  9 10 11   Sg   Pkt")
+				self["Kopfzeile"].setText(" Nr  Name        18 19 20 21 22 23 24 Sg   Pkt")
 			if self.list == 2:
-				self["Kopfzeile"].setText(" Nr  Name        Fr 12 13 14 15 16 17 18 19 20 21 22  Sg   Pkt")
+				self["Kopfzeile"].setText(" Nr  Name        25 26 27 28 29 30 31 Sg   Pkt")
 			if self.list == 3:
-				self["Kopfzeile"].setText(" Nr  Name        Fr 23 25 26 27 28 29 30 31 32 33 34 Sg   Pkt")
+				self["Kopfzeile"].setText(" Nr  Name        32 33 34             Sg   Pkt")
 
 	def Liste2(self):
@@ -328,6 +328,6 @@
 		liste = self.list
 
-		if liste == 3 and current_w == 1280: # HD Skin hat nur 2 Seiten
-			liste = 2
+		if liste == 2 and current_w == 1280: # HD Skin hat nur 1 Seite
+			liste = 1
 			self.list = liste
 		if liste > 3:
@@ -336,12 +336,12 @@
 		self.liste_load(liste)
 		if current_w == 1280:
-			self["Kopfzeile"].setText("Nr  Name       Fr 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34       Sg  Pkt")
+			self["Kopfzeile"].setText("Nr  Name   18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34    Sg  Pkt")
 		else:
 			if self.list == 1:
-				self["Kopfzeile"].setText(" Nr  Name        Fr 1  2  3  4  5  6  7  8  9 10 11   Sg   Pkt")
+				self["Kopfzeile"].setText(" Nr  Name        18 19 20 21 22 23 24 Sg   Pkt")
 			if self.list == 2:
-				self["Kopfzeile"].setText(" Nr  Name        Fr 12 13 14 15 16 17 18 19 20 21 22  Sg   Pkt")
+				self["Kopfzeile"].setText(" Nr  Name        25 26 27 28 29 30 31 Sg   Pkt")
 			if self.list == 3:
-				self["Kopfzeile"].setText(" Nr  Name        Fr 23 25 26 27 28 29 30 31 32 33 34  Sg   Pkt")
+				self["Kopfzeile"].setText(" Nr  Name        32 33 34             Sg   Pkt")
 
 
@@ -411,5 +411,5 @@
 	def feed_failed(self, failure_instance):
 		print "[Tipprunde] [feed_failed] " + str(failure_instance)
-		self["Kopfzeile"].text = _("Could not connect to Tippserver:") + "\n" + failure_instance.getErrorMessage() + "\n\n" + _("Please check your network settings!")
+		self["Kopfzeile"].text = _("Error:") + " " + failure_instance.getErrorMessage() + "\n\n" + _("Please check your network settings!")
 
 #------------------------------------------------------------------------------------------
@@ -422,7 +422,7 @@
 				#pos = find(zeile,'#')
 				zeile = zeile.replace('\n',"")
-				#print len(zeile)
+				print len(zeile)
 				if len(zeile) == 0:
-						zeile = "0"
+					zeile = "0"
 				sp.append(zeile)
 		f.close
@@ -438,5 +438,8 @@
 			maxzahler = 1200
 		if self.liste == 5:
-			maxzahler = self.maxuser*40
+			maxzahler = self.maxuser*22
+			
+		maxzahler = self.maxuser*22
+			
 
 		if current_w == 1280:
@@ -450,9 +453,9 @@
 
 				if liste == 1:
-						text = "%s %s %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %0.2f %02d" %  (nr,name,int(sp[i+2]),int(sp[i+3]),int(sp[i+4]),int(sp[i+5]),int(sp[i+6]),int(sp[i+7]),int(sp[i+8]),int(sp[i+9]),int(sp[i+10]),int(sp[i+11]),int(sp[i+12]),int(sp[i+13]),int(sp[i+14]),int(sp[i+15]),int(sp[i+16]),int(sp[i+17]),int(sp[i+18]),int(sp[i+19]),int(sp[i+20]),float(sp[i+38]),int(sp[i+39]))
+						text = "%s %s %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %0.2f %02d" %  (nr,name,int(sp[i+2]),int(sp[i+3]),int(sp[i+4]),int(sp[i+5]),int(sp[i+6]),int(sp[i+7]),int(sp[i+8]),int(sp[i+9]),int(sp[i+10]),int(sp[i+11]),int(sp[i+12]),int(sp[i+13]),int(sp[i+14]),int(sp[i+15]),int(sp[i+16]),int(sp[i+17]),int(sp[i+18]),int(sp[i+19]),float(sp[i+20]),int(sp[i+21]))
 						tlist.append(TabelleListEntry(text, color))
-				if liste == 2:
-						text = "%s %s %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d    %0.2f  %02d" %  (nr,name,int(sp[i+2]),int(sp[i+21]),int(sp[i+22]),int(sp[i+23]),int(sp[i+24]),int(sp[i+25]),int(sp[i+26]),int(sp[i+27]),int(sp[i+28]),int(sp[i+29]),int(sp[i+30]),int(sp[i+31]),int(sp[i+32]),int(sp[i+33]),int(sp[i+34]),int(sp[i+35]),int(sp[i+36]),int(sp[i+37]),float(sp[i+38]),int(sp[i+39]))
-						tlist.append(TabelleListEntry(text, color))
+				#if liste == 2:
+						#text = "%s %s %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d    %0.2f  %02d" %  (nr,name,int(sp[i+2]),int(sp[i+21]),int(sp[i+22]),int(sp[i+23]),int(sp[i+24]),int(sp[i+25]),int(sp[i+26]),int(sp[i+27]),int(sp[i+28]),int(sp[i+29]),int(sp[i+30]),int(sp[i+31]),int(sp[i+32]),int(sp[i+33]),int(sp[i+34]),int(sp[i+35]),int(sp[i+36]),int(sp[i+37]),float(sp[i+38]),int(sp[i+39]))
+						#tlist.append(TabelleListEntry(text, color))
 
 				if color == config.plugins.tipprunde.color2.value:
@@ -461,5 +464,5 @@
 					color = config.plugins.tipprunde.color2.value
 				#print text
-				i = i + 40
+				i = i + 22
 
 
@@ -474,11 +477,11 @@
 
 				if liste == 1:
-						text = "%s %s %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %0.2f  %02d" %  (nr,name,int(sp[i+2]),int(sp[i+3]),int(sp[i+4]),int(sp[i+5]),int(sp[i+6]),int(sp[i+7]),int(sp[i+8]),int(sp[i+9]),int(sp[i+10]),int(sp[i+11]),int(sp[i+12]),int(sp[i+13]),float(sp[i+38]),int(sp[i+39]))
+						text = "%s %s %02d %02d %02d %02d %02d %02d %02d %0.2f  %02d" %  (nr,name,int(sp[i+2]),int(sp[i+3]),int(sp[i+4]),int(sp[i+5]),int(sp[i+6]),int(sp[i+7]),int(sp[i+8]),float(sp[i+20]),int(sp[i+21]))
 						tlist.append(TabelleListEntry(text, color))
 				if liste == 2:
-						text = "%s %s %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %0.2f  %02d" %  (nr,name,int(sp[i+14]),int(sp[i+15]),int(sp[i+16]),int(sp[i+17]),int(sp[i+18]),int(sp[i+19]),int(sp[i+20]),int(sp[i+21]),int(sp[i+22]),int(sp[i+23]),int(sp[i+24]),int(sp[i+25]),float(sp[i+38]),int(sp[i+39]))
+						text = "%s %s %02d %02d %02d %02d %02d %02d %02d %0.2f  %02d" %  (nr,name,int(sp[i+9]),int(sp[i+10]),int(sp[i+11]),int(sp[i+12]),int(sp[i+13]),int(sp[i+14]),int(sp[i+15]),float(sp[i+20]),int(sp[i+21]))
 						tlist.append(TabelleListEntry(text, color))
 				if liste == 3:
-						text = "%s %s %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %0.2f  %02d" %  (nr,name,int(sp[i+26]),int(sp[i+27]),int(sp[i+28]),int(sp[i+29]),int(sp[i+30]),int(sp[i+31]),int(sp[i+32]),int(sp[i+33]),int(sp[i+34]),int(sp[i+35]),int(sp[i+36]),int(sp[i+37]),float(sp[i+38]),int(sp[i+39]))
+						text = "%s %s %02d %02d %02d             %0.2f  %02d" %  (nr,name,int(sp[i+16]),int(sp[i+17]),int(sp[i+18]),float(sp[i+20]),int(sp[i+21]))
 						tlist.append(TabelleListEntry(text, color))
 
@@ -489,5 +492,5 @@
 					color = config.plugins.tipprunde.color2.value
 				#print text
-				i = i + 40
+				i = i + 22
 
 		self["feedlist"].l.setList(tlist)
@@ -506,7 +509,7 @@
 				#pos = find(zeile,'#')
 				zeile = zeile.replace('\n',"")
-				#print len(zeile)
+				print len(zeile)
 				if len(zeile) == 0:
-						zeile = "0"
+					zeile = "0"
 				sp.append(zeile)
 		f.close
@@ -524,5 +527,5 @@
 			maxzahler = 1200
 
-		maxzahler = self.maxuser*40
+		maxzahler = self.maxuser*22
 
 		if current_w == 1280:
@@ -536,9 +539,9 @@
 
 				if self.list == 1:
-						text = "%s %s %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %0.2f %02d" %  (nr,name,int(sp[i+2]),int(sp[i+3]),int(sp[i+4]),int(sp[i+5]),int(sp[i+6]),int(sp[i+7]),int(sp[i+8]),int(sp[i+9]),int(sp[i+10]),int(sp[i+11]),int(sp[i+12]),int(sp[i+13]),int(sp[i+14]),int(sp[i+15]),int(sp[i+16]),int(sp[i+17]),int(sp[i+18]),int(sp[i+19]),int(sp[i+20]),float(sp[i+38]),int(sp[i+39]))
+						text = "%s %s %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %0.2f %02d" %  (nr,name,int(sp[i+2]),int(sp[i+3]),int(sp[i+4]),int(sp[i+5]),int(sp[i+6]),int(sp[i+7]),int(sp[i+8]),int(sp[i+9]),int(sp[i+10]),int(sp[i+11]),int(sp[i+12]),int(sp[i+13]),int(sp[i+14]),int(sp[i+15]),int(sp[i+16]),int(sp[i+17]),int(sp[i+18]),int(sp[i+19]),float(sp[i+20]),int(sp[i+21]))
 						tlist.append(TabelleListEntry(text, color))
-				if self.list == 2:
-						text = "%s %s %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d    %0.2f  %02d" %  (nr,name,int(sp[i+2]),int(sp[i+21]),int(sp[i+22]),int(sp[i+23]),int(sp[i+24]),int(sp[i+25]),int(sp[i+26]),int(sp[i+27]),int(sp[i+28]),int(sp[i+29]),int(sp[i+30]),int(sp[i+31]),int(sp[i+32]),int(sp[i+33]),int(sp[i+34]),int(sp[i+35]),int(sp[i+36]),int(sp[i+37]),float(sp[i+38]),int(sp[i+39]))
-						tlist.append(TabelleListEntry(text, color))
+				#if self.list == 2:
+						#text = "%s %s %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d    %0.2f  %02d" %  (nr,name,int(sp[i+2]),int(sp[i+21]),int(sp[i+22]),int(sp[i+23]),int(sp[i+24]),int(sp[i+25]),int(sp[i+26]),int(sp[i+27]),int(sp[i+28]),int(sp[i+29]),int(sp[i+30]),int(sp[i+31]),int(sp[i+32]),int(sp[i+33]),int(sp[i+34]),int(sp[i+35]),int(sp[i+36]),int(sp[i+37]),float(sp[i+38]),int(sp[i+39]))
+						#tlist.append(TabelleListEntry(text, color))
 
 				if color == config.plugins.tipprunde.color2.value:
@@ -547,5 +550,5 @@
 					color = config.plugins.tipprunde.color2.value
 				#print text
-				i = i + 40
+				i = i + 22
 
 
@@ -560,11 +563,11 @@
 
 				if self.list == 1:
-						text = "%s %s %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %0.2f  %02d" %  (nr,name,int(sp[i+2]),int(sp[i+3]),int(sp[i+4]),int(sp[i+5]),int(sp[i+6]),int(sp[i+7]),int(sp[i+8]),int(sp[i+9]),int(sp[i+10]),int(sp[i+11]),int(sp[i+12]),int(sp[i+13]),float(sp[i+38]),int(sp[i+39]))
+						text = "%s %s %02d %02d %02d %02d %02d %02d %02d %0.2f  %02d" %  (nr,name,int(sp[i+2]),int(sp[i+3]),int(sp[i+4]),int(sp[i+5]),int(sp[i+6]),int(sp[i+7]),int(sp[i+8]),float(sp[i+20]),int(sp[i+21]))
 						tlist.append(TabelleListEntry(text, color))
 				if self.list == 2:
-						text = "%s %s %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %0.2f  %02d" %  (nr,name,int(sp[i+14]),int(sp[i+15]),int(sp[i+16]),int(sp[i+17]),int(sp[i+18]),int(sp[i+19]),int(sp[i+20]),int(sp[i+21]),int(sp[i+22]),int(sp[i+23]),int(sp[i+24]),int(sp[i+25]),float(sp[i+38]),int(sp[i+39]))
+						text = "%s %s %02d %02d %02d %02d %02d %02d %02d %0.2f  %02d" %  (nr,name,int(sp[i+9]),int(sp[i+10]),int(sp[i+11]),int(sp[i+12]),int(sp[i+13]),int(sp[i+14]),int(sp[i+15]),float(sp[i+20]),int(sp[i+21]))
 						tlist.append(TabelleListEntry(text, color))
 				if self.list == 3:
-						text = "%s %s %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %02d %0.2f  %02d" %  (nr,name,int(sp[i+26]),int(sp[i+27]),int(sp[i+28]),int(sp[i+29]),int(sp[i+30]),int(sp[i+31]),int(sp[i+32]),int(sp[i+33]),int(sp[i+34]),int(sp[i+35]),int(sp[i+36]),int(sp[i+37]),float(sp[i+38]),int(sp[i+39]))
+						text = "%s %s %02d %02d %02d             %0.2f  %02d" %  (nr,name,int(sp[i+16]),int(sp[i+17]),int(sp[i+18]),float(sp[i+20]),int(sp[i+21]))
 						tlist.append(TabelleListEntry(text, color))
 
@@ -573,6 +576,6 @@
 				else:
 					color = config.plugins.tipprunde.color2.value
-				print text
-				i = i + 40
+				#print text
+				i = i + 22
 
 		self["feedlist"].l.setList(tlist)