Merge branch 'experimental' of git.opendreambox.org:/git/enigma2 into experimental

11 files changed, 207 insertions, 36 deletions

diff --git a/lib/python/Components/Converter/ServiceInfo.py b/lib/python/Components/Converter/ServiceInfo.py
index 5014fde6..fa3518ce 100644
--- a/lib/python/Components/Converter/ServiceInfo.py
+++ b/lib/python/Components/Converter/ServiceInfo.py
@@ -19,6 +19,7 @@ class ServiceInfo(Converter, object):
 	ONID = 13
 	SID = 14
 	FRAMERATE = 15
+	TRANSFERBPS = 16
 	
 
 	def __init__(self, type):
@@ -40,6 +41,7 @@ class ServiceInfo(Converter, object):
 				"OnId": (self.ONID, (iPlayableService.evUpdatedInfo,)),
 				"Sid": (self.SID, (iPlayableService.evUpdatedInfo,)),
 				"Framerate": (self.FRAMERATE, (iPlayableService.evVideoSizeChanged,iPlayableService.evUpdatedInfo,)),
+				"TransferBPS": (self.TRANSFERBPS, (iPlayableService.evUpdatedInfo,)),
 			}[type]
 
 	def getServiceInfoString(self, info, what, convert = lambda x: "%d" % x):
@@ -112,6 +114,8 @@ class ServiceInfo(Converter, object):
 			return self.getServiceInfoString(info, iServiceInformation.sSID)
 		elif self.type == self.FRAMERATE:
 			return self.getServiceInfoString(info, iServiceInformation.sFrameRate, lambda x: "%d fps" % ((x+500)/1000))
+		elif self.type == self.TRANSFERBPS:
+			return self.getServiceInfoString(info, iServiceInformation.sTransferBPS, lambda x: "%d kB/s" % (x/1024))
 		return ""
 
 	text = property(getText)
diff --git a/lib/python/Components/Converter/TemplatedMultiContent.py b/lib/python/Components/Converter/TemplatedMultiContent.py
index b86d94bf..b1d89f55 100644..100755
--- a/lib/python/Components/Converter/TemplatedMultiContent.py
+++ b/lib/python/Components/Converter/TemplatedMultiContent.py
@@ -10,8 +10,8 @@ class TemplatedMultiContent(StringList):
 		del l["self"] # cleanup locals a bit
 		del l["args"]
 
-		self.template = eval(args, {}, l)
 		self.active_style = None
+		self.template = eval(args, {}, l)
 		assert "fonts" in self.template
 		assert "itemHeight" in self.template
 		assert "template" in self.template or "templates" in self.template
@@ -25,7 +25,6 @@ class TemplatedMultiContent(StringList):
 		if not self.content:
 			from enigma import eListboxPythonMultiContent
 			self.content = eListboxPythonMultiContent()
-			self.setTemplate()
 
 			# also setup fonts (also given by source)
 			index = 0
@@ -35,30 +34,37 @@ class TemplatedMultiContent(StringList):
 
 		# if only template changed, don't reload list
 		if what[0] == self.CHANGED_SPECIFIC and what[1] == "style":
-			self.setTemplate()
-			return
-
-		if self.source:
+			pass
+		elif self.source:
 			self.content.setList(self.source.list)
-			self.setTemplate()
 
+		self.setTemplate()
 		self.downstream_elements.changed(what)
 
 	def setTemplate(self):
 		if self.source:
 			style = self.source.style
+
 			if style == self.active_style:
-				return # style did not change
+				return
 
 			# if skin defined "templates", that means that it defines multiple styles in a dict. template should still be a default
 			templates = self.template.get("templates")
 			template = self.template.get("template")
 			itemheight = self.template["itemHeight"]
+			selectionEnabled = self.template.get("selectionEnabled", True)
+			scrollbarMode = self.template.get("scrollbarMode", "showOnDemand")
 
 			if templates and style and style in templates: # if we have a custom style defined in the source, and different templates in the skin, look it up
 				template = templates[style][1]
 				itemheight = templates[style][0]
