aboutsummaryrefslogtreecommitdiff
path: root/lib/python/Components/UsageConfig.py
diff options
context:
space:
mode:
authorghost <andreas.monzner@multimedia-labs.de>2008-11-17 19:23:02 +0100
committerghost <andreas.monzner@multimedia-labs.de>2008-11-17 19:23:02 +0100
commit5eb41508927a7f48d09d52e158e136fa07252dac (patch)
treef5ce5ebbc380e903eda85d37b0a5ff503f4fea3d /lib/python/Components/UsageConfig.py
parent94913d0f73c36623ae19916d79cee759b7f6bc98 (diff)
parent8cf7cff9fc9cde4d7add449478b8b35103325295 (diff)
downloadenigma2-5eb41508927a7f48d09d52e158e136fa07252dac.tar.gz
enigma2-5eb41508927a7f48d09d52e158e136fa07252dac.zip
Merge branch 'master' into async_picload
Diffstat (limited to 'lib/python/Components/UsageConfig.py')
-rw-r--r--lib/python/Components/UsageConfig.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/python/Components/UsageConfig.py b/lib/python/Components/UsageConfig.py
index 714d366d..6ed87840 100644
--- a/lib/python/Components/UsageConfig.py
+++ b/lib/python/Components/UsageConfig.py
@@ -1,5 +1,5 @@
from Components.Harddisk import harddiskmanager
-from config import ConfigSubsection, ConfigYesNo, config, ConfigSelection, ConfigText, ConfigNumber, ConfigSet
+from config import ConfigSubsection, ConfigYesNo, config, ConfigSelection, ConfigText, ConfigNumber, ConfigSet, ConfigLocations
from enigma import Misc_Options, setTunerTypePriorityOrder;
from SystemInfo import SystemInfo
import os
@@ -30,6 +30,9 @@ def InitUsageConfig():
("standard", _("standard")), ("swap", _("swap PiP and main picture")),
("swapstop", _("move PiP to main picture")), ("stop", _("stop PiP")) ])
+ config.usage.allowed_timeshift_paths = ConfigLocations(default = ["/media/hdd/"])
+ config.usage.timeshift_path = ConfigText(default = "/media/hdd")
+
config.usage.on_movie_start = ConfigSelection(default = "ask", choices = [
("ask", _("Ask user")), ("resume", _("Resume from last position")), ("beginning", _("Start from the beginning")) ])
config.usage.on_movie_stop = ConfigSelection(default = "ask", choices = [