From: acid-burn Date: Tue, 13 Oct 2009 05:12:43 +0000 (+0200) Subject: Enigma2{data/skin_default.xml,Screens/Setup.py}: -replace Buttons and Labels through... X-Git-Tag: 2.6.0~24 X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/2f32fea66879d0d84d401ca7ff83a97a3837c36a Enigma2{data/skin_default.xml,Screens/Setup.py}: -replace Buttons and Labels through StaticText - remove irritating double Title and use self.setup_title as Screen Title --- diff --git a/data/skin_default.xml b/data/skin_default.xml index 065d99d9..b2adfaa3 100755 --- a/data/skin_default.xml +++ b/data/skin_default.xml @@ -861,14 +861,11 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y())) - - - - - - - - + + + + + @@ -1107,9 +1104,9 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y())) - - - + + + diff --git a/lib/python/Screens/Setup.py b/lib/python/Screens/Setup.py old mode 100644 new mode 100755 index 7226562f..e9c3c680 --- a/lib/python/Screens/Setup.py +++ b/lib/python/Screens/Setup.py @@ -3,8 +3,7 @@ from Components.ActionMap import NumberActionMap from Components.config import config, ConfigNothing from Components.SystemInfo import SystemInfo from Components.ConfigList import ConfigListScreen -from Components.Label import Label -from Components.Pixmap import Pixmap +from Components.Sources.StaticText import StaticText import xml.etree.cElementTree @@ -27,26 +26,21 @@ class SetupError(Exception): return self.msg class SetupSummary(Screen): - skin = """ - - - - - """ def __init__(self, session, parent): + Screen.__init__(self, session, parent = parent) - self["SetupTitle"] = Label(_(parent.setup_title)) - self["SetupEntry"] = Label("") - self["SetupValue"] = Label("") + self["SetupTitle"] = StaticText(_(parent.setup_title)) + self["SetupEntry"] = StaticText("") + self["SetupValue"] = StaticText("") self.onShow.append(self.addWatcher) self.onHide.append(self.removeWatcher) - + def addWatcher(self): self.parent.onChangedEntry.append(self.selectionChanged) self.parent["config"].onSelectionChanged.append(self.selectionChanged) self.selectionChanged() - + def removeWatcher(self): self.parent.onChangedEntry.remove(self.selectionChanged) self.parent["config"].onSelectionChanged.remove(self.selectionChanged) @@ -77,7 +71,6 @@ class Setup(ConfigListScreen, Screen): def __init__(self, session, setup): Screen.__init__(self, session) - # for the skin: first try a setup_, then Setup self.skinName = ["setup_" + setup, "Setup" ] @@ -88,13 +81,9 @@ class Setup(ConfigListScreen, Screen): self.refill(list) #check for list.entries > 0 else self.close - self["title"] = Label(_(self.setup_title)) + self["key_red"] = StaticText(_("Cancel")) + self["key_green"] = StaticText(_("OK")) - self["oktext"] = Label(_("OK")) - self["canceltext"] = Label(_("Cancel")) - self["ok"] = Pixmap() - self["cancel"] = Pixmap() - self["actions"] = NumberActionMap(["SetupActions"], { "cancel": self.keyCancel, @@ -104,6 +93,10 @@ class Setup(ConfigListScreen, Screen): ConfigListScreen.__init__(self, list, session = session, on_change = self.changedEntry) self.changedEntry() + self.onLayoutFinish.append(self.layoutFinished) + + def layoutFinished(self): + self.setTitle(_(self.setup_title)) # for summary: def changedEntry(self):