X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/10502348ab4f43a465c606cb68a6f0b7f1f8ce07..b399699bf940782cfb003510734ee348fd3b160e:/lib/python/Screens/Menu.py
diff --git a/lib/python/Screens/Menu.py b/lib/python/Screens/Menu.py
index da36eb38..4be2ebca 100644
--- a/lib/python/Screens/Menu.py
+++ b/lib/python/Screens/Menu.py
@@ -2,20 +2,9 @@ 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 HarddiskSetup import HarddiskSelection
from Components.Button import Button
from Components.Label import Label
from Components.ProgressBar import ProgressBar
-from ConfigMenu import *
-
-from About import *
-
-from TimerEdit import *
from enigma import quitMainloop
@@ -23,6 +12,8 @@ import xml.dom.minidom
from xml.dom import EMPTY_NAMESPACE
from skin import elementsWithTag
+from Screens.Satconfig import NimSelection
+
from Tools import XMLTools
# some screens
@@ -36,46 +27,18 @@ def doGlobal(screen):
# - self.openDialog(ScartLoopThrough)
#
-mdom = xml.dom.minidom.parseString(
- """
-
""")
+
+# 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):
@@ -94,35 +57,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"
@@ -183,28 +117,8 @@ class Menu(Screen):
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
- #remove old code (i.e. goScan / goClock...)
def __init__(self, *x):
Menu.__init__(self, *x)
@@ -216,9 +130,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
@@ -230,9 +141,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())