X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/bf937d04817e6af798d7bdc9de5d85f9654f5bcf..d2b1dcb3466ed5476094d9ff445d1df1b4ed14ff:/lib/python/Screens/Menu.py?ds=inline

diff --git a/lib/python/Screens/Menu.py b/lib/python/Screens/Menu.py
index 328c9b39..7554d814 100644
--- a/lib/python/Screens/Menu.py
+++ b/lib/python/Screens/Menu.py
@@ -1,4 +1,4 @@
-#from Screen import *
+from Screen import *
 from Components.MenuList import MenuList
 from Components.ActionMap import ActionMap
 from Components.Header import Header
@@ -6,19 +6,14 @@ from Components.Button import Button
 from Components.Label import Label
 from Components.ProgressBar import ProgressBar
 
-# hack.... dynamically importing all screens
-from __init__ import __all__
-for i in __all__:
-	print "import " + i
-	if (i is not "Menu" ):
-		exec "from " + i + " import *"
-
 from enigma import quitMainloop
 
 import xml.dom.minidom
 from xml.dom import EMPTY_NAMESPACE
 from skin import elementsWithTag
 
+from Screens.Setup import *
+
 from Tools import XMLTools
 
 # some screens
@@ -37,14 +32,13 @@ def doGlobal(screen):
 try:
 	# first we search in the current path
 	menufile = file('data/menu.xml', 'r')
-except:
+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)
@@ -68,33 +62,67 @@ class Menu(Screen):
 		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.
+		if arg[0] != "":
+			exec "from Screens." + 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)
 
 	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)
 			#TODO add check if !empty(node.childNodes)
 			destList.append((MenuTitle, a))
 		
 	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
+					
+					# 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)
@@ -119,28 +147,9 @@ class Menu(Screen):
 		
 		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)
-
-
 class MainMenu(Menu):
 	#add file load functions for the xml-file