menu positioning for the plugins works now

example:
def getMenuRegistrationList():
	list = []
	list.append(("setup", 2, "Softwareupdate", "Example"))
	list.append(("mainmenu", 0, "Foo", "Bar"))
	return list

this means, that we have 2 menu entries:
a menu entry "Softwareupdate" is added to the setup menu on position 2 which calls the Example screen of the plugin
and a menu entry Foo is added to the main menu on the first position which calls the screen Bar

diff --git a/lib/python/Components/PluginComponent.py b/lib/python/Components/PluginComponent.py
index e0cc90a4a4a7eded8ede68388086fb8ea46790c8..adfc98a0855a9d69af4cf731d16f7559e231c3cb 100644 (file)
--- a/lib/python/Components/PluginComponent.py
+++ b/lib/python/Components/PluginComponent.py
@@ -57,11 +57,11 @@ class PluginComponent:
        
        def menuDelete(self):
                for menuEntry in self.menuEntries:
        
        def menuDelete(self):
                for menuEntry in self.menuEntries:

-                       menuupdater.delMenuItem(menuEntry[0][0], menuEntry[0][2], menuEntry[1], menuEntry[0][3])
+                       menuupdater.delMenuItem(menuEntry[0][0], menuEntry[0][1], menuEntry[0][2], menuEntry[1], menuEntry[0][3])

 
        def menuUpdate(self):
                for menuEntry in self.menuEntries:
 
        def menuUpdate(self):
                for menuEntry in self.menuEntries:

-                       menuupdater.addMenuItem(menuEntry[0][0], menuEntry[0][2], menuEntry[1], menuEntry[0][3])
+                       menuupdater.addMenuItem(menuEntry[0][0], menuEntry[0][1], menuEntry[0][2], menuEntry[1], menuEntry[0][3])

        
        def runPlugin(self, plugin, session):
                try:
        
        def runPlugin(self, plugin, session):
                try:

diff --git a/lib/python/Screens/Menu.py b/lib/python/Screens/Menu.py
index 68a8ef98bfca4c31ac86551499efaa8c6d951914..9c41c16595f6ce8762165c4243c8b3e62a5dab59 100644 (file)
--- a/lib/python/Screens/Menu.py
+++ b/lib/python/Screens/Menu.py
@@ -57,13 +57,13 @@ class MenuUpdater:
        def __init__(self):
                self.updatedMenuItems = {}
        
        def __init__(self):
                self.updatedMenuItems = {}
        

-       def addMenuItem(self, id, text, module, screen):
+       def addMenuItem(self, id, pos, text, module, screen):

                if not self.updatedMenuAvailable(id):
                        self.updatedMenuItems[id] = []
                if not self.updatedMenuAvailable(id):
                        self.updatedMenuItems[id] = []

-               self.updatedMenuItems[id].append([text, module, screen])
+               self.updatedMenuItems[id].append([text, pos, module, screen])

        
        

-       def delMenuItem(self, id, text, module, screen):
-               self.updatedMenuItems[id].remove([text, 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 updatedMenuAvailable(self, id):
                return self.updatedMenuItems.has_key(id)


@@ -151,19 +151,26 @@ class Menu(Screen):
                list = []
                menuID = ""
 
                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)
                        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)
                        elif x.tagName == 'menu':
                                self.addMenu(list, x)

+                               count += 1

                        elif x.tagName == "id":
                                menuID = getValbyAttr(x, "val")
                        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

 
 

-               if menuupdater.updatedMenuAvailable(menuID):
-                       for x in menuupdater.getUpdatedMenu(menuID):
-                               list.append((x[0], boundFunction(self.runScreen, (x[1], x[2] + ", "))))

 
                self["menu"] = MenuList(list)   
                                                        
 
                self["menu"] = MenuList(list)