[DVDBurn] usability improvements: title list layout, bottom info area, consistency...
[enigma2.git] / lib / python / Plugins / Extensions / DVDBurn / ProjectSettings.py
old mode 100644 (file)
new mode 100755 (executable)
index e97961b..39d7277
@@ -8,21 +8,21 @@ from Components.Sources.List import List
 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 fileExists, resolveFilename, SCOPE_PLUGINS, SCOPE_FONTS, SCOPE_HDD
 from Components.config import config, getConfigListEntry
 from Components.ConfigList import ConfigListScreen
 
 class FileBrowser(Screen, HelpableScreen):
-       skin = """
-       <screen name="FileBrowser" position="100,100" size="520,376" title="DVD File Browser" >
-               <widget name="filelist" position="0,0" size="520,376" scrollbarMode="showOnDemand" />
-       </screen>"""
-       def __init__(self, session, scope, settings):
+
+       def __init__(self, session, scope, configRef):
                Screen.__init__(self, session)
+               # for the skin: first try FileBrowser_DVDBurn, then FileBrowser, this allows individual skinning
+               self.skinName = ["FileBrowser_DVDBurn", "FileBrowser" ]
+
                HelpableScreen.__init__(self)
                self.scope = scope
                pattern = ""
+               self.configRef = configRef
                currDir = "/"
                if self.scope == "project":
                        currDir = self.getDir()
@@ -31,19 +31,19 @@ class FileBrowser(Screen, HelpableScreen):
                        currDir = self.getDir()
                        pattern = "(?i)^.*\.(ddvdm\.xml)"
                if self.scope == "menubg":
-                       currDir = self.getDir(settings.menubg)
+                       currDir = self.getDir(configRef.getValue())
                        pattern = "(?i)^.*\.(jpeg|jpg|jpe|png|bmp)"
                elif self.scope == "menuaudio":
-                       currDir = self.getDir(settings.menuaudio)
+                       currDir = self.getDir(configRef.getValue())
                        pattern = "(?i)^.*\.(mp2|m2a|ac3)"
                elif self.scope == "vmgm":
-                       currDir = self.getDir(settings.vmgm)
+                       currDir = self.getDir(configRef.getValue())
                        pattern = "(?i)^.*\.(mpg|mpeg)"
                elif self.scope == "font_face":
-                       currDir = self.getDir(settings.font_face, resolveFilename(SCOPE_FONTS))
+                       currDir = self.getDir(configRef.getValue(), resolveFilename(SCOPE_FONTS))
                        pattern = "(?i)^.*\.(ttf)"
                elif self.scope == "isopath":
-                       currDir = settings.isopath.getValue()
+                       currDir = configRef.getValue()
                elif self.scope == "image":
                        currDir = resolveFilename(SCOPE_HDD)
                        pattern = "(?i)^.*\.(iso)"
@@ -51,17 +51,22 @@ class FileBrowser(Screen, HelpableScreen):
                self.filelist = FileList(currDir, matchingPattern=pattern)
                self["filelist"] = self.filelist
 
