fix
[enigma2.git] / lib / python / Screens / Menu.py
index fd2f2761d32db4823f1a4eefd782d0de7232f768..e1af589a700d24d36ef8d93140dbdba5b1f47285 100644 (file)
@@ -2,17 +2,12 @@ from Screen import *
 from Components.MenuList import MenuList
 from Components.ActionMap import ActionMap
 from Components.Header import Header
-
-# hack ... must be made dynamic
-from Screens.Setup import Setup
-from ServiceScan import ServiceScan
-from ScartLoopThrough import ScartLoopThrough
 from Components.Button import Button
 from Components.Label import Label
 from Components.ProgressBar import ProgressBar
-from ConfigMenu import *
+from Components.config import configfile
 
-from TimerEdit import *
+from Tools.Directories import resolveFilename, SCOPE_SKIN
 
 from enigma import quitMainloop
 
@@ -20,6 +15,8 @@ import xml.dom.minidom
 from xml.dom import EMPTY_NAMESPACE
 from skin import elementsWithTag
 
+from Screens.Setup import *
+
 from Tools import XMLTools
 
 # some screens
@@ -27,58 +24,18 @@ def doGlobal(screen):
        screen["clock"] = Clock()
 
 
-mdom = xml.dom.minidom.parseString(
-        """
-       <menu text="Mainmenu" title="the real Mainmenu">
-               <item text="Standby debug">quitMainloop()</item>
-               <item text="Automatic Scan">self.openDialog(ServiceScan)</item>
-
-               <item text="Blub1">self.openSetup("rc")</item>
-               <item text="Blub2">self.openSetup("blasel")</item>
-
-               <item text="TV-Mode">self.setModeTV()</item>
-               <item text="Radio-Mode">self.setModeRadio()</item>
-               <item text="File-Mode">self.setModeFile()</item>
-               <item text="Scart">self.openDialog(ScartLoopThrough)</item>
-               <item text="Timer">self.openDialog(TimerEditList)</item>
-               <menu text="Setup">
-                       <menu text="Service Organising">
-                               <item text="New Bouquets"></item>
-                               <item text="Add to Bouquets"></item>
-                               <item text="Edit Bouquets"></item>
-                       </menu>
-                       <menu text="Service Searching">
-                               <item text="Satelliteconfig"></item>
-                               <item text="Satfinder"></item>
-                               <item text="Rotor Control"></item>
-                               <item text="Edit Transponder"></item>
-                               <item text="Automatic Scan">self.openDialog(ServiceScan)</item>
-                               <item text="Automatic 'Multisat' Scan"></item>
-                               <item text="Manual Scan"></item>
-                       </menu>
-                       <menu text="System">
-                               <item text="Time Date"></item>
-                               <item text="Video Audio"></item>
-                               <item text="UHF Modulator"></item>
-                               <item text="Harddisk"></item>
-                               <item text="Keyboard"></item>
-                               <item text="OSD">self.openDialog(configOSD)</item>
-                               <item text="Language"></item>
-                               <item text="LCD"></item>
-                       </menu>
-                       <item text="Common Interface"></item>
-                       <item text="Parental Control"></item>
-                       <item text="Expert"></item>
-               </menu>
-               <item text="Games"></item>
-               <item text="Information"></item>
-               <menu text="Standby">
-                       <item text="PowerOff"></item>
-                       <item text="Restart"></item>
-                       <item text="Standby"></item>
-                       <item text="Sleep Timer">self.goSetup()</item>
-               </menu>
-       </menu>""")
+#              <item text="TV-Mode">self.setModeTV()</item>
+#              <item text="Radio-Mode">self.setModeRadio()</item>
+#              <item text="File-Mode">self.setModeFile()</item>
+#              <item text="Scart">self.openDialog(ScartLoopThrough)</item>
+#                      <item text="Sleep Timer"></item>
+
+
+# read the menu
+menufile = file(resolveFilename(SCOPE_SKIN, 'menu.xml'), 'r')
+mdom = xml.dom.minidom.parseString(menufile.read())
+menufile.close()
+
 
 def getValbyAttr(x, attr):
        for p in range(x.attributes.length):
@@ -96,118 +53,160 @@ class boundFunction:
                self.args = args
        def __call__(self):
                self.fnc(*self.args)
