Merge commit 'origin/master' into tmbinc/FixTimingBugs

39 files changed, 669 insertions, 619 deletions

diff --git a/lib/python/Screens/About.py b/lib/python/Screens/About.py
index e184512b..6cf0f7b4 100644
--- a/lib/python/Screens/About.py
+++ b/lib/python/Screens/About.py
@@ -25,7 +25,7 @@ class About(Screen):
 		self["FPVersion"] = StaticText(fp_version)
 
 		nims = nimmanager.nimList()
-		for count in range(4):
+		for count in (0, 1, 2, 3):
 			if count < len(nims):
 				self["Tuner" + str(count)] = StaticText(nims[count])
 			else:
@@ -33,7 +33,7 @@ class About(Screen):
 
 		self["HDDHeader"] = StaticText(_("Detected HDD:"))
 		hddlist = harddiskmanager.HDDList()
-		hdd = len(hddlist) > 0 and hddlist[0][1] or None
+		hdd = hddlist and hddlist[0][1] or None
 		if hdd is not None and hdd.model() != "":
 			self["hddA"] = StaticText(_("%s\n(%s, %d MB free)") % (hdd.model(), hdd.capacity(),hdd.free()))
 		else:
diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
index ebfbe812..0ff4042b 100644
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -95,7 +95,7 @@ class ChannelContextMenu(Screen):
 		inBouquet = csel.getMutableList() is not None
 		haveBouquets = config.usage.multibouquet.value
 
-		if not (len(current_sel_path) or current_sel_flags & (eServiceReference.isDirectory|eServiceReference.isMarker)):
+		if not (current_sel_path or current_sel_flags & (eServiceReference.isDirectory|eServiceReference.isMarker)):
 			append_when_current_valid(current, menu, (_("show transponder info"), self.showServiceInformations), level = 2)
 		if csel.bouquet_mark_edit == OFF and not csel.movemode:
 			if not inBouquetRootList:
@@ -317,11 +317,24 @@ class ChannelSelectionEPG:
 
 	def showEPGList(self):
 		ref=self.getCurrentSelection()
-		ptr=eEPGCache.getInstance()
-		if ptr.startTimeQuery(ref) != -1:
-			self.session.open(EPGSelection, ref)
-		else:
-			print 'no epg for service', ref.toString()
+		if ref:
+			self.savedService = ref
+			self.session.openWithCallback(self.SingleServiceEPGClosed, EPGSelection, ref, serviceChangeCB=self.changeServiceCB)
+
+	def SingleServiceEPGClosed(self, ret=False):
+		self.setCurrentSelection(self.savedService)
+
+	def changeServiceCB(self, direction, epg):
+		beg = self.getCurrentSelection()
+		while True:
+			if direction > 0:
+				self.moveDown()
+			else:
+				self.moveUp()
+			cur = self.getCurrentSelection()
+			if cur == beg or not (cur.flags & eServiceReference.isMarker):
+				break
+		epg.setService(ServiceReference(self.getCurrentSelection()))
 
 class ChannelSelectionEdit:
 	def __init__(self):
@@ -558,7 +571,7 @@ class ChannelSelectionEdit:
 		del self.servicePath[:] # remove all elements
 		self.servicePath += self.savedPath # add saved elements
 		del self.savedPath
-		self.setRoot(self.servicePath[len(self.servicePath)-1])
+		self.setRoot(self.servicePath[-1])
 
 	def clearMarks(self):
 		self.servicelist.clearMarks()
@@ -781,13 +794,13 @@ class ChannelSelectionBase(Screen):
 
 	def getServiceName(self, ref):
 		str = self.removeModeStr(ServiceReference(ref).getServiceName())
-		if not len(str):
+		if not str:
 			pathstr = ref.getPath()
-			if pathstr.find('FROM PROVIDERS') != -1:
+			if 'FROM PROVIDERS' in pathstr:
 				return _("Provider")
-			if pathstr.find('FROM SATELLITES') != -1:
+			if 'FROM SATELLITES' in pathstr:
 				return _("Satellites")
-			if pathstr.find(') ORDER BY name') != -1:
+			if ') ORDER BY name' in pathstr:
 				return _("All")
 		return str
 
@@ -831,9 +844,8 @@ class ChannelSelectionBase(Screen):
 
 	def pathUp(self, justSet=False):
 		prev = self.servicePath.pop()
-		length = len(self.servicePath)
-		if length:
-			current = self.servicePath[length-1]
+		if self.servicePath:
+			current = self.servicePath[-1]
 			self.setRoot(current, justSet)
 			if not justSet:
 				self.setCurrentSelection(prev)
@@ -961,7 +973,7 @@ class ChannelSelectionBase(Screen):
 				self.enterPath(ref)
 
 	def inBouquet(self):
-		if len(self.servicePath) > 0 and self.servicePath[0] == self.bouquet_root:
+		if self.servicePath and self.servicePath[0] == self.bouquet_root:
 			return True
 		return False
 
@@ -1235,8 +1247,7 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit, ChannelSelect
 		del self.servicePath[:]
 		self.servicePath += path
 		self.saveRoot()
-		plen = len(path)
-		root = path[plen-1]
+		root = path[-1]
 		cur_root = self.getRoot()
 		if cur_root and cur_root != root:
 			self.setRoot(root)
@@ -1249,7 +1260,7 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit, ChannelSelect
 		for i in self.servicePath:
 			path += i.toString()
 			path += ';'
-		if len(path) and path != self.lastroot.value:
+		if path and path != self.lastroot.value:
 			self.lastroot.value = path
 			self.lastroot.save()
 
@@ -1259,7 +1270,7 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit, ChannelSelect
 		tmp = re.findall(self.lastroot.value)
 		cnt = 0
 		for i in tmp:
-			self.servicePath.append(eServiceReference(i[:len(i)-1]))
+			self.servicePath.append(eServiceReference(i[:-1]))
 			cnt += 1
 		if cnt:
 			path = self.servicePath.pop()
@@ -1269,7 +1280,7 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit, ChannelSelect
 			self.saveRoot()
 
 	def preEnterPath(self, refstr):
-		if len(self.servicePath) and self.servicePath[0] != eServiceReference(refstr):
+		if self.servicePath and self.servicePath[0] != eServiceReference(refstr):
 			pathstr = self.lastroot.value
 			if pathstr is not None and pathstr.find(refstr) == 0:
 				self.restoreRoot()
@@ -1289,16 +1300,14 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit, ChannelSelect
 			self.lastservice.save()
 
 	def setCurrentServicePath(self, path):
-		hlen = len(self.history)
-		if hlen > 0:
+		if self.history:
 			self.history[self.history_pos] = path
 		else:
 			self.history.append(path)
 		self.setHistoryPath()
 
 	def getCurrentServicePath(self):
-		hlen = len(self.history)
-		if hlen > 0:
+		if self.history:
 			return self.history[self.history_pos]
 		return None
 
