from Components.Button import Button
from Components.Label import Label
from Components.ProgressBar import ProgressBar
+from Components.config import configfile
+
+from Tools.Directories import resolveFilename, SCOPE_SKIN
from enigma import quitMainloop
# read the menu
-try:
- # first we search in the current path
- menufile = file('data/menu.xml', 'r')
-except IOError:
- # if not found in the current path, we use the global datadir-path
- menufile = file('/usr/share/enigma2/menu.xml', 'r')
+menufile = file(resolveFilename(SCOPE_SKIN, 'menu.xml'), 'r')
mdom = xml.dom.minidom.parseString(menufile.read())
menufile.close()
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] = []
- 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)
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"))
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"))
if ItemText != "": #check for name
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
- 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["actions"] = ActionMap(["OkCancelActions", "MenuActions"],
{
"ok": self.okbuttonClick,
- "cancel": self.close,
- "menu": self.close
+ "cancel": self.closeNonRecursive,
+ "menu": self.closeRecursive
})
a = getValbyAttr(parent, "title")
a = _(getValbyAttr(parent, "text"))
self["title"] = Header(a)
+ def closeNonRecursive(self):
+ self.close(False)
+
+ def closeRecursive(self):
+ self.close(True)
+
class MainMenu(Menu):
#add file load functions for the xml-file