commit missing code for pixmaps in mainmenu
[enigma2.git] / lib / python / Screens / Menu.py
index 1390b51a74ad0e99d2f14cbf177829fccae10c4d..00f16722f4056113b9fe964cf28ee92a4128236c 100644 (file)
@@ -1,20 +1,15 @@
 from Screen import Screen
-from Components.Sources.MenuList import MenuList
+from Components.Sources.List import List
 from Components.ActionMap import ActionMap
 from Components.Header import Header
-from Components.Button import Button
 from Components.Label import Label
-from Components.ProgressBar import ProgressBar
 from Components.config import configfile
 from Components.Sources.Clock import Clock
+from Components.PluginComponent import plugins
 
 from Tools.Directories import resolveFilename, SCOPE_SKIN
 
-from enigma import quitMainloop
-
 import xml.dom.minidom
-from xml.dom import EMPTY_NAMESPACE
-from skin import elementsWithTag
 
 from Screens.Setup import Setup, getSetupTitle
 
@@ -23,7 +18,6 @@ from Tools import XMLTools
 #              <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>
 
 
@@ -62,9 +56,9 @@ menuupdater = MenuUpdater()
 class MenuSummary(Screen):
        skin = """
        <screen position="0,0" size="132,64">
-               <widget name="MenuTitle" position="0,4" size="132,21" font="Regular;18" />
-               <widget name="MenuEntry" position="0,25" size="132,21" font="Regular;16" />
-               <widget source="CurrentTime" render="Label" position="50,46" size="82,18" font="Regular;16" >
+               <widget name="MenuTitle" position="6,4" size="120,21" font="Regular;18" />
+               <widget name="MenuEntry" position="6,25" size="120,21" font="Regular;16" />
+               <widget source="CurrentTime" render="Label" position="56,46" size="82,18" font="Regular;16" >
                        <convert type="ClockToText">WithSeconds</convert>
                </widget>
        </screen>"""
@@ -109,27 +103,28 @@ class Menu(Screen):
                # FIXME. somehow
                if arg[0] != "":
                        exec "from " + arg[0] + " import *"
-                       
+
                self.openDialog(*eval(arg[1]))
 
-       def nothing(self):                                                                                                                                      #dummy
+       def nothing(self): #dummy
                pass
 
        def openDialog(self, *dialog):                          # in every layer needed
-               self.session.open(*dialog)
+               self.session.openWithCallback(self.menuClosed, *dialog)
 
        def openSetup(self, dialog):
                self.session.openWithCallback(self.menuClosed, Setup, dialog)
 
        def addMenu(self, destList, node):
                MenuTitle = _(node.getAttribute("text").encode("UTF-8") or "??")
+               entryID = node.getAttribute("entryID") or "undefined"
                x = node.getAttribute("flushConfigOnClose")
                if x:
                        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))
+               destList.append((MenuTitle, a, entryID))
 
        def menuClosedWithConfigFlush(self, *res):
                configfile.save()
@@ -141,6 +136,7 @@ class Menu(Screen):
 
        def addItem(self, destList, node):
                item_text = node.getAttribute("text").encode("UTF-8")
+               entryID = node.getAttribute("entryID") or "undefined"
                for x in node.childNodes:
                        if x.nodeType != xml.dom.minidom.Element.nodeType:
                                continue
@@ -156,16 +152,16 @@ class Menu(Screen):
                                        module = "Screens." + module
                                else:
                                        module = ""
-                               
-                               # check for arguments. they will be appended to the 
+
+                               # check for arguments. they will be appended to the
                                # openDialog call
                                args = XMLTools.mergeText(x.childNodes)
                                screen += ", " + args
-                                       
-                               destList.append((_(item_text or "??"), boundFunction(self.runScreen, (module, screen))))
+
+                               destList.append((_(item_text or "??"), boundFunction(self.runScreen, (module, screen)), entryID))
                                return
                        elif x.tagName == 'code':
-                               destList.append((_(item_text or "??"), boundFunction(self.execText, XMLTools.mergeText(x.childNodes))))
+                               destList.append((_(item_text or "??"), boundFunction(self.execText, XMLTools.mergeText(x.childNodes)), entryID))
                                return
                        elif x.tagName == 'setup':
                                id = x.getAttribute("id")
@@ -173,19 +169,17 @@ class Menu(Screen):
                                        item_text = _(getSetupTitle(id)) + "..."
                                else:
                                        item_text = _(item_text)
-                               destList.append((item_text, boundFunction(self.openSetup, id)))
+                               destList.append((item_text, boundFunction(self.openSetup, id), entryID))
                                return
-               
-               destList.append((item_text,self.nothing))
+               destList.append((item_text, self.nothing, entryID))
 
 
        def __init__(self, session, parent, childNode):
                Screen.__init__(self, session)
                
                list = []
-               menuID = ""
-
-               menuID = -1
+               
+               menuID = None
                for x in childNode:                                             #walk through the actual nodelist
                        if x.nodeType != xml.dom.minidom.Element.nodeType:
                            continue
@@ -198,16 +192,28 @@ class Menu(Screen):
                        elif x.tagName == "id":
                                menuID = x.getAttribute("val")
                                count = 0
-                       if menuID != -1:
+
+                       if menuID is not None:
+                               # menuupdater?
                                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
 
+               if menuID is not None:
+                       # plugins
+                       for l in plugins.getPluginsForMenu(menuID):
+                               list.append((l[0], boundFunction(l[1], self.session)))
+
+               # for the skin: first try a menu_<menuID>, then Menu
+               self.skinName = [ ]
+               if menuID is not None:
+                       self.skinName.append("menu_" + menuID)
+               self.skinName.append("Menu")
+
+               self["menu"] = List(list)
 
-               self["menu"] = MenuList(list)   
-                                                       
                self["actions"] = ActionMap(["OkCancelActions", "MenuActions"], 
                        {
                                "ok": self.okbuttonClick,
@@ -234,23 +240,5 @@ class MainMenu(Menu):
        #add file load functions for the xml-file
        
        def __init__(self, *x):
-               Menu.__init__(self, *x)
                self.skinName = "Menu"
-
-       def openDialog(self, dialog):
-               self.session.open(dialog)
-
-       def openSetup(self, dialog):
-               self.session.open(Setup, dialog)
-
-       def setModeTV(self):
-               print "set Mode to TV"
-               pass
-
-       def setModeRadio(self):
-               print "set Mode to Radio"
-               pass
-
-       def setModeFile(self):
-               print "set Mode to File"
-               pass
+               Menu.__init__(self, *x)