@@ -1411,7 +1420,7 @@ class ChannelSelectionRadio(ChannelSelectionBase, ChannelSelectionEdit, ChannelS
 		for i in self.servicePathRadio:
 			path += i.toString()
 			path += ';'
-		if len(path) and path != config.radio.lastroot.value:
+		if path and path != config.radio.lastroot.value:
 			config.radio.lastroot.value = path
 			config.radio.lastroot.save()
 
@@ -1421,7 +1430,7 @@ class ChannelSelectionRadio(ChannelSelectionBase, ChannelSelectionEdit, ChannelS
 		tmp = re.findall(config.radio.lastroot.value)
 		cnt = 0
 		for i in tmp:
-			self.servicePathRadio.append(eServiceReference(i[:len(i)-1]))
+			self.servicePathRadio.append(eServiceReference(i[:-1]))
 			cnt += 1
 		if cnt:
 			path = self.servicePathRadio.pop()
@@ -1431,7 +1440,7 @@ class ChannelSelectionRadio(ChannelSelectionBase, ChannelSelectionEdit, ChannelS
 			self.saveRoot()
 
 	def preEnterPath(self, refstr):
-		if len(self.servicePathRadio) and self.servicePathRadio[0] != eServiceReference(refstr):
+		if self.servicePathRadio and self.servicePathRadio[0] != eServiceReference(refstr):
 			pathstr = config.radio.lastroot.value
 			if pathstr is not None and pathstr.find(refstr) == 0:
 				self.restoreRoot()
diff --git a/lib/python/Screens/ChoiceBox.py b/lib/python/Screens/ChoiceBox.py
index 4739b7e1..7c8b1427 100644
--- a/lib/python/Screens/ChoiceBox.py
+++ b/lib/python/Screens/ChoiceBox.py
@@ -5,9 +5,13 @@ from Components.ChoiceList import ChoiceEntryComponent, ChoiceList
 from Components.Sources.StaticText import StaticText
 
 class ChoiceBox(Screen):
-	def __init__(self, session, title = "", list = [], keys = None, selection = 0):
+	def __init__(self, session, title = "", list = [], keys = None, selection = 0, skin_name = []):
 		Screen.__init__(self, session)
 
+		if isinstance(skin_name, str):
+			skin_name = [skin_name]
+		self.skinName = skin_name + ["ChoiceBox"] 
+
 		self["text"] = Label(title)
 		self.list = []
 		self.summarylist = []
diff --git a/lib/python/Screens/Ci.py b/lib/python/Screens/Ci.py
index 5028301e..0fb0feeb 100644
--- a/lib/python/Screens/Ci.py
+++ b/lib/python/Screens/Ci.py
@@ -12,11 +12,21 @@ from enigma import eTimer, eDVBCI_UI, eDVBCIInterfaces
 
 MAX_NUM_CI = 4
 
+def setCIBitrate(configElement):
+	if configElement.value == "no":
+		eDVBCI_UI.getInstance().setClockRate(configElement.slotid, eDVBCI_UI.rateNormal)
+	else:
+		eDVBCI_UI.getInstance().setClockRate(configElement.slotid, eDVBCI_UI.rateHigh)
+
 def InitCiConfig():
 	config.ci = ConfigSubList()
 	for slot in range(MAX_NUM_CI):
 		config.ci.append(ConfigSubsection())
 		config.ci[slot].canDescrambleMultipleServices = ConfigSelection(choices = [("auto", _("Auto")), ("no", _("No")), ("yes", _("Yes"))], default = "auto")
+		if SystemInfo["CommonInterfaceSupportsHighBitrates"]:
+			config.ci[slot].canHandleHighBitrates = ConfigSelection(choices = [("no", _("No")), ("yes", _("Yes"))], default = "no")
+			config.ci[slot].canHandleHighBitrates.slotid = slot
+			config.ci[slot].canHandleHighBitrates.addNotifier(setCIBitrate)
 
 class MMIDialog(Screen):
 	def __init__(self, session, slotid, action, handler = eDVBCI_UI.getInstance(), wait_text = _("wait for ci...") ):
@@ -121,7 +131,7 @@ class MMIDialog(Screen):
 		elif self.tag == "WAIT":
 			self.handler.stopMMI(self.slotid)
 			self.closeMmi()
-		elif self.tag in [ "MENU", "LIST" ]:
+		elif self.tag in ( "MENU", "LIST" ):
 			print "cancel list"
 			self.handler.answerMenu(self.slotid, 0)
 			self.showWait()
@@ -226,7 +236,13 @@ class CiMessageHandler:
 		self.ci = { }
 		self.dlgs = { }
 		eDVBCI_UI.getInstance().ciStateChanged.get().append(self.ciStateChanged)
-		SystemInfo["CommonInterface"]= eDVBCIInterfaces.getInstance().getNumOfSlots() > 0
+		SystemInfo["CommonInterface"] = eDVBCIInterfaces.getInstance().getNumOfSlots() > 0
+		try:
+			file = open("/proc/stb/tsmux/ci0_tsclk", "r")
+			file.close()
+			SystemInfo["CommonInterfaceSupportsHighBitrates"] = True
+		except:
+			SystemInfo["CommonInterfaceSupportsHighBitrates"] = False
 
 	def setSession(self, session):
 		self.session = session
@@ -285,7 +301,7 @@ class CiSelection(Screen):
 
 	def selectionChanged(self):
 		cur_idx = self["entries"].getCurrentIndex()
-		self["text"].setText(_("Slot %d")%((cur_idx / 4)+1))
+		self["text"].setText(_("Slot %d")%((cur_idx / 5)+1))
 
 	def keyConfigEntry(self, key):
 		try:
@@ -315,6 +331,8 @@ class CiSelection(Screen):
 			self.list.append( (appname, ConfigNothing(), 2, slot) )
 
 		self.list.append(getConfigListEntry(_("Multiple service support"), config.ci[slot].canDescrambleMultipleServices))
+		if SystemInfo["CommonInterfaceSupportsHighBitrates"]:
+			self.list.append(getConfigListEntry(_("High bitrate support"), config.ci[slot].canHandleHighBitrates))
 
 	def updateState(self, slot):
 		state = eDVBCI_UI.getInstance().getState(slot)
diff --git a/lib/python/Screens/Console.py b/lib/python/Screens/Console.py
index c6b156cf..2058c041 100644
--- a/lib/python/Screens/Console.py
+++ b/lib/python/Screens/Console.py
@@ -11,7 +11,6 @@ class Console(Screen):
 		</screen>"""
 		
 	def __init__(self, session, title = "Console", cmdlist = None, finishedCallback = None, closeOnSuccess = False):
-		self.skin = Console.skin
 		Screen.__init__(self, session)
 
 		self.finishedCallback = finishedCallback
@@ -68,4 +67,4 @@ class Console(Screen):
 			self.container.dataAvail.remove(self.dataAvail)
 
 	def dataAvail(self, str):
-		self["text"].setText(self["text"].getText() + str)
\ No newline at end of file
+		self["text"].setText(self["text"].getText() + str)
diff --git a/lib/python/Screens/DefaultWizard.py b/lib/python/Screens/DefaultWizard.py
index 9883dc8e..73b07acf 100644
--- a/lib/python/Screens/DefaultWizard.py
+++ b/lib/python/Screens/DefaultWizard.py
@@ -96,8 +96,6 @@ def filescan_open(list, session, **kwargs):
 
 def filescan(**kwargs):
 	from Components.Scanner import Scanner, ScanPath
-	from mimetypes import add_type
-	add_type("application/x-dream-package", "dmpkg")
 	return \
 		Scanner(mimetypes = ["application/x-dream-package"], 
 			paths_to_scan = 
@@ -106,7 +104,7 @@ def filescan(**kwargs):
 					ScanPath(path = "", with_subdirs = False), 
 				], 
 			name = "Dream-Package", 
-			description = "Install settings, skins, software...", 
+			description = _("Install settings, skins, software..."), 
 			openfnc = filescan_open, )
 
 print "add dreampackage scanner plugin"
diff --git a/lib/python/Screens/EpgSelection.py b/lib/python/Screens/EpgSelection.py
index e7388fc2..d09ed004 100644
--- a/lib/python/Screens/EpgSelection.py
+++ b/lib/python/Screens/EpgSelection.py
@@ -25,12 +25,14 @@ class EPGSelection(Screen):
 	
 	ZAP = 1
 
-	def __init__(self, session, service, zapFunc=None, eventid=None, bouquetChangeCB=None):
+	def __init__(self, session, service, zapFunc=None, eventid=None, bouquetChangeCB=None, serviceChangeCB=None):
 		Screen.__init__(self, session)
 		self.bouquetChangeCB = bouquetChangeCB
+		self.serviceChangeCB = serviceChangeCB
 		self.ask_time = -1 #now
 		self["key_red"] = Button("")
 		self.closeRecursive = False
+		self.saved_title = None
 		if isinstance(service, str) and eventid != None:
 			self.type = EPG_TYPE_SIMILAR
 			self["key_yellow"] = Button()
@@ -68,7 +70,7 @@ class EPGSelection(Screen):
 		self["key_green"] = Button(_("Add timer"))
 		self.key_green_choice = self.ADD_TIMER
 		self.key_red_choice = self.EMPTY
-		self["list"] = EPGList(type = self.type, selChangedCB = self.onSelectionChanged, timer = self.session.nav.RecordTimer)
+		self["list"] = EPGList(type = self.type, selChangedCB = self.onSelectionChanged, timer = session.nav.RecordTimer)
 
 		self["actions"] = ActionMap(["EPGSelectActions", "OkCancelActions"],
 			{
@@ -80,11 +82,12 @@ class EPGSelection(Screen):
 				"info": self.infoKeyPressed,
 				"red": self.zapTo,
 				"input_date_time": self.enterDateTime,
-				"nextBouquet": self.nextBouquet,
-				"prevBouquet": self.prevBouquet
+				"nextBouquet": self.nextBouquet, # just used in multi epg yet
+				"prevBouquet": self.prevBouquet, # just used in multi epg yet
+				"nextService": self.nextService, # just used in single epg yet
+				"prevService": self.prevService, # just used in single epg yet
 			})
 		self["actions"].csel = self
-
 		self.onLayoutFinish.append(self.onCreate)
 
 	def nextBouquet(self):
@@ -95,6 +98,14 @@ class EPGSelection(Screen):
 		if self.bouquetChangeCB:
 			self.bouquetChangeCB(-1, self)
 
+	def nextService(self):
+		if self.serviceChangeCB:
+			self.serviceChangeCB(1, self)
+
+	def prevService(self):
+		if self.serviceChangeCB:
+			self.serviceChangeCB(-1, self)
+
 	def enterDateTime(self):
 		if self.type == EPG_TYPE_MULTI:
 			global mepg_config_initialized
@@ -129,6 +140,10 @@ class EPGSelection(Screen):
 		self.services = services
 		self.onCreate()
 
+	def setService(self, service):
+		self.currentService = service
+		self.onCreate()
+
 	#just used in multipeg
 	def onCreate(self):
 		l = self["list"]
@@ -137,7 +152,12 @@ class EPGSelection(Screen):
 			l.fillMultiEPG(self.services, self.ask_time)
 			l.moveToService(self.session.nav.getCurrentlyPlayingServiceReference())
 		elif self.type == EPG_TYPE_SINGLE:
-			l.fillSingleEPG(self.currentService)
+			service = self.currentService
+			if self.saved_title is None:
+				self.saved_title = self.instance.getTitle()
+			title = self.saved_title + ' - ' + service.getServiceName()
+			self.instance.setTitle(title)
+			l.fillSingleEPG(service)
 		else:
 			l.fillSimilarList(self.currentService, self.eventid)
 
diff --git a/lib/python/Screens/EventView.py b/lib/python/Screens/EventView.py
index 6aed1e11..c1ffb585 100644
--- a/lib/python/Screens/EventView.py
+++ b/lib/python/Screens/EventView.py
@@ -20,7 +20,7 @@ class EventViewBase:
 		self.similarEPGCB = similarEPGCB
 		self.cbFunc = callback
 		self.currentService=Ref
-		self.isRecording = (not Ref.ref.flags & eServiceReference.isGroup) and len(Ref.ref.getPath())
+		self.isRecording = (not Ref.ref.flags & eServiceReference.isGroup) and Ref.ref.getPath()
 		self.event = Event
 		self["epg_description"] = ScrollLabel()
 		self["datetime"] = Label()
@@ -71,6 +71,8 @@ class EventViewBase:
 		self.key_green_choice = self.ADD_TIMER
 	
 	def timerAdd(self):
+		if self.isRecording:
+			return
 		event = self.event
 		serviceref = self.currentService
 		if event is None:
@@ -134,12 +136,12 @@ class EventViewBase:
 		text = event.getEventName()
 		short = event.getShortDescription()
 		ext = event.getExtendedDescription()
-		if len(short) > 0 and short != text:
-			text = text + '\n\n' + short
-		if len(ext) > 0:
-			if len(text) > 0:
-				text = text + '\n\n'
-			text = text + ext
+		if short and short != text:
+			text += '\n\n' + short
+		if ext:
+			if text:
+				text += '\n\n'
+			text += ext
 
 		self.setTitle(event.getEventName())
 		self["epg_description"].setText(text)
@@ -189,7 +191,7 @@ class EventViewBase:
 			self["key_red"].setText(_("Similar"))
 
 	def openSimilarList(self):
-		if self.similarEPGCB is not None and len(self["key_red"].getText()):
+		if self.similarEPGCB is not None and self["key_red"].getText():
 			id = self.event and self.event.getEventId()
 			refstr = str(self.currentService)
 			if id is not None:
diff --git a/lib/python/Screens/HarddiskSetup.py b/lib/python/Screens/HarddiskSetup.py
index 19a674ec..c9f069fe 100644
--- a/lib/python/Screens/HarddiskSetup.py
+++ b/lib/python/Screens/HarddiskSetup.py
@@ -39,7 +39,7 @@ class HarddiskSetup(Screen):
 		Screen.__init__(self, session)
 		self.hdd = hdd
 
-		if type not in [self.HARDDISK_INITIALIZE, self.HARDDISK_CHECK]:
+		if type not in (self.HARDDISK_INITIALIZE, self.HARDDISK_CHECK):
 			self.type = self.HARDDISK_INITIALIZE
 		else:
 			self.type = type
diff --git a/lib/python/Screens/HelpMenu.py b/lib/python/Screens/HelpMenu.py
index abef38db..74882a35 100644
--- a/lib/python/Screens/HelpMenu.py
+++ b/lib/python/Screens/HelpMenu.py
@@ -29,13 +29,13 @@ class HelpMenu(Screen, Rc):
 		#arrow = self["arrowup"]
 		print "selection:", selection
 
-		if selection and len(selection) > 1 and selection[1] == "SHIFT":
-			self.selectKey("SHIFT")
-
-		if selection and len(selection) > 1 and selection[1] == "long":
-			self["long_key"].setText(_("Long Keypress"))
-		else:
-			self["long_key"].setText("")
+		longText = ""
+		if selection and len(selection) > 1:
+			if selection[1] == "SHIFT":
+				self.selectKey("SHIFT")
+			elif selection[1] == "long":
+				longText = _("Long Keypress")
+		self["long_key"].setText(longText)
 
 		self.selectKey(selection[0])
 		#if selection is None:
@@ -55,6 +55,6 @@ class HelpableScreen:
 		self.session.openWithCallback(self.callHelpAction, HelpMenu, self.helpList)
 
 	def callHelpAction(self, *args):
-		if len(args):
+		if args:
 			(actionmap, context, action) = args
 			actionmap.action(context, action)
diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index bd9ea182..4d92bd39 100644
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -148,8 +148,8 @@ class MoviePlayer(InfoBarBase, InfoBarShowHide, \
 				InfoBarPlugins:
 			x.__init__(self)
 
-		self.lastservice = self.session.nav.getCurrentlyPlayingServiceReference()
-		self.session.nav.playService(service)
+		self.lastservice = session.nav.getCurrentlyPlayingServiceReference()
+		session.nav.playService(service)
 		self.returning = False
 		self.onClose.append(self.__onClose)
 
diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index a50c10be..c1618184 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -369,25 +369,66 @@ class InfoBarSimpleEventView:
 			})
 
 	def openEventView(self):
-		self.epglist = [ ]
+		epglist = [ ]
+		self.epglist = epglist
 		service = self.session.nav.getCurrentService()
 		ref = self.session.nav.getCurrentlyPlayingServiceReference()
 		info = service.info()
 		ptr=info.getEvent(0)
 		if ptr:
-			self.epglist.append(ptr)
+			epglist.append(ptr)
 		ptr=info.getEvent(1)
 		if ptr:
-			self.epglist.append(ptr)
-		if len(self.epglist) > 0:
-			self.session.open(EventViewSimple, self.epglist[0], ServiceReference(ref), self.eventViewCallback)
+			epglist.append(ptr)
+		if epglist:
+			self.session.open(EventViewSimple, epglist[0], ServiceReference(ref), self.eventViewCallback)
 
 	def eventViewCallback(self, setEvent, setService, val): #used for now/next displaying
-		if len(self.epglist) > 1:
-			tmp = self.epglist[0]
-			self.epglist[0]=self.epglist[1]
-			self.epglist[1]=tmp
-			setEvent(self.epglist[0])
+		epglist = self.epglist
+		if len(epglist) > 1:
+			tmp = epglist[0]
+			epglist[0] = epglist[1]
+			epglist[1] = tmp
+			setEvent(epglist[0])
+
+class SimpleServicelist:
+	def __init__(self, services):
+		self.services = services
+		self.length = len(services)
+		self.current = 0
+
+	def selectService(self, service):
+		if not self.length:
+			self.current = -1
+			return False
+		else:
+			self.current = 0
+			while self.services[self.current].ref != service:
+				self.current += 1
+				if self.current >= self.length:
+					return False
+		return True
+
+	def nextService(self):
+		if not self.length:
+			return
+		if self.current+1 < self.length:
+			self.current += 1
+		else:
+			self.current = 0
+
+	def prevService(self):
+		if not self.length:
+			return
+		if self.current-1 > -1:
+			self.current -= 1
+		else:
+			self.current = self.length - 1
+
+	def currentService(self):
+		if not self.length or self.current >= self.length:
+			return None
+		return self.services[self.current]
 
 class InfoBarEPG:
 	""" EPG - Opens an EPG list when the showEPGList action fires """
@@ -440,7 +481,7 @@ class InfoBarEPG:
 
 	def openBouquetEPG(self, bouquet, withCallback=True):
 		services = self.getBouquetServices(bouquet)
-		if len(services):
+		if services:
 			self.epg_bouquet = bouquet
 			if withCallback:
 				self.dlg_stack.append(self.session.openWithCallback(self.closed, EPGSelection, services, self.zapToService, None, self.changeBouquetCB))
@@ -455,7 +496,7 @@ class InfoBarEPG:
 				self.bouquetSel.up()
 			bouquet = self.bouquetSel.getCurrent()
 			services = self.getBouquetServices(bouquet)
-			if len(services):
+			if services:
 				self.epg_bouquet = bouquet
 				epg.setServices(services)
 
@@ -485,19 +526,40 @@ class InfoBarEPG:
 		elif cnt == 1:
 			self.openBouquetEPG(bouquets[0][1], withCallback)
 
+	def changeServiceCB(self, direction, epg):
+		if self.serviceSel:
+			if direction > 0:
+				self.serviceSel.nextService()
+			else:
+				self.serviceSel.prevService()
+			epg.setService(self.serviceSel.currentService())
+
+	def SingleServiceEPGClosed(self, ret=False):
+		self.serviceSel = None
+
 	def openSingleServiceEPG(self):
 		ref=self.session.nav.getCurrentlyPlayingServiceReference()
-		self.session.open(EPGSelection, ref)
+		if ref:
+			if self.servicelist.getMutableList() is not None: # bouquet in channellist
+				current_path = self.servicelist.getRoot()
+				services = self.getBouquetServices(current_path)
+				self.serviceSel = SimpleServicelist(services)
+				if self.serviceSel.selectService(ref):
+					self.session.openWithCallback(self.SingleServiceEPGClosed, EPGSelection, ref, serviceChangeCB = self.changeServiceCB)
+				else:
+					self.session.openWithCallback(self.SingleServiceEPGClosed, EPGSelection, ref)
+			else:
+				self.session.open(EPGSelection, ref)
 
 	def showEventInfoPlugins(self):
 		list = [(p.name, boundFunction(self.runPlugin, p)) for p in plugins.getPlugins(where = PluginDescriptor.WHERE_EVENTINFO)]
 
 		if list:
 			list.append((_("show single service EPG..."), self.openSingleServiceEPG))
-			self.session.openWithCallback(self.EventInfoPluginChosen, ChoiceBox, title=_("Please choose an extension..."), list = list)
+			self.session.openWithCallback(self.EventInfoPluginChosen, ChoiceBox, title=_("Please choose an extension..."), list = list, skin_name = "EPGExtensionsList")
 		else:
 			self.openSingleServiceEPG()
-			
+
 	def runPlugin(self, plugin):
 		plugin(session = self.session, servicelist = self.servicelist)
 		
@@ -621,11 +683,6 @@ class InfoBarSeek:
 				iPlayableService.evEOF: self.__evEOF,
 				iPlayableService.evSOF: self.__evSOF,
 			})
-		self.eofState = 0
-		self.eofTimer = eTimer()
-		self.eofTimer.timeout.get().append(self.doEof)
-		self.eofInhibitTimer = eTimer()
-		self.eofInhibitTimer.timeout.get().append(self.inhibitEof)
 
 		self.minSpeedBackward = useSeekBackHack and 16 or 0
 
@@ -642,9 +699,9 @@ class InfoBarSeek:
 					return 1
 				elif action[:8] == "seekdef:":
 					key = int(action[8:])
-					time = [-config.seek.selfdefined_13.value, False, config.seek.selfdefined_13.value,
+					time = (-config.seek.selfdefined_13.value, False, config.seek.selfdefined_13.value,
 						-config.seek.selfdefined_46.value, False, config.seek.selfdefined_46.value,
-						-config.seek.selfdefined_79.value, False, config.seek.selfdefined_79.value][key-1]
+						-config.seek.selfdefined_79.value, False, config.seek.selfdefined_79.value)[key-1]
 					self.screen.doSeekRelative(time * 90000)
 					return 1					
 				else:
@@ -761,9 +818,6 @@ class InfoBarSeek:
 	def __serviceStarted(self):
 		self.seekstate = self.SEEK_STATE_PLAY
 		self.__seekableStatusChanged()
-		if self.eofState != 0:
-			self.eofTimer.stop()
-		self.eofState = 0
 
 	def setSeekState(self, state):
 		service = self.session.nav.getCurrentService()
@@ -772,7 +826,7 @@ class InfoBarSeek:
 			return False
 
 		if not self.isSeekable():
-			if state not in [self.SEEK_STATE_PLAY, self.SEEK_STATE_PAUSE]:
+			if state not in (self.SEEK_STATE_PLAY, self.SEEK_STATE_PAUSE):
 				state = self.SEEK_STATE_PLAY
 
 		pauseable = service.pause()
@@ -834,16 +888,6 @@ class InfoBarSeek:
 		seekable = self.getSeek()
 		if seekable is None:
 			return
-		prevstate = self.seekstate
-		if self.eofState == 1:
-			self.eofState = 2
-			self.inhibitEof()
-		if self.seekstate == self.SEEK_STATE_EOF:
-			if prevstate == self.SEEK_STATE_PAUSE:
-				self.setSeekState(self.SEEK_STATE_PAUSE)
-			else:
-				self.setSeekState(self.SEEK_STATE_PLAY)
-		self.eofInhibitTimer.start(200, True)
 		seekable.seekTo(pts)
 
 	def doSeekRelative(self, pts):
@@ -851,15 +895,12 @@ class InfoBarSeek:
 		if seekable is None:
 			return
 		prevstate = self.seekstate
-		if self.eofState == 1:
-			self.eofState = 2
-			self.inhibitEof()
+
 		if self.seekstate == self.SEEK_STATE_EOF:
 			if prevstate == self.SEEK_STATE_PAUSE:
 				self.setSeekState(self.SEEK_STATE_PAUSE)
 			else:
 				self.setSeekState(self.SEEK_STATE_PLAY)
-		self.eofInhibitTimer.start(200, True)
 		seekable.seekRelative(pts<0 and -1 or 1, abs(pts))
 		if abs(pts) > 100 and config.usage.show_infobar_on_skip.value:
 			self.showAfterSeek()
@@ -894,30 +935,31 @@ class InfoBarSeek:
 			self.setSeekState(self.makeStateSlowMotion(speed))
 
 	def seekBack(self):
-		if self.seekstate == self.SEEK_STATE_PLAY:
+		seekstate = self.seekstate
+		if seekstate == self.SEEK_STATE_PLAY:
 			self.setSeekState(self.makeStateBackward(int(config.seek.enter_backward.value)))
-		elif self.seekstate == self.SEEK_STATE_EOF:
+		elif seekstate == self.SEEK_STATE_EOF:
 			self.setSeekState(self.makeStateBackward(int(config.seek.enter_backward.value)))
 			self.doSeekRelative(-6)
-		elif self.seekstate == self.SEEK_STATE_PAUSE:
+		elif seekstate == self.SEEK_STATE_PAUSE:
 			self.doSeekRelative(-3)
-		elif self.isStateForward(self.seekstate):
-			speed = self.seekstate[1]
-			if self.seekstate[2]:
-				speed /= self.seekstate[2]
+		elif self.isStateForward(seekstate):
+			speed = seekstate[1]
+			if seekstate[2]:
+				speed /= seekstate[2]
 			speed = self.getLower(speed, config.seek.speeds_forward.value)
 			if speed:
 				self.setSeekState(self.makeStateForward(speed))
 			else:
 				self.setSeekState(self.SEEK_STATE_PLAY)
-		elif self.isStateBackward(self.seekstate):
-			speed = -self.seekstate[1]
-			if self.seekstate[2]:
-				speed /= self.seekstate[2]
+		elif self.isStateBackward(seekstate):
+			speed = -seekstate[1]
+			if seekstate[2]:
+				speed /= seekstate[2]
 			speed = self.getHigher(speed, config.seek.speeds_backward.value) or config.seek.speeds_backward.value[-1]
 			self.setSeekState(self.makeStateBackward(speed))
-		elif self.isStateSlowMotion(self.seekstate):
-			speed = self.getHigher(self.seekstate[2], config.seek.speeds_slowmotion.value)
+		elif self.isStateSlowMotion(seekstate):
+			speed = self.getHigher(seekstate[2], config.seek.speeds_slowmotion.value)
 			if speed:
 				self.setSeekState(self.makeStateSlowMotion(speed))
 			else:
@@ -970,44 +1012,19 @@ class InfoBarSeek:
 		return False
 		
 	def __evEOF(self):
-		if self.eofState == 0 and self.seekstate != self.SEEK_STATE_EOF:
-			self.eofState = 1
-			time = self.calcRemainingTime()
-			if not time:
-				time = 3000   # Failed to calc, use default
-			elif time == 0:
-				time = 300    # Passed end, shortest wait
-			elif time > 15000:
-				self.eofState = -2  # Too long, block eof
-				time = 15000
-			else:
-				time += 1000  # Add margin
-			self.eofTimer.start(time, True)
-
-	def inhibitEof(self):
-		if self.eofState >= 1:
-			self.eofState = -self.eofState
-			self.eofTimer.stop()
-			self.doEof()
-
-	def doEof(self):
 		if self.seekstate == self.SEEK_STATE_EOF:
 			return
-		if self.eofState == -2 or self.isStateBackward(self.seekstate):
-			self.eofState = 0
-			return
 
-		# if we are seeking, we try to end up ~1s before the end, and pause there.
-		eofstate = self.eofState
+		# if we are seeking forward, we try to end up ~1s before the end, and pause there.
 		seekstate = self.seekstate
-		self.eofState = 0
-		if not self.seekstate == self.SEEK_STATE_PAUSE:
+		if self.seekstate != self.SEEK_STATE_PAUSE:
 			self.setSeekState(self.SEEK_STATE_EOF)
-		if eofstate == -1 or not seekstate in [self.SEEK_STATE_PLAY, self.SEEK_STATE_PAUSE]:
+
+		if seekstate not in (self.SEEK_STATE_PLAY, self.SEEK_STATE_PAUSE): # if we are seeking
 			seekable = self.getSeek()
 			if seekable is not None:
 				seekable.seekTo(-1)
-		if eofstate == 1 and seekstate == self.SEEK_STATE_PLAY:
+		if seekstate == self.SEEK_STATE_PLAY: # regular EOF
 			self.doEofInternal(True)
 		else:
 			self.doEofInternal(False)
@@ -1284,7 +1301,7 @@ class InfoBarExtensions:
 		list.extend([(x[0](), x) for x in extensionsList])
 
 		keys += [""] * len(extensionsList)
-		self.session.openWithCallback(self.extensionCallback, ChoiceBox, title=_("Please choose an extension..."), list = list, keys = keys)
+		self.session.openWithCallback(self.extensionCallback, ChoiceBox, title=_("Please choose an extension..."), list = list, keys = keys, skin_name = "ExtensionsList")
 
 	def extensionCallback(self, answer):
 		if answer is not None:
@@ -1302,7 +1319,9 @@ class InfoBarPlugins:
 		return name
 
 	def getPluginList(self):
-		return [((boundFunction(self.getPluginName, p.name), boundFunction(self.runPlugin, p), lambda: True), None) for p in plugins.getPlugins(where = PluginDescriptor.WHERE_EXTENSIONSMENU)]
+		list = [((boundFunction(self.getPluginName, p.name), boundFunction(self.runPlugin, p), lambda: True), None, p.name) for p in plugins.getPlugins(where = PluginDescriptor.WHERE_EXTENSIONSMENU)]
+		list.sort(key = lambda e: e[2]) # sort by name
+		return list
 
 	def runPlugin(self, plugin):
 		if isinstance(self, InfoBarChannelSelection):
@@ -1489,7 +1508,7 @@ class InfoBarInstantRecord:
 
 	def isInstantRecordRunning(self):
 		print "self.recording:", self.recording
-		if len(self.recording) > 0:
+		if self.recording:
 			for x in self.recording:
 				if x.isRunning():
 					return True
@@ -1532,7 +1551,7 @@ class InfoBarInstantRecord:
 		print "after:\n", self.recording
 
 	def setEndtime(self, entry):
-		if entry is not None:
+		if entry is not None and entry >= 0:
 			self.selectedEntry = entry
 			self.endtime=ConfigClock(default = self.recording[self.selectedEntry].end)
 			dlg = self.session.openWithCallback(self.TimeDateInputClosed, TimeDateInput, self.endtime)
@@ -1549,7 +1568,7 @@ class InfoBarInstantRecord:
 				self.session.nav.RecordTimer.timeChanged(self.recording[self.selectedEntry])
 
 	def changeDuration(self, entry):
-		if entry is not None:
+		if entry is not None and entry >= 0:
 			self.selectedEntry = entry
 			self.session.openWithCallback(self.inputCallback, InputBox, title=_("How many minutes do you want to record?"), text="5", maxSize=False, type=Input.NUMBER)
 
@@ -1640,16 +1659,16 @@ class InfoBarAudioSelection:
 					break
 
 			if SystemInfo["CanDownmixAC3"]:
-				tlist = [(_("AC3 downmix") + " - " +[_("Off"), _("On")][config.av.downmix_ac3.value and 1 or 0], "CALLFUNC", self.changeAC3Downmix),
-					([_("Left"), _("Stereo"), _("Right")][self.audioChannel.getCurrentChannel()], "mode"),
+				tlist = [(_("AC3 downmix") + " - " +(_("Off"), _("On"))[config.av.downmix_ac3.value and 1 or 0], "CALLFUNC", self.changeAC3Downmix),
+					((_("Left"), _("Stereo"), _("Right"))[self.audioChannel.getCurrentChannel()], "mode"),
 					("--", "")] + tlist
 				keys = [ "red", "green", "", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0"] + [""]*n
 				selection += 3
 			else:
-				tlist = [([_("Left"), _("Stereo"), _("Right")][self.audioChannel.getCurrentChannel()], "mode"), ("--", "")] + tlist
+				tlist = [((_("Left"), _("Stereo"), _("Right"))[self.audioChannel.getCurrentChannel()], "mode"), ("--", "")] + tlist
 				keys = [ "red", "", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0"] + [""]*n
 				selection += 2
-			self.session.openWithCallback(self.audioSelected, ChoiceBox, title=_("Select audio track"), list = tlist, selection = selection, keys = keys)
+			self.session.openWithCallback(self.audioSelected, ChoiceBox, title=_("Select audio track"), list = tlist, selection = selection, keys = keys, skin_name = "AudioTrackSelection")
 		else:
 			del self.audioTracks
 
@@ -1658,7 +1677,7 @@ class InfoBarAudioSelection:
 		list = choicelist.list
 		t = list[0][1]
 		list[0][1]=(t[0], t[1], t[2], t[3], t[4], t[5], t[6],
-			_("AC3 downmix") + " - " +[_("On"), _("Off")][config.av.downmix_ac3.value and 1 or 0])
+			_("AC3 downmix") + " - " + (_("On"), _("Off"))[config.av.downmix_ac3.value and 1 or 0])
 		choicelist.setList(list)
 		if config.av.downmix_ac3.value:
 			config.av.downmix_ac3.value = False
@@ -1673,7 +1692,7 @@ class InfoBarAudioSelection:
 					keys = ["red", "green", "yellow"]
 					selection = self.audioChannel.getCurrentChannel()
 					tlist = ((_("left"), 0), (_("stereo"), 1), (_("right"), 2))
-					self.session.openWithCallback(self.modeSelected, ChoiceBox, title=_("Select audio mode"), list = tlist, selection = selection, keys = keys)
+					self.session.openWithCallback(self.modeSelected, ChoiceBox, title=_("Select audio mode"), list = tlist, selection = selection, keys = keys, skin_name ="AudioModeSelection")
 			else:
 				del self.audioChannel
 				if self.session.nav.getCurrentService().audioTracks().getNumberOfTracks() > audio[1]:
@@ -1774,7 +1793,7 @@ class InfoBarSubserviceSelection:
 				keys = ["red", "",  "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" ] + [""] * n
 				selection += 2
 
-			self.session.openWithCallback(self.subserviceSelected, ChoiceBox, title=_("Please select a subservice..."), list = tlist, selection = selection, keys = keys)
+			self.session.openWithCallback(self.subserviceSelected, ChoiceBox, title=_("Please select a subservice..."), list = tlist, selection = selection, keys = keys, skin_name = "SubserviceSelection")
 
 	def subserviceSelected(self, service):
 		del self.bouquets
@@ -2089,9 +2108,6 @@ class InfoBarSummary(Screen):
 #			<convert type="ServiceName">Reference</convert>
 #		</widget>
 
-	def __init__(self, session, parent):
-		Screen.__init__(self, session, parent = parent)
-
 class InfoBarSummarySupport:
 	def __init__(self):
 		pass
@@ -2117,9 +2133,6 @@ class InfoBarMoviePlayerSummary(Screen):
 		</widget>
 	</screen>"""
 
-	def __init__(self, session, parent):
-		Screen.__init__(self, session)
-
 class InfoBarMoviePlayerSummarySupport:
 	def __init__(self):
 		pass
@@ -2220,7 +2233,7 @@ class InfoBarServiceErrorPopupSupport:
 		else:
 			self.last_error = error
 
-		errors = {
+		error = {
 			eDVBServicePMTHandler.eventNoResources: _("No free tuner!"),
 			eDVBServicePMTHandler.eventTuneFailed: _("Tune failed!"),
 			eDVBServicePMTHandler.eventNoPAT: _("No data on transponder!\n(Timeout reading PAT)"),
@@ -2231,9 +2244,7 @@ class InfoBarServiceErrorPopupSupport:
 			eDVBServicePMTHandler.eventSOF: None,
 			eDVBServicePMTHandler.eventEOF: None,
 			eDVBServicePMTHandler.eventMisconfiguration: _("Service unavailable!\nCheck tuner configuration!"),
-		}
-
-		error = errors.get(error) #this returns None when the key not exist in the dict
+		}.get(error) #this returns None when the key not exist in the dict
 
 		if error is not None:
 			Notifications.AddPopup(text = error, type = MessageBox.TYPE_ERROR, timeout = 5, id = "ZapError")
diff --git a/lib/python/Screens/LanguageSelection.py b/lib/python/Screens/LanguageSelection.py
index 94ede08c..082daa55 100644
--- a/lib/python/Screens/LanguageSelection.py
+++ b/lib/python/Screens/LanguageSelection.py
@@ -76,21 +76,22 @@ class LanguageSelection(Screen):
 		print "ok"
 
 	def updateList(self):
-		first_time = len(self.list) == 0
+		first_time = not self.list
 
-		self.list = []
-		if len(language.getLanguageList()) == 0: # no language available => display only english
-			self.list.append(LanguageEntryComponent("en", _cached("en_EN"), "en_EN"))
+		languageList = language.getLanguageList()
+		if not languageList: # no language available => display only english
+			list = [ LanguageEntryComponent("en", _cached("en_EN"), "en_EN") ]
 		else:
-			for x in language.getLanguageList():
-				self.list.append(LanguageEntryComponent(file = x[1][2].lower(), name = _cached("%s_%s" % x[1][1:3]), index = x[0]))
-		#self.list.sort(key=lambda x: x[1][7])
+			list = [ LanguageEntryComponent(file = x[1][2].lower(), name = _cached("%s_%s" % x[1][1:3]), index = x[0]) for x in languageList]
+		self.list = list
+
+		#list.sort(key=lambda x: x[1][7])
 
 		print "updateList"
 		if first_time:
-			self["languages"].list = self.list
+			self["languages"].list = list
 		else:
-			self["languages"].updateList(self.list)
+			self["languages"].updateList(list)
 		print "done"
 
 	def changed(self):
diff --git a/lib/python/Screens/LocationBox.py b/lib/python/Screens/LocationBox.py
index fa47b1f2..61d7105d 100644
--- a/lib/python/Screens/LocationBox.py
+++ b/lib/python/Screens/LocationBox.py
@@ -163,11 +163,11 @@ class LocationBox(Screen, NumericalTextInput, HelpableScreen):
 		})
 
 		# Run some functions when shown
-		self.onShown.extend([
+		self.onShown.extend((
 			boundFunction(self.setTitle, windowTitle),
 			self.updateTarget,
 			self.showHideRename,
-		])
+		))
 
 		self.onLayoutFinish.append(self.switchToFileListOnStart)
  
@@ -241,7 +241,7 @@ class LocationBox(Screen, NumericalTextInput, HelpableScreen):
 			)
 
 	def createDirCallback(self, res):