+				if len(templates[style]) > 2:
+					selectionEnabled = templates[style][2]
+				if len(templates[style]) > 3:
+					scrollbarMode = templates[style][3]
 
 			self.content.setTemplate(template)
-
 			self.content.setItemHeight(itemheight)
+			self.selectionEnabled = selectionEnabled
+			self.scrollbarMode = scrollbarMode
+			self.active_style = style
diff --git a/lib/python/Components/FanControl.py b/lib/python/Components/FanControl.py
index cee0523e..a993c396 100644
--- a/lib/python/Components/FanControl.py
+++ b/lib/python/Components/FanControl.py
@@ -3,6 +3,9 @@ import os
 from Components.config import config, ConfigSubList, ConfigSubsection, ConfigSlider
 from Tools.BoundFunction import boundFunction
 
+import NavigationInstance
+from enigma import iRecordableService
+
 class FanControl:
 	# ATM there's only support for one fan
 	def __init__(self):
@@ -13,18 +16,42 @@ class FanControl:
 		self.createConfig()
 		config.misc.standbyCounter.addNotifier(self.standbyCounterChanged, initial_call = False)
 
-	def leaveStandby(self):
+	def setVoltage_PWM(self):
 		for fanid in range(self.getFanCount()):
 			cfg = self.getConfig(fanid)
 			self.setVoltage(fanid, cfg.vlt.value)
 			self.setPWM(fanid, cfg.pwm.value)
+			print "[FanControl]: setting fan values: fanid = %d, voltage = %d, pwm = %d" % (fanid, cfg.vlt.value, cfg.pwm.value)
+
+	def setVoltage_PWM_Standby(self):
+		for fanid in range(self.getFanCount()):
+			cfg = self.getConfig(fanid)
+			self.setVoltage(fanid, cfg.vlt_standby.value)
+			self.setPWM(fanid, cfg.pwm_standby.value)
+			print "[FanControl]: setting fan values (standby mode): fanid = %d, voltage = %d, pwm = %d" % (fanid, cfg.vlt_standby.value, cfg.pwm_standby.value)
+
+	def getRecordEvent(self, recservice, event):
+		recordings = len(NavigationInstance.instance.getRecordings())
+		if event == iRecordableService.evEnd:
+			if recordings == 0:
+				self.setVoltage_PWM_Standby()
+		elif event == iRecordableService.evStart:
+			if recordings == 1:
+				self.setVoltage_PWM()
+
+	def leaveStandby(self):
+		NavigationInstance.instance.record_event.remove(self.getRecordEvent)
+		recordings = NavigationInstance.instance.getRecordings()
+		if not recordings:
+			self.setVoltage_PWM()
 
 	def standbyCounterChanged(self, configElement):
 		from Screens.Standby import inStandby
 		inStandby.onClose.append(self.leaveStandby)
-		for fanid in range(self.getFanCount()):
-			self.setVoltage(fanid, 0)
-			self.setPWM(fanid, 0)
+		recordings = NavigationInstance.instance.getRecordings()
+		NavigationInstance.instance.record_event.append(self.getRecordEvent)
+		if not recordings:
+			self.setVoltage_PWM_Standby()
 
 	def createConfig(self):
 		def setVlt(fancontrol, fanid, configElement):
@@ -35,12 +62,14 @@ class FanControl:
 		config.fans = ConfigSubList()
 		for fanid in range(self.getFanCount()):
 			fan = ConfigSubsection()
-			fan.vlt = ConfigSlider(default = 16, increment = 5, limits = (0, 255))
+			fan.vlt = ConfigSlider(default = 15, increment = 5, limits = (0, 255))
 			fan.pwm = ConfigSlider(default = 0, increment = 5, limits = (0, 255))
+			fan.vlt_standby = ConfigSlider(default = 5, increment = 5, limits = (0, 255))
+			fan.pwm_standby = ConfigSlider(default = 0, increment = 5, limits = (0, 255))
 			fan.vlt.addNotifier(boundFunction(setVlt, self, fanid))
 			fan.pwm.addNotifier(boundFunction(setPWM, self, fanid))
 			config.fans.append(fan)
