move __init__ to top

[enigma2.git] / lib / python / Screens / Setup.py

diff --git a/lib/python/Screens/Setup.py b/lib/python/Screens/Setup.py
index d9fc08939470ca7bb6331233647ff099946af1c7..41a9cf5136a91eedf6faecfe900a6ca0db77d1f9 100644 (file)
--- a/lib/python/Screens/Setup.py
+++ b/lib/python/Screens/Setup.py
@@ -4,6 +4,7 @@ from Components.config import config                            #global config instance
 from Components.config import configSelection
 from Components.ConfigList import ConfigList
 from Components.Label import Label
+from Components.Pixmap import Pixmap
 
 import xml.dom.minidom
 from xml.dom import EMPTY_NAMESPACE
@@ -11,6 +12,7 @@ from skin import elementsWithTag
 
 from Tools import XMLTools
 
+# FIXME: use resolveFile!
 # read the setupmenu
 try:
        # first we search in the current path
@@ -31,62 +33,45 @@ def getValbyAttr(x, attr):
        
        return ""
 
-class Setup(Screen):
-
-       def addItems(self, list, childNode):
-               for x in childNode:
-                       if x.nodeType != xml.dom.minidom.Element.nodeType:
-                               continue
-                       elif x.tagName == 'item':
-                               ItemText = _(getValbyAttr(x, "text"))
-                               b = eval(XMLTools.mergeText(x.childNodes));
-                               print "item " + ItemText + " " + b.configPath
-                               if b == "":
-                                       continue
-                               #add to configlist
-                               item = b.controlType(b)
-                               
-                               # the first b is the item itself, ignored by the configList.
-                               # the second one is converted to string.
-                               list.append( (ItemText, item) )
-
-       def keyOk(self):
-               if (self["config"].getCurrent()[1].parent.enabled == True):
-                       self["config"].handleKey(config.key["choseElement"])
-       def keyLeft(self):
-               if (self["config"].getCurrent()[1].parent.enabled == True):
-                       self["config"].handleKey(config.key["prevElement"])
-       def keyRight(self):
-               if (self["config"].getCurrent()[1].parent.enabled == True):
-                       self["config"].handleKey(config.key["nextElement"])
+class SetupSummary(Screen):
+       skin = """
+       <screen position="0,0" size="132,64">
+               <widget name="SetupTitle" position="0,0" size="132,16" font="Regular;12" />
+               <widget name="SetupEntry" position="0,16" size="132,32" font="Regular;12" />
+               <widget name="SetupValue" position="0,48" size="132,16" font="Regular;12" />
+       </screen>"""
 
-       def keySave(self):
-               print "save requested"
-               for x in self["config"].list:
-                       x[1].save()
-               self.close()
-
-       def keyCancel(self):
-               print "cancel requested"
-               for x in self["config"].list:
-                       x[1].cancel()
-               self.close()
+       def __init__(self, session, parent):
+               Screen.__init__(self, session)
+               self["SetupTitle"] = Label(_(parent.setup_title))
+               self["SetupEntry"] = Label("")
+               self["SetupValue"] = Label("")
+               self.parent = parent
+               self.onShow.append(self.addWatcher)
+               self.onHide.append(self.removeWatcher)
                
-       def keyNumberGlobal(self, number):
-               print "You pressed number " + str(number)
-               if (self["config"].getCurrent()[1].parent.enabled == True):
-                       self["config"].handleKey(config.key[str(number)])
+       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)
 
+       def selectionChanged(self):
+               self["SetupEntry"].text = self.parent.getCurrentEntry()
+               self["SetupValue"].text = self.parent.getCurrentValue()
 
+class Setup(Screen):
        def __init__(self, session, setup):
                Screen.__init__(self, session)
 
-               print "request setup for " + setup
-               
                xmldata = setupdom.childNodes[0]
                
                entries = xmldata.childNodes
 
+               self.onChangedEntry = [ ]
                list = []
                                
                for x in entries:             #walk through the actual nodelist
@@ -103,11 +88,14 @@ class Setup(Screen):
                
                self["config"] = ConfigList(list)
 
-               self["title"] = Label(_(myTitle));
-
-               self["ok"] = Label("OK")
-               self["cancel"] = Label("Cancel")
+               self.setup_title = myTitle
+               self["title"] = Label(_(self.setup_title))
 
+               self["oktext"] = Label(_("OK"))
+               self["canceltext"] = Label(_("Cancel"))
+               self["ok"] = Pixmap()
+               self["cancel"] = Pixmap()
+               
                self["actions"] = NumberActionMap(["SetupActions"], 
                        {
                                "cancel": self.keyCancel,
@@ -126,3 +114,67 @@ class Setup(Screen):
                                "9": self.keyNumberGlobal,
                                "0": self.keyNumberGlobal
                        }, -1)
+
+               self.changedEntry()
+
+       # for summary:
+       def changedEntry(self):
+               for x in self.onChangedEntry:
+                       x()
+
+       def getCurrentEntry(self):
+               return self["config"].getCurrent()[0]
+
+       def getCurrentValue(self):
+               return str(self["config"].getCurrent()[1].parent.value)
+
+       def createSummary(self):
+               return SetupSummary
+
+       def addItems(self, list, childNode):
+               for x in childNode:
+                       if x.nodeType != xml.dom.minidom.Element.nodeType:
+                               continue
+                       elif x.tagName == 'item':
+                               ItemText = _(getValbyAttr(x, "text"))
+                               b = eval(XMLTools.mergeText(x.childNodes));
+                               print "item " + ItemText + " " + b.configPath
+                               if b == "":
+                                       continue
+                               #add to configlist
+                               item = b.controlType(b)
+                               
+                               # the first b is the item itself, ignored by the configList.
+                               # the second one is converted to string.
+                               list.append( (ItemText, item) )
+
+       def handleKey(self, key):
+               # ignore keys when not enabled
+               if self["config"].getCurrent()[1].parent.enabled:
+                       self["config"].handleKey(config.key[key])
+                       print self["config"].getCurrent()
+                       self.changedEntry()
+
+       def keyOk(self):
+               self.handleKey("choseElement")
+
+       def keyLeft(self):
+               self.handleKey("prevElement")
+
+       def keyRight(self):
+               self.handleKey("nextElement")
+
+       def keySave(self):
+               print "save requested"
+               for x in self["config"].list:
+                       x[1].save()
+               self.close()
+
+       def keyCancel(self):
+               print "cancel requested"
+               for x in self["config"].list:
+                       x[1].cancel()
+               self.close()
+               
+       def keyNumberGlobal(self, number):
+               self.handleKey(str(number))