-		if res is not None and len(res):
+		if res:
 			path = os.path.join(self["filelist"].current_directory, res)
 			if not pathExists(path):
 				if not createDir(path):
@@ -454,7 +454,7 @@ class LocationBox(Screen, NumericalTextInput, HelpableScreen):
 
 	def selectByStart(self):
 		# Don't do anything on initial call
-		if not len(self.quickselect):
+		if not self.quickselect:
 			return
 
 		# Don't select if no dir
@@ -503,16 +503,12 @@ class LocationBox(Screen, NumericalTextInput, HelpableScreen):
 		return str(type(self)) + "(" + self.text + ")"
 
 class MovieLocationBox(LocationBox):
-	skinName = "LocationBox"
-
 	def __init__(self, session, text, dir, minFree = None):
 		inhibitDirs = ["/bin", "/boot", "/dev", "/etc", "/lib", "/proc", "/sbin", "/sys", "/usr", "/var"]
 		LocationBox.__init__(self, session, text = text, currDir = dir, bookmarks = config.movielist.videodirs, autoAdd = True, editDir = True, inhibitDirs = inhibitDirs, minFree = minFree)
+		self.skinName = "LocationBox"
 
 class TimeshiftLocationBox(LocationBox):
-
-	skinName = "LocationBox" # XXX: though we could use a custom skin or inherit the hardcoded one we stick with the original :-)
-
 	def __init__(self, session):
 		inhibitDirs = ["/bin", "/boot", "/dev", "/etc", "/lib", "/proc", "/sbin", "/sys", "/usr", "/var"]
 		LocationBox.__init__(
@@ -524,8 +520,9 @@ class TimeshiftLocationBox(LocationBox):
 				autoAdd = True,
 				editDir = True,
 				inhibitDirs = inhibitDirs,
-				minFree = 1024 # XXX: the same requirement is hardcoded in servicedvb.cpp
+				minFree = 1024 # the same requirement is hardcoded in servicedvb.cpp
 		)
