X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/eabcf8e80696baf83ecfac2aa44cf5a4853c4679..d17eccddcb6e6a6e4a5c259514355e791933139d:/lib/python/Screens/Menu.py

diff --git a/lib/python/Screens/Menu.py b/lib/python/Screens/Menu.py
index fd2f2761..328c9b39 100644
--- a/lib/python/Screens/Menu.py
+++ b/lib/python/Screens/Menu.py
@@ -1,18 +1,17 @@
-from Screen import *
+#from Screen import *
 from Components.MenuList import MenuList
 from Components.ActionMap import ActionMap
 from Components.Header import Header
-
-# hack ... must be made dynamic
-from Screens.Setup import Setup
-from ServiceScan import ServiceScan
-from ScartLoopThrough import ScartLoopThrough
 from Components.Button import Button
 from Components.Label import Label
 from Components.ProgressBar import ProgressBar
-from ConfigMenu import *
 
-from TimerEdit import *
+# 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
 
@@ -27,58 +26,24 @@ def doGlobal(screen):
 	screen["clock"] = Clock()
 
 
-mdom = xml.dom.minidom.parseString(
-        """
-	<menu text="Mainmenu" title="the real Mainmenu">
-		<item text="Standby debug">quitMainloop()</item>
-		<item text="Automatic Scan">self.openDialog(ServiceScan)</item>
-
-		<item text="Blub1">self.openSetup("rc")</item>
-		<item text="Blub2">self.openSetup("blasel")</item>
-
-		<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="Timer">self.openDialog(TimerEditList)</item>
-		<menu text="Setup">
-			<menu text="Service Organising">
-				<item text="New Bouquets"></item>
-				<item text="Add to Bouquets"></item>
-				<item text="Edit Bouquets"></item>
-			</menu>
-			<menu text="Service Searching">
-				<item text="Satelliteconfig"></item>
-				<item text="Satfinder"></item>
-				<item text="Rotor Control"></item>
-				<item text="Edit Transponder"></item>
-				<item text="Automatic Scan">self.openDialog(ServiceScan)</item>
-				<item text="Automatic 'Multisat' Scan"></item>
-				<item text="Manual Scan"></item>
-			</menu>
-			<menu text="System">
-				<item text="Time Date"></item>
-				<item text="Video Audio"></item>
-				<item text="UHF Modulator"></item>
-				<item text="Harddisk"></item>
-				<item text="Keyboard"></item>
-				<item text="OSD">self.openDialog(configOSD)</item>
-				<item text="Language"></item>
-				<item text="LCD"></item>
-			</menu>
-			<item text="Common Interface"></item>
-			<item text="Parental Control"></item>
-			<item text="Expert"></item>
-		</menu>
-		<item text="Games"></item>
-		<item text="Information"></item>
-		<menu text="Standby">
-			<item text="PowerOff"></item>
-			<item text="Restart"></item>
-			<item text="Standby"></item>
-			<item text="Sleep Timer">self.goSetup()</item>
-		</menu>
-	</menu>""")
+#		<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>
+
+
+# read the menu
+try:
+	# first we search in the current path
+	menufile = file('data/menu.xml', 'r')
+except:
+	# 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):
@@ -97,35 +62,6 @@ class boundFunction:
 	def __call__(self):
 		self.fnc(*self.args)
 
-class configOSD(Screen):
-	#this needs focus handling - so not useable
-
-	def okbuttonClick(self):
-		self.close
- 
-	def __init__(self, session):
-		Screen.__init__(self, session)
-
-		self["actions"] = ActionMap(["OkCancelActions"], 
-			{
-				"ok": self.okbuttonClick,
-				"cancel": self.close
-			})
-
-		self["okbutton"] = Button("Save")
-
-		self["txt_alpha"] = Label("Alpha:")
-		self["sld_alpha"] = ProgressBar()
-		self["sld_alpha"].setValue(50)
-
-		self["txt_brightness"] = Label("Brightness:")
-		self["sld_brightness"] = ProgressBar()
-		self["sld_brightness"].setValue(50)
-
-		self["txt_gamma"] = Label("Contrast:")
-		self["sld_gamma"] = ProgressBar()
-		self["sld_gamma"].setValue(50)
-
 class Menu(Screen):
 	def okbuttonClick(self):
 		print "okbuttonClick"
@@ -142,7 +78,7 @@ class Menu(Screen):
 		self.session.open(dialog)
 
 	def openSetup(self, dialog):
-		self.session.open(setup, dialog)
+		self.session.open(Setup, dialog)
 
 	def addMenu(self, destList, node):
 		MenuTitle = getValbyAttr(node, "text")
@@ -207,7 +143,6 @@ class FixedMenu(Screen):
 
 class MainMenu(Menu):
 	#add file load functions for the xml-file
-	#remove old code (i.e. goScan / goClock...)
 	
 	def __init__(self, *x):
 		Menu.__init__(self, *x)
@@ -219,9 +154,6 @@ class MainMenu(Menu):
 	def openSetup(self, dialog):
 		self.session.open(Setup, dialog)
 
-	def goSetup(self):
-		self.session.open(configTest)
-	
 	def setModeTV(self):
 		print "set Mode to TV"
 		pass
@@ -233,9 +165,3 @@ class MainMenu(Menu):
 	def setModeFile(self):
 		print "set Mode to File"
 		pass
-
-	def goScan(self):
-		self.session.open(ServiceScan)
-	
-	def goClock(self):
-		self.session.open(clockDisplay, Clock())