meta/plugin_graphmultiepg.xml: fix merge conflict

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

diff --git a/lib/python/Components/RecordingConfig.py b/lib/python/Components/RecordingConfig.py
old mode 100644 (file)
new mode 100755 (executable)
index 6a3bfb6..40dfb2c
--- a/lib/python/Components/RecordingConfig.py
+++ b/lib/python/Components/RecordingConfig.py
@@ -1,10 +1,14 @@
-from config import ConfigInteger, ConfigYesNo, ConfigSubsection, config
-import os
+from config import ConfigNumber, ConfigYesNo, ConfigSubsection, ConfigSelection, config
 
 def InitRecordingConfig():
        config.recording = ConfigSubsection();
        # actually this is "recordings always have priority". "Yes" does mean: don't ask. The RecordTimer will ask when value is 0.
        config.recording.asktozap = ConfigYesNo(default=True)
-       config.recording.margin_before = ConfigInteger(default=0, limits=(0,30))
-       config.recording.margin_after = ConfigInteger(default=0, limits=(0,30))
+       config.recording.margin_before = ConfigNumber(default=0)
+       config.recording.margin_after = ConfigNumber(default=0)
        config.recording.debug = ConfigYesNo(default = False)
+       config.recording.ascii_filenames = ConfigYesNo(default = False)
+       config.recording.filename_composition = ConfigSelection(default = "standard", choices = [
+               ("standard", _("standard")),
+               ("short", _("Short filenames")),
+               ("long", _("Long filenames")) ] )
\ No newline at end of file