Path and template fixes

[enigma2.git] / lib / python / Plugins / Extensions / DVDBurn / ProjectSettings.py

diff --git a/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py b/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py
index ba78e5e17e11901c0ea2f709c250b809e8d2f09f..fc8672c5557363f0ce797195e5efc675db6dfc41 100644 (file)
--- a/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py
+++ b/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py
@@ -9,7 +9,7 @@ from Components.Sources.StaticText import StaticText
 from Components.Sources.Progress import Progress
 from Components.FileList import FileList
 from enigma import eListboxPythonMultiContent, gFont, RT_HALIGN_LEFT
-from Tools.Directories import resolveFilename, SCOPE_PLAYLIST, SCOPE_SKIN, SCOPE_FONTS
+from Tools.Directories import resolveFilename, SCOPE_PLUGINS, SCOPE_FONTS
 from Components.config import config, getConfigListEntry
 from Components.ConfigList import ConfigListScreen
 
@@ -41,16 +41,16 @@ class FileBrowser(Screen, HelpableScreen):
                pattern = ""
                currDir = "/"
                if self.scope == "project":
-                       currDir = resolveFilename(SCOPE_PLAYLIST)
+                       currDir = self.getDir()
                        pattern = "(?i)^.*\.(ddvdp\.xml)"               
                if self.scope == "menubg":
-                       currDir = self.getDir(settings.menubg, resolveFilename(SCOPE_SKIN))
+                       currDir = self.getDir(settings.menubg)
                        pattern = "(?i)^.*\.(jpeg|jpg|jpe|png|bmp)"
                elif self.scope == "menuaudio":
-                       currDir = self.getDir(settings.menuaudio, resolveFilename(SCOPE_SKIN))
+                       currDir = self.getDir(settings.menuaudio)
                        pattern = "(?i)^.*\.(mp2|m2a|ac3)"
                elif self.scope == "vmgm":
-                       currDir = self.getDir(settings.vmgm, resolveFilename(SCOPE_SKIN))
+                       currDir = self.getDir(settings.vmgm)
                        pattern = "(?i)^.*\.(mpg|mpeg)"
                elif self.scope == "font_face":
                        currDir = self.getDir(settings.font_face, resolveFilename(SCOPE_FONTS))
@@ -65,12 +65,12 @@ class FileBrowser(Screen, HelpableScreen):
                                "cancel": self.exit
                        })
 
-       def getDir(self, key, defaultDir):
-               settingDir = key.getValue()
-               if len(settingDir) > 1:
-                       return (settingDir.rstrip("/").rsplit("/",1))[0]
-               else:
-                       return defaultDir
+       def getDir(self, key=None, defaultDir=None):
+               if key:
+                       settingDir = key.getValue()
+                       if len(settingDir) > 1:
+                               return (settingDir.rstrip("/").rsplit("/",1))[0]
+               return defaultDir or (resolveFilename(SCOPE_PLUGINS)+"Extensions/DVDBurn/")
 
        def ok(self):
                if self.filelist.canDescent():
@@ -106,7 +106,7 @@ class ProjectSettings(Screen,ConfigListScreen):
                self["key_yellow"] = StaticText(_("Load"))
                self["key_blue"] = StaticText(_("Save"))
                
-               infotext = _("Available format variables") + ":\n%i=" + _("Track") + ", %t=" + _("Title") + ", %d=" + _("Description") + ", %l=" + _("length") + ", %c=" + _("chapters") + ",\n" + _("Record") + " %T=" + _("Begin time") + ", %Y=" + _("year") + ", %M=" + _("month") + ", %D=" + _("day") + ",\n%C=" + _("Channel") + ", %f=" + _("filename")
+               infotext = _("Available format variables") + ":\n$i=" + _("Track") + ", $t=" + _("Title") + ", $d=" + _("Description") + ", $l=" + _("length") + ", $c=" + _("chapters") + ",\n" + _("Record") + " $T=" + _("Begin time") + ", $Y=" + _("year") + ", $M=" + _("month") + ", $D=" + _("day") + ",\n$A=" + _("audio tracks") + ", $C=" + _("Channel") + ", $f=" + _("filename")
                self["info"] = StaticText(infotext)
 
                self.settings = project.settings
@@ -124,6 +124,7 @@ class ProjectSettings(Screen,ConfigListScreen):
                self.list.append(getConfigListEntry(_("Menu")+' '+_("spaces (top, between rows, left)"), self.settings.space))
                self.list.append(getConfigListEntry(_("Menu")+' '+_("Audio"), self.settings.menuaudio))
                self.list.append(getConfigListEntry(_("VMGM (intro trailer)"), self.settings.vmgm))
+               self.list.append(getConfigListEntry(_("Auto chapter split every ? minutes (0=never)"), self.settings.autochapter))
                ConfigListScreen.__init__(self, self.list)
                
                self.keydict = {}
@@ -150,8 +151,7 @@ class ProjectSettings(Screen,ConfigListScreen):
                
        def ok(self):
                key = self.keydict[self["config"].getCurrent()[1]]
-               browseKeys = ["menubg", "menuaudio", "vmgm", "font_face"]
-               if key in browseKeys:
+               if key in self.project.filekeys:
                        self.session.openWithCallback(self.FileBrowserClosed, FileBrowser, key, self.settings)
 
        def cancel(self):
@@ -171,8 +171,8 @@ class ProjectSettings(Screen,ConfigListScreen):
                        self.session.open(MessageBox,text,type = MessageBox.TYPE_ERROR)
 
        def FileBrowserClosed(self, path, scope):
-               if scope == "project":
+               if scope in self.project.filekeys:
+                       self.settings.dict()[scope].setValue(path)
+               elif scope == "project":
                        if not self.project.loadProject(path):
                                self.session.open(MessageBox,self.project.error,MessageBox.TYPE_ERROR)
-               elif scope:
-                       self.settings.dict()[scope].setValue(path)