X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/2dc13ab463d67b1255ec31cbe2b27cafef318dbe..2977b2dfa5d96055c5abc10ec31adb4dbf8f9e2a:/lib/python/Plugins/Extensions/DVDBurn/TitleList.py
diff --git a/lib/python/Plugins/Extensions/DVDBurn/TitleList.py b/lib/python/Plugins/Extensions/DVDBurn/TitleList.py
index 2cbdf0b2..19380af4 100644
--- a/lib/python/Plugins/Extensions/DVDBurn/TitleList.py
+++ b/lib/python/Plugins/Extensions/DVDBurn/TitleList.py
@@ -1,67 +1,20 @@
-import DVDProject, TitleList, TitleCutter
-
+import DVDProject, TitleList, TitleCutter, ProjectSettings, DVDToolbox, Process
from Screens.Screen import Screen
from Screens.ChoiceBox import ChoiceBox
from Screens.InputBox import InputBox
from Screens.MessageBox import MessageBox
+from Screens.HelpMenu import HelpableScreen
+from Screens.TaskView import JobView
+from Components.Task import job_manager
from Components.ActionMap import HelpableActionMap, ActionMap
from Components.Sources.List import List
from Components.Sources.StaticText import StaticText
from Components.Sources.Progress import Progress
-from Components.FileList import FileList
+from Components.Label import Label
from enigma import eListboxPythonMultiContent, gFont, RT_HALIGN_LEFT
+from Tools.Directories import resolveFilename, SCOPE_PLUGINS
-class WaitBox(MessageBox):
- def __init__(self, session, callback):
- MessageBox.__init__(self, session, text=_("Preparing... Please wait"), type = MessageBox.TYPE_INFO)
- self.skinName = "MessageBox"
- self.CB = callback
- self.onShown.append(self.runCB)
-
- def ok(self):
- pass
-
- def runCB(self):
- from enigma import eTimer
- self.delayTimer = eTimer()
- self.delayTimer.callback.append(self.CB)
- self.delayTimer.start(10,1)
-
-class FileBrowser(Screen):
- skin = """
-
-
- """
- def __init__(self, session, currDir = None, projectBrowser = False):
- Screen.__init__(self, session)
- self.projectBrowser = projectBrowser
- if not currDir:
- currDir = "/"
-
- if projectBrowser:
- self.filelist = FileList(currDir, matchingPattern = "(?i)^.*\.(ddvdp\.xml)")
- else:
- self.filelist = FileList(currDir, matchingPattern = "(?i)^.*\.(jpeg|jpg|jpe|png|bmp)")
- self["filelist"] = self.filelist
-
- self["FilelistActions"] = ActionMap(["OkCancelActions"],
- {
- "ok": self.ok,
- "cancel": self.exit
- })
-
- def ok(self):
- if self.filelist.canDescent():
- self.filelist.descent()
- else:
- ret = self["filelist"].getCurrentDirectory() + '/' + self["filelist"].getFilename()
- self.close(ret,self.projectBrowser)
-
- def exit(self):
- self.close(None)
-
-
-class TitleList(Screen):
+class TitleList(Screen, HelpableScreen):
skin = """
@@ -72,7 +25,8 @@ class TitleList(Screen):
-
+
+
@@ -82,13 +36,14 @@ class TitleList(Screen):
def __init__(self, session, project = None):
Screen.__init__(self, session)
+ HelpableScreen.__init__(self)
self["titleactions"] = HelpableActionMap(self, "DVDTitleList",
{
"addTitle": (self.addTitle, _("Add a new title"), _("Add title")),
"editTitle": (self.editTitle, _("Edit chapters of current title"), _("Edit title")),
"removeCurrentTitle": (self.removeCurrentTitle, _("Remove currently selected title"), _("Remove title")),
- "saveProject": (self.saveProject, _("Save current project to disk"), _("Save")),
+ "settings": (self.settings, _("Collection settings"), _("Settings")),
"burnProject": (self.burnProject, _("Burn DVD"), _("Burn DVD")),
})
@@ -97,22 +52,21 @@ class TitleList(Screen):
"contextMenu": (self.showMenu, _("menu")),
})
- self["key_red"] = StaticText(_("Add title"))
- self["key_green"] = StaticText(_("Edit title"))
- self["key_yellow"] = StaticText(_("Remove title"))
- self["key_blue"] = StaticText(_("Save"))
-
- self["title_label"] = StaticText()
- self["space_label"] = StaticText()
- self["space_bar"] = Progress()
-
self["actions"] = ActionMap(["OkCancelActions"],
{
"cancel": self.leave
})
- #Action("addTitle", self.addTitle)
-
+ self["key_red"] = StaticText(_("Remove title"))
+ self["key_green"] = StaticText(_("Add title"))
+ self["key_yellow"] = StaticText(_("Edit title"))
+ self["key_blue"] = StaticText(_("Settings"))
+
+ self["title_label"] = StaticText()
+ self["error_label"] = Label("")
+ self["space_label"] = StaticText()
+ self["space_bar"] = Progress()
+
if project is not None:
self.project = project
else:
@@ -120,110 +74,153 @@ class TitleList(Screen):
self["titles"] = List(list = [ ], enableWrapAround = True, item_height=30, fonts = [gFont("Regular", 20)])
self.updateTitleList()
- self.updateCollectionName()
-
- #self["addTitle"] = ActionButton("titleactions", "addTitle")
- #self["editTitle"] = ActionButton("titleactions", "editTitle")
- #self["removeCurrentTitle"] = ActionButton("titleactions", "removeCurrentTitle")
- #self["saveProject"] = ActionButton("titleactions", "saveProject")
- #self["burnProject"] = ActionButton("titleactions", "burnProject")
def showMenu(self):
menu = []
+ if self.project.settings.output.getValue() == "dvd":
+ menu.append((_("Burn DVD"), "burn"));
+ elif self.project.settings.output.getValue() == "iso":
+ menu.append((_("Create DVD-ISO"), "burn"));
+ menu.append((_("Preview menu"), "previewMenu"));
+ menu.append((_("DVD media toolbox"), "toolbox"));
+ menu.append((_("Collection settings"), "settings"));
menu.append((_("Add a new title"), "addtitle"));
menu.append((_("Remove title"), "removetitle"));
menu.append((_("Edit chapters of current title"), "edittitle"));
- menu.append((_("Set collection name"), "setname"));
- menu.append((_("Set menu background"), "setbackground"));
- menu.append((_("Save current project to disk"), "save"));
- menu.append((_("Load saved project from disk"), "load"));
- menu.append((_("Preview menu"), "previewMenu"));
- menu.append((_("Burn DVD"), "burn"));
+ menu.append((_("Burn existing image to DVD"), "burniso"));
+ menu.append((_("Exit"), "exit"));
self.session.openWithCallback(self.menuCallback, ChoiceBox, title="", list=menu)
def menuCallback(self, choice):
if choice is None:
return
-
if choice[1] == "removetitle":
self.removeCurrentTitle()
elif choice[1] == "addtitle":
self.addTitle()
elif choice[1] == "edittitle":
self.editTitle()
- elif choice[1] == "setname":
- self.setName()
- elif choice[1] == "setbackground":
- self.showFileBrowser(False)
- elif choice[1] == "save":
- self.saveProject()
- elif choice[1] == "load":
- self.showFileBrowser(True)
+ elif choice[1] == "toolbox":
+ self.toolbox()
+ elif choice[1] == "settings":
+ self.settings()
elif choice[1] == "previewMenu":
self.previewMenu()
elif choice[1] == "burn":
self.burnProject()
-
- def setName(self):
- self.session.openWithCallback(self.setNameCallback, InputBox, title=_("Set collection name"), text=self.project.name, maxSize=False, visible_width = 56)
-
- def setNameCallback(self, name):
- if name is not None:
- self.project.name = name
- self.updateCollectionName()
+ elif choice[1] == "burniso":
+ self.session.openWithCallback(self.burnISO, ProjectSettings.FileBrowser, "image", self.project.settings)
+ elif choice[1] == "exit":
+ self.leave()
def newProject(self):
self.project = DVDProject.DVDProject()
- self.project.titles = [ ]
- self.project.session = self.session
- self.updateCollectionName()
-
- def updateCollectionName(self):
- self["title_label"].text = _("Table of content for collection") + " \"" + self.project.name + "\":"
+ if self.loadTemplate():
+ self.project.session = self.session
+ self.settingsCB()
def addTitle(self):
from Screens.MovieSelection import MovieSelection
+ from Components.Button import Button
+ from Components.ActionMap import HelpableActionMap
class MovieSelectionNoMenu(MovieSelection):
def __init__(self, session):
MovieSelection.__init__(self, session)
self.skinName = "MovieSelection"
-
+ self["key_red"] = Button(_("Edit title"))
+ self["key_green"] = Button(_("Add"))
+ self["ColorActions"] = HelpableActionMap(self, "ColorActions",
+ {
+ "red": (self.movieSelected, _("Add a new title")),
+ "green": (self.insertWithoutEdit, ("insert without cutlist editor"))
+ })
+ def updateTags(self):
+ pass
def doContext(self):
print "context menu forbidden inside DVDBurn to prevent calling multiple instances"
-
+ def insertWithoutEdit(self):
+ current = self.getCurrent()
+ if current is not None:
+ current.edit = False
+ self.close(current)
+ def movieSelected(self):
+ current = self.getCurrent()
+ if current is not None:
+ current.edit = True
+ self.close(current)
self.session.openWithCallback(self.selectedSource, MovieSelectionNoMenu)
def selectedSource(self, source):
if source is None:
return None
t = self.project.addService(source)
- self.editTitle(t, readOnly=True)
+ try:
+ editor = source.edit
+ except AttributeError:
+ editor = True
+ self.editTitle(t, editor)
def removeCurrentTitle(self):
title = self.getCurrentTitle()
+ self.removeTitle(title)
+
+ def removeTitle(self, title):
if title is not None:
self.project.titles.remove(title)
self.updateTitleList()
- def saveProject(self):
- self.project.saveProject("/testProgs/dvd/")
+ def toolbox(self):
+ self.session.open(DVDToolbox.DVDToolbox)
- def burnProject(self):
- self.project.waitboxref = self.project.session.open(WaitBox,self.burnProjectCB)
+ def settings(self):
+ self.session.openWithCallback(self.settingsCB, ProjectSettings.ProjectSettings, self.project)
- def burnProjectCB(self):
- import Process
- job = Process.Burn(self.session, self.project)
- from Screens.TaskView import JobView
- self.session.open(JobView, job)
+ def settingsCB(self, update=True):
+ if not update:
+ return
+ self["title_label"].text = _("Table of content for collection") + " \"" + self.project.settings.name.getValue() + "\":"
+
+ def loadTemplate(self):
+ filename = resolveFilename(SCOPE_PLUGINS)+"Extensions/DVDBurn/DreamboxDVDtemplate.ddvdp.xml"
+ if self.project.loadProject(filename):
+ self["error_label"].hide()
+ return True
+ else:
+ self["error_label"].text = self.project.error
+ self["error_label"].show()
+ return False
+
+ def burnProject(self):
+ if self.project.settings.authormode.getValue() == "data_ts":
+ job = Process.DVDdataJob(self.project)
+ job_manager.AddJob(job)
+ job_manager.in_background = False
+ self.session.openWithCallback(self.JobViewCB, JobView, job)
+ else:
+ autochapter = self.project.settings.autochapter.getValue()
+ if autochapter > 0:
+ for title in self.project.titles:
+ title.produceAutoChapter(autochapter)
+ job = Process.DVDJob(self.project)
+ job_manager.AddJob(job)
+ job_manager.in_background = False
+ self.session.openWithCallback(self.JobViewCB, JobView, job)
+
+ def burnISO(self, path, scope):
+ if path:
+ job = Process.DVDisoJob(self.project, path)
+ job_manager.AddJob(job)
+ job_manager.in_background = False
+ self.session.openWithCallback(self.JobViewCB, JobView, job)
+
+ def JobViewCB(self, in_background):
+ job_manager.in_background = in_background
def previewMenu(self):
- self.project.waitboxref = self.project.session.open(WaitBox,self.previewMenuCB)
+ job = Process.DVDJob(self.project, menupreview=True)
+ job_manager.in_background = False
+ job_manager.AddJob(job)
- def previewMenuCB(self):
- import Process
- job = Process.PreviewMenu(self.session, self.project)
-
def updateTitleList(self):
res = [ ]
totalsize = 0
@@ -255,37 +252,31 @@ class TitleList(Screen):
t = self["titles"].getCurrent()
return t and t[0]
- def editTitle(self, title = None, readOnly = False):
+ def editTitle(self, title = None, editor = True):
t = title or self.getCurrentTitle()
if t is not None:
self.current_edit_title = t
- if readOnly:
- self.session.openWithCallback(self.titleEditDone, TitleCutter.CutlistReader, t)
- else:
+ if editor:
self.session.openWithCallback(self.titleEditDone, TitleCutter.TitleCutter, t)
+ else:
+ self.session.openWithCallback(self.titleEditDone, TitleCutter.CutlistReader, t)
def titleEditDone(self, cutlist):
t = self.current_edit_title
t.cuesheet = cutlist
t.produceFinalCuesheet()
- print "title edit of %s done, resulting cutlist:" % (t.source.toString()), t.cutlist, "chaptermarks:", t.chaptermarks
- self.updateTitleList()
+ if t.sVideoType != 0:
+ self.session.openWithCallback(self.DVDformatCB,MessageBox,text = _("The DVD standard doesn't support H.264 (HDTV) video streams. Do you want to create a Dreambox format data DVD (which will not play in stand-alone DVD players) instead?"), type = MessageBox.TYPE_YESNO)
+ else:
+ self.updateTitleList()
+
+ def DVDformatCB(self, answer):
+ t = self.current_edit_title
+ if answer == True:
+ self.project.settings.authormode.setValue("data_ts")
+ self.updateTitleList()
+ else:
+ self.removeTitle(t)
def leave(self):
self.close()
-
- def showFileBrowser(self, projectBrowser=False):
- if projectBrowser:
- currDir = "/home/root"
- else:
- currDir = self.project.menubg
- if len(currDir) > 1:
- currDir = (currDir.rstrip("/").rsplit("/",1))[0]
- self.session.openWithCallback(self.FileBrowserClosed, FileBrowser, currDir, projectBrowser)
-
- def FileBrowserClosed(self, path, projectBrowser=False):
- print "FileBrowserClosed", path, projectBrowser
- if projectBrowser:
- print "would load project", path
- else:
- self.project.menubg = path