-
-class configOSD(Screen):
-       #this needs focus handling - so not useable
-
-       def okbuttonClick(self):
-               self.close
-       def __init__(self, session):
-               Screen.__init__(self, session)
-
-               self["actions"] = ActionMap(["OkCancelActions"], 
-                       {
-                               "ok": self.okbuttonClick,
-                               "cancel": self.close
-                       })
-
-               self["okbutton"] = Button("Save")
-
-               self["txt_alpha"] = Label("Alpha:")
-               self["sld_alpha"] = ProgressBar()
-               self["sld_alpha"].setValue(50)
-
-               self["txt_brightness"] = Label("Brightness:")
-               self["sld_brightness"] = ProgressBar()
-               self["sld_brightness"].setValue(50)
-
-               self["txt_gamma"] = Label("Contrast:")
-               self["sld_gamma"] = ProgressBar()
-               self["sld_gamma"].setValue(50)
-
+               
+class MenuUpdater:
+       def __init__(self):
+               self.updatedMenuItems = {}
+       
+       def addMenuItem(self, id, pos, text, module, screen):
+               if not self.updatedMenuAvailable(id):
+                       self.updatedMenuItems[id] = []
+               self.updatedMenuItems[id].append([text, pos, module, screen])
+       
+       def delMenuItem(self, id, pos, text, module, screen):
+               self.updatedMenuItems[id].remove([text, pos, module, screen])
+       
+       def updatedMenuAvailable(self, id):
+               return self.updatedMenuItems.has_key(id)
+       
+       def getUpdatedMenu(self, id):
+               return self.updatedMenuItems[id]
+       
+menuupdater = MenuUpdater()
+               
 class Menu(Screen):
        def okbuttonClick(self):
                print "okbuttonClick"
                selection = self["menu"].getCurrent()
                selection[1]()
 
-       def evalText(self, text):
-               eval(text)
+       def execText(self, text):
+               exec text
                
+       def runScreen(self, arg):
+               # arg[0] is the module (as string)
+               # arg[1] is Screen inside this module 
+               #        plus possible arguments, as 
+               #        string (as we want to reference 
+               #        stuff which is just imported)
+               # FIXME. somehow
+               print arg
+               if arg[0] != "":
+                       exec "from " + arg[0] + " import *"
+                       
+               self.openDialog(*eval(arg[1]))
+
        def nothing(self):                                                                                                                                      #dummy
                pass
 
-       def openDialog(self, dialog):                           # in every layer needed
-               self.session.open(dialog)
+       def openDialog(self, *dialog):                          # in every layer needed
+               self.session.open(*dialog)
 
        def openSetup(self, dialog):
-               self.session.open(setup, dialog)
+               self.session.openWithCallback(self.menuClosed, Setup, dialog)
 
        def addMenu(self, destList, node):
-               MenuTitle = getValbyAttr(node, "text")
+               MenuTitle = _(getValbyAttr(node, "text"))
                if MenuTitle != "":                                                                                                                                     #check for title
-                       a = boundFunction(self.session.open, Menu, node, node.childNodes)
+                       x = getValbyAttr(node, "flushConfigOnClose")
+                       if x == "1":
+                               a = boundFunction(self.session.openWithCallback, self.menuClosedWithConfigFlush, Menu, node, node.childNodes)
+                       else:
+                               a = boundFunction(self.session.openWithCallback, self.menuClosed, Menu, node, node.childNodes)
                        #TODO add check if !empty(node.childNodes)
                        destList.append((MenuTitle, a))
-               
+
+       def menuClosedWithConfigFlush(self, *res):
+               configfile.save()
+               self.menuClosed(*res)
+
+       def menuClosed(self, *res):
+               if len(res) and res[0]:
+                       self.close(True)
+
        def addItem(self, destList, node):
-               ItemText = getValbyAttr(node, "text")
+               ItemText = _(getValbyAttr(node, "text"))
                if ItemText != "":                                                                                                                                      #check for name
