From: Fraxinas Date: Tue, 30 Mar 2010 12:17:41 +0000 (+0200) Subject: Revert "[DVDBurn] usability improvements: title list layout, bottom info area, consis... X-Git-Tag: 2.8.0~32 X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/33b03607a97f4d3b7baacaca632942570a54ac5c Revert "[DVDBurn] usability improvements: title list layout, bottom info area, consistency of user interface (fixes #316)" This reverts commit cf16247cbcaf1620ad597c24323c81ac3604cbda. --- diff --git a/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py b/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py index 0a0106bb..a1c38842 100755 --- a/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py +++ b/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py @@ -92,10 +92,10 @@ class ProjectSettings(Screen,ConfigListScreen): - - - - + + + + diff --git a/lib/python/Plugins/Extensions/DVDBurn/TitleList.py b/lib/python/Plugins/Extensions/DVDBurn/TitleList.py index 8cfc57e5..dbc988b1 100755 --- a/lib/python/Plugins/Extensions/DVDBurn/TitleList.py +++ b/lib/python/Plugins/Extensions/DVDBurn/TitleList.py @@ -16,40 +16,33 @@ from Tools.Directories import resolveFilename, SCOPE_PLUGINS class TitleList(Screen, HelpableScreen): skin = """ - + - - - - + + + + - - + + {"template": [ MultiContentEntryText(pos = (0, 0), size = (420, 20), font = 0, flags = RT_HALIGN_LEFT, text = 1), # index 1 Title, MultiContentEntryText(pos = (0, 20), size = (328, 17), font = 1, flags = RT_HALIGN_LEFT, text = 2), # index 2 description, - MultiContentEntryText(pos = (418, 6), size = (120, 20), font = 1, flags = RT_HALIGN_RIGHT, text = 3), # index 3 channel, - MultiContentEntryText(pos = (326, 20), size = (154, 17), font = 1, flags = RT_HALIGN_RIGHT, text = 4), # index 4 begin time, - MultiContentEntryText(pos = (480, 20), size = (58, 20), font = 1, flags = RT_HALIGN_RIGHT, text = 5), # index 5 duration, + MultiContentEntryText(pos = (420, 6), size = (120, 20), font = 1, flags = RT_HALIGN_RIGHT, text = 3), # index 3 begin time, + MultiContentEntryText(pos = (328, 20), size = (154, 17), font = 1, flags = RT_HALIGN_RIGHT, text = 4), # index 4 channel, + MultiContentEntryText(pos = (482, 20), size = (58, 20), font = 1, flags = RT_HALIGN_RIGHT, text = 5), # index 4 channel, ], "fonts": [gFont("Regular", 20), gFont("Regular", 14)], "itemHeight": 37 } - - - - - - - - - + + """ def __init__(self, session, project = None): @@ -82,19 +75,17 @@ class TitleList(Screen, HelpableScreen): self["title_label"] = StaticText() self["error_label"] = StaticText() - self["space_label_single"] = StaticText() - self["space_label_dual"] = StaticText() - self["hint"] = StaticText(_("Advanced Options")) - self["medium"] = StaticText() - self["space_bar_single"] = Progress() - self["space_bar_dual"] = Progress() + self["space_label"] = StaticText() + self["space_bar"] = Progress() - self["titles"] = List([]) - self.previous_size = 0 if project is not None: self.project = project else: self.newProject() + + self["titles"] = List([]) + self.updateTitleList() + self.previous_size = 0 self.onLayoutFinish.append(self.layoutFinished) def layoutFinished(self): @@ -116,16 +107,15 @@ class TitleList(Screen, HelpableScreen): j = self.backgroundJob menu.append(("%s: %s (%d%%)" % (j.getStatustext(), j.name, int(100*j.progress/float(j.end))), self.showBackgroundJob)) menu.append((_("DVD media toolbox"), self.toolbox)) + menu.append((_("Preview menu"), self.previewMenu)) if self.project.settings.output.getValue() == "dvd": if len(self["titles"].list): menu.append((_("Burn DVD"), self.burnProject)) elif self.project.settings.output.getValue() == "iso": menu.append((_("Create DVD-ISO"), self.burnProject)) menu.append((_("Burn existing image to DVD"), self.selectImage)) - if len(self["titles"].list): - menu.append((_("Preview menu"), self.previewMenu)) - menu.append((_("Edit chapters of current title"), self.editTitle)) - menu.append((_("Reset and renumerate title names"), self.resetTitles)) + menu.append((_("Edit chapters of current title"), self.editTitle)) + menu.append((_("Reset and renumerate title names"), self.resetTitles)) menu.append((_("Exit"), self.leave)) self.session.openWithCallback(self.menuCallback, ChoiceBox, title="", list=menu) @@ -159,9 +149,9 @@ class TitleList(Screen, HelpableScreen): - - - + + + @@ -207,7 +197,7 @@ class TitleList(Screen, HelpableScreen): self.close(current) self.session.openWithCallback(self.selectedSource, DVDMovieSelection) - def selectedSource(self, source = None): + def selectedSource(self, source): if source is None: return None if not source.getPath().endswith(".ts"): @@ -238,7 +228,7 @@ class TitleList(Screen, HelpableScreen): def settingsCB(self, update=True): if not update: return - self.updateTitleList() + self["title_label"].text = _("Table of content for collection") + " \"" + self.project.settings.name.getValue() + "\":" def loadTemplate(self): filename = resolveFilename(SCOPE_PLUGINS)+"Extensions/DVDBurn/DreamboxDVD.ddvdp.xml" @@ -291,11 +281,9 @@ class TitleList(Screen, HelpableScreen): if len(list): self["key_red"].text = _("Remove title") self["key_yellow"].text = _("Title properties") - self["title_label"].text = _("Table of content for collection") + " \"" + self.project.settings.name.getValue() + "\":" else: self["key_red"].text = "" self["key_yellow"].text = "" - self["title_label"].text = _("Please add titles to the compilation") def updateSize(self): size = self.project.size/(1024*1024) @@ -304,29 +292,20 @@ class TitleList(Screen, HelpableScreen): print "updateSize:", size, "MAX_DL:", MAX_DL, "MAX_SL:", MAX_SL if size > MAX_DL: percent = 100 * size / float(MAX_DL) - self["space_label_dual"].text = "%d MB (%.2f%%)" % (size, percent) - self["space_bar_dual"].value = int(percent) - self["space_bar_single"].value = 100 - self["space_label_single"].text = "" - self["medium"].text = _("exceeds dual layer medium!") + self["space_label"].text = "%d MB - " % size + _("exceeds dual layer medium!") + " (%.2f%% " % (100-percent) + _("free") + ")" + self["space_bar"].value = int(percent) if self.previous_size < MAX_DL: self.session.open(MessageBox,text = _("exceeds dual layer medium!"), type = MessageBox.TYPE_ERROR) elif size > MAX_SL: percent = 100 * size / float(MAX_DL) - self["space_label_dual"].text = "%d MB (%.2f%%)" % (size, percent) - self["space_bar_dual"].value = int(percent) - self["space_bar_single"].value = 100 - self["space_label_single"].text = "" - self["medium"].text = _("required medium type: DUAL LAYER DVD") + ", %d MB " % (MAX_DL - size) + _("free") + self["space_label"].text = "%d MB " % size + _("of a DUAL layer medium used.") + " (%.2f%% " % (100-percent) + _("free") + ")" + self["space_bar"].value = int(percent) if self.previous_size < MAX_SL: - self.session.open(MessageBox, text = _("Your collection exceeds the size of a single layer medium, you will need a blank dual layer DVD!"), timeout = 10, type = MessageBox.TYPE_INFO) + self.session.open(MessageBox,text = _("Your collection exceeds the size of a single layer medium, you will need a blank dual layer DVD!"), type = MessageBox.TYPE_INFO) elif size < MAX_SL: percent = 100 * size / float(MAX_SL) - self["space_label_single"].text = "%d MB (%.2f%%)" % (size, percent) - self["space_bar_single"].value = int(percent) - self["space_bar_dual"].value = 0 - self["space_label_dual"].text = "" - self["medium"].text = _("required medium type: SINGLE LAYER DVD") + ", %d MB " % (MAX_SL - size) + _("free") + self["space_label"].text = "%d MB " % size + _("of a SINGLE layer medium used.") + " (%.2f%% " % (100-percent) + _("free") + ")" + self["space_bar"].value = int(percent) self.previous_size = size def getCurrentTitle(self): @@ -367,13 +346,5 @@ class TitleList(Screen, HelpableScreen): else: self.removeTitle(t) - def leave(self, close = False): - if not len(self["titles"].list) or close: - self.close() - else: - self.session.openWithCallback(self.exitCB, MessageBox,text = _("Are you sure you want to exit this wizard?"), type = MessageBox.TYPE_YESNO) - - def exitCB(self, answer): - print "exitCB", answer - if answer is not None and answer: - self.close() \ No newline at end of file + def leave(self): + self.close() diff --git a/lib/python/Plugins/Extensions/DVDBurn/TitleProperties.py b/lib/python/Plugins/Extensions/DVDBurn/TitleProperties.py index 956f054d..0a664eba 100755 --- a/lib/python/Plugins/Extensions/DVDBurn/TitleProperties.py +++ b/lib/python/Plugins/Extensions/DVDBurn/TitleProperties.py @@ -21,12 +21,10 @@ class TitleProperties(Screen,ConfigListScreen): - - - - - + + + @@ -40,8 +38,7 @@ class TitleProperties(Screen,ConfigListScreen): self["key_red"] = StaticText(_("Cancel")) self["key_green"] = StaticText(_("OK")) - self["key_yellow"] = StaticText(_("Edit Title")) - self["key_blue"] = StaticText() + self["key_blue"] = StaticText(_("Edit Title")) self["serviceinfo"] = StaticText() self["thumbnail"] = Pixmap() @@ -60,7 +57,7 @@ class TitleProperties(Screen,ConfigListScreen): { "green": self.exit, "red": self.cancel, - "yellow": self.editTitle, + "blue": self.editTitle, "cancel": self.cancel, "ok": self.ok, }, -2)