Enigma2{data/skin_default.xml,Screens/Setup.py}: -replace Buttons and Labels through...

- 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 065d99d..b2adfaa 100755 (executable)
--- 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()))
        </screen>
        <!-- Setup -->
        <screen name="Setup" position="center,center" size="560,430" title="Setup">
-               <widget name="cancel" pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
-               <widget name="ok" pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/yellow.png" position="280,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/blue.png" position="420,0" size="140,40" alphatest="on" />
-               <widget name="canceltext" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
-               <widget name="oktext" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
-               <widget name="title" position="10,45" size="280,35" font="Regular;23" />
-               <widget name="config" position="10,95" size="540,325" scrollbarMode="showOnDemand" />
+               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
+               <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on" />
+               <widget source="key_red" render="Label" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
+               <widget source="key_green" render="Label" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
+               <widget name="config" position="5,50" size="550,325" scrollbarMode="showOnDemand" />
        </screen>
        <!-- Simple channelselection -->
        <screen name="SimpleChannelSelection" position="center,center" size="560,430" title="Channel Selection">
@@ -1107,9 +1104,9 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
        </screen>
        <!-- LCD screen (setup) -->
        <screen name="SetupSummary" position="0,0" size="132,64">
-               <widget name="SetupTitle" position="6,0" size="120,16" font="Regular;12" />
-               <widget name="SetupEntry" position="6,16" size="120,32" font="Regular;12" />
-               <widget name="SetupValue" position="6,48" size="120,16" font="Regular;12" />
+               <widget source="SetupTitle" render="Label" position="6,0" size="120,16" font="Regular;12" />
+               <widget source="SetupEntry" render="Label" position="6,16" size="120,32" font="Regular;12" />
+               <widget source="SetupValue" render="Label" position="6,48" size="120,16" font="Regular;12" />
        </screen>
        <!-- LCD screen (misc) -->
        <screen name="SimpleSummary" position="0,0" size="132,64">

diff --git a/lib/python/Screens/Setup.py b/lib/python/Screens/Setup.py
old mode 100644 (file)
new mode 100755 (executable)
index 7226562..e9c3c68
--- 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 = """
-       <screen position="6,0" size="120,64">
-               <widget name="SetupTitle" position="6,0" size="120,16" font="Regular;12" />
-               <widget name="SetupEntry" position="6,16" size="120,32" font="Regular;12" />
-               <widget name="SetupValue" position="6,48" size="120,16" font="Regular;12" />
-       </screen>"""
 
        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_<setupID>, 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):