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 59f0ff57733c94922f88f3d91f02b65e65dc9ee8..7226562fd5a5431865ac58d874513526b0beb756 100644 (file)
--- a/lib/python/Screens/Setup.py
+++ b/lib/python/Screens/Setup.py
@@ -1,16 +1,12 @@
 from Screen import Screen
 from Screen import Screen

-from MessageBox import MessageBox

 from Components.ActionMap import NumberActionMap
 from Components.ActionMap import NumberActionMap

-from Components.config import config, KEY_LEFT, KEY_RIGHT, KEY_OK
-from Components.ConfigList import ConfigList, ConfigListScreen
+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.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
 
 # FIXME: use resolveFile!
 # read the setupmenu


@@ -20,9 +16,16 @@ 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()
 

+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">
 class SetupSummary(Screen):
        skin = """
        <screen position="6,0" size="120,64">


@@ -32,11 +35,10 @@ class SetupSummary(Screen):
        </screen>"""
 
        def __init__(self, session, parent):
        </screen>"""
 
        def __init__(self, session, parent):

-               Screen.__init__(self, session)
+               Screen.__init__(self, session, parent = parent)

                self["SetupTitle"] = Label(_(parent.setup_title))
                self["SetupEntry"] = Label("")
                self["SetupValue"] = Label("")
                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)
                
                self.onShow.append(self.addWatcher)
                self.onHide.append(self.removeWatcher)
                


@@ -57,28 +59,35 @@ class Setup(ConfigListScreen, Screen):
 
        ALLOW_SUSPEND = True
 
 
        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)
 

-               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.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':
-                               if x.getAttribute("key") != setup:
-                                       continue
-                               self.addItems(list, x.childNodes);
-                               myTitle = x.getAttribute("title").encode("UTF-8")
+               self.refill(list)

 
                #check for list.entries > 0 else self.close
 
                #check for list.entries > 0 else self.close

-               
-               self.setup_title = myTitle

                self["title"] = Label(_(self.setup_title))
 
                self["oktext"] = Label(_("OK"))
                self["title"] = Label(_(self.setup_title))
 
                self["oktext"] = Label(_("OK"))


@@ -110,49 +119,36 @@ class Setup(ConfigListScreen, Screen):
        def createSummary(self):
                return SetupSummary
 
        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':
-                               item_text = _(x.getAttribute("text").encode("UTF-8") or "??")
-                               b = eval(XMLTools.mergeText(x.childNodes));
+       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 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.

-                               list.append( (item_text, item) )
-
-       def keySave(self):
-               print "save requested"
-               for x in self["config"].list:
-                       x[1].save()
-               self.close()
-       
-       def cancelConfirm(self, result):
-               if not result:
-                       return
-
-               print "cancel requested"
-               
-               for x in self["config"].list:
-                       x[1].cancel()
-               self.close()
-
-       def keyCancel(self):
-               is_changed = False
-               for x in self["config"].list:
-                       is_changed |= x[1].isChanged()
-               
-               if is_changed:
-                       self.session.openWithCallback(self.cancelConfirm, MessageBox, _("Really close without saving settings?"))
-               else:
-                       self.close()
+                               if not isinstance(item, ConfigNothing):
+                                       list.append( (item_text, item) )

 
 def getSetupTitle(id):
 
 def getSetupTitle(id):

-       xmldata = setupdom.childNodes[0].childNodes
-       for x in elementsWithTag(xmldata, "setup"):
-               if x.getAttribute("key") == id:
-                       return x.getAttribute("title").encode("UTF-8")
+       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))