+		self.skinName = "LocationBox"
 
 	def cancel(self):
 		config.usage.timeshift_path.cancel()
diff --git a/lib/python/Screens/Menu.py b/lib/python/Screens/Menu.py
index 93f23dfb..5f2032f1 100644
--- a/lib/python/Screens/Menu.py
+++ b/lib/python/Screens/Menu.py
@@ -61,9 +61,6 @@ class MenuSummary(Screen):
 		</widget>
 	</screen>"""
 
-	def __init__(self, session, parent):
-		Screen.__init__(self, session, parent)
-
 class Menu(Screen):
 
 	ALLOW_SUSPEND = True
@@ -118,7 +115,7 @@ class Menu(Screen):
 		self.menuClosed(*res)
 
 	def menuClosed(self, *res):
-		if len(res) and res[0]:
+		if res and res[0]:
 			self.close(True)
 
 	def addItem(self, destList, node):
diff --git a/lib/python/Screens/MessageBox.py b/lib/python/Screens/MessageBox.py
index 8a5989c7..10485680 100644
--- a/lib/python/Screens/MessageBox.py
+++ b/lib/python/Screens/MessageBox.py
@@ -43,7 +43,7 @@ class MessageBox(Screen):
 			else:
 				self.list = [ (_("no"), 1), (_("yes"), 0) ]
 		
-		if len(self.list):
+		if self.list:
 			self["selectedChoice"].setText(self.list[0][0])
 		self["list"] = MenuList(self.list)
 
@@ -134,7 +134,7 @@ class MessageBox(Screen):
 		if self.close_on_any_key:
 			self.close(True)
 		self["list"].instance.moveSelection(direction)
-		if len(self.list):
+		if self.list:
 			self["selectedChoice"].setText(self["list"].getCurrent()[0])
 		self.stopTimer()
 
diff --git a/lib/python/Screens/MovieSelection.py b/lib/python/Screens/MovieSelection.py
index 5951653f..174a4f07 100644
--- a/lib/python/Screens/MovieSelection.py
+++ b/lib/python/Screens/MovieSelection.py
@@ -65,20 +65,20 @@ class MovieContextMenu(Screen):
 			})
 
 		menu = [(_("delete..."), self.delete)]
-		
-		for p in plugins.getPlugins(PluginDescriptor.WHERE_MOVIELIST):
-			menu.append((p.description, boundFunction(self.execPlugin, p)))
-		
+		menu.extend([(p.description, boundFunction(self.execPlugin, p)) for p in plugins.getPlugins(PluginDescriptor.WHERE_MOVIELIST)])
+
 		if config.movielist.moviesort.value == MovieList.SORT_ALPHANUMERIC:
 			menu.append((_("sort by date"), boundFunction(self.sortBy, MovieList.SORT_RECORDED)))
 		else:
 			menu.append((_("alphabetic sort"), boundFunction(self.sortBy, MovieList.SORT_ALPHANUMERIC)))
 		
-		menu.append((_("list style default"), boundFunction(self.listType, MovieList.LISTTYPE_ORIGINAL)))
-		menu.append((_("list style compact with description"), boundFunction(self.listType, MovieList.LISTTYPE_COMPACT_DESCRIPTION)))
-		menu.append((_("list style compact"), boundFunction(self.listType, MovieList.LISTTYPE_COMPACT)))
-		menu.append((_("list style single line"), boundFunction(self.listType, MovieList.LISTTYPE_MINIMAL)))
-		
+		menu.extend((
+			(_("list style default"), boundFunction(self.listType, MovieList.LISTTYPE_ORIGINAL)),
+			(_("list style compact with description"), boundFunction(self.listType, MovieList.LISTTYPE_COMPACT_DESCRIPTION)),
+			(_("list style compact"), boundFunction(self.listType, MovieList.LISTTYPE_COMPACT)),
+			(_("list style single line"), boundFunction(self.listType, MovieList.LISTTYPE_MINIMAL))
+		))
+
 		if config.movielist.description.value == MovieList.SHOW_DESCRIPTION:
 			menu.append((_("hide extended description"), boundFunction(self.showDescription, MovieList.HIDE_DESCRIPTION)))
 		else:
diff --git a/lib/python/Screens/Mute.py b/lib/python/Screens/Mute.py
index f64be901..f80267ad 100644
--- a/lib/python/Screens/Mute.py
+++ b/lib/python/Screens/Mute.py
@@ -1,6 +1,5 @@
 from Screen import Screen
 
 class Mute(Screen):
-	def __init__(self, session):
-		Screen.__init__(self, session)
+	pass
 
diff --git a/lib/python/Screens/NetworkSetup.py b/lib/python/Screens/NetworkSetup.py
index ea2d17e6..50f8c41b 100755
--- a/lib/python/Screens/NetworkSetup.py
+++ b/lib/python/Screens/NetworkSetup.py
@@ -28,8 +28,10 @@ class InterfaceList(MenuList):
 		self.l.setItemHeight(30)
 
 def InterfaceEntryComponent(index,name,default,active ):
-	res = [ (index) ]
-	res.append(MultiContentEntryText(pos=(80, 5), size=(430, 25), font=0, text=name))
+	res = [
+		(index),
+		MultiContentEntryText(pos=(80, 5), size=(430, 25), font=0, text=name)
+	]
 	num_configured_if = len(iNetwork.getConfiguredAdapters())
 	if num_configured_if >= 2:
 		if default is True:
@@ -62,7 +64,7 @@ class NetworkAdapterSelection(Screen,HelpableScreen):
 		
 		self.adapters = [(iNetwork.getFriendlyAdapterName(x),x) for x in iNetwork.getAdapterList()]
 		
-		if len(self.adapters) == 0:
+		if not self.adapters:
 			self.onFirstExecBegin.append(self.NetworkFallback)
 			
 		self["OkCancelActions"] = HelpableActionMap(self, "OkCancelActions",
@@ -232,17 +234,16 @@ class NameserverSetup(Screen, ConfigListScreen, HelpableScreen):
 
 	def createConfig(self):
 		self.nameservers = iNetwork.getNameserverList()
-		self.nameserverEntries = []
-		
-		for nameserver in self.nameservers:
-			self.nameserverEntries.append(NoSave(ConfigIP(default=nameserver)))
+		self.nameserverEntries = [ NoSave(ConfigIP(default=nameserver)) for nameserver in self.nameservers]
 
 	def createSetup(self):
 		self.list = []
-		
-		for i in range(len(self.nameserverEntries)):
-			self.list.append(getConfigListEntry(_("Nameserver %d") % (i + 1), self.nameserverEntries[i]))
-		
+
+		i = 1
+		for x in self.nameserverEntries:
+			self.list.append(getConfigListEntry(_("Nameserver %d") % (i), x))
+			i += 1
+
 		self["config"].list = self.list
 		self["config"].l.setList(self.list)
 
diff --git a/lib/python/Screens/NumericalTextInputHelpDialog.py b/lib/python/Screens/NumericalTextInputHelpDialog.py
index 39c644b9..e0979587 100644
--- a/lib/python/Screens/NumericalTextInputHelpDialog.py
+++ b/lib/python/Screens/NumericalTextInputHelpDialog.py
@@ -4,7 +4,7 @@ from Components.Label import Label
 class NumericalTextInputHelpDialog(Screen):
 	def __init__(self, session, textinput):
 		Screen.__init__(self, session)
-		for x in range(1, 10):
+		for x in (1, 2, 3, 4, 5, 6, 7, 8, 9):
 			self["key%d" % x] = Label(text=textinput.mapping[x].encode("utf-8"))
 		self.last_marked = 0
 
diff --git a/lib/python/Screens/PVRState.py b/lib/python/Screens/PVRState.py
index 8b90c420..891379ca 100644
--- a/lib/python/Screens/PVRState.py
+++ b/lib/python/Screens/PVRState.py
@@ -8,5 +8,5 @@ class PVRState(Screen):
 		self["state"] = Label(text="")
 
 class TimeshiftState(PVRState):
-	def __init__(self, session):
-		PVRState.__init__(self, session)
+	pass
+
diff --git a/lib/python/Screens/ParentalControlSetup.py b/lib/python/Screens/ParentalControlSetup.py
index 6ae12cae..4c63dd5c 100644
--- a/lib/python/Screens/ParentalControlSetup.py
+++ b/lib/python/Screens/ParentalControlSetup.py
@@ -215,9 +215,7 @@ class ParentalControlEditor(Screen):
 		if result is not None:
 			print "result:", result
 			self.currentLetter = result[1]
-			self.list = []
-			for x in self.servicesList[result[1]]:
-				self.list.append(ParentalControlEntryComponent(x[0], x[1], parentalControl.getProtectionLevel(x[0]) != -1))
+			self.list = [ParentalControlEntryComponent(x[0], x[1], parentalControl.getProtectionLevel(x[0]) != -1) for x in self.servicesList[result[1]]]
 			self.servicelist.setList(self.list)
 		else:
 			parentalControl.save()
diff --git a/lib/python/Screens/PluginBrowser.py b/lib/python/Screens/PluginBrowser.py
index 0f6ee746..cd17e2e0 100644
--- a/lib/python/Screens/PluginBrowser.py
+++ b/lib/python/Screens/PluginBrowser.py
@@ -51,11 +51,9 @@ class PluginBrowser(Screen):
 		plugin(session=self.session)
 		
 	def updateList(self):
-		self.list = [ ]
 		self.pluginlist = plugins.getPlugins(PluginDescriptor.WHERE_PLUGINMENU)
-		for plugin in self.pluginlist:
-			self.list.append(PluginEntryComponent(plugin))
-		
+		self.list = [PluginEntryComponent(plugin) for plugin in self.pluginlist]
+
 		self["list"].l.setList(self.list)
 
 	def delete(self):
@@ -187,7 +185,7 @@ class PluginDownloadBrowser(Screen):
 						self.pluginlist.append(plugin)
 	
 	def updateList(self):
-		self.list = []
+		list = []
 		expandableIcon = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/expandable-plugins.png"))
 		expandedIcon = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/expanded-plugins.png"))
 		verticallineIcon = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/verticalline-plugins.png"))
@@ -204,10 +202,10 @@ class PluginDownloadBrowser(Screen):
 			
 		for x in self.plugins.keys():
 			if x in self.expanded:
-				self.list.append(PluginCategoryComponent(x, expandedIcon))
-				for plugin in self.plugins[x]:
-					self.list.append(PluginDownloadComponent(plugin[0], plugin[1]))
+				list.append(PluginCategoryComponent(x, expandedIcon))
+				list.extend([PluginDownloadComponent(plugin[0], plugin[1]) for plugin in self.plugins[x]])
 			else:
-				self.list.append(PluginCategoryComponent(x, expandableIcon))
-		self["list"].l.setList(self.list)
+				list.append(PluginCategoryComponent(x, expandableIcon))
+		self.list = list
+		self["list"].l.setList(list)
 
diff --git a/lib/python/Screens/Rc.py b/lib/python/Screens/Rc.py
index 3a7c78b3..27ba1abd 100644
--- a/lib/python/Screens/Rc.py
+++ b/lib/python/Screens/Rc.py
@@ -81,4 +81,3 @@ class Rc:
 		for selectPic in self.selectpics:
 			for pic in selectPic[1]:
 				self[pic].hide()
-	
\ No newline at end of file
diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py
index da6fcc12..8b5089a3 100644
--- a/lib/python/Screens/Satconfig.py
+++ b/lib/python/Screens/Satconfig.py
@@ -21,7 +21,7 @@ class NimSetup(Screen, ConfigListScreen):
 		else:
 			list.append(getConfigListEntry(_("Port A"), nim.diseqcA))
 
-		if mode in ["toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"]:
+		if mode in ("toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"):
 			list.append(getConfigListEntry(_("Port B"), nim.diseqcB))
 			if mode == "diseqc_a_b_c_d":
 				list.append(getConfigListEntry(_("Port C"), nim.diseqcC))
@@ -99,7 +99,7 @@ class NimSetup(Screen, ConfigListScreen):
 			if self.nimConfig.configMode.value == "simple":			#simple setup
 				self.diseqcModeEntry = getConfigListEntry(_("Mode"), self.nimConfig.diseqcMode)
 				self.list.append(self.diseqcModeEntry)
-				if self.nimConfig.diseqcMode.value in ["single", "toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"]:
+				if self.nimConfig.diseqcMode.value in ("single", "toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"):
 					self.createSimpleSetup(self.list, self.nimConfig.diseqcMode.value)
 				if self.nimConfig.diseqcMode.value == "positioner":
 					self.createPositionerSetup(self.list)
@@ -204,7 +204,7 @@ class NimSetup(Screen, ConfigListScreen):
 		if self.have_advanced and self.nim.config_mode == "advanced":
 			self.fillAdvancedList()
 		for x in self.list:
-			if x in [self.turnFastEpochBegin, self.turnFastEpochEnd]:
+			if x in (self.turnFastEpochBegin, self.turnFastEpochEnd):
 				# workaround for storing only hour*3600+min*60 value in configfile
 				# not really needed.. just for cosmetics..
 				tm = localtime(x[1].value)
@@ -453,7 +453,7 @@ class NimSelection(Screen):
 			text = nimConfig.configMode.value
 			if self.showNim(x):
 				if x.isCompatible("DVB-S"):
-					if nimConfig.configMode.value in ["loopthrough", "equal", "satposdepends"]:
+					if nimConfig.configMode.value in ("loopthrough", "equal", "satposdepends"):
 						text = { "loopthrough": _("loopthrough to"),
 								 "equal": _("equal to"),
 								 "satposdepends": _("second cable of motorized LNB") } [nimConfig.configMode.value]
@@ -461,11 +461,11 @@ class NimSelection(Screen):
 					elif nimConfig.configMode.value == "nothing":
 						text = _("nothing connected")
 					elif nimConfig.configMode.value == "simple":
-						if nimConfig.diseqcMode.value in ["single", "toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"]:
+						if nimConfig.diseqcMode.value in ("single", "toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"):
 							text = _("Sats") + ": " 
 							if nimConfig.diseqcA.orbital_position != 3601:
 								text += nimmanager.getSatName(int(nimConfig.diseqcA.value))
-							if nimConfig.diseqcMode.value in ["toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"]:
+							if nimConfig.diseqcMode.value in ("toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"):
 								if nimConfig.diseqcB.orbital_position != 3601:
 									text += "," + nimmanager.getSatName(int(nimConfig.diseqcB.value))
 							if nimConfig.diseqcMode.value == "diseqc_a_b_c_d":
@@ -491,4 +491,4 @@ class NimSelection(Screen):
 					
 				self.list.append((slotid, x.friendly_full_description, text, x))
 		self["nimlist"].setList(self.list)
-		self["nimlist"].updateList(self.list)
\ No newline at end of file
+		self["nimlist"].updateList(self.list)
diff --git a/lib/python/Screens/ServiceInfo.py b/lib/python/Screens/ServiceInfo.py
index df8af4b4..fa2f4474 100644
--- a/lib/python/Screens/ServiceInfo.py
+++ b/lib/python/Screens/ServiceInfo.py
@@ -19,11 +19,6 @@ def to_unsigned(x):
 	return x & 0xFFFFFFFF
 
 def ServiceInfoListEntry(a, b, valueType=TYPE_TEXT, param=4):
-	res = [ ]
-
-	#PyObject *type, *px, *py, *pwidth, *pheight, *pfnt, *pstring, *pflags;
-	res.append((eListboxPythonMultiContent.TYPE_TEXT, 0, 0, 200, 30, 0, RT_HALIGN_LEFT, ""))
-	res.append((eListboxPythonMultiContent.TYPE_TEXT, 0, 0, 200, 25, 0, RT_HALIGN_LEFT, a))
 	print "b:", b
 	if not isinstance(b, str):
 		if valueType == TYPE_VALUE_HEX:
@@ -34,10 +29,13 @@ def ServiceInfoListEntry(a, b, valueType=TYPE_TEXT, param=4):
 			b = ("0x%0" + str(param) + "x (%dd)") % (to_unsigned(b), b)
 		else:
 			b = str(b)
-	
-	res.append((eListboxPythonMultiContent.TYPE_TEXT, 220, 0, 350, 25, 0, RT_HALIGN_LEFT, b))
 
-	return res
+	return [
+		#PyObject *type, *px, *py, *pwidth, *pheight, *pfnt, *pstring, *pflags;
+		(eListboxPythonMultiContent.TYPE_TEXT, 0, 0, 200, 30, 0, RT_HALIGN_LEFT, ""),
+		(eListboxPythonMultiContent.TYPE_TEXT, 0, 0, 200, 25, 0, RT_HALIGN_LEFT, a),
+		(eListboxPythonMultiContent.TYPE_TEXT, 220, 0, 350, 25, 0, RT_HALIGN_LEFT, b)
+	]
 
 class ServiceInfoList(HTMLComponent, GUIComponent):
 	def __init__(self, source):
@@ -151,9 +149,7 @@ class ServiceInfo(Screen):
 						 "transmission_mode": _("Transmission Mode"),
 						 "guard_interval" 	: _("Guard Interval"),
 						 "hierarchy_information": _("Hierarchy Information") }
-				Labels = [ ]
-				for i in tp_info.keys():
-					Labels.append( (conv[i], tp_info[i], TYPE_VALUE_DEC) )
+				Labels = [(conv[i], tp_info[i], TYPE_VALUE_DEC) for i in tp_info.keys()]
 				self.fillList(Labels)
 
 	def pids(self):
@@ -186,7 +182,7 @@ class ServiceInfo(Screen):
 		if frontendDataOrg and len(frontendDataOrg):
 			frontendData = ConvertToHumanReadable(frontendDataOrg)
 			if frontendDataOrg["tuner_type"] == "DVB-S":
-				return (("NIM", ['A', 'B', 'C', 'D'][frontendData["tuner_number"]], TYPE_TEXT),
+				return (("NIM", ('A', 'B', 'C', 'D')[frontendData["tuner_number"]], TYPE_TEXT),
 							("Type", frontendData["system"], TYPE_TEXT),
 							("Modulation", frontendData["modulation"], TYPE_TEXT),
 							("Orbital position", frontendData["orbital_position"], TYPE_VALUE_DEC),
@@ -198,7 +194,7 @@ class ServiceInfo(Screen):
 							("Pilot", frontendData.get("pilot", None), TYPE_TEXT),
 							("Rolloff", frontendData.get("rolloff", None), TYPE_TEXT))
 			elif frontendDataOrg["tuner_type"] == "DVB-C":
-				return (("NIM", ['A', 'B', 'C', 'D'][frontendData["tuner_number"]], TYPE_TEXT),
+				return (("NIM", ('A', 'B', 'C', 'D')[frontendData["tuner_number"]], TYPE_TEXT),
 						("Type", frontendData["tuner_type"], TYPE_TEXT),
 						("Frequency", frontendData["frequency"], TYPE_VALUE_DEC),
 						("Symbolrate", frontendData["symbol_rate"], TYPE_VALUE_DEC),
@@ -206,7 +202,7 @@ class ServiceInfo(Screen):
 						("Inversion", frontendData["inversion"], TYPE_TEXT),
 						("FEC inner", frontendData["fec_inner"], TYPE_TEXT))
 			elif frontendDataOrg["tuner_type"] == "DVB-T":
-				return (("NIM", ['A', 'B', 'C', 'D'][frontendData["tuner_number"]], TYPE_TEXT),
+				return (("NIM", ('A', 'B', 'C', 'D')[frontendData["tuner_number"]], TYPE_TEXT),
 						("Type", frontendData["tuner_type"], TYPE_TEXT),
 						("Frequency", frontendData["frequency"], TYPE_VALUE_DEC),
 						("Inversion", frontendData["inversion"], TYPE_TEXT),
diff --git a/lib/python/Screens/Setup.py b/lib/python/Screens/Setup.py
index 1d035b8a..7226562f 100644
--- a/lib/python/Screens/Setup.py
+++ b/lib/python/Screens/Setup.py
@@ -21,10 +21,10 @@ setupfile.close()
 
 class SetupError(Exception):
     def __init__(self, message):
-        self.message = message
+        self.msg = message
 
     def __str__(self):
-        return self.message
+        return self.msg
 
 class SetupSummary(Screen):
 	skin = """
