check for running jobs before shutting down/rebooting

[enigma2.git] / lib / python / Components / UsageConfig.py

diff --git a/lib/python/Components/UsageConfig.py b/lib/python/Components/UsageConfig.py
index 3df3a44206bccb984216ab0f48671248e95b0db5..714d366d01442d2c3a964d8c0e503b767cffffa6 100644 (file)
--- a/lib/python/Components/UsageConfig.py
+++ b/lib/python/Components/UsageConfig.py
@@ -1,4 +1,5 @@
-from config import ConfigSubsection, ConfigYesNo, config, ConfigSelection, ConfigText, ConfigNumber, ConfigSet, ConfigNothing
+from Components.Harddisk import harddiskmanager
+from config import ConfigSubsection, ConfigYesNo, config, ConfigSelection, ConfigText, ConfigNumber, ConfigSet
 from enigma import Misc_Options, setTunerTypePriorityOrder;
 from SystemInfo import SystemInfo
 import os
@@ -54,13 +55,15 @@ def InitUsageConfig():
                ("5", "DVB-T/-S/-C") ])
 
        config.usage.blinking_display_clock_during_recording = ConfigYesNo(default = False)
-
+       config.usage.load_length_of_movies_in_moviellist = ConfigYesNo(default = True)
+       
        def TunerTypePriorityOrderChanged(configElement):
                setTunerTypePriorityOrder(int(configElement.value))
        config.usage.alternatives_priority.addNotifier(TunerTypePriorityOrderChanged)
 
        def setHDDStandby(configElement):
-               os.system("hdparm -S" + configElement.value + " /dev/ide/host0/bus0/target0/lun0/disc")
+               for hdd in harddiskmanager.HDDList():
+                       os.system("hdparm -S%s %s" % (configElement.value, hdd[1].getDeviceName()))
        config.usage.hdd_standby.addNotifier(setHDDStandby)
 
        def set12VOutput(configElement):
@@ -80,7 +83,7 @@ def InitUsageConfig():
        config.seek.selfdefined_79 = ConfigNumber(default=300)
 
        config.seek.speeds_forward = ConfigSet(default=[2, 4, 8, 16, 32, 64, 128], choices=[2, 4, 6, 8, 12, 16, 24, 32, 48, 64, 96, 128])
-       config.seek.speeds_backward = ConfigSet(default=[2, 4, 8, 16, 32, 64, 128], choices=[1, 2, 4, 6, 8, 12, 16, 24, 32, 48, 64, 96, 128])
+       config.seek.speeds_backward = ConfigSet(default=[8, 16, 32, 64, 128], choices=[1, 2, 4, 6, 8, 12, 16, 24, 32, 48, 64, 96, 128])
        config.seek.speeds_slowmotion = ConfigSet(default=[2, 4, 8], choices=[2, 4, 6, 8, 12, 16, 25])
 
        config.seek.enter_forward = ConfigSelection(default = "2", choices = ["2"])
@@ -109,14 +112,13 @@ def InitUsageConfig():
 
 def updateChoices(sel, choices):
        if choices:
-                defval = None
-                val = int(sel.value)
+               defval = None
+               val = int(sel.value)
                if not val in choices:
-                        tmp = choices+[]
-                        tmp.reverse()
-                        for x in tmp:
-                                if x < val:
-                                        defval = str(x)
-                                        break
+                       tmp = choices+[]
+                       tmp.reverse()
+                       for x in tmp:
+                               if x < val:
+                                       defval = str(x)
+                                       break
                sel.setChoices(map(str, choices), defval)
-