From deaf3139671ce0aa53a741b2fece9fbe3fd98c4e Mon Sep 17 00:00:00 2001 From: Andreas Frisch Date: Fri, 12 Sep 2008 12:00:35 +0000 Subject: [PATCH] Path and template fixes --- .../Plugins/Extensions/DVDBurn/DVDProject.py | 32 ++++++++++++++---- .../DVDBurn/DreamboxDVDtemplate.ddvdp.xml | 18 ++++++++++ .../Plugins/Extensions/DVDBurn/Makefile.am | 3 +- .../Plugins/Extensions/DVDBurn/Process.py | 3 +- .../Extensions/DVDBurn/ProjectSettings.py | 24 ++++++------- .../Plugins/Extensions/DVDBurn/TitleCutter.py | 7 ++-- .../Plugins/Extensions/DVDBurn/TitleList.py | 6 ++-- .../Extensions/DVDBurn/dreamdvd_boat.jpg | Bin 0 -> 187417 bytes .../Plugins/Extensions/DVDBurn/silence.mp2 | Bin 0 -> 8340 bytes .../Plugins/Extensions/DVDBurn/vmgmblank.mpg | Bin 0 -> 24576 bytes .../Plugins/Extensions/DVDBurn/vmgmdream.mpg | Bin 0 -> 575488 bytes 11 files changed, 65 insertions(+), 28 deletions(-) create mode 100644 lib/python/Plugins/Extensions/DVDBurn/DreamboxDVDtemplate.ddvdp.xml create mode 100644 lib/python/Plugins/Extensions/DVDBurn/dreamdvd_boat.jpg create mode 100644 lib/python/Plugins/Extensions/DVDBurn/silence.mp2 create mode 100644 lib/python/Plugins/Extensions/DVDBurn/vmgmblank.mpg create mode 100644 lib/python/Plugins/Extensions/DVDBurn/vmgmdream.mpg diff --git a/lib/python/Plugins/Extensions/DVDBurn/DVDProject.py b/lib/python/Plugins/Extensions/DVDBurn/DVDProject.py index cfad6774..962b34cb 100644 --- a/lib/python/Plugins/Extensions/DVDBurn/DVDProject.py +++ b/lib/python/Plugins/Extensions/DVDBurn/DVDProject.py @@ -1,3 +1,4 @@ + from Tools.Directories import fileExists from Components.config import config, ConfigSubsection, ConfigInteger, ConfigYesNo, ConfigText, ConfigSelection, getConfigListEntry, ConfigSequence @@ -9,24 +10,41 @@ class ConfigPixelvals(ConfigSequence): def __init__(self): ConfigSequence.__init__(self, seperator = ",", limits = [(0,200),(0,200),(0,200)]) +class ConfigPixelvals(ConfigSequence): + def __init__(self): + ConfigSequence.__init__(self, seperator = ",", limits = [(0,200),(0,200),(0,200)]) + +class ConfigFilename(ConfigText): + def __init__(self): + ConfigText.__init__(self, default = "", fixed_size = True, visible_width = False) + + def getMulti(self, selected): + filename = (self.text.rstrip("/").rsplit("/",1))[1].encode("utf-8")[:40] + " " + print "ConfigFilename =", filename + if self.allmarked: + mark = range(0, len(filename)) + else: + mark = [filename] + return ("mtext"[1-selected:], filename, mark) + class DVDProject: def __init__(self): self.titles = [ ] self.target = None self.settings = ConfigSubsection() - self.settings.name = ConfigText(visible_width = 40) + self.settings.name = ConfigText(fixed_size = False, visible_width = 40) self.settings.authormode = ConfigSelection(choices = [("menu_linked", _("Linked titles with a DVD menu")), ("just_linked", _("Direct playback of linked titles without menu")), ("menu_seperate", _("Seperate titles with a main menu")), ]) - self.settings.menubg = ConfigText(visible_width = 40) - self.settings.menuaudio = ConfigText(visible_width = 40) - self.settings.titleformat = ConfigText(visible_width = 40) - self.settings.subtitleformat = ConfigText(visible_width = 40) + self.settings.menubg = ConfigFilename() + self.settings.menuaudio = ConfigFilename() + self.settings.titleformat = ConfigText(fixed_size = False, visible_width = 40) + self.settings.subtitleformat = ConfigText(fixed_size = False, visible_width = 40) self.settings.color_headline = ConfigColor() self.settings.color_highlight = ConfigColor() self.settings.color_button = ConfigColor() - self.settings.font_face = ConfigText(visible_width = 40) + self.settings.font_face = ConfigFilename() self.settings.font_size = ConfigPixelvals() self.settings.space = ConfigPixelvals() - self.settings.vmgm = ConfigText(visible_width = 40) + self.settings.vmgm = ConfigFilename() self.settings.autochapter = ConfigInteger(default = 0, limits = (0, 99)) self.filekeys = ["vmgm", "menubg", "menuaudio", "font_face"] diff --git a/lib/python/Plugins/Extensions/DVDBurn/DreamboxDVDtemplate.ddvdp.xml b/lib/python/Plugins/Extensions/DVDBurn/DreamboxDVDtemplate.ddvdp.xml new file mode 100644 index 00000000..cb358648 --- /dev/null +++ b/lib/python/Plugins/Extensions/DVDBurn/DreamboxDVDtemplate.ddvdp.xml @@ -0,0 +1,18 @@ + + + + + diff --git a/lib/python/Plugins/Extensions/DVDBurn/Makefile.am b/lib/python/Plugins/Extensions/DVDBurn/Makefile.am index 886876cc..3b2f4484 100644 --- a/lib/python/Plugins/Extensions/DVDBurn/Makefile.am +++ b/lib/python/Plugins/Extensions/DVDBurn/Makefile.am @@ -5,6 +5,5 @@ install_PYTHON = \ plugin.py \ DVDProject.py DVDTitle.py TitleCutter.py TitleList.py Process.py ProjectSettings.py -install_DATA = keymap.xml +install_DATA = *.xml *.jpg *.mpg *.mp2 -SUBDIRS = data template diff --git a/lib/python/Plugins/Extensions/DVDBurn/Process.py b/lib/python/Plugins/Extensions/DVDBurn/Process.py index 12d85b45..67654f61 100644 --- a/lib/python/Plugins/Extensions/DVDBurn/Process.py +++ b/lib/python/Plugins/Extensions/DVDBurn/Process.py @@ -345,6 +345,7 @@ def formatTitle(template, title, track): template = template.replace("$t", title.name) template = template.replace("$d", title.descr) template = template.replace("$c", str(len(title.chaptermarks)+1)) + template = template.replace("$A", str(title.audiotracks)) template = template.replace("$f", title.inputfile) template = template.replace("$C", title.channel) l = title.length @@ -524,7 +525,7 @@ def CreateAuthoringXML(job): authorxml.append(' \n') for i in range( nr_titles ): for audiotrack in job.project.titles[i].audiotracks: - authorxml.append('