@@ -35,11 +35,10 @@ class SetupSummary(Screen):
 	</screen>"""
 
 	def __init__(self, session, parent):
-		Screen.__init__(self, session)
+		Screen.__init__(self, session, parent = parent)
 		self["SetupTitle"] = Label(_(parent.setup_title))
 		self["SetupEntry"] = Label("")
 		self["SetupValue"] = Label("")
-		self.parent = parent
 		self.onShow.append(self.addWatcher)
 		self.onHide.append(self.removeWatcher)
 		
diff --git a/lib/python/Screens/Standby.py b/lib/python/Screens/Standby.py
index d09f28af..afea94b9 100644
--- a/lib/python/Screens/Standby.py
+++ b/lib/python/Screens/Standby.py
@@ -87,9 +87,6 @@ class StandbySummary(Screen):
 		</widget>
 	</screen>"""
 
-	def __init__(self, session, parent):
-		Screen.__init__(self, session)
-
 from enigma import quitMainloop, iRecordableService
 from Screens.MessageBox import MessageBox
 from time import time
@@ -100,7 +97,7 @@ inTryQuitMainloop = False
 class TryQuitMainloop(MessageBox):
 	def __init__(self, session, retvalue=1, timeout=-1, default_yes = True):
 		self.retval=retvalue
-		recordings = len(session.nav.getRecordings())
+		recordings = session.nav.getRecordings()
 		jobs = len(job_manager.getPendingJobs())
 		self.connected = False
 		reason = ""
@@ -137,7 +134,7 @@ class TryQuitMainloop(MessageBox):
 	def getRecordEvent(self, recservice, event):
 		if event == iRecordableService.evEnd:
 			recordings = self.session.nav.getRecordings()
-			if not len(recordings): # no more recordings exist
+			if not recordings: # no more recordings exist
 				rec_time = self.session.nav.RecordTimer.getNextRecordingTime()
 				if rec_time > 0 and (rec_time - time()) < 360:
 					self.initTimeout(360) # wait for next starting timer
diff --git a/lib/python/Screens/SubservicesQuickzap.py b/lib/python/Screens/SubservicesQuickzap.py
index 24af517d..3bcc3c46 100644
--- a/lib/python/Screens/SubservicesQuickzap.py
+++ b/lib/python/Screens/SubservicesQuickzap.py
@@ -9,10 +9,17 @@ from Components.ServiceEventTracker import InfoBarBase
 
 from enigma import eTimer
 
-class SubservicesQuickzap(InfoBarBase, InfoBarShowHide, InfoBarMenu, InfoBarInstantRecord, InfoBarSeek, InfoBarTimeshift, InfoBarTimeshiftState, InfoBarExtensions, InfoBarSubtitleSupport, InfoBarAudioSelection, Screen):
+class SubservicesQuickzap(InfoBarBase, InfoBarShowHide, InfoBarMenu, \
+		InfoBarInstantRecord, InfoBarSeek, InfoBarTimeshift, \
+		InfoBarTimeshiftState, InfoBarExtensions, InfoBarSubtitleSupport, \
+		InfoBarAudioSelection, Screen):
+
 	def __init__(self, session, subservices):
 		Screen.__init__(self, session)
-		for x in [InfoBarBase, InfoBarShowHide, InfoBarMenu, InfoBarInstantRecord, InfoBarSeek, InfoBarTimeshift, InfoBarTimeshiftState, InfoBarSubtitleSupport, InfoBarExtensions, InfoBarAudioSelection]:
+		for x in InfoBarBase, InfoBarShowHide, InfoBarMenu, \
+				InfoBarInstantRecord, InfoBarSeek, InfoBarTimeshift, \
+				InfoBarTimeshiftState, InfoBarSubtitleSupport, \
+				InfoBarExtensions, InfoBarAudioSelection:
 			x.__init__(self)
 
 		self.restoreService = self.session.nav.getCurrentlyPlayingServiceReference()