-               self["FilelistActions"] = ActionMap(["OkCancelActions"],
+               self["FilelistActions"] = ActionMap(["SetupActions"],
                        {
+                               "save": self.ok,
                                "ok": self.ok,
                                "cancel": self.exit
                        })
+               self["key_red"] = StaticText(_("Cancel"))
+               self["key_green"] = StaticText(_("OK"))
+               self.onLayoutFinish.append(self.layoutFinished)
+
+       def layoutFinished(self):
+               self.setTitle(_("DVD File Browser"))
 
-       def getDir(self, key=None, defaultDir=None):
-               if key:
-                       settingDir = key.getValue()
-                       if len(settingDir) > 1:
-                               return (settingDir.rstrip("/").rsplit("/",1))[0]
+       def getDir(self, currentVal=None, defaultDir=None):
+               if currentVal:
+                       return (currentVal.rstrip("/").rsplit("/",1))[0]
                return defaultDir or (resolveFilename(SCOPE_PLUGINS)+"Extensions/DVDBurn/")
 
        def ok(self):
@@ -70,29 +75,30 @@ class FileBrowser(Screen, HelpableScreen):
                        if self.scope == "image":
                                path = self["filelist"].getCurrentDirectory() or ""
                                if fileExists(path+"VIDEO_TS"):
-                                       self.close(path,self.scope)
+                                       self.close(path,self.scope,self.configRef)
                else:
                        ret = self["filelist"].getCurrentDirectory() + '/' + self["filelist"].getFilename()
-                       self.close(ret,self.scope)
+                       self.close(ret,self.scope,self.configRef)
 
        def exit(self):
                if self.scope == "isopath":
-                       self.close(self["filelist"].getCurrentDirectory(),self.scope)
-               self.close(None,False)
+                       self.close(self["filelist"].getCurrentDirectory(),self.scope,self.configRef)
+               self.close(None,False,None)
 
 class ProjectSettings(Screen,ConfigListScreen):
        skin = """
-               <screen position="90,83" size="560,445" title="Collection settings" >
-                   <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
-                   <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on" />
-                   <ePixmap pixmap="skin_default/buttons/yellow.png" position="280,0" size="140,40" alphatest="on" />
-                   <ePixmap pixmap="skin_default/buttons/blue.png" position="420,0" size="140,40" alphatest="on" />
-                   <widget source="key_red" render="Label" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
-                   <widget source="key_green" render="Label" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
-                   <widget source="key_yellow" render="Label" position="280,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#a08500" transparent="1" />
-                   <widget source="key_blue" render="Label" position="420,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#18188b" transparent="1" />
-                   <widget name="config" position="10,50" size="540,276" scrollbarMode="showOnDemand" />
-                   <widget source="info" render="Label" position="20,350" size="520,90" font="Regular;16" />
+               <screen name="ProjectSettings" position="center,center" size="560,440" title="Collection settings" >
+                       <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
+                       <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on" />
+                       <ePixmap pixmap="skin_default/buttons/yellow.png" position="280,0" size="140,40" alphatest="on" />
+                       <ePixmap pixmap="skin_default/buttons/blue.png" position="420,0" size="140,40" alphatest="on" />
+                       <widget source="key_red" render="Label" position="0,0" zPosition="1" size="140,40" font="Regular;19" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
+                       <widget source="key_green" render="Label" position="140,0" zPosition="1" size="140,40" font="Regular;19" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
+                       <widget source="key_yellow" render="Label" position="280,0" zPosition="1" size="140,40" font="Regular;19" halign="center" valign="center" backgroundColor="#a08500" transparent="1" />
+                       <widget source="key_blue" render="Label" position="420,0" zPosition="1" size="140,40" font="Regular;19" halign="center" valign="center" backgroundColor="#18188b" transparent="1" />
+                       <widget name="config" position="5,50" size="550,276" scrollbarMode="showOnDemand" />
+                       <ePixmap pixmap="skin_default/div-h.png" position="0,350" zPosition="1" size="560,2" />
+                       <widget source="info" render="Label" position="10,360" size="550,80" font="Regular;18" halign="center" valign="center" />
                </screen>"""
 
        def __init__(self, session, project = None):
@@ -113,13 +119,10 @@ class ProjectSettings(Screen,ConfigListScreen):
                        infotext = ""
                self["info"] = StaticText(infotext)
 
+               self.keydict = {}
                self.settings = project.settings
                ConfigListScreen.__init__(self, [])
                self.initConfigList()
-                       
-               self.keydict = {}
-               for key, val in self.settings.dict().iteritems():
-                       self.keydict[val] = key
                
                self["setupActions"] = ActionMap(["SetupActions", "ColorActions"],
                {
@@ -130,6 +133,10 @@ class ProjectSettings(Screen,ConfigListScreen):
                    "cancel": self.cancel,
                    "ok": self.ok,
                }, -2)
+               self.onLayoutFinish.append(self.layoutFinished)
+
+       def layoutFinished(self):
+               self.setTitle(_("Collection settings"))
 
        def changedConfigList(self):
                key = self.keydict[self["config"].getCurrent()[1]]
@@ -151,6 +158,7 @@ class ProjectSettings(Screen,ConfigListScreen):
                                self.list.append(getConfigListEntry(_("Menu")+' '+_("Title"), self.project.menutemplate.settings.titleformat))
                                self.list.append(getConfigListEntry(_("Menu")+' '+_("Subtitles"), self.project.menutemplate.settings.subtitleformat))
                                self.list.append(getConfigListEntry(_("Menu")+' '+_("background image"), self.project.menutemplate.settings.menubg))
+                               self.list.append(getConfigListEntry(_("Menu")+' '+_("Language selection"), self.project.menutemplate.settings.menulang))
                        #self.list.append(getConfigListEntry(_("Menu")+' '+_("headline")+' '+_("color"), self.settings.color_headline))
                        #self.list.append(getConfigListEntry(_("Menu")+' '+_("text")+' '+_("color"), self.settings.color_button))
                        #self.list.append(getConfigListEntry(_("Menu")+' '+_("highlighted button")+' '+_("color"), self.settings.color_highlight))
@@ -167,6 +175,11 @@ class ProjectSettings(Screen,ConfigListScreen):
                                self.list.append(getConfigListEntry(("DVD data format"), self.settings.dataformat))
                
                self["config"].setList(self.list)
+               self.keydict = {}
+               for key, val in self.settings.dict().iteritems():
+                       self.keydict[val] = key
+               for key, val in self.project.menutemplate.settings.dict().iteritems():
+                       self.keydict[val] = key
 
        def keyLeft(self):
                ConfigListScreen.keyLeft(self)
@@ -190,8 +203,9 @@ class ProjectSettings(Screen,ConfigListScreen):
                
        def ok(self):
                key = self.keydict[self["config"].getCurrent()[1]]
-               if key in self.project.filekeys:
-                       self.session.openWithCallback(self.FileBrowserClosed, FileBrowser, key, self.settings)
+               from DVDProject import ConfigFilename
+               if type(self["config"].getCurrent()[1]) == ConfigFilename:
+                       self.session.openWithCallback(self.FileBrowserClosed, FileBrowser, key, self["config"].getCurrent()[1])
 
        def cancel(self):
                self.close(False)
@@ -210,17 +224,28 @@ class ProjectSettings(Screen,ConfigListScreen):
                                text = _("Save")+' '+_('Error')
                                self.session.open(MessageBox,text,type = MessageBox.TYPE_ERROR)
 
-       def FileBrowserClosed(self, path, scope):
+       def FileBrowserClosed(self, path, scope, configRef):
                if scope == "menutemplate":
-                       if not self.project.menutemplate.loadTemplate(path):
-                               self.session.open(MessageBox,self.project.error,MessageBox.TYPE_ERROR)
-                       else:
+                       if self.project.menutemplate.loadTemplate(path):
                                print "[ProjectSettings] menu template loaded"
-
-               if scope in self.project.filekeys:
-                       self.settings.dict()[scope].setValue(path)
-               elif scope == "project":
-                       if not self.project.loadProject(path):
+                               configRef.setValue(path)
+                               self.initConfigList()
+                       else:
                                self.session.open(MessageBox,self.project.error,MessageBox.TYPE_ERROR)
+               elif scope == "project":
+                       self.path = path
+                       print "len(self.titles)", len(self.project.titles)
+                       if len(self.project.titles):
+                               self.session.openWithCallback(self.askLoadCB, MessageBox,text = _("Your current collection will get lost!") + "\n" + _("Do you want to restore your settings?"), type = MessageBox.TYPE_YESNO)
                        else:
+                               self.askLoadCB(True)
+               elif scope:
+                       configRef.setValue(path)
+                       self.initConfigList()
+
+       def askLoadCB(self, answer):
+               if answer is not None and answer:
+                       if self.project.loadProject(self.path):
                                self.initConfigList()
+                       else:
+                               self.session.open(MessageBox,self.project.error,MessageBox.TYPE_ERROR)
\ No newline at end of file