-			
+	
 	def getConfig(self, fanid):
 		return config.fans[fanid]
 	
@@ -85,4 +114,4 @@ class FanControl:
 		f.write("%x" % value)
 		f.close()
 	
-fancontrol = FanControl()
\ No newline at end of file
+fancontrol = FanControl()
diff --git a/lib/python/Components/Ipkg.py b/lib/python/Components/Ipkg.py
index 0ba1165c..71447775 100755
--- a/lib/python/Components/Ipkg.py
+++ b/lib/python/Components/Ipkg.py
@@ -1,4 +1,5 @@
 from enigma import eConsoleAppContainer
+from Tools.Directories import fileExists
 
 class IpkgComponent:
 	EVENT_INSTALL = 0
@@ -20,7 +21,7 @@ class IpkgComponent:
 	
 	def __init__(self, ipkg = '/usr/bin/ipkg'):
 		self.ipkg = ipkg
-		
+		self.opkgAvail = fileExists('/usr/bin/opkg')
 		self.cmd = eConsoleAppContainer()
 		self.cache = None
 		self.callbackList = []
@@ -89,7 +90,10 @@ class IpkgComponent:
 			if data.find('Downloading') == 0:
 				self.callCallbacks(self.EVENT_DOWNLOAD, data.split(' ', 5)[1].strip())
 			elif data.find('Upgrading') == 0:
-				self.callCallbacks(self.EVENT_UPGRADE, data.split('    ', 1)[1].split(' ')[0])
+				if self.opkgAvail:
+					self.callCallbacks(self.EVENT_UPGRADE, data.split(' ', 1)[1].split(' ')[0])
+				else:
+					self.callCallbacks(self.EVENT_UPGRADE, data.split('    ', 1)[1].split(' ')[0])
 			elif data.find('Installing') == 0:
 				self.callCallbacks(self.EVENT_INSTALL, data.split(' ', 1)[1].split(' ')[0])
 			elif data.find('Removing') == 0:
diff --git a/lib/python/Components/Network.py b/lib/python/Components/Network.py
index 45b8bfa0..b9da48d8 100755
--- a/lib/python/Components/Network.py
+++ b/lib/python/Components/Network.py
@@ -580,11 +580,11 @@ class Network:
 				self.wlanmodule = 'madwifi'
 		if os_path.exists(rt73_dir):
 			rtfiles = listdir(rt73_dir)
-			if len(rtfiles) == 2:
+			if len(rtfiles) == 2 or len(rtfiles) == 5:
 				self.wlanmodule = 'ralink'
 		if os_path.exists(zd1211b_dir):
 			zdfiles = listdir(zd1211b_dir)
-			if len(zdfiles) == 1:
+			if len(zdfiles) == 1 or len(zdfiles) == 5:
 				self.wlanmodule = 'zydas'
 		return self.wlanmodule
 	
diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index 00d06095..c68e9404 100644
--- a/lib/python/Components/NimManager.py
+++ b/lib/python/Components/NimManager.py
@@ -1,4 +1,5 @@
 from Tools.HardwareInfo import HardwareInfo
+from Tools.BoundFunction import boundFunction
 
 from config import config, ConfigSubsection, ConfigSelection, ConfigFloat, \
 	ConfigSatlist, ConfigYesNo, ConfigInteger, ConfigSubList, ConfigNothing, \
@@ -13,6 +14,7 @@ from enigma import eDVBSatelliteEquipmentControl as secClass, \
 
 from time import localtime, mktime
 from datetime import datetime
+from Tools.BoundFunction import boundFunction
 
 def getConfigSatlist(orbpos, satlist):
 	default_orbpos = None
@@ -444,7 +446,7 @@ class SecConfigure:
 		self.update()
 
 class NIM(object):
