Support turbo2.

[vuplus_dvbapp] / lib / python / Screens / RecordPaths.py

diff --git a/lib/python/Screens/RecordPaths.py b/lib/python/Screens/RecordPaths.py
index c833266..55159d9 100644 (file)
--- a/lib/python/Screens/RecordPaths.py
+++ b/lib/python/Screens/RecordPaths.py
@@ -6,7 +6,7 @@ from Components.config import config, ConfigSelection, getConfigListEntry, confi
 from Components.ConfigList import ConfigListScreen
 from Components.ActionMap import ActionMap
 from Tools.Directories import fileExists
-
+from Components.UsageConfig import preferredPath
 
 class RecordPathsSettings(Screen,ConfigListScreen):
        skin = """
@@ -36,16 +36,16 @@ class RecordPathsSettings(Screen,ConfigListScreen):
                }, -2)
 
        def checkReadWriteDir(self, configele):
+               value = configele.value
                print "checkReadWrite: ", configele.value
-               if configele.value in [x[0] for x in self.styles] or fileExists(configele.value, "w"):
-                       configele.last_value = configele.value
+               if not value or value in [x[0] for x in self.styles] or fileExists(value, "w"):
+                       configele.last_value = value
                        return True
                else:
-                       dir = configele.value
                        configele.value = configele.last_value
                        self.session.open(
                                MessageBox,
-                               _("The directory %s is not writable.\nMake sure you select a writable directory instead.")%dir,
+                               _("The directory %s is not writable.\nMake sure you select a writable directory instead.") % value,
                                type = MessageBox.TYPE_ERROR
                                )
                        return False
@@ -55,11 +55,11 @@ class RecordPathsSettings(Screen,ConfigListScreen):
                styles_keys = [x[0] for x in self.styles]
                tmp = config.movielist.videodirs.value
                default = config.usage.default_path.value
-               if default not in tmp:
+               if default and default not in tmp:
                        tmp = tmp[:]
                        tmp.append(default)
                print "DefaultPath: ", default, tmp
-               self.default_dirname = ConfigSelection(default = default, choices = tmp)
+               self.default_dirname = ConfigSelection(default = default, choices = [("", _("<Default movie location>"))] + tmp)
                tmp = config.movielist.videodirs.value
                default = config.usage.timer_path.value
                if default not in tmp and default not in styles_keys:
@@ -115,7 +115,7 @@ class RecordPathsSettings(Screen,ConfigListScreen):
                                self.dirnameSelected,
                                MovieLocationBox,
                                txt,
-                               self.default_dirname.value
+                               preferredPath(self.default_dirname.value)
                        )
                elif currentry == self.timer_entry:
                        self.entrydirname = self.timer_dirname
@@ -123,7 +123,7 @@ class RecordPathsSettings(Screen,ConfigListScreen):
                                self.dirnameSelected,
                                MovieLocationBox,
                                _("Initial location in new timers"),
-                               self.timer_dirname.value
+                               preferredPath(self.timer_dirname.value)
                        )
                elif currentry == self.instantrec_entry:
                        self.entrydirname = self.instantrec_dirname
@@ -131,7 +131,7 @@ class RecordPathsSettings(Screen,ConfigListScreen):
                                self.dirnameSelected,
                                MovieLocationBox,
                                _("Location for instant recordings"),
-                               self.instantrec_dirname.value
+                               preferredPath(self.instantrec_dirname.value)
                        )
                elif currentry == self.timeshift_entry:
                        self.entrydirname = self.timeshift_dirname
@@ -148,10 +148,10 @@ class RecordPathsSettings(Screen,ConfigListScreen):
                                styles_keys = [x[0] for x in self.styles]
                                tmp = config.movielist.videodirs.value
                                default = self.default_dirname.value
-                               if default not in tmp:
+                               if default and default not in tmp:
                                        tmp = tmp[:]
                                        tmp.append(default)
-                               self.default_dirname.setChoices(tmp, default=default)
+                               self.default_dirname.setChoices([("", _("<Default movie location>"))] + tmp, default=default)
                                tmp = config.movielist.videodirs.value
                                default = self.timer_dirname.value
                                if default not in tmp and default not in styles_keys: