X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/1f3de605b9be5751d14c39f785adc5d4af2fced7..ee7a4508e2a846ab03bb1885bab4424f04e40519:/lib/python/Screens/Menu.py
diff --git a/lib/python/Screens/Menu.py b/lib/python/Screens/Menu.py
index 503990b6..328c9b39 100644
--- a/lib/python/Screens/Menu.py
+++ b/lib/python/Screens/Menu.py
@@ -1,17 +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 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
@@ -26,55 +26,24 @@ def doGlobal(screen):
screen["clock"] = Clock()
-mdom = xml.dom.minidom.parseString(
- """
-
""")
+# - 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:
+ # 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):
@@ -93,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"
@@ -134,6 +74,12 @@ class Menu(Screen):
def nothing(self): #dummy
pass
+ 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")
if MenuTitle != "": #check for title
@@ -197,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)
@@ -206,9 +151,9 @@ class MainMenu(Menu):
def openDialog(self, dialog):
self.session.open(dialog)
- def goSetup(self):
- self.session.open(configTest)
-
+ def openSetup(self, dialog):
+ self.session.open(Setup, dialog)
+
def setModeTV(self):
print "set Mode to TV"
pass
@@ -220,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())