From: acid-burn Date: Wed, 7 Oct 2009 10:16:11 +0000 (+0000) Subject: Merge branch 'master' of /git/enigma2 X-Git-Tag: 2.6.0~39 X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/a50e6cee4c01a0fb96c1446e6f9d39da1e7556c8?hp=0b06818dbb088f312e4b7c3099bde8adbb301124 Merge branch 'master' of /git/enigma2 --- diff --git a/data/skin.xml b/data/skin.xml old mode 100644 new mode 100755 index 15923305..d5fe01e6 --- a/data/skin.xml +++ b/data/skin.xml @@ -255,7 +255,7 @@ - + diff --git a/data/skin_default.xml b/data/skin_default.xml index 10571996..100bd5bf 100755 --- a/data/skin_default.xml +++ b/data/skin_default.xml @@ -1,7 +1,7 @@ - + @@ -46,6 +46,7 @@ + @@ -59,19 +60,19 @@ - + - + - + - + @@ -108,7 +109,7 @@ - + @@ -120,7 +121,7 @@ - + @@ -165,19 +166,19 @@ self.instance.move(ePoint((720-wsizex)/2, (576-wsizey)/(count > 7 and 2 or 3) - + - + - + @@ -187,7 +188,7 @@ self.instance.move(ePoint((720-wsizex)/2, (576-wsizey)/(count > 7 and 2 or 3) - + @@ -251,7 +252,7 @@ self.instance.move(ePoint((720-wsizex)/2, (576-wsizey)/(count > 7 and 2 or 3) - + @@ -263,7 +264,7 @@ self.instance.move(ePoint((720-wsizex)/2, (576-wsizey)/(count > 7 and 2 or 3) - + @@ -283,7 +284,7 @@ self.instance.move(ePoint((720-wsizex)/2, (576-wsizey)/(count > 7 and 2 or 3) - + @@ -298,7 +299,7 @@ self.instance.move(ePoint((720-wsizex)/2, (576-wsizey)/(count > 7 and 2 or 3) - + @@ -342,11 +343,11 @@ self.instance.move(ePoint((720-wsizex)/2, (576-wsizey)/(count > 7 and 2 or 3) - + - + @@ -356,7 +357,7 @@ self.instance.move(ePoint((720-wsizex)/2, (576-wsizey)/(count > 7 and 2 or 3) - + @@ -371,19 +372,19 @@ self.instance.move(ePoint((720-wsizex)/2, (576-wsizey)/(count > 7 and 2 or 3) - + - + - + {"template": [ @@ -417,7 +418,7 @@ self.instance.move(ePoint((720-wsizex)/2, (576-wsizey)/(count > 7 and 2 or 3) - + @@ -455,14 +456,14 @@ self.instance.move(ePoint((720-wsizex)/2, (576-wsizey)/(count > 7 and 2 or 3) - + - + @@ -509,15 +510,15 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y())) - + - + - + @@ -612,11 +613,11 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y())) - + - + {"template": [ @@ -630,11 +631,11 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y())) - + - + @@ -655,15 +656,15 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y())) - - + + - + - + @@ -671,18 +672,18 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y())) - + - + - + @@ -690,7 +691,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y())) - + @@ -777,7 +778,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y())) - + @@ -810,12 +811,12 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y())) - + - + @@ -823,7 +824,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y())) - + @@ -835,7 +836,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y())) - + TYPE 0,0 @@ -859,7 +860,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y())) - + @@ -870,7 +871,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y())) - + @@ -892,7 +893,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y())) - + @@ -926,7 +927,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y())) - + Blink @@ -937,18 +938,18 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y())) - + - + - + @@ -956,7 +957,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y())) - + @@ -965,7 +966,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y())) - + @@ -977,7 +978,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y())) - + @@ -987,7 +988,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y())) - + @@ -1000,7 +1001,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y())) - + @@ -1014,7 +1015,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y())) - + @@ -1025,7 +1026,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y())) - + @@ -1124,7 +1125,8 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y())) Blink - + + @@ -1152,6 +1154,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y())) + @@ -1160,10 +1163,19 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y())) - + + + + + + + + + + diff --git a/lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py b/lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py old mode 100644 new mode 100755 index ce16259e..feb39a95 --- a/lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py +++ b/lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py @@ -13,15 +13,13 @@ from Plugins.SystemPlugins.Hotplug.plugin import hotplugNotifier class DVDToolbox(Screen): skin = """ - + - - @@ -34,7 +32,6 @@ class DVDToolbox(Screen): self["key_red"] = StaticText(_("Exit")) self["key_green"] = StaticText(_("Update")) self["key_yellow"] = StaticText() - self["key_blue"] = StaticText() self["space_label"] = StaticText() self["space_bar"] = Progress() @@ -49,14 +46,17 @@ class DVDToolbox(Screen): "red": self.exit, "green": self.update, "yellow": self.format, - #"blue": self.eject, "cancel": self.exit, "pageUp": self.pageUp, "pageDown": self.pageDown }) self.update() hotplugNotifier.append(self.update) - + self.onLayoutFinish.append(self.layoutFinished) + + def layoutFinished(self): + self.setTitle(_("DVD media toolbox")) + def pageUp(self): self["details"].pageUp() diff --git a/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py b/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py old mode 100644 new mode 100755 index f95bbc36..9b4e2d54 --- a/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py +++ b/lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py @@ -15,9 +15,14 @@ from Components.ConfigList import ConfigListScreen class FileBrowser(Screen, HelpableScreen): skin = """ - - - """ + + + + + + + """ + def __init__(self, session, scope, configRef): Screen.__init__(self, session) HelpableScreen.__init__(self) @@ -58,6 +63,13 @@ class FileBrowser(Screen, HelpableScreen): "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, currentVal=None, defaultDir=None): if currentVal: return (currentVal.rstrip("/").rsplit("/",1))[0] @@ -81,17 +93,18 @@ class FileBrowser(Screen, HelpableScreen): class ProjectSettings(Screen,ConfigListScreen): skin = """ - - - - - - - - - - - + + + + + + + + + + + + """ def __init__(self, session, project = None): @@ -126,6 +139,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]] diff --git a/lib/python/Plugins/Extensions/DVDBurn/TitleList.py b/lib/python/Plugins/Extensions/DVDBurn/TitleList.py old mode 100644 new mode 100755 index 83bafd74..928a8b82 --- a/lib/python/Plugins/Extensions/DVDBurn/TitleList.py +++ b/lib/python/Plugins/Extensions/DVDBurn/TitleList.py @@ -10,28 +10,27 @@ 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.Label import Label from enigma import eListboxPythonMultiContent, gFont, RT_HALIGN_LEFT from Tools.Directories import resolveFilename, SCOPE_PLUGINS class TitleList(Screen, HelpableScreen): skin = """ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + """ def __init__(self, session, project = None): @@ -63,7 +62,7 @@ class TitleList(Screen, HelpableScreen): self["key_blue"] = StaticText(_("Settings")) self["title_label"] = StaticText() - self["error_label"] = Label("") + self["error_label"] = StaticText() self["space_label"] = StaticText() self["space_bar"] = Progress() @@ -75,6 +74,10 @@ class TitleList(Screen, HelpableScreen): self["titles"] = List(list = [ ], enableWrapAround = True, item_height=30, fonts = [gFont("Regular", 20)]) self.updateTitleList() self.previous_size = 0 + self.onLayoutFinish.append(self.layoutFinished) + + def layoutFinished(self): + self.setTitle(_("DVD Titlelist")) def checkBackgroundJobs(self): for job in job_manager.getPendingJobs(): @@ -128,18 +131,43 @@ class TitleList(Screen, HelpableScreen): def addTitle(self): from Screens.MovieSelection import MovieSelection - from Components.Button import Button from Components.ActionMap import HelpableActionMap - class MovieSelectionNoMenu(MovieSelection): + class DVDMovieSelection(MovieSelection): + skin = """ + + + + + + + + + + + ShortDescription + + + Duration + AsLength + + + RecordServiceName + + + ExtendedDescription + + + """ def __init__(self, session): MovieSelection.__init__(self, session) - self.skinName = "MovieSelection" - self["key_red"] = Button(_("Edit title")) - self["key_green"] = Button(_("Add")) + self["key_red"] = StaticText(_("Close")) + self["key_green"] = StaticText(_("Add")) + self["key_yellow"] = StaticText(_("Edit title")) self["ColorActions"] = HelpableActionMap(self, "ColorActions", { - "red": (self.movieSelected, _("Add a new title")), - "green": (self.insertWithoutEdit, ("insert without cutlist editor")) + "red": (self.close, _("Close title selection")), + "green": (self.insertWithoutEdit, ("insert without cutlist editor")), + "yellow": (self.movieSelected, _("Add a new title")) }) def updateTags(self): pass @@ -155,7 +183,7 @@ class TitleList(Screen, HelpableScreen): if current is not None: current.edit = True self.close(current) - self.session.openWithCallback(self.selectedSource, MovieSelectionNoMenu) + self.session.openWithCallback(self.selectedSource, DVDMovieSelection) def selectedSource(self, source): if source is None: @@ -190,11 +218,10 @@ class TitleList(Screen, HelpableScreen): def loadTemplate(self): filename = resolveFilename(SCOPE_PLUGINS)+"Extensions/DVDBurn/DreamboxDVD.ddvdp.xml" if self.project.load(filename): - self["error_label"].hide() + self["error_label"].setText("") return True else: - self["error_label"].text = self.project.error - self["error_label"].show() + self["error_label"].setText(self.project.error) return False def askBurnProject(self): diff --git a/lib/python/Plugins/Extensions/DVDBurn/TitleProperties.py b/lib/python/Plugins/Extensions/DVDBurn/TitleProperties.py old mode 100644 new mode 100755 index 86d21c25..11601cc3 --- a/lib/python/Plugins/Extensions/DVDBurn/TitleProperties.py +++ b/lib/python/Plugins/Extensions/DVDBurn/TitleProperties.py @@ -18,16 +18,16 @@ import DVDTitle class TitleProperties(Screen,ConfigListScreen): skin = """ - - - - - - - - - - + + + + + + + + + + """ def __init__(self, session, parent, project, title_idx): @@ -63,6 +63,10 @@ class TitleProperties(Screen,ConfigListScreen): }, -2) self.onShown.append(self.update) + self.onLayoutFinish.append(self.layoutFinished) + + def layoutFinished(self): + self.setTitle(_("Properties of current title")) def initConfigList(self, element=None): try: diff --git a/lib/python/Plugins/Extensions/MediaPlayer/settings.py b/lib/python/Plugins/Extensions/MediaPlayer/settings.py old mode 100644 new mode 100755 index 8a032d16..5f9ce7cd --- a/lib/python/Plugins/Extensions/MediaPlayer/settings.py +++ b/lib/python/Plugins/Extensions/MediaPlayer/settings.py @@ -15,12 +15,12 @@ config.mediaplayer.defaultDir = ConfigDirectory() class DirectoryBrowser(Screen, HelpableScreen): skin = """ - - - - - - + + + + + + """ def __init__(self, session, currDir): from Components.Sources.StaticText import StaticText @@ -55,12 +55,12 @@ class DirectoryBrowser(Screen, HelpableScreen): class MediaPlayerSettings(Screen,ConfigListScreen): skin = """ - - - - - - + + + + + + """ def __init__(self, session, parent): diff --git a/lib/python/Plugins/Extensions/PicturePlayer/plugin.py b/lib/python/Plugins/Extensions/PicturePlayer/plugin.py old mode 100644 new mode 100755 index 10e4e514..3925b07c --- a/lib/python/Plugins/Extensions/PicturePlayer/plugin.py +++ b/lib/python/Plugins/Extensions/PicturePlayer/plugin.py @@ -6,12 +6,11 @@ from Plugins.Plugin import PluginDescriptor from Components.Pixmap import Pixmap, MovingPixmap from Components.ActionMap import ActionMap, NumberActionMap -from Components.Label import Label -from Components.Button import Button +from Components.Sources.StaticText import StaticText from Components.FileList import FileList from Components.AVSwitch import AVSwitch from Components.Sources.List import List -from Components.ConfigList import ConfigList +from Components.ConfigList import ConfigList, ConfigListScreen from Components.config import config, ConfigSubsection, ConfigInteger, ConfigSelection, ConfigText, ConfigEnableDisable, KEY_LEFT, KEY_RIGHT, KEY_0, getConfigListEntry @@ -30,37 +29,39 @@ config.pic.bgcolor = ConfigSelection(default="#00000000", choices = [("#00000000 config.pic.textcolor = ConfigSelection(default="#0038FF48", choices = [("#00000000", _("black")),("#009eb9ff", _("blue")),("#00ff5a51", _("red")), ("#00ffe875", _("yellow")), ("#0038FF48", _("green"))]) class picshow(Screen): - def __init__(self, session): - self.skin = """ - - - - - - - - - + skin = """ + + + + + + + + + + - """ + """ + def __init__(self, session): Screen.__init__(self, session) self["actions"] = ActionMap(["OkCancelActions", "ColorActions", "DirectionActions"], { "cancel": self.KeyExit, - "red": self.KeyRed, + "red": self.KeyExit, + "green": self.KeyGreen, "yellow": self.KeyYellow, "blue": self.KeyBlue, "ok": self.KeyOk }, -1) - self["key_red"] = Button(_("Thumbnails")) - self["key_green"] = Button() - self["key_yellow"] = Button(_("Exif")) - self["key_blue"] = Button(_("Setup")) - self["label"] = Label() + self["key_red"] = StaticText(_("Close")) + self["key_green"] = StaticText(_("Thumbnails")) + self["key_yellow"] = StaticText("") + self["key_blue"] = StaticText(_("Setup")) + self["label"] = StaticText("") self["thn"] = Pixmap() currDir = config.pic.lastDir.value @@ -70,13 +71,13 @@ class picshow(Screen): self.filelist = FileList(currDir, matchingPattern = "(?i)^.*\.(jpeg|jpg|jpe|png|bmp|gif)") self["filelist"] = self.filelist self["filelist"].onSelectionChanged.append(self.selectionChanged) - + self.ThumbTimer = eTimer() self.ThumbTimer.callback.append(self.showThumb) self.picload = ePicLoad() self.picload.PictureData.get().append(self.showPic) - + self.onLayoutFinish.append(self.setConf) def showPic(self, picInfo=""): @@ -87,8 +88,8 @@ class picshow(Screen): text = picInfo.split('\n',1) self["label"].setText(text[1]) - self["label"].show() - + self["key_yellow"].setText(_("Exif")) + def showThumb(self): if not self.filelist.canDescent(): if self.filelist.getCurrentDirectory() and self.filelist.getFilename(): @@ -99,17 +100,18 @@ class picshow(Screen): if not self.filelist.canDescent(): self.ThumbTimer.start(500, True) else: - self["label"].hide() + self["label"].setText("") self["thn"].hide() - - def KeyRed(self): + self["key_yellow"].setText("") + + def KeyGreen(self): #if not self.filelist.canDescent(): self.session.openWithCallback(self.callbackView, Pic_Thumb, self.filelist.getFileList(), self.filelist.getSelectionIndex(), self.filelist.getCurrentDirectory()) - + def KeyYellow(self): if not self.filelist.canDescent(): self.session.open(Pic_Exif, self.picload.getInfo(self.filelist.getCurrentDirectory() + self.filelist.getFilename())) - + def KeyBlue(self): self.session.openWithCallback(self.setConf ,Pic_Setup) @@ -120,10 +122,11 @@ class picshow(Screen): self.session.openWithCallback(self.callbackView, Pic_Full_View, self.filelist.getFileList(), self.filelist.getSelectionIndex(), self.filelist.getCurrentDirectory()) def setConf(self): + self.setTitle(_("PicturePlayer")) sc = getScale() #0=Width 1=Height 2=Aspect 3=use_cache 4=resize_type 5=Background(#AARRGGBB) self.picload.setPara((self["thn"].instance.size().width(), self["thn"].instance.size().height(), sc[0], sc[1], config.pic.cache.value, int(config.pic.resize.value), "#00000000")) - + def callbackView(self, val=0): if val > 0: self.filelist.moveToIndex(val) @@ -139,70 +142,83 @@ class picshow(Screen): config.pic.save() self.close() -#------------------------------------------------------------------------------------------ -class Pic_Setup(Screen): +class Pic_Setup(Screen, ConfigListScreen): + skin = """ + + + + + + + """ def __init__(self, session): - self.skin = """ - - """ Screen.__init__(self, session) + self.session = session + + self["actions"] = ActionMap(["SetupActions", "ColorActions"], + { + "cancel": self.keyCancel, + "save": self.keySave, + }, -2) + + self["key_red"] = StaticText(_("Cancel")) + self["key_green"] = StaticText(_("OK")) + + self.list = [] + ConfigListScreen.__init__(self, self.list, session = self.session) + self.createSetup() + self.onLayoutFinish.append(self.layoutFinished) + + def layoutFinished(self): + self.setTitle(_("Settings")) + + def createSetup(self): + self.list = [] + self.list.append(getConfigListEntry(_("Slideshow Interval (sec.)"), config.pic.slidetime)) + self.list.append(getConfigListEntry(_("Scaling Mode"), config.pic.resize)) + self.list.append(getConfigListEntry(_("Cache Thumbnails"), config.pic.cache)) + self.list.append(getConfigListEntry(_("show Infoline"), config.pic.infoline)) + self.list.append(getConfigListEntry(_("Frame size in full view"), config.pic.framesize)) + self.list.append(getConfigListEntry(_("slide picture in loop"), config.pic.loop)) + self.list.append(getConfigListEntry(_("backgroundcolor"), config.pic.bgcolor)) + self.list.append(getConfigListEntry(_("textcolor"), config.pic.textcolor)) + self["config"].list = self.list + self["config"].l.setList(self.list) - self["actions"] = NumberActionMap(["SetupActions"], - { - "cancel": self.close, - "left": self.keyLeft, - "right": self.keyRight, - "0": self.keyNumber, - "1": self.keyNumber, - "2": self.keyNumber, - "3": self.keyNumber, - "4": self.keyNumber, - "5": self.keyNumber, - "6": self.keyNumber, - "7": self.keyNumber, - "8": self.keyNumber, - "9": self.keyNumber - }, -1) - - list = [] - self["liste"] = ConfigList(list) - list.append(getConfigListEntry(_("Slideshow Interval (sec.)"), config.pic.slidetime)) - list.append(getConfigListEntry(_("Scaling Mode"), config.pic.resize)) - list.append(getConfigListEntry(_("Cache Thumbnails"), config.pic.cache)) - list.append(getConfigListEntry(_("show Infoline"), config.pic.infoline)) - list.append(getConfigListEntry(_("Frame size in full view"), config.pic.framesize)) - list.append(getConfigListEntry(_("slide picture in loop"), config.pic.loop)) - list.append(getConfigListEntry(_("backgroundcolor"), config.pic.bgcolor)) - list.append(getConfigListEntry(_("textcolor"), config.pic.textcolor)) - def keyLeft(self): - self["liste"].handleKey(KEY_LEFT) + ConfigListScreen.keyLeft(self) def keyRight(self): - self["liste"].handleKey(KEY_RIGHT) - - def keyNumber(self, number): - self["liste"].handleKey(KEY_0 + number) + ConfigListScreen.keyRight(self) -#--------------------------------------------------------------------------- class Pic_Exif(Screen): - def __init__(self, session, exiflist): - self.skin = """ - + skin = """ + + + + - {"template": [ MultiContentEntryText(pos = (5, 5), size = (250, 30), flags = RT_HALIGN_LEFT, text = 0), MultiContentEntryText(pos = (260, 5), size = (290, 30), flags = RT_HALIGN_LEFT, text = 1)], "fonts": [gFont("Regular", 20)], "itemHeight": 30 } + { + "template": [ MultiContentEntryText(pos = (5, 5), size = (250, 30), flags = RT_HALIGN_LEFT, text = 0), MultiContentEntryText(pos = (260, 5), size = (290, 30), flags = RT_HALIGN_LEFT, text = 1)], + "fonts": [gFont("Regular", 20)], + "itemHeight": 30 + } - - """ + + """ + + def __init__(self, session, exiflist): Screen.__init__(self, session) self["actions"] = ActionMap(["OkCancelActions"], { "cancel": self.close }, -1) - + + self["key_red"] = StaticText(_("Close")) + exifdesc = [_("filename")+':', "EXIF-Version:", "Make:", "Camera:", "Date/Time:", "Width / Height:", "Flash used:", "Orientation:", "User Comments:", "Metering Mode:", "Exposure Program:", "Light Source:", "CompressedBitsPerPixel:", "ISO Speed Rating:", "X-Resolution:", "Y-Resolution:", "Resolution Unit:", "Brightness:", "Exposure Time:", "Exposure Bias:", "Distance:", "CCD-Width:", "ApertureFNumber:"] list = [] @@ -213,8 +229,11 @@ class Pic_Exif(Screen): name = exiflist[x].split('/')[-1] list.append((exifdesc[x], name)) self["menu"] = List(list) + self.onLayoutFinish.append(self.layoutFinished) + + def layoutFinished(self): + self.setTitle(_("Info")) -#---------------------------------------------------------------------------------------- T_INDEX = 0 T_FRAME_POS = 1 @@ -252,7 +271,7 @@ class Pic_Thumb(Screen): absX = self.spaceX + (posX*(self.spaceX + self.picX)) absY = self.spaceY + (posY*(self.spaceY + self.picY)) self.positionlist.append((absX, absY)) - skincontent += "" + skincontent += "" skincontent += "" @@ -276,7 +295,7 @@ class Pic_Thumb(Screen): self["frame"] = MovingPixmap() for x in range(self.thumbsC): - self["label"+str(x)] = Label() + self["label"+str(x)] = StaticText() self["thumb"+str(x)] = Pixmap() self.Thumbnaillist = [] @@ -418,7 +437,7 @@ class Pic_Full_View(Screen): \ \ \ - " + " Screen.__init__(self, session) @@ -437,7 +456,7 @@ class Pic_Full_View(Screen): self["point"] = Pixmap() self["pic"] = Pixmap() self["play_icon"] = Pixmap() - self["file"] = Label(_("please wait, loading picture...")) + self["file"] = StaticText(_("please wait, loading picture...")) self.old_index = 0 self.filelist = [] @@ -480,7 +499,7 @@ class Pic_Full_View(Screen): self["play_icon"].hide() if config.pic.infoline.value == False: - self["file"].hide() + self["file"].setText("") self.start_decode() def ShowPicture(self): diff --git a/lib/python/Plugins/SystemPlugins/Videomode/plugin.py b/lib/python/Plugins/SystemPlugins/Videomode/plugin.py old mode 100644 new mode 100755 index 1b820fb1..db810f0c --- a/lib/python/Plugins/SystemPlugins/Videomode/plugin.py +++ b/lib/python/Plugins/SystemPlugins/Videomode/plugin.py @@ -3,16 +3,17 @@ from Plugins.Plugin import PluginDescriptor from Components.SystemInfo import SystemInfo from Components.ConfigList import ConfigListScreen from Components.config import getConfigListEntry, config, ConfigBoolean, ConfigNothing, ConfigSlider +from Components.Sources.StaticText import StaticText from VideoHardware import video_hw config.misc.videowizardenabled = ConfigBoolean(default = True) class VideoSetup(Screen, ConfigListScreen): + def __init__(self, session, hw): Screen.__init__(self, session) - self.skinName = "Setup" - self.setup_title = "Videomode Setup" + self.setup_title = _("A/V Settings") self.hw = hw self.onChangedEntry = [ ] @@ -30,18 +31,15 @@ class VideoSetup(Screen, ConfigListScreen): "save": self.apply, }, -2) - from Components.Label import Label - self["title"] = Label(_("A/V Settings")) - - self["oktext"] = Label(_("OK")) - self["canceltext"] = Label(_("Cancel")) - - from Components.Pixmap import Pixmap - self["ok"] = Pixmap() - self["cancel"] = Pixmap() + self["key_red"] = StaticText(_("Cancel")) + self["key_green"] = StaticText(_("OK")) self.createSetup() self.grabLastGoodMode() + self.onLayoutFinish.append(self.layoutFinished) + + def layoutFinished(self): + self.setTitle(self.setup_title) def startHotplug(self): self.hw.on_hotplug.append(self.createSetup) @@ -231,4 +229,4 @@ def Plugins(**kwargs): ] if config.misc.videowizardenabled.value: list.append(PluginDescriptor(name=_("Video Wizard"), where = PluginDescriptor.WHERE_WIZARD, fnc=(0, VideoWizard))) - return list + return list