-	def __init__(self, slot, type, description, has_outputs = True, internally_connectable = None):
+	def __init__(self, slot, type, description, has_outputs = True, internally_connectable = None, multi_type = {}):
 		self.slot = slot
 
 		if type not in ("DVB-S", "DVB-C", "DVB-T", "DVB-S2", None):
@@ -455,6 +457,7 @@ class NIM(object):
 		self.description = description
 		self.has_outputs = has_outputs
 		self.internally_connectable = internally_connectable
+		self.multi_type = multi_type
 
 	def isCompatible(self, what):
 		compatible = {
@@ -466,6 +469,9 @@ class NIM(object):
 			}
 		return what in compatible[self.type]
 	
+	def getType(self):
+		return self.type
+	
 	def connectableTo(self):
 		connectable = {
 				"DVB-S": ("DVB-S", "DVB-S2"),
@@ -491,6 +497,13 @@ class NIM(object):
 	
 	def internallyConnectableTo(self):
 		return self.internally_connectable
+	
+	def isMultiType(self):
+		return (len(self.multi_type) > 0)
+	
+	# returns dict {<slotid>: <type>}
+	def getMultiTypeList(self):
+		return self.multi_type
 
 	slot_id = property(getSlotID)
 
@@ -636,7 +649,15 @@ class NimManager:
 				entries[current_slot]["has_outputs"] = (input == "yes")
 			elif line.strip().startswith("Internally_Connectable:"):
 				input = int(line.strip()[len("Internally_Connectable:") + 1:])
-				entries[current_slot]["internally_connectable"] = input 
+				entries[current_slot]["internally_connectable"] = input
+			elif  line.strip().startswith("Mode"):
+				# "Mode 0: DVB-T" -> ["Mode 0", " DVB-T"]
+				split = line.strip().split(":")
+				# "Mode 0" -> ["Mode, "0"]
+				split2 = split[0].split(" ")
+				modes = entries[current_slot].get("multi_type", {})
+				modes[split2[1]] = split[1].strip()
+				entries[current_slot]["multi_type"] = modes
 			elif line.strip().startswith("empty"):
 				entries[current_slot]["type"] = None
 				entries[current_slot]["name"] = _("N/A")
@@ -650,12 +671,17 @@ class NimManager:
 				entry["has_outputs"] = True
 			if not (entry.has_key("internally_connectable")):
 				entry["internally_connectable"] = None
-			self.nim_slots.append(NIM(slot = id, description = entry["name"], type = entry["type"], has_outputs = entry["has_outputs"], internally_connectable = entry["internally_connectable"]))
+			if not (entry.has_key("multi_type")):
+				entry["multi_type"] = {}
+			self.nim_slots.append(NIM(slot = id, description = entry["name"], type = entry["type"], has_outputs = entry["has_outputs"], internally_connectable = entry["internally_connectable"], multi_type = entry["multi_type"]))
 
 	def hasNimType(self, chktype):
 		for slot in self.nim_slots:
 			if slot.isCompatible(chktype):
 				return True
+			for type in slot.getMultiTypeList().values():
+				if chktype == type:
+					return True
 		return False
 	
 	def getNimType(self, slotid):
@@ -663,6 +689,9 @@ class NimManager:
 	
 	def getNimDescription(self, slotid):
 		return self.nim_slots[slotid].friendly_full_description
+	
+	def getNimName(self, slotid):
+		return self.nim_slots[slotid].description
 
 	def getNimListOfType(self, type, exception = -1):
 		# returns a list of indexes for NIMs compatible to the given type, except for 'exception'
@@ -938,16 +967,22 @@ def InitSecParams():
 # the configElement should be only visible when diseqc 1.2 is disabled
 
 def InitNimManager(nimmgr):
-	InitSecParams()
 	hw = HardwareInfo()
+	addNimConfig = False
+	try:
+		config.Nims
+	except:
+		addNimConfig = True
 
-	config.Nims = ConfigSubList()
-	for x in range(len(nimmgr.nim_slots)):
-		config.Nims.append(ConfigSubsection())
+	if addNimConfig:
+		InitSecParams()
+		config.Nims = ConfigSubList()
+		for x in range(len(nimmgr.nim_slots)):
+			config.Nims.append(ConfigSubsection())
 
 	lnb_choices = {
 		"universal_lnb": _("Universal LNB"),
-#		"unicable": _("Unicable"),
+		"unicable": _("Unicable"),
 		"c_band": _("C-Band"),
 		"user_defined": _("User defined")}
 
@@ -1218,11 +1253,49 @@ def InitNimManager(nimmgr):
 		slot_id = configElement.slot_id
 		if nimmgr.nim_slots[slot_id].description == 'Alps BSBE2':
 			open("/proc/stb/frontend/%d/tone_amplitude" %(fe_id), "w").write(configElement.value)
-
+			
+	def tunerTypeChanged(nimmgr, configElement):
+		fe_id = configElement.fe_id
+		print "tunerTypeChanged feid %d to mode %s" % (fe_id, configElement.value)
+		try:
+			oldvalue = open("/sys/module/dvb_core/parameters/dvb_shutdown_timeout", "r").readline()
+			open("/sys/module/dvb_core/parameters/dvb_shutdown_timeout", "w").write("0")
+		except:
+			print "[info] no /sys/module/dvb_core/parameters/dvb_shutdown_timeout available"
+		frontend = eDVBResourceManager.getInstance().allocateRawChannel(fe_id).getFrontend()
+		frontend.closeFrontend()
+		open("/proc/stb/frontend/%d/mode" % (fe_id), "w").write(configElement.value)
+		frontend.reopenFrontend()
+		try:
+			open("/sys/module/dvb_core/parameters/dvb_shutdown_timeout", "w").write(oldvalue)
+		except:
+			print "[info] no /sys/module/dvb_core/parameters/dvb_shutdown_timeout available"
+		nimmgr.enumerateNIMs()
+	
+	empty_slots = 0
+	for slot in nimmgr.nim_slots:
+		x = slot.slot
+		nim = config.Nims[x]
+		addMultiType = False
+		try:
+			nim.multiType
+		except:
+			addMultiType = True
+		if slot.isMultiType() and addMultiType:
+			typeList = []
+			for id in slot.getMultiTypeList().keys():
+				type = slot.getMultiTypeList()[id]
+				typeList.append((id, type))
+			nim.multiType = ConfigSelection(typeList, "0")
+			
+			nim.multiType.fe_id = x - empty_slots
+			nim.multiType.addNotifier(boundFunction(tunerTypeChanged, nimmgr))
+		
 	empty_slots = 0
 	for slot in nimmgr.nim_slots:
 		x = slot.slot
 		nim = config.Nims[x]
+
 		if slot.isCompatible("DVB-S"):
 			nim.toneAmplitude = ConfigSelection([("9", "600mV"), ("8", "700mV"), ("7", "800mV"), ("6", "900mV"), ("5", "1100mV")], "7")
 			nim.toneAmplitude.fe_id = x - empty_slots
diff --git a/lib/python/Components/Renderer/Listbox.py b/lib/python/Components/Renderer/Listbox.py
index 7a895330..716fe445 100644..100755
--- a/lib/python/Components/Renderer/Listbox.py
+++ b/lib/python/Components/Renderer/Listbox.py
@@ -19,6 +19,7 @@ class Listbox(Renderer, object):
 		self.__content = None
 		self.__wrap_around = False
 		self.__selection_enabled = True
+		self.__scrollbarMode = "showOnDemand"
 
 	GUI_WIDGET = eListbox
 
@@ -38,6 +39,7 @@ class Listbox(Renderer, object):
 		instance.selectionChanged.get().append(self.selectionChanged)
 		self.wrap_around = self.wrap_around # trigger
 		self.selection_enabled = self.selection_enabled # trigger
+		self.scrollbarMode = self.scrollbarMode # trigger
 
 	def preWidgetRemove(self, instance):
 		instance.setContent(None)
@@ -76,7 +78,24 @@ class Listbox(Renderer, object):
 
 	selection_enabled = property(lambda self: self.__selection_enabled, setSelectionEnabled)
 
+	def setScrollbarMode(self, mode):
+		self.__scrollbarMode = mode
+		if self.instance is not None:
+			self.instance.setScrollbarMode(int(
+				{ "showOnDemand": 0,
+				  "showAlways": 1,
+				  "showNever": 2,
+				}[mode]))
+
+	scrollbarMode = property(lambda self: self.__scrollbarMode, setScrollbarMode)
+	
 	def changed(self, what):
+		if hasattr(self.source, "selectionEnabled"):
+			self.selection_enabled = self.source.selectionEnabled
+		if hasattr(self.source, "scrollbarMode"):
+			self.scrollbarMode = self.source.scrollbarMode
+		if len(what) > 1 and isinstance(what[1], str) and what[1] == "style":
+			return
 		self.content = self.source.content
 
 	def entry_changed(self, index):
diff --git a/lib/python/Components/ServiceList.py b/lib/python/Components/ServiceList.py
index 6095812a..cd055a82 100755..100644
--- a/lib/python/Components/ServiceList.py
+++ b/lib/python/Components/ServiceList.py
@@ -7,6 +7,8 @@ from Tools.LoadPixmap import LoadPixmap
 
 from Tools.Directories import resolveFilename, SCOPE_CURRENT_SKIN
 
+from Components.config import config
+
 class ServiceList(HTMLComponent, GUIComponent):
 	MODE_NORMAL = 0
 	MODE_FAVOURITES = 1
@@ -62,6 +64,22 @@ class ServiceList(HTMLComponent, GUIComponent):
 					self.l.setColor(eListboxServiceContent.markedBackgroundSelected, parseColor(value))
 				elif attrib == "foregroundColorServiceNotAvail":
 					self.l.setColor(eListboxServiceContent.serviceNotAvail, parseColor(value))
+				elif attrib == "colorEventProgressbar":
+					self.l.setColor(eListboxServiceContent.serviceEventProgressbarColor, parseColor(value))
+				elif attrib == "colorEventProgressbarSelected":
+					self.l.setColor(eListboxServiceContent.serviceEventProgressbarColorSelected, parseColor(value))
+				elif attrib == "colorEventProgressbarBorder":
+					self.l.setColor(eListboxServiceContent.serviceEventProgressbarBorderColor, parseColor(value))
+				elif attrib == "colorEventProgressbarBorderSelected":
+					self.l.setColor(eListboxServiceContent.serviceEventProgressbarBorderColorSelected, parseColor(value))
+				elif attrib == "colorServiceDescription":
+					self.l.setColor(eListboxServiceContent.serviceDescriptionColor, parseColor(value))
+				elif attrib == "colorServiceDescriptionSelected":
+					self.l.setColor(eListboxServiceContent.serviceDescriptionColorSelected, parseColor(value))
+				elif attrib == "picServiceEventProgressbar":
+					pic = LoadPixmap(resolveFilename(SCOPE_CURRENT_SKIN, value))
+					if pic:
+						self.l.setPixmap(self.l.picServiceEventProgressbar, pic)
 				elif attrib == "serviceItemHeight":
 					self.ItemHeight = int(value)
 				elif attrib == "serviceNameFont":
@@ -213,17 +231,24 @@ class ServiceList(HTMLComponent, GUIComponent):
 
 	def setMode(self, mode):
 		self.mode = mode
+		self.l.setItemHeight(self.ItemHeight)
+		self.l.setVisualMode(eListboxServiceContent.visModeComplex)
 		if mode == self.MODE_NORMAL:
-			self.l.setItemHeight(self.ItemHeight)
-			self.l.setVisualMode(eListboxServiceContent.visModeComplex)
+			if config.usage.show_event_progress_in_servicelist.value:
+				self.l.setElementPosition(self.l.celServiceEventProgressbar, eRect(0, 0, 52, self.ItemHeight))
+			else:
+				self.l.setElementPosition(self.l.celServiceEventProgressbar, eRect(0, 0, 0, 0))
 			self.l.setElementFont(self.l.celServiceName, self.ServiceNameFont)
 			self.l.setElementPosition(self.l.celServiceName, eRect(0, 0, self.instance.size().width(), self.ItemHeight))
 			self.l.setElementFont(self.l.celServiceInfo, self.ServiceInfoFont)
 		else:
-			self.l.setItemHeight(self.ItemHeight)
-			self.l.setVisualMode(eListboxServiceContent.visModeComplex)
+			if config.usage.show_event_progress_in_servicelist.value:
+				self.l.setElementPosition(self.l.celServiceEventProgressbar, eRect(60, 0, 52, self.ItemHeight))
+			else:
+				self.l.setElementPosition(self.l.celServiceEventProgressbar, eRect(60, 0, 0, 0))
 			self.l.setElementFont(self.l.celServiceNumber, self.ServiceNumberFont)
 			self.l.setElementPosition(self.l.celServiceNumber, eRect(0, 0, 50, self.ItemHeight))
 			self.l.setElementFont(self.l.celServiceName, self.ServiceNameFont)
 			self.l.setElementPosition(self.l.celServiceName, eRect(60, 0, self.instance.size().width()-60, self.ItemHeight))
 			self.l.setElementFont(self.l.celServiceInfo, self.ServiceInfoFont)
+
diff --git a/lib/python/Components/Sources/List.py b/lib/python/Components/Sources/List.py
index 1eab32b2..6f0670a1 100644
--- a/lib/python/Components/Sources/List.py
+++ b/lib/python/Components/Sources/List.py
@@ -91,8 +91,9 @@ to generate HTML."""
 		return self.__style
 
 	def setStyle(self, style):
-		self.__style = style
-		self.changed((self.CHANGED_SPECIFIC, "style"))
+		if self.__style != style:
+			self.__style = style
+			self.changed((self.CHANGED_SPECIFIC, "style"))
 
 	style = property(getStyle, setStyle)
 
diff --git a/lib/python/Components/Task.py b/lib/python/Components/Task.py
index a1e04bce..2e4e757d 100644
--- a/lib/python/Components/Task.py
+++ b/lib/python/Components/Task.py
@@ -16,6 +16,7 @@ class Job(object):
 		self.end = 100
 		self.__progress = 0
 		self.weightScale = 1
+		self.afterEvent = None
 
 		self.state_changed = CList()
 
diff --git a/lib/python/Components/UsageConfig.py b/lib/python/Components/UsageConfig.py
index 60827107..b86c1a13 100644
--- a/lib/python/Components/UsageConfig.py
+++ b/lib/python/Components/UsageConfig.py
@@ -51,7 +51,14 @@ def InitUsageConfig():
 
 	config.usage.on_long_powerpress = ConfigSelection(default = "show_menu", choices = [
 		("show_menu", _("show shutdown menu")),
-		("shutdown", _("immediate shutdown")) ] )
+		("shutdown", _("immediate shutdown")),
+		("standby", _("Standby")) ] )
+	
+	config.usage.on_short_powerpress = ConfigSelection(default = "standby", choices = [
+		("show_menu", _("show shutdown menu")),
+		("shutdown", _("immediate shutdown")),
+		("standby", _("Standby")) ] )
+
 
 	config.usage.alternatives_priority = ConfigSelection(default = "0", choices = [
 		("0", "DVB-S/-C/-T"),
@@ -61,6 +68,8 @@ def InitUsageConfig():
 		("4", "DVB-T/-C/-S"),
 		("5", "DVB-T/-S/-C") ])
 
+	config.usage.show_event_progress_in_servicelist = ConfigYesNo(default = False)
+
 	config.usage.blinking_display_clock_during_recording = ConfigYesNo(default = False)
 
 	config.usage.show_message_when_recording_starts = ConfigYesNo(default = True)