X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/bb438bec17665a907c28ca47d665766c7b26be79..7a421f3ff2dad0150148880a71d6542ab87589bd:/lib/python/Screens/Menu.py
diff --git a/lib/python/Screens/Menu.py b/lib/python/Screens/Menu.py
index 4ad36d18..93f23dfb 100644
--- a/lib/python/Screens/Menu.py
+++ b/lib/python/Screens/Menu.py
@@ -1,53 +1,26 @@
-from Screen import *
-from Components.MenuList import MenuList
-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 Screen import Screen
+from Components.Sources.List import List
+from Components.ActionMap import NumberActionMap
+from Components.Sources.StaticText import StaticText
+from Components.config import configfile
+from Components.PluginComponent import plugins
+from Components.config import config
+from Components.SystemInfo import SystemInfo
-from enigma import quitMainloop
+from Tools.Directories import resolveFilename, SCOPE_SKIN
-import xml.dom.minidom
-from xml.dom import EMPTY_NAMESPACE
-from skin import elementsWithTag
-
-from Screens.Setup import *
-
-from Tools import XMLTools
-
-# some screens
-def doGlobal(screen):
- screen["clock"] = Clock()
+import xml.etree.cElementTree
+from Screens.Setup import Setup, getSetupTitle
# - self.setModeTV()
# - self.setModeRadio()
# - self.setModeFile()
-# - self.openDialog(ScartLoopThrough)
#
# 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')
-mdom = xml.dom.minidom.parseString(menufile.read())
-menufile.close()
-
-
-def getValbyAttr(x, attr):
- for p in range(x.attributes.length):
- a = x.attributes.item(p)
- attrib = str(a.name)
- value = str(a.value)
- if attrib == attr:
- return value
-
- return ""
+mdom = xml.etree.cElementTree.parse(resolveFilename(SCOPE_SKIN, 'menu.xml'))
class boundFunction:
def __init__(self, fnc, *args):
@@ -60,145 +33,229 @@ class MenuUpdater:
def __init__(self):
self.updatedMenuItems = {}
- def addMenuItem(self, id, text, module, screen):
+ def addMenuItem(self, id, pos, text, module, screen, weight):
if not self.updatedMenuAvailable(id):
self.updatedMenuItems[id] = []
- self.updatedMenuItems[id].append([text, module, screen])
+ self.updatedMenuItems[id].append([text, pos, module, screen, weight])
- def delMenuItem(self, id, text, module, screen):
- self.updatedMenuItems[id].remove([text, module, screen])
+ def delMenuItem(self, id, pos, text, module, screen, weight):
+ self.updatedMenuItems[id].remove([text, pos, module, screen, weight])
def updatedMenuAvailable(self, id):
return self.updatedMenuItems.has_key(id)
def getUpdatedMenu(self, id):
return self.updatedMenuItems[id]
-
+
menuupdater = MenuUpdater()
-
+
+class MenuSummary(Screen):
+ skin = """
+
+
+
+
+
+
+ WithSeconds
+
+ """
+
+ def __init__(self, session, parent):
+ Screen.__init__(self, session, parent)
+
class Menu(Screen):
+
+ ALLOW_SUSPEND = True
+
def okbuttonClick(self):
print "okbuttonClick"
selection = self["menu"].getCurrent()
- selection[1]()
+ if selection is not None:
+ selection[1]()
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.
+ # 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.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)
- #TODO add check if !empty(node.childNodes)
- destList.append((MenuTitle, a))
-
+ requires = node.get("requires")
+ if requires and not SystemInfo.get(requires, False):
+ return
+ MenuTitle = _(node.get("text", "??").encode("UTF-8"))
+ entryID = node.get("entryID", "undefined")
+ weight = node.get("weight", 50)
+ x = node.get("flushConfigOnClose")
+ if x:
+ a = boundFunction(self.session.openWithCallback, self.menuClosedWithConfigFlush, Menu, node)
+ else:
+ a = boundFunction(self.session.openWithCallback, self.menuClosed, Menu, node)
+ #TODO add check if !empty(node.childNodes)
+ destList.append((MenuTitle, a, entryID, weight))
+
+ 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
- for x in node.childNodes:
- if x.nodeType != xml.dom.minidom.Element.nodeType:
- continue
- elif x.tagName == 'screen':
- module = "Screens." + getValbyAttr(x, "module")
- screen = getValbyAttr(x, "screen")
-
- if len(screen) == 0:
- screen = 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):
+ requires = node.get("requires")
+ if requires and not SystemInfo.get(requires, False):
+ return
+ item_text = node.get("text", "").encode("UTF-8")
+ entryID = node.get("entryID", "undefined")
+ weight = node.get("weight", 50)
+ for x in node:
+ if x.tag == 'screen':
+ module = x.get("module")
+ screen = x.get("screen")
+
+ if screen is None:
+ screen = module
+
+ print module, screen
+ if module:
+ module = "Screens." + module
+ else:
+ module = ""
+
+ # check for arguments. they will be appended to the
+ # openDialog call
+ args = x.text or ""
+ screen += ", " + args
+
+ destList.append((_(item_text or "??"), boundFunction(self.runScreen, (module, screen)), entryID, weight))
+ return
+ elif x.tag == 'code':
+ destList.append((_(item_text or "??"), boundFunction(self.execText, x.text), entryID, weight))
+ return
+ elif x.tag == 'setup':
+ id = x.get("id")
+ if item_text == "":
+ item_text = _(getSetupTitle(id)) + "..."
+ else:
+ item_text = _(item_text)
+ destList.append((item_text, boundFunction(self.openSetup, id), entryID, weight))
+ return
+ destList.append((item_text, self.nothing, entryID, weight))
+
+
+ def __init__(self, session, parent):
Screen.__init__(self, session)
list = []
- menuID = ""
-
- 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)
- elif x.tagName == 'menu':
+
+ menuID = None
+ for x in parent: #walk through the actual nodelist
+ if x.tag == 'item':
+ item_level = int(x.get("level", 0))
+ if item_level <= config.usage.setup_level.index:
+ self.addItem(list, x)
+ count += 1
+ elif x.tag == 'menu':
self.addMenu(list, x)
- elif x.tagName == "id":
- menuID = getValbyAttr(x, "val")
+ count += 1
+ elif x.tag == "id":
+ menuID = x.get("val")
+ count = 0
+
+ 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] + ", ")), x[4]))
+ count += 1
+
+ if menuID is not None:
+ # plugins
+ for l in plugins.getPluginsForMenu(menuID):
+ # check if a plugin overrides an existing menu
+ plugin_menuid = l[2]
+ for x in list:
+ if x[2] == plugin_menuid:
+ list.remove(x)
+ break
+ list.append((l[0], boundFunction(l[1], self.session), l[2], l[3] or 50))
- if menuupdater.updatedMenuAvailable(menuID):
- for x in menuupdater.getUpdatedMenu(menuID):
- list.append((x[0], boundFunction(self.runScreen, (x[1], x[2] + ", "))))
+ # for the skin: first try a menu_, then Menu
+ self.skinName = [ ]
+ if menuID is not None:
+ self.skinName.append("menu_" + menuID)
+ self.skinName.append("Menu")
- self["menu"] = MenuList(list)
-
- self["actions"] = ActionMap(["OkCancelActions", "MenuActions"],
+ # Sort by Weight
+ list.sort(key=lambda x: int(x[3]))
+
+ self["menu"] = List(list)
+
+ self["actions"] = NumberActionMap(["OkCancelActions", "MenuActions", "NumberActions"],
{
"ok": self.okbuttonClick,
- "cancel": self.close,
- "menu": self.close
+ "cancel": self.closeNonRecursive,
+ "menu": self.closeRecursive,
+ "1": self.keyNumberGlobal,
+ "2": self.keyNumberGlobal,
+ "3": self.keyNumberGlobal,
+ "4": self.keyNumberGlobal,
+ "5": self.keyNumberGlobal,
+ "6": self.keyNumberGlobal,
+ "7": self.keyNumberGlobal,
+ "8": self.keyNumberGlobal,
+ "9": self.keyNumberGlobal
})
-
- a = getValbyAttr(parent, "title")
- if a == "": #if empty use name
- a = _(getValbyAttr(parent, "text"))
- self["title"] = Header(a)
-class MainMenu(Menu):
- #add file load functions for the xml-file
-
- def __init__(self, *x):
- Menu.__init__(self, *x)
- self.skinName = "Menu"
+ a = parent.get("title", "").encode("UTF-8") or None
+ a = a and _(a)
+ if a is None:
+ a = _(parent.get("text", "").encode("UTF-8"))
+ self["title"] = StaticText(a)
+ self.menu_title = a
- def openDialog(self, dialog):
- self.session.open(dialog)
+ def keyNumberGlobal(self, number):
+ print "menu keyNumber:", number
+ # Calculate index
+ number -= 1
- def openSetup(self, dialog):
- self.session.open(Setup, dialog)
+ if len(self["menu"].list) > number:
+ self["menu"].setIndex(number)
+ self.okbuttonClick()
- def setModeTV(self):
- print "set Mode to TV"
- pass
+ def closeNonRecursive(self):
+ self.close(False)
- def setModeRadio(self):
- print "set Mode to Radio"
- pass
+ def closeRecursive(self):
+ self.close(True)
- def setModeFile(self):
- print "set Mode to File"
- pass
+ def createSummary(self):
+ return MenuSummary
+
+class MainMenu(Menu):
+ #add file load functions for the xml-file
+
+ def __init__(self, *x):
+ self.skinName = "Menu"
+ Menu.__init__(self, *x)