fix directory browser + implement changelog viewer

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

diff --git a/lib/python/Screens/Setup.py b/lib/python/Screens/Setup.py
index efd10e36ac78040b9c0e6028852c4462cacf8fd2..7226562fd5a5431865ac58d874513526b0beb756 100644 (file)
--- a/lib/python/Screens/Setup.py
+++ b/lib/python/Screens/Setup.py
@@ -1,16 +1,14 @@
 from Screen import Screen
 from Screen import Screen

-from Components.ActionMap import ActionMap
-from Components.config import config                           #global config instance
-from Components.config import configSelection
-from Components.ConfigList import ConfigList
+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.Label import Label

+from Components.Pixmap import Pixmap

 
 

-import xml.dom.minidom
-from xml.dom import EMPTY_NAMESPACE
-from skin import elementsWithTag
-
-from Tools import XMLTools
+import xml.etree.cElementTree

 
 

+# FIXME: use resolveFile!

 # read the setupmenu
 try:
        # first we search in the current path
 # read the setupmenu
 try:
        # first we search in the current path


@@ -18,133 +16,139 @@ try:
 except:
        # if not found in the current path, we use the global datadir-path
        setupfile = file('/usr/share/enigma2/setup.xml', 'r')
 except:
        # if not found in the current path, we use the global datadir-path
        setupfile = file('/usr/share/enigma2/setup.xml', 'r')

-setupdom = xml.dom.minidom.parseString(setupfile.read())
+setupdom = xml.etree.cElementTree.parse(setupfile)

 setupfile.close()
 
 setupfile.close()
 

-def getValbyAttr(x, attr):
-       for p in range(x.attributes.length):
-               a = x.attributes.item(p)
-               attrib = str(a.name)
-               value = str(a.value)
-               if attrib == attr:
-                       return value
+class SetupError(Exception):
+    def __init__(self, message):
+        self.msg = message
+
+    def __str__(self):
+        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.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()

        
        

-       return ""
+       def removeWatcher(self):
+               self.parent.onChangedEntry.remove(self.selectionChanged)
+               self.parent["config"].onSelectionChanged.remove(self.selectionChanged)

 
 

-class Setup(Screen):
+       def selectionChanged(self):
+               self["SetupEntry"].text = self.parent.getCurrentEntry()
+               self["SetupValue"].text = self.parent.getCurrentValue()

 
 

-       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"])
-
-       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):
-               print "You pressed number " + str(number)
-               if (self["config"].getCurrent()[1].parent.enabled == True):
-                       self["config"].handleKey(config.key[str(number)])
-
-
-       # TODO ugly as hell. any better ideas?
-       def keyNumber1(self):
-               self.keyNumberGlobal(1)
-       def keyNumber2(self):
-               self.keyNumberGlobal(2)
-       def keyNumber3(self):
-               self.keyNumberGlobal(3)
-       def keyNumber4(self):
-               self.keyNumberGlobal(4)
-       def keyNumber5(self):
-               self.keyNumberGlobal(5)
-       def keyNumber6(self):
-               self.keyNumberGlobal(6)
-       def keyNumber7(self):
-               self.keyNumberGlobal(7)
-       def keyNumber8(self):
-               self.keyNumberGlobal(8)
-       def keyNumber9(self):
-               self.keyNumberGlobal(9)
-       def keyNumber0(self):
-               self.keyNumberGlobal(0)
+class Setup(ConfigListScreen, Screen):
+
+       ALLOW_SUSPEND = True

 
 

+       def removeNotifier(self):
+               config.usage.setup_level.notifiers.remove(self.levelChanged)

 
 

+       def levelChanged(self, configElement):
+               list = []
+               self.refill(list)
+               self["config"].setList(list)
+
+       def refill(self, list):
+               xmldata = setupdom.getroot()
+               for x in xmldata.findall("setup"):
+                       if x.get("key") != self.setup:
+                               continue
+                       self.addItems(list, x);
+                       self.setup_title = x.get("title", "").encode("UTF-8")

 
        def __init__(self, session, setup):
                Screen.__init__(self, session)
 
 
        def __init__(self, session, setup):
                Screen.__init__(self, session)
 

-               print "request setup for " + setup
-               
-               xmldata = setupdom.childNodes[0]
-               
-               entries = xmldata.childNodes
+               # for the skin: first try a setup_<setupID>, then Setup
+               self.skinName = ["setup_" + setup, "Setup" ]

 
 

+               self.onChangedEntry = [ ]
+
+               self.setup = setup

                list = []
                list = []

-                               
-               for x in entries:             #walk through the actual nodelist
-                       if x.nodeType != xml.dom.minidom.Element.nodeType:
-                               continue
-                       elif x.tagName == 'setup':
-                               ItemText = getValbyAttr(x, "key")
-                               if ItemText != setup:
-                                       continue
-                               self.addItems(list, x.childNodes);
-               
-               #check for list.entries > 0 else self.close
-               
-               self["config"] = ConfigList(list)
+               self.refill(list)

 
 

-               self["ok"] = Label("OK")
-               self["cancel"] = Label("Cancel")
+               #check for list.entries > 0 else self.close
+               self["title"] = Label(_(self.setup_title))

 
 

-               self["actions"] = ActionMap(["SetupActions"], 
+               self["oktext"] = Label(_("OK"))
+               self["canceltext"] = Label(_("Cancel"))
+               self["ok"] = Pixmap()
+               self["cancel"] = Pixmap()
+               
+               self["actions"] = NumberActionMap(["SetupActions"], 

                        {
                                "cancel": self.keyCancel,
                        {
                                "cancel": self.keyCancel,

-                               "ok": self.keyOk,
-                               "left": self.keyLeft,
-                               "right": self.keyRight,

                                "save": self.keySave,
                                "save": self.keySave,

-                               "1": self.keyNumber1,
-                               "2": self.keyNumber2,
-                               "3": self.keyNumber3,
-                               "4": self.keyNumber4,
-                               "5": self.keyNumber5,
-                               "6": self.keyNumber6,
-                               "7": self.keyNumber7,
-                               "8": self.keyNumber8,
-                               "9": self.keyNumber9,
-                               "0": self.keyNumber0
-                               
-                       }, -1)
+                       }, -2)
+
+               ConfigListScreen.__init__(self, list, session = session, on_change = self.changedEntry)
+
+               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].getText())
+
+       def createSummary(self):
+               return SetupSummary
+
+       def addItems(self, list, parentNode):
+               for x in parentNode:
+                       if x.tag == 'item':
+                               item_level = int(x.get("level", 0))
+
+                               if not self.levelChanged in config.usage.setup_level.notifiers:
+                                       config.usage.setup_level.notifiers.append(self.levelChanged)
+                                       self.onClose.append(self.removeNotifier)
+
+                               if item_level > config.usage.setup_level.index:
+                                       continue
+
+                               requires = x.get("requires")
+                               if requires and not SystemInfo.get(requires, False):
+                                       continue;
+
+                               item_text = _(x.get("text", "??").encode("UTF-8"))
+                               b = eval(x.text or "");
+                               if b == "":
+                                       continue
+                               #add to configlist
+                               item = b
+                               # the first b is the item itself, ignored by the configList.
+                               # the second one is converted to string.
+                               if not isinstance(item, ConfigNothing):
+                                       list.append( (item_text, item) )
+
+def getSetupTitle(id):
+       xmldata = setupdom.getroot()
+       for x in xmldata.findall("setup"):
+               if x.get("key") == id:
+                       return x.get("title", "").encode("UTF-8")
+       raise SetupError("unknown setup id '%s'!" % repr(id))