@@ -97,12 +104,15 @@ class SubservicesQuickzap(InfoBarBase, InfoBarShowHide, InfoBarMenu, InfoBarInst
 	def showSelection(self):
 		self.updateSubservices()
 		tlist = []
-		if self.n is not None:
-			for x in range(self.n):
-				i = self.subservices.getSubservice(x)
-				tlist.append((i.getName(), x))
+		n = self.n or 0
+		if n:
+			idx = 0
+			while idx < n:
+				i = self.subservices.getSubservice(idx)
+				tlist.append((i.getName(), idx))
+				idx += 1
 
-		keys = [ "", "1", "2", "3", "4", "5", "6", "7", "8", "9" ] + [""] * self.n
+		keys = [ "", "1", "2", "3", "4", "5", "6", "7", "8", "9" ] + [""] * n
 		self.session.openWithCallback(self.subserviceSelected, ChoiceBox, title=_("Please select a subservice..."), list = tlist, selection = self.currentlyPlayingSubservice, keys = keys)
 	
 	def subserviceSelected(self, service):
diff --git a/lib/python/Screens/SubtitleDisplay.py b/lib/python/Screens/SubtitleDisplay.py
index 80d3bd26..13ece59a 100644
--- a/lib/python/Screens/SubtitleDisplay.py
+++ b/lib/python/Screens/SubtitleDisplay.py
@@ -1,7 +1,6 @@
 from Screens.Screen import Screen
 
 class SubtitleDisplay(Screen):
-	def __init__(self, session):
-		Screen.__init__(self, session)
-		
+	pass
+
 	# not really much to do...
diff --git a/lib/python/Screens/Subtitles.py b/lib/python/Screens/Subtitles.py
index e6378619..54bc7a5b 100644
--- a/lib/python/Screens/Subtitles.py
+++ b/lib/python/Screens/Subtitles.py
@@ -30,10 +30,11 @@ class Subtitles(Screen, ConfigListScreen):
 		self.__selected_subtitle = None
 
 	def fillList(self):
-		del self.list[:]
-		print "self.list", self.list
+		list = self.list
+		del list[:]
+		print "self.list", list
 		if self.subtitlesEnabled():
-			self.list.append(getConfigListEntry(_("Disable Subtitles"), ConfigNothing(), None))
+			list.append(getConfigListEntry(_("Disable Subtitles"), ConfigNothing(), None))
 			sel = self.infobar.selected_subtitle
 		else:
 			sel = None
@@ -44,29 +45,29 @@ class Subtitles(Screen, ConfigListScreen):
 				text = _("Enable")
 			if x[0] == 0:
 				if LanguageCodes.has_key(x[4]):
-					self.list.append(getConfigListEntry(text+" DVB "+LanguageCodes[x[4]][0], ConfigNothing(), x))
+					list.append(getConfigListEntry(text+" DVB "+LanguageCodes[x[4]][0], ConfigNothing(), x))
 				else:
-					self.list.append(getConfigListEntry(text+" DVB "+x[4], ConfigNothing(), x))
+					list.append(getConfigListEntry(text+" DVB "+x[4], ConfigNothing(), x))
 			elif x[0] == 1:
 				if x[4] == 'und': #undefined
-					self.list.append(getConfigListEntry(text+" TTX "+_("Page")+" %x%02x"%(x[3],x[2]), ConfigNothing(), x))
+					list.append(getConfigListEntry(text+" TTX "+_("Page")+" %x%02x"%(x[3],x[2]), ConfigNothing(), x))
 				else:
 					if LanguageCodes.has_key(x[4]):
-						self.list.append(getConfigListEntry(text+" TTX "+_("Page")+" %x%02x"%(x[3],x[2])+" "+LanguageCodes[x[4]][0], ConfigNothing(), x))
+						list.append(getConfigListEntry(text+" TTX "+_("Page")+" %x%02x"%(x[3],x[2])+" "+LanguageCodes[x[4]][0], ConfigNothing(), x))
 					else:
-						self.list.append(getConfigListEntry(text+" TTX "+_("Page")+" %x%02x"%(x[3],x[2])+" "+x[4], ConfigNothing(), x))
+						list.append(getConfigListEntry(text+" TTX "+_("Page")+" %x%02x"%(x[3],x[2])+" "+x[4], ConfigNothing(), x))
 			elif x[0] == 2:
-				types = [" UTF-8 text "," SSA / AAS "," .SRT file "]
+				types = (" UTF-8 text "," SSA / AAS "," .SRT file ")
 				if x[4] == 'und': #undefined
-					self.list.append(getConfigListEntry(text+types[x[2]]+_("Subtitles")+" %d" % x[1], ConfigNothing(), x))
+					list.append(getConfigListEntry(text+types[x[2]]+_("Subtitles")+" %d" % x[1], ConfigNothing(), x))
 				else:
 					if LanguageCodes.has_key(x[4]):
-						self.list.append(getConfigListEntry(text+types[x[2]]+_("Subtitles") + ' ' + LanguageCodes[x[4]][0], ConfigNothing(), x))
+						list.append(getConfigListEntry(text+types[x[2]]+_("Subtitles") + ' ' + LanguageCodes[x[4]][0], ConfigNothing(), x))
 					else:
-						self.list.append(getConfigListEntry(text+types[x[2]]+_("Subtitles")+" %d " % x[1] +x[4], ConfigNothing(), x))
+						list.append(getConfigListEntry(text+types[x[2]]+_("Subtitles")+" %d " % x[1] +x[4], ConfigNothing(), x))
 #		return _("Disable subtitles")
-		self["config"].list = self.list
-		self["config"].l.setList(self.list)
+		self["config"].list = list
+		self["config"].l.setList(list)
 
 	def __updatedInfo(self):
 		self.fillList()
@@ -95,7 +96,7 @@ class Subtitles(Screen, ConfigListScreen):
 		ConfigListScreen.keyRight(self)
 
 	def ok(self):
-		if len(self.list):
+		if self.list:
 			cur = self["config"].getCurrent()
 			self.enableSubtitle(cur[2])
 		self.close(1)
diff --git a/lib/python/Screens/TaskView.py b/lib/python/Screens/TaskView.py
index 69604279..1453c05f 100644
--- a/lib/python/Screens/TaskView.py
+++ b/lib/python/Screens/TaskView.py
@@ -80,7 +80,7 @@ class JobView(InfoBarNotifications, Screen, ConfigListScreen):
 		else:
 			self["job_task"].text = ""
 			self["summary_job_task"].text = j.getStatustext()
-		if j.status in [j.FINISHED, j.FAILED]:
+		if j.status in (j.FINISHED, j.FAILED):
 			self.performAfterEvent()
 			self["backgroundable"].boolean = False
 			if j.status == j.FINISHED:
@@ -94,11 +94,11 @@ class JobView(InfoBarNotifications, Screen, ConfigListScreen):
 			self.close(True)
 
 	def ok(self):
-		if self.job.status in [self.job.FINISHED, self.job.FAILED]:
+		if self.job.status in (self.job.FINISHED, self.job.FAILED):
 			self.close(False)
 
 	def abort(self):
-		if self.job.status in [self.job.FINISHED, self.job.FAILED]:
+		if self.job.status in (self.job.FINISHED, self.job.FAILED):
 			self.close(False)
 		if self["cancelable"].boolean == True:
 			self.job.cancel()
diff --git a/lib/python/Screens/TimeDateInput.py b/lib/python/Screens/TimeDateInput.py
index 7f940909..56ccae90 100644
--- a/lib/python/Screens/TimeDateInput.py
+++ b/lib/python/Screens/TimeDateInput.py
@@ -42,9 +42,10 @@ class TimeDateInput(Screen, ConfigListScreen):
 		self.timeinput_time = conf_time
 
 	def createSetup(self, configlist):
-		self.list = []
-		self.list.append(getConfigListEntry(_("Date"), self.timeinput_date))
-		self.list.append(getConfigListEntry(_("Time"), self.timeinput_time))
+		self.list = [
+			getConfigListEntry(_("Date"), self.timeinput_date),
+			getConfigListEntry(_("Time"), self.timeinput_time)
+		]
 		configlist.list = self.list
 		configlist.l.setList(self.list)
 
diff --git a/lib/python/Screens/TimerEdit.py b/lib/python/Screens/TimerEdit.py
index 6499ef50..caaf8c95 100644
--- a/lib/python/Screens/TimerEdit.py
+++ b/lib/python/Screens/TimerEdit.py
@@ -171,14 +171,11 @@ class TimerEditList(Screen):
 			self.key_blue_choice = self.EMPTY
 
 	def fillTimerList(self):
-		del self.list[:]
-		
-		for timer in self.session.nav.RecordTimer.timer_list:
-			self.list.append((timer, False))
-		
-		for timer in self.session.nav.RecordTimer.processed_timers:
-			self.list.append((timer, True))
-		self.list.sort(cmp = lambda x, y: x[0].begin < y[0].begin)
+		list = self.list
+		del list[:]
+		list.extend([(timer, False) for timer in self.session.nav.RecordTimer.timer_list])
+		list.extend([(timer, True) for timer in self.session.nav.RecordTimer.processed_timers])
+		list.sort(cmp = lambda x, y: x[0].begin < y[0].begin)
 
 	def showLog(self):
 		cur=self["timerlist"].getCurrent()
diff --git a/lib/python/Screens/TimerEntry.py b/lib/python/Screens/TimerEntry.py
index 92a16af8..edd19685 100644
--- a/lib/python/Screens/TimerEntry.py
+++ b/lib/python/Screens/TimerEntry.py
@@ -57,12 +57,12 @@ class TimerEntry(Screen, ConfigListScreen):
 				AFTEREVENT.AUTO: "auto"
 				}[self.timer.afterEvent]
 
-			weekday_table = ["mon", "tue", "wed", "thu", "fri", "sat", "sun"]
+			weekday_table = ("mon", "tue", "wed", "thu", "fri", "sat", "sun")
 
 			# calculate default values
 			day = []
 			weekday = 0
-			for x in range(0,7):
+			for x in (0, 1, 2, 3, 4, 5, 6):
 				day.append(0)
 			if self.timer.repeated: # repeated
 				type = "repeated"
@@ -74,7 +74,7 @@ class TimerEntry(Screen, ConfigListScreen):
 					flags = self.timer.repeated
 					repeated = "user"
 					count = 0
-					for x in range(0, 7):
+					for x in (0, 1, 2, 3, 4, 5, 6):
 						if flags == 1: # weekly
 							print "Set to weekday " + str(x)
 							weekday = x
@@ -98,7 +98,7 @@ class TimerEntry(Screen, ConfigListScreen):
 			self.timerentry_name = ConfigText(default = self.timer.name, visible_width = 50, fixed_size = False)
 			self.timerentry_description = ConfigText(default = self.timer.description, visible_width = 50, fixed_size = False)
 			self.timerentry_tags = self.timer.tags[:]
-			self.timerentry_tagsset = ConfigSelection(choices = [len(self.timerentry_tags) == 0 and "None" or " ".join(self.timerentry_tags)])
+			self.timerentry_tagsset = ConfigSelection(choices = [not self.timerentry_tags and "None" or " ".join(self.timerentry_tags)])
 
 			self.timerentry_repeated = ConfigSelection(default = repeated, choices = [("daily", _("daily")), ("weekly", _("weekly")), ("weekdays", _("Mon-Fri")), ("user", _("user defined"))])
 
@@ -117,7 +117,7 @@ class TimerEntry(Screen, ConfigListScreen):
 			self.timerentry_weekday = ConfigSelection(default = weekday_table[weekday], choices = [("mon",_("Monday")), ("tue", _("Tuesday")), ("wed",_("Wednesday")), ("thu", _("Thursday")), ("fri", _("Friday")), ("sat", _("Saturday")), ("sun", _("Sunday"))])
 
 			self.timerentry_day = ConfigSubList()
-			for x in range(0,7):
+			for x in (0, 1, 2, 3, 4, 5, 6):
 				self.timerentry_day.append(ConfigYesNo(default = day[x]))
 
 			# FIXME some service-chooser needed here
@@ -197,14 +197,14 @@ class TimerEntry(Screen, ConfigListScreen):
 			self.createSetup("config")
 
 	def keyLeft(self):
-		if self["config"].getCurrent() in [self.channelEntry, self.tagsSet]:
+		if self["config"].getCurrent() in (self.channelEntry, self.tagsSet):
 			self.keySelect()
 		else:
 			ConfigListScreen.keyLeft(self)
 			self.newConfig()
 
 	def keyRight(self):
-		if self["config"].getCurrent() in [self.channelEntry, self.tagsSet]:
+		if self["config"].getCurrent() in (self.channelEntry, self.tagsSet):
 			self.keySelect()
 		else:
 			ConfigListScreen.keyRight(self)
@@ -236,7 +236,7 @@ class TimerEntry(Screen, ConfigListScreen):
 			self.keyGo()
 
 	def finishedChannelSelection(self, *args):
-		if len(args):
+		if args:
 			self.timerentry_service_ref = ServiceReference(args[0])
 			self.timerentry_service.setCurrentText(self.timerentry_service_ref.getServiceName())
 			self["config"].invalidate(self.channelEntry)
@@ -281,18 +281,18 @@ class TimerEntry(Screen, ConfigListScreen):
 			self.timer.begin, self.timer.end = self.getBeginEnd()
 		if self.timerentry_type.value == "repeated":
 			if self.timerentry_repeated.value == "daily":
-				for x in range(0,7):
+				for x in (0, 1, 2, 3, 4, 5, 6):
 					self.timer.setRepeated(x)
 
 			if self.timerentry_repeated.value == "weekly":
 				self.timer.setRepeated(self.timerentry_weekday.index)
 
 			if self.timerentry_repeated.value == "weekdays":
-				for x in range(0,5):
+				for x in (0, 1, 2, 3, 4):
 					self.timer.setRepeated(x)
 
 			if self.timerentry_repeated.value == "user":
-				for x in range(0,7):
+				for x in (0, 1, 2, 3, 4, 5, 6):
 					if self.timerentry_day[x].value:
 						self.timer.setRepeated(x)
 
@@ -310,9 +310,9 @@ class TimerEntry(Screen, ConfigListScreen):
 
 		if self.timer.eit is not None:
 			event = eEPGCache.getInstance().lookupEventId(self.timer.service_ref.ref, self.timer.eit)
-			if event is not None:
+			if event:
 				n = event.getNumOfLinkageServices()
-				if n > 0:
+				if n > 1:
 					tlist = []
 					ref = self.session.nav.getCurrentlyPlayingServiceReference()
 					parent = self.timer.service_ref.ref
@@ -324,7 +324,9 @@ class TimerEntry(Screen, ConfigListScreen):
 						tlist.append((i.getName(), i))
 					self.session.openWithCallback(self.subserviceSelected, ChoiceBox, title=_("Please select a subservice to record..."), list = tlist, selection = selection)
 					return
-
+				elif n > 0:
+					parent = self.timer.service_ref.ref
+					self.timer.service_ref = ServiceReference(event.getLinkageService(parent, 0))
 		self.saveTimer()
 		self.close((True, self.timer))
 
@@ -367,7 +369,7 @@ class TimerEntry(Screen, ConfigListScreen):
 	def tagEditFinished(self, ret):
 		if ret is not None:
 			self.timerentry_tags = ret
-			self.timerentry_tagsset.setChoices([len(ret) == 0 and "None" or " ".join(ret)])
+			self.timerentry_tagsset.setChoices([not ret and "None" or " ".join(ret)])
 			self["config"].invalidate(self.tagsSet)
 
 class TimerLog(Screen):
@@ -410,9 +412,7 @@ class TimerLog(Screen):
 		self.updateText()
 
 	def fillLogList(self):
-		self.list = [ ]
-		for x in self.log_entries:
-			self.list.append((str(strftime("%Y-%m-%d %H-%M", localtime(x[0])) + " - " + x[2]), x))
+		self.list = [(str(strftime("%Y-%m-%d %H-%M", localtime(x[0])) + " - " + x[2]), x) for x in self.log_entries]
 
 	def clearLog(self):
 		self.log_entries = []
@@ -444,7 +444,7 @@ class TimerLog(Screen):
 		self.updateText()
 
 	def updateText(self):
-		if len(self.list) > 0:
+		if self.list:
 			self["logentry"].setText(str(self["loglist"].getCurrent()[1][2]))
 		else:
 			self["logentry"].setText("")
diff --git a/lib/python/Screens/TimerSelection.py b/lib/python/Screens/TimerSelection.py
index 7a1d9ecd..a97c7ba3 100644
--- a/lib/python/Screens/TimerSelection.py
+++ b/lib/python/Screens/TimerSelection.py
@@ -22,4 +22,3 @@ class TimerSelection(Screen):
 	
 	def selected(self):
 		self.close(self["timerlist"].getCurrentIndex())
-	
\ No newline at end of file
diff --git a/lib/python/Screens/VirtualKeyBoard.py b/lib/python/Screens/VirtualKeyBoard.py
index 5dc1a090..9b676a5f 100755
--- a/lib/python/Screens/VirtualKeyBoard.py
+++ b/lib/python/Screens/VirtualKeyBoard.py
@@ -1,289 +1,291 @@
-# -*- coding: iso-8859-1 -*-

-from Components.Language import language

