use nimselection instead of satconfig

[enigma2.git] / lib / python / Screens / Menu.py

diff --git a/lib/python/Screens/Menu.py b/lib/python/Screens/Menu.py
index da36eb384643c4615846af51853660c1f2118033..4be2ebcaeec806fccd6a3f54c2b61bca33aba228 100644 (file)
--- 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):
 #              <item text="Scart">self.openDialog(ScartLoopThrough)</item>
 #                      <item text="Sleep Timer"></item>
 
-mdom = xml.dom.minidom.parseString(
-        """
-       <menu text="Mainmenu" title="Mainmenu">
-               <item text="Standby debug">quitMainloop()</item>
-               <item text="Timer">self.openDialog(TimerEditList)</item>
-               <menu text="Setup">
-                       <menu text="Service Organising -disabled-">
-                               <item text="New Bouquets"></item>
-                               <item text="Add to Bouquets"></item>
-                               <item text="Edit Bouquets"></item>
-                       </menu>
-                       <menu text="Service Searching">
-                               <item text="Satelliteconfig">self.openSetup("satconfig")</item>
-                               <item text="Satfinder -disabled-"></item>
-                               <item text="Rotor Control -disabled-"></item>
-                               <item text="Edit Transponder -disabled-"></item>
-                               <item text="Automatic Scan">self.openDialog(ServiceScan)</item>
-                       </menu>
-                       <menu text="System">
-                               <item text="Timezone">self.openSetup("timezone")</item>
-                               <item text="Video Audio">self.openSetup("avsetup")</item>
-                               <item text="UHF Modulator">self.openSetup("rfmod")</item>
-                               <item text="Harddisk">self.openDialog(HarddiskSelection)</item>
-                               <item text="Remote Control">self.openSetup("rc")</item>
-                               <item text="Keyboard">self.openSetup("keyboard")</item>
-                               <item text="OSD">self.openSetup("osd")</item>
-                               <item text="LCD">self.openSetup("lcd")</item>
-                       </menu>
-                       <item text="Common Interface"></item>
-                       <item text="Parental Control">self.openSetup("parental")</item>
-                       <item text="Expert">self.openSetup("expert")</item>
-               </menu>
-               <item text="Games (not found)"></item>
-               <item text="Information">self.openDialog(About)</item>
-               <menu text="Standby">
-                       <item text="PowerOff">quitMainloop()</item>
-                       <item text="Restart">quitMainloop()</item>
-                       <item text="Standby">quitMainloop()</item>
-               </menu>
-       </menu>""")
+
+# 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())