aboutsummaryrefslogtreecommitdiff
path: root/lib/python/Components/UsageConfig.py
diff options
context:
space:
mode:
authorFraxinas <andreas.frisch@multimedia-labs.de>2008-11-17 10:04:02 +0100
committerFraxinas <andreas.frisch@multimedia-labs.de>2008-11-17 10:04:02 +0100
commit37b38cb05fc6bc4993f852a78bdba93c7627cf5b (patch)
tree67b0f7159bea05a067626d719ac67d81979d547b /lib/python/Components/UsageConfig.py
parent083c49ace50d1aa702cf47785e0d38966f8e71a1 (diff)
parent153e0ed5048c79c600e1acd085b62015b7314ba7 (diff)
downloadenigma2-37b38cb05fc6bc4993f852a78bdba93c7627cf5b.tar.gz
enigma2-37b38cb05fc6bc4993f852a78bdba93c7627cf5b.zip
Merge branch 'master' of fraxinas@git.opendreambox.org:/git/enigma2
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 = [