-from Components.ActionMap import ActionMap

-from Components.Label import Label

-from Components.Pixmap import Pixmap

-from Components.MenuList import MenuList

-from Components.MultiContent import MultiContentEntryText, MultiContentEntryPixmapAlphaTest

-from enigma import eListboxPythonMultiContent, gFont, RT_HALIGN_CENTER, RT_VALIGN_CENTER

-from Screen import Screen

-from Tools.Directories import resolveFilename, SCOPE_SKIN_IMAGE

-from Tools.LoadPixmap import LoadPixmap

-

-class VirtualKeyBoardList(MenuList):

-	def __init__(self, list, enableWrapAround=False):

-		MenuList.__init__(self, list, enableWrapAround, eListboxPythonMultiContent)

-		self.l.setFont(0, gFont("Regular", 22))

-		self.l.setItemHeight(45)

-

-def VirtualKeyBoardEntryComponent(keys, selectedKey,shiftMode=False):

-	key_backspace = LoadPixmap(cached=True, path=resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/vkey_backspace.png"))

-	key_bg = LoadPixmap(cached=True, path=resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/vkey_bg.png"))

-	key_clr = LoadPixmap(cached=True, path=resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/vkey_clr.png"))

-	key_esc = LoadPixmap(cached=True, path=resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/vkey_esc.png"))

-	key_ok = LoadPixmap(cached=True, path=resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/vkey_ok.png"))

-	key_sel = LoadPixmap(cached=True, path=resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/vkey_sel.png"))

-	key_shift = LoadPixmap(cached=True, path=resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/vkey_shift.png"))

-	key_shift_sel = LoadPixmap(cached=True, path=resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/vkey_shift_sel.png"))

-	key_space = LoadPixmap(cached=True, path=resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/vkey_space.png"))

-	

-	res = [ (keys) ]

-	

-	x = 0

-	count = 0

-	if shiftMode:

-		shiftkey_png = key_shift_sel

-	else:

-		shiftkey_png = key_shift

-	for key in keys:

-		if key == "EXIT":

-			res.append(MultiContentEntryPixmapAlphaTest(pos=(x, 0), size=(45, 45), png=key_esc))

-		elif key == "BACKSPACE":

-			res.append(MultiContentEntryPixmapAlphaTest(pos=(x, 0), size=(45, 45), png=key_backspace))

-		elif key == "CLEAR":

-			res.append(MultiContentEntryPixmapAlphaTest(pos=(x, 0), size=(45, 45), png=key_clr))

-		elif key == "SHIFT":

-			res.append(MultiContentEntryPixmapAlphaTest(pos=(x, 0), size=(45, 45), png=shiftkey_png))

-		elif key == "SPACE":

-			res.append(MultiContentEntryPixmapAlphaTest(pos=(x, 0), size=(45, 45), png=key_space))

-		elif key == "OK":

-			res.append(MultiContentEntryPixmapAlphaTest(pos=(x, 0), size=(45, 45), png=key_ok))

-		#elif key == "<-":

-		#	res.append(MultiContentEntryPixmapAlphaTest(pos=(x, 0), size=(45, 45), png=key_left))

-		#elif key == "->":

-		#	res.append(MultiContentEntryPixmapAlphaTest(pos=(x, 0), size=(45, 45), png=key_right))

-		

-		else:

-			res.append(MultiContentEntryPixmapAlphaTest(pos=(x, 0), size=(45, 45), png=key_bg))

-			res.append(MultiContentEntryText(pos=(x, 0), size=(45, 45), font=0, text=key.encode("utf-8"), flags=RT_HALIGN_CENTER | RT_VALIGN_CENTER))

-		

-		if selectedKey == count:

-			res.append(MultiContentEntryPixmapAlphaTest(pos=(x, 0), size=(45, 45), png=key_sel))

-		

-		x += 45

-		count += 1

-	

-	return res

-

-

-class VirtualKeyBoard(Screen):

-

-	def __init__(self, session, title="", text=""):

-		Screen.__init__(self, session)

-		self.keys_list = []

-		self.shiftkeys_list = []

-		self.lang = language.getLanguage()

-		if self.lang == 'de_DE':

-			self.keys_list = [

-				[u"EXIT", u"1", u"2", u"3", u"4", u"5", u"6", u"7", u"8", u"9", u"0", u"BACKSPACE"],

-				[u"q", u"w", u"e", u"r", u"t", u"z", u"u", u"i", u"o", u"p", u"ü", u"+"],

-				[u"a", u"s", u"d", u"f", u"g", u"h", u"j", u"k", u"l", u"ö", u"ä", u"#"],

-				[u"<", u"y", u"x", u"c", u"v", u"b", u"n", u"m", u",", ".", u"-", u"CLEAR"],

-				[u"SHIFT", u"SPACE", u"@", u"ß", u"OK"]]

-			

-			self.shiftkeys_list = [

-				[u"EXIT", u"!", u'"', u"§", u"$", u"%", u"&", u"/", u"(", u")", u"=", u"BACKSPACE"],

-				[u"Q", u"W", u"E", u"R", u"T", u"Z", u"U", u"I", u"O", u"P", u"Ü", u"*"],

-				[u"A", u"S", u"D", u"F", u"G", u"H", u"J", u"K", u"L", u"Ö", u"Ä", u"'"],

-				[u">", u"Y", u"X", u"C", u"V", u"B", u"N", u"M", u";", u":", u"_", u"CLEAR"],

-				[u"SHIFT", u"SPACE", u"?", u"\\", u"OK"]]

-			

-		elif self.lang == 'es_ES':

-			#still missing keys (u"ùÙ")

-			self.keys_list = [

-				[u"EXIT", u"1", u"2", u"3", u"4", u"5", u"6", u"7", u"8", u"9", u"0", u"BACKSPACE"],

-				[u"q", u"w", u"e", u"r", u"t", u"z", u"u", u"i", u"o", u"p", u"ú", u"+"],

-				[u"a", u"s", u"d", u"f", u"g", u"h", u"j", u"k", u"l", u"ó", u"á", u"#"],

-				[u"<", u"y", u"x", u"c", u"v", u"b", u"n", u"m", u",", ".", u"-", u"CLEAR"],

-				[u"SHIFT", u"SPACE", u"@", u"£", u"à", u"é", u"è", u"í", u"ì", u"ñ", u"ò", u"OK"]]

-			

-			self.shiftkeys_list = [

-				[u"EXIT", u"!", u'"', u"§", u"$", u"%", u"&", u"/", u"(", u")", u"=", u"BACKSPACE"],

-				[u"Q", u"W", u"E", u"R", u"T", u"Z", u"U", u"I", u"O", u"P", u"Ú", u"*"],

-				[u"A", u"S", u"D", u"F", u"G", u"H", u"J", u"K", u"L", u"Ó", u"Á", u"'"],

-				[u">", u"Y", u"X", u"C", u"V", u"B", u"N", u"M", u";", u":", u"_", u"CLEAR"],

-				[u"SHIFT", u"SPACE", u"?", u"\\", u"À", u"É", u"È",  u"Í", u"Ì", u"Ñ", u"Ò", u"OK"]]

-				

-		elif self.lang in ['sv_SE', 'fi_FI']:

-			self.keys_list = [

-				[u"EXIT", u"1", u"2", u"3", u"4", u"5", u"6", u"7", u"8", u"9", u"0", u"BACKSPACE"],

-				[u"q", u"w", u"e", u"r", u"t", u"z", u"u", u"i", u"o", u"p", u"é", u"+"],

-				[u"a", u"s", u"d", u"f", u"g", u"h", u"j", u"k", u"l", u"ö", u"ä", u"#"],

-				[u"<", u"y", u"x", u"c", u"v", u"b", u"n", u"m", u",", ".", u"-", u"CLEAR"],

-				[u"SHIFT", u"SPACE", u"@", u"ß", u"å", u"OK"]]

-				

-			self.shiftkeys_list = [

-				[u"EXIT", u"!", u'"', u"§", u"$", u"%", u"&", u"/", u"(", u")", u"=", u"BACKSPACE"],

-				[u"Q", u"W", u"E", u"R", u"T", u"Z", u"U", u"I", u"O", u"P", u"É", u"*"],

-				[u"A", u"S", u"D", u"F", u"G", u"H", u"J", u"K", u"L", u"Ö", u"Ä", u"'"],

-				[u">", u"Y", u"X", u"C", u"V", u"B", u"N", u"M", u";", u":", u"_", u"CLEAR"],

-

-				[u"SHIFT", u"SPACE", u"?", u"\\", u"Å", u"OK"]]

-		else:

-			self.keys_list = [

-				[u"EXIT", u"1", u"2", u"3", u"4", u"5", u"6", u"7", u"8", u"9", u"0", u"BACKSPACE"],

-				[u"q", u"w", u"e", u"r", u"t", u"z", u"u", u"i", u"o", u"p", u"+", u"@"],

-				[u"a", u"s", u"d", u"f", u"g", u"h", u"j", u"k", u"l", u"#", u"\\"],

-				[u"<", u"y", u"x", u"c", u"v", u"b", u"n", u"m", u",", ".", u"-", u"CLEAR"],

-				[u"SHIFT", u"SPACE", u"OK"]]

-			

-			self.shiftkeys_list = [

-				[u"EXIT", u"!", u'"', u"§", u"$", u"%", u"&", u"/", u"(", u")", u"=", u"BACKSPACE"],

-				[u"Q", u"W", u"E", u"R", u"T", u"Z", u"U", u"I", u"O", u"P", u"*"],

-				[u"A", u"S", u"D", u"F", u"G", u"H", u"J", u"K", u"L", u"'", u"?"],

-				[u">", u"Y", u"X", u"C", u"V", u"B", u"N", u"M", u";", u":", u"_", u"CLEAR"],

-				[u"SHIFT", u"SPACE", u"OK"]]

-		

-		self.shiftMode = False

-		self.text = text

-		self.selectedKey = 0

-		

-		self["header"] = Label(title)

-		self["text"] = Label(self.text)

-		self["list"] = VirtualKeyBoardList([])

-		

-		self["actions"] = ActionMap(["OkCancelActions", "WizardActions", "ColorActions"],

-			{

-				"ok": self.okClicked,

-				"cancel": self.exit,

-				"left": self.left,

-				"right": self.right,

-				"up": self.up,

-				"down": self.down,

-				"red": self.backClicked,

-				"green": self.ok

-			}, -2)

-		

-		self.onLayoutFinish.append(self.buildVirtualKeyBoard)

-

-	def buildVirtualKeyBoard(self, selectedKey=0):

-		list = []

-		

-		if self.shiftMode:

-			self.k_list = self.shiftkeys_list

-			for keys in self.k_list:

-				if selectedKey < 12 and selectedKey > -1:

-					list.append(VirtualKeyBoardEntryComponent(keys, selectedKey,True))

-				else:

-					list.append(VirtualKeyBoardEntryComponent(keys, -1,True))

-				selectedKey -= 12

-		else:

-			self.k_list = self.keys_list

-			for keys in self.k_list:

-				if selectedKey < 12 and selectedKey > -1:

-					list.append(VirtualKeyBoardEntryComponent(keys, selectedKey))

-				else:

-					list.append(VirtualKeyBoardEntryComponent(keys, -1))

-				selectedKey -= 12

-		

-		self["list"].setList(list)

-

-	

-	def backClicked(self):

-		self.text = self["text"].getText()[:-1]

-		self["text"].setText(self.text)

-			

-	def okClicked(self):

-		if self.shiftMode:

-			list = self.shiftkeys_list

-		else:

-			list = self.keys_list

-		

-		selectedKey = self.selectedKey

-

-		for x in list:

-			if selectedKey < 12:

-				text = x[selectedKey]

-				break

-			else:

-				selectedKey -= 12

-

-		text = text.encode("utf-8")

-

-		if text == "EXIT":

-			self.close(None)

-		

-		elif text == "BACKSPACE":

-			self.text = self["text"].getText()[:-1]

-			self["text"].setText(self.text)

-		

-		elif text == "CLEAR":

-			self.text = ""

-			self["text"].setText(self.text)

-		

-		elif text == "SHIFT":

-			if self.shiftMode:

-				self.shiftMode = False

-			else:

-				self.shiftMode = True

-			

-			self.buildVirtualKeyBoard(self.selectedKey)

-		

-		elif text == "SPACE":

-			self.text += " "

-			self["text"].setText(self.text)

-		

-		elif text == "OK":

-			self.close(self["text"].getText())

-		

-		else:

-			self.text = self["text"].getText()

-			self.text += text

-			self["text"].setText(self.text)

-

-	def ok(self):

-		self.close(self["text"].getText())

-

-	def exit(self):

-		self.close(None)

-

-	def left(self):

-		self.selectedKey -= 1

-		

-		if self.selectedKey == -1:

-			self.selectedKey = 11

-		elif self.selectedKey == 11:

-			self.selectedKey = 23

-		elif self.selectedKey == 23:

-			self.selectedKey = 35

-		elif self.selectedKey == 35:

-			self.selectedKey = 47

-		elif self.selectedKey == 47:

-			self.selectedKey = 59

-		

-		self.showActiveKey()

-

-	def right(self):

-		self.selectedKey += 1

-		

-		if self.selectedKey == 12:

-			self.selectedKey = 0

-		elif self.selectedKey == 24:

-			self.selectedKey = 12

-		elif self.selectedKey == 36:

-			self.selectedKey = 24

-		elif self.selectedKey == 48:

-			self.selectedKey = 36

-		elif self.selectedKey == 60:

-			self.selectedKey = 48

-		

-		self.showActiveKey()

-

-	def up(self):

-		self.selectedKey -= 12

-		

-		if self.selectedKey < 0:

-			self.selectedKey += 60

-		

-		self.showActiveKey()

-

-	def down(self):

-		self.selectedKey += 12

-		

-		if self.selectedKey > 59:

-			self.selectedKey -= 60

-		

-		self.showActiveKey()

-

-	def showActiveKey(self):

-		self.buildVirtualKeyBoard(self.selectedKey)

+# -*- coding: iso-8859-1 -*-
+from Components.Language import language
+from Components.ActionMap import ActionMap
+from Components.Label import Label
+from Components.Pixmap import Pixmap
+from Components.MenuList import MenuList
+from Components.MultiContent import MultiContentEntryText, MultiContentEntryPixmapAlphaTest
+from enigma import eListboxPythonMultiContent, gFont, RT_HALIGN_CENTER, RT_VALIGN_CENTER
+from Screen import Screen
+from Tools.Directories import resolveFilename, SCOPE_SKIN_IMAGE
+from Tools.LoadPixmap import LoadPixmap
+
+class VirtualKeyBoardList(MenuList):
+	def __init__(self, list, enableWrapAround=False):
+		MenuList.__init__(self, list, enableWrapAround, eListboxPythonMultiContent)
+		self.l.setFont(0, gFont("Regular", 22))
+		self.l.setItemHeight(45)
+
+def VirtualKeyBoardEntryComponent(keys, selectedKey,shiftMode=False):
+	key_backspace = LoadPixmap(cached=True, path=resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/vkey_backspace.png"))
+	key_bg = LoadPixmap(cached=True, path=resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/vkey_bg.png"))
+	key_clr = LoadPixmap(cached=True, path=resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/vkey_clr.png"))
+	key_esc = LoadPixmap(cached=True, path=resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/vkey_esc.png"))
+	key_ok = LoadPixmap(cached=True, path=resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/vkey_ok.png"))
+	key_sel = LoadPixmap(cached=True, path=resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/vkey_sel.png"))
+	key_shift = LoadPixmap(cached=True, path=resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/vkey_shift.png"))
+	key_shift_sel = LoadPixmap(cached=True, path=resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/vkey_shift_sel.png"))
+	key_space = LoadPixmap(cached=True, path=resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/vkey_space.png"))
+	
+	res = [ (keys) ]
+	
+	x = 0
+	count = 0
+	if shiftMode:
+		shiftkey_png = key_shift_sel
+	else:
+		shiftkey_png = key_shift
+	for key in keys:
+		if key == "EXIT":
+			res.append(MultiContentEntryPixmapAlphaTest(pos=(x, 0), size=(45, 45), png=key_esc))
+		elif key == "BACKSPACE":
+			res.append(MultiContentEntryPixmapAlphaTest(pos=(x, 0), size=(45, 45), png=key_backspace))
+		elif key == "CLEAR":
+			res.append(MultiContentEntryPixmapAlphaTest(pos=(x, 0), size=(45, 45), png=key_clr))
+		elif key == "SHIFT":
+			res.append(MultiContentEntryPixmapAlphaTest(pos=(x, 0), size=(45, 45), png=shiftkey_png))
+		elif key == "SPACE":
+			res.append(MultiContentEntryPixmapAlphaTest(pos=(x, 0), size=(45, 45), png=key_space))
+		elif key == "OK":
+			res.append(MultiContentEntryPixmapAlphaTest(pos=(x, 0), size=(45, 45), png=key_ok))
+		#elif key == "<-":
+		#	res.append(MultiContentEntryPixmapAlphaTest(pos=(x, 0), size=(45, 45), png=key_left))
+		#elif key == "->":
+		#	res.append(MultiContentEntryPixmapAlphaTest(pos=(x, 0), size=(45, 45), png=key_right))
+		
+		else:
+			res.extend((
+				MultiContentEntryPixmapAlphaTest(pos=(x, 0), size=(45, 45), png=key_bg),
+				MultiContentEntryText(pos=(x, 0), size=(45, 45), font=0, text=key.encode("utf-8"), flags=RT_HALIGN_CENTER | RT_VALIGN_CENTER)
+			))
+		
+		if selectedKey == count:
+			res.append(MultiContentEntryPixmapAlphaTest(pos=(x, 0), size=(45, 45), png=key_sel))
+		
+		x += 45
+		count += 1
+	
+	return res
+
+
+class VirtualKeyBoard(Screen):
+
+	def __init__(self, session, title="", text=""):
+		Screen.__init__(self, session)
+		self.keys_list = []
+		self.shiftkeys_list = []
+		self.lang = language.getLanguage()
+		if self.lang == 'de_DE':
+			self.keys_list = [
+				[u"EXIT", u"1", u"2", u"3", u"4", u"5", u"6", u"7", u"8", u"9", u"0", u"BACKSPACE"],
+				[u"q", u"w", u"e", u"r", u"t", u"z", u"u", u"i", u"o", u"p", u"ü", u"+"],
+				[u"a", u"s", u"d", u"f", u"g", u"h", u"j", u"k", u"l", u"ö", u"ä", u"#"],
+				[u"<", u"y", u"x", u"c", u"v", u"b", u"n", u"m", u",", ".", u"-", u"CLEAR"],
+				[u"SHIFT", u"SPACE", u"@", u"ß", u"OK"]]
+			
+			self.shiftkeys_list = [
+				[u"EXIT", u"!", u'"', u"§", u"$", u"%", u"&", u"/", u"(", u")", u"=", u"BACKSPACE"],
+				[u"Q", u"W", u"E", u"R", u"T", u"Z", u"U", u"I", u"O", u"P", u"Ü", u"*"],
+				[u"A", u"S", u"D", u"F", u"G", u"H", u"J", u"K", u"L", u"Ö", u"Ä", u"'"],
+				[u">", u"Y", u"X", u"C", u"V", u"B", u"N", u"M", u";", u":", u"_", u"CLEAR"],
+				[u"SHIFT", u"SPACE", u"?", u"\\", u"OK"]]
+			
+		elif self.lang == 'es_ES':
+			#still missing keys (u"ùÙ")
+			self.keys_list = [
+				[u"EXIT", u"1", u"2", u"3", u"4", u"5", u"6", u"7", u"8", u"9", u"0", u"BACKSPACE"],
+				[u"q", u"w", u"e", u"r", u"t", u"z", u"u", u"i", u"o", u"p", u"ú", u"+"],
+				[u"a", u"s", u"d", u"f", u"g", u"h", u"j", u"k", u"l", u"ó", u"á", u"#"],
+				[u"<", u"y", u"x", u"c", u"v", u"b", u"n", u"m", u",", ".", u"-", u"CLEAR"],
+				[u"SHIFT", u"SPACE", u"@", u"£", u"à", u"é", u"è", u"í", u"ì", u"ñ", u"ò", u"OK"]]
+			
+			self.shiftkeys_list = [
+				[u"EXIT", u"!", u'"', u"§", u"$", u"%", u"&", u"/", u"(", u")", u"=", u"BACKSPACE"],
+				[u"Q", u"W", u"E", u"R", u"T", u"Z", u"U", u"I", u"O", u"P", u"Ú", u"*"],
+				[u"A", u"S", u"D", u"F", u"G", u"H", u"J", u"K", u"L", u"Ó", u"Á", u"'"],
+				[u">", u"Y", u"X", u"C", u"V", u"B", u"N", u"M", u";", u":", u"_", u"CLEAR"],
+				[u"SHIFT", u"SPACE", u"?", u"\\", u"À", u"É", u"È",  u"Í", u"Ì", u"Ñ", u"Ò", u"OK"]]
+				
+		elif self.lang in ('sv_SE', 'fi_FI'):
+			self.keys_list = [
+				[u"EXIT", u"1", u"2", u"3", u"4", u"5", u"6", u"7", u"8", u"9", u"0", u"BACKSPACE"],
+				[u"q", u"w", u"e", u"r", u"t", u"z", u"u", u"i", u"o", u"p", u"é", u"+"],
+				[u"a", u"s", u"d", u"f", u"g", u"h", u"j", u"k", u"l", u"ö", u"ä", u"#"],
+				[u"<", u"y", u"x", u"c", u"v", u"b", u"n", u"m", u",", ".", u"-", u"CLEAR"],
+				[u"SHIFT", u"SPACE", u"@", u"ß", u"å", u"OK"]]
+				
+			self.shiftkeys_list = [
+				[u"EXIT", u"!", u'"', u"§", u"$", u"%", u"&", u"/", u"(", u")", u"=", u"BACKSPACE"],
+				[u"Q", u"W", u"E", u"R", u"T", u"Z", u"U", u"I", u"O", u"P", u"É", u"*"],
+				[u"A", u"S", u"D", u"F", u"G", u"H", u"J", u"K", u"L", u"Ö", u"Ä", u"'"],
+				[u">", u"Y", u"X", u"C", u"V", u"B", u"N", u"M", u";", u":", u"_", u"CLEAR"],
+
+				[u"SHIFT", u"SPACE", u"?", u"\\", u"Å", u"OK"]]
+		else:
+			self.keys_list = [
+				[u"EXIT", u"1", u"2", u"3", u"4", u"5", u"6", u"7", u"8", u"9", u"0", u"BACKSPACE"],
+				[u"q", u"w", u"e", u"r", u"t", u"z", u"u", u"i", u"o", u"p", u"+", u"@"],
+				[u"a", u"s", u"d", u"f", u"g", u"h", u"j", u"k", u"l", u"#", u"\\"],
+				[u"<", u"y", u"x", u"c", u"v", u"b", u"n", u"m", u",", ".", u"-", u"CLEAR"],
+				[u"SHIFT", u"SPACE", u"OK"]]
+			
+			self.shiftkeys_list = [
+				[u"EXIT", u"!", u'"', u"§", u"$", u"%", u"&", u"/", u"(", u")", u"=", u"BACKSPACE"],
+				[u"Q", u"W", u"E", u"R", u"T", u"Z", u"U", u"I", u"O", u"P", u"*"],
+				[u"A", u"S", u"D", u"F", u"G", u"H", u"J", u"K", u"L", u"'", u"?"],
+				[u">", u"Y", u"X", u"C", u"V", u"B", u"N", u"M", u";", u":", u"_", u"CLEAR"],
+				[u"SHIFT", u"SPACE", u"OK"]]
+		
+		self.shiftMode = False
+		self.text = text
+		self.selectedKey = 0
+		
+		self["header"] = Label(title)
+		self["text"] = Label(self.text)
+		self["list"] = VirtualKeyBoardList([])
+		
+		self["actions"] = ActionMap(["OkCancelActions", "WizardActions", "ColorActions"],
+			{
+				"ok": self.okClicked,
+				"cancel": self.exit,
+				"left": self.left,
+				"right": self.right,
+				"up": self.up,
+				"down": self.down,
+				"red": self.backClicked,
+				"green": self.ok
+			}, -2)
+		
+		self.onLayoutFinish.append(self.buildVirtualKeyBoard)
+
+	def buildVirtualKeyBoard(self, selectedKey=0):
+		list = []
+		
+		if self.shiftMode:
+			self.k_list = self.shiftkeys_list
+			for keys in self.k_list:
+				if selectedKey < 12 and selectedKey > -1:
+					list.append(VirtualKeyBoardEntryComponent(keys, selectedKey,True))
+				else:
+					list.append(VirtualKeyBoardEntryComponent(keys, -1,True))
+				selectedKey -= 12
+		else:
+			self.k_list = self.keys_list
+			for keys in self.k_list:
+				if selectedKey < 12 and selectedKey > -1:
+					list.append(VirtualKeyBoardEntryComponent(keys, selectedKey))
+				else:
+					list.append(VirtualKeyBoardEntryComponent(keys, -1))
+				selectedKey -= 12
+		
+		self["list"].setList(list)
+
+	
+	def backClicked(self):
+		self.text = self["text"].getText()[:-1]
+		self["text"].setText(self.text)
+			
+	def okClicked(self):
+		if self.shiftMode:
+			list = self.shiftkeys_list
+		else:
+			list = self.keys_list
+		
+		selectedKey = self.selectedKey
+
+		for x in list:
+			if selectedKey < 12:
+				text = x[selectedKey]
+				break
+			else:
+				selectedKey -= 12
+
+		text = text.encode("utf-8")
+
+		if text == "EXIT":
+			self.close(None)
+		
+		elif text == "BACKSPACE":
+			self.text = self["text"].getText()[:-1]
+			self["text"].setText(self.text)
+		
+		elif text == "CLEAR":
+			self.text = ""
+			self["text"].setText(self.text)
+		
+		elif text == "SHIFT":
+			if self.shiftMode:
+				self.shiftMode = False
+			else:
+				self.shiftMode = True
+			
+			self.buildVirtualKeyBoard(self.selectedKey)
+		
+		elif text == "SPACE":
+			self.text += " "
+			self["text"].setText(self.text)
+		
+		elif text == "OK":
+			self.close(self["text"].getText())
+		
+		else:
+			self.text = self["text"].getText()
+			self.text += text
+			self["text"].setText(self.text)
+
+	def ok(self):
+		self.close(self["text"].getText())
+
+	def exit(self):
+		self.close(None)
+
+	def left(self):
+		self.selectedKey -= 1
+		
+		if self.selectedKey == -1:
+			self.selectedKey = 11
+		elif self.selectedKey == 11:
+			self.selectedKey = 23
+		elif self.selectedKey == 23:
+			self.selectedKey = 35
+		elif self.selectedKey == 35:
+			self.selectedKey = 47
+		elif self.selectedKey == 47:
+			self.selectedKey = 59
+		
+		self.showActiveKey()
+
+	def right(self):
+		self.selectedKey += 1
+		
+		if self.selectedKey == 12:
+			self.selectedKey = 0
+		elif self.selectedKey == 24:
+			self.selectedKey = 12
+		elif self.selectedKey == 36:
+			self.selectedKey = 24
+		elif self.selectedKey == 48:
+			self.selectedKey = 36
+		elif self.selectedKey == 60:
+			self.selectedKey = 48
+		
+		self.showActiveKey()
+
+	def up(self):
+		self.selectedKey -= 12
+		
+		if self.selectedKey < 0:
+			self.selectedKey += 60
+		
+		self.showActiveKey()
+
+	def down(self):
+		self.selectedKey += 12
+		
+		if self.selectedKey > 59:
+			self.selectedKey -= 60
+		
+		self.showActiveKey()
+
+	def showActiveKey(self):
+		self.buildVirtualKeyBoard(self.selectedKey)
diff --git a/lib/python/Screens/Wizard.py b/lib/python/Screens/Wizard.py
index 2326b915..555110a4 100755
--- a/lib/python/Screens/Wizard.py
+++ b/lib/python/Screens/Wizard.py
@@ -475,6 +475,11 @@ class Wizard(Screen):
 			self.currStep += 1
 			self.updateValues()
 		else:
+			if self.wizard[self.currStep].has_key("displaytext"):
+				displaytext = self.wizard[self.currStep]["displaytext"]
+				print "set LCD text"
+				for x in self.lcdCallbacks:
+					x(displaytext)
 			if len(self.stepHistory) == 0 or self.stepHistory[-1] != self.currStep:
 				self.stepHistory.append(self.currStep)
 			print "wizard step:", self.wizard[self.currStep]
@@ -599,10 +604,7 @@ class WizardManager:
 		self.wizards.append((wizard, precondition, priority))
 	
 	def getWizards(self):
-		list = []
-		for x in self.wizards:
-			if x[1] == 1: # precondition
-				list.append((x[2], x[0]))
-		return list
+		# x[1] is precondition
+		return [(x[2], x[0]) for x in self.wizards if x[1] == 1]
 
 wizardManager = WizardManager()
diff --git a/lib/python/Screens/WizardLanguage.py b/lib/python/Screens/WizardLanguage.py
index ec9758d2..91fc80db 100644
--- a/lib/python/Screens/WizardLanguage.py
+++ b/lib/python/Screens/WizardLanguage.py
@@ -31,7 +31,3 @@ class WizardLanguage(Wizard):
 		self.updateText(firstset = True)
 		self.updateValues()
 		self.updateLanguageDescription()
-		
-
-		
-		
\ No newline at end of file