-                       b = XMLTools.mergeText(node.childNodes)
-                       if b != "":                                                                                                                                                             #check for function
-                               destList.append((ItemText,boundFunction(self.evalText,b)))
-                       else:
-                               destList.append((ItemText,self.nothing))                                #use dummy as function
+                       for x in node.childNodes:
+                               if x.nodeType != xml.dom.minidom.Element.nodeType:
+                                       continue
+                               elif x.tagName == 'screen':
+                                       module = getValbyAttr(x, "module")
+                                       screen = getValbyAttr(x, "screen")
+
+                                       if len(screen) == 0:
+                                               screen = module
+
+                                       if module != "":
+                                               module = "Screens." + module
+                                       
+                                       # check for arguments. they will be appended to the 
+                                       # openDialog call
+                                       args = XMLTools.mergeText(x.childNodes)
+                                       screen += ", " + args
+                                       
+                                       destList.append((ItemText, boundFunction(self.runScreen, (module, screen))))
+                                       return
+                               elif x.tagName == 'code':
+                                       destList.append((ItemText, boundFunction(self.execText, XMLTools.mergeText(x.childNodes))))
+                                       return
+                               elif x.tagName == 'setup':
+                                       id = getValbyAttr(x, "id")
+                                       destList.append((ItemText, boundFunction(self.openSetup, id)))
+                                       return
+                       
+                       destList.append((ItemText,self.nothing))
+
 
        def __init__(self, session, parent, childNode):
                Screen.__init__(self, session)
                
                list = []
+               menuID = ""
 
-               for x in childNode:                                                     #walk through the actual nodelist
+               menuID = -1
+               for x in childNode:                                             #walk through the actual nodelist
                        if x.nodeType != xml.dom.minidom.Element.nodeType:
                            continue
                        elif x.tagName == 'item':
                                self.addItem(list, x)
+                               count += 1
                        elif x.tagName == 'menu':
                                self.addMenu(list, x)
+                               count += 1
+                       elif x.tagName == "id":
+                               menuID = getValbyAttr(x, "val")
+                               count = 0
+                       if menuID != -1:
+                               if menuupdater.updatedMenuAvailable(menuID):
+                                       for x in menuupdater.getUpdatedMenu(menuID):
+                                               if x[1] == count:
+                                                       list.append((x[0], boundFunction(self.runScreen, (x[2], x[3] + ", "))))
+                                                       count += 1
+
 
                self["menu"] = MenuList(list)   
                                                        
-               self["actions"] = ActionMap(["OkCancelActions"], 
+               self["actions"] = ActionMap(["OkCancelActions", "MenuActions"], 
                        {
                                "ok": self.okbuttonClick,
-                               "cancel": self.close
+                               "cancel": self.closeNonRecursive,
+                               "menu": self.closeRecursive
                        })
                
                a = getValbyAttr(parent, "title")
                if a == "":                                                                                                             #if empty use name
-                       a = getValbyAttr(parent, "text")
+                       a = _(getValbyAttr(parent, "text"))
                self["title"] = Header(a)
 
-class FixedMenu(Screen):
-       def okbuttonClick(self):
-               selection = self["menu"].getCurrent()
-               selection[1]()
-
-       def __init__(self, session, title, list):
-               Screen.__init__(self, session)
-               
-               self["menu"] = MenuList(list)   
-                                                       
-               self["actions"] = ActionMap(["OkCancelActions"], 
-                       {
-                               "ok": self.okbuttonClick,
-                               "cancel": self.close
-                       })
-               
-               self["title"] = Header(title)
+       def closeNonRecursive(self):
+               self.close(False)
 
+       def closeRecursive(self):
+               self.close(True)
 
 class MainMenu(Menu):
        #add file load functions for the xml-file
-       #remove old code (i.e. goScan / goClock...)
        
        def __init__(self, *x):
                Menu.__init__(self, *x)
@@ -219,9 +218,6 @@ class MainMenu(Menu):
        def openSetup(self, dialog):
                self.session.open(Setup, dialog)
 
-       def goSetup(self):
-               self.session.open(configTest)
-       
        def setModeTV(self):
                print "set Mode to TV"
                pass
@@ -233,9 +229,3 @@ class MainMenu(Menu):
        def setModeFile(self):
                print "set Mode to File"
                pass
-
-       def goScan(self):
-               self.session.open(ServiceScan)
-       
-       def goClock(self):
-               self.session.open(clockDisplay, Clock())