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 71d5123f9f409b1cbf59510ed15df478d7f8fdf8..4be2ebcaeec806fccd6a3f54c2b61bca33aba228 100644 (file)
--- a/lib/python/Screens/Menu.py
+++ b/lib/python/Screens/Menu.py
@@ -1,30 +1,10 @@
-#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 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 Network 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 Components.Button import Button
+from Components.Label import Label
+from Components.ProgressBar import ProgressBar
 
 from enigma import quitMainloop
 
@@ -32,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
@@ -75,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"
@@ -164,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)
@@ -197,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
@@ -211,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())