[DVDBurn] usability improvements: title list layout, bottom info area, consistency...

[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 9b4e2d54c90b3e7017fe5da94ef9a20d7abe032b..39d7277e96801e15c7c987a3482f1af0da13b56a 100755 (executable)
--- a/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py
+++ b/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py
@@ -8,23 +8,17 @@ 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="center,center" size="520,430" title="DVD File Browser" >
-                       <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" />
-                       <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 name="filelist" position="5,50" size="510,380" scrollbarMode="showOnDemand" />
-               </screen>"""
 
        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 = ""
@@ -57,12 +51,12 @@ 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)
@@ -98,10 +92,10 @@ class ProjectSettings(Screen,ConfigListScreen):
                        <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 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" />
@@ -239,11 +233,19 @@ class ProjectSettings(Screen,ConfigListScreen):
                        else:
                                self.session.open(MessageBox,self.project.error,MessageBox.TYPE_ERROR)
                elif scope == "project":
-                       if self.project.loadProject(path):
-                               configRef.setValue(path)
-                               self.initConfigList()
+                       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.session.open(MessageBox,self.project.error,MessageBox.TYPE_ERROR)
+                               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