X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/56ac7a4a764a4251a851778df09967405aa9a930..f4e60c14b94fe0155aba9addc908a0b2860b3cd8:/lib/python/Components/UsageConfig.py?ds=sidebyside

diff --git a/lib/python/Components/UsageConfig.py b/lib/python/Components/UsageConfig.py
index 2ea91aeb..6fcab8bc 100644
--- a/lib/python/Components/UsageConfig.py
+++ b/lib/python/Components/UsageConfig.py
@@ -17,12 +17,12 @@ def InitUsageConfig():
 	config.usage.show_infobar_on_zap = ConfigYesNo(default = True)
 	config.usage.show_infobar_on_skip = ConfigYesNo(default = True)
 	config.usage.show_infobar_on_event_change = ConfigYesNo(default = True)
-	config.usage.hdd_standby = ConfigSelection(default = "120", choices = [
-		("0", _("no standby")), ("2", "10 " + _("seconds")), ("6", "30 " + _("seconds")),
-		("12", "1 " + _("minute")), ("24", "2 " + _("minutes")),
-		("60", "5 " + _("minutes")), ("120", "10 " + _("minutes")), ("240", "20 " + _("minutes")),
-		("241", "30 " + _("minutes")), ("242", "1 " + _("hour")), ("244", "2 " + _("hours")),
-		("248", "4 " + _("hours")) ])
+	config.usage.hdd_standby = ConfigSelection(default = "600", choices = [
+		("0", _("no standby")), ("10", "10 " + _("seconds")), ("30", "30 " + _("seconds")),
+		("60", "1 " + _("minute")), ("120", "2 " + _("minutes")),
+		("300", "5 " + _("minutes")), ("600", "10 " + _("minutes")), ("1200", "20 " + _("minutes")),
+		("1800", "30 " + _("minutes")), ("3600", "1 " + _("hour")), ("7200", "2 " + _("hours")),
+		("14400", "4 " + _("hours")) ])
 	config.usage.output_12V = ConfigSelection(default = "do not change", choices = [
 		("do not change", _("do not change")), ("off", _("off")), ("on", _("on")) ])
 
@@ -58,6 +58,9 @@ def InitUsageConfig():
 		("5", "DVB-T/-S/-C") ])
 
 	config.usage.blinking_display_clock_during_recording = ConfigYesNo(default = False)
+
+	config.usage.show_message_when_recording_starts = ConfigYesNo(default = True)
+
 	config.usage.load_length_of_movies_in_moviellist = ConfigYesNo(default = True)
 	
 	def TunerTypePriorityOrderChanged(configElement):
@@ -66,7 +69,7 @@ def InitUsageConfig():
 
 	def setHDDStandby(configElement):
 		for hdd in harddiskmanager.HDDList():
-			os.system("hdparm -S%s %s" % (configElement.value, hdd[1].getDeviceName()))
+			hdd[1].setIdleTime(int(configElement.value))
 	config.usage.hdd_standby.addNotifier(setHDDStandby)
 
 	def set12VOutput(configElement):
@@ -118,7 +121,7 @@ def updateChoices(sel, choices):
 		defval = None
 		val = int(sel.value)
 		if not val in choices:
-			tmp = choices+[]
+			tmp = choices[:]
 			tmp.reverse()
 			for x in tmp:
 				if x < val: