X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/6ac5293d96c9fcd2961d3a71c635c485cf254a1d..a51752e73e737052dc0f2b731a387deef80e64af:/lib/python/Screens/Menu.py

diff --git a/lib/python/Screens/Menu.py b/lib/python/Screens/Menu.py
index d6ec9015..34c534b5 100644
--- a/lib/python/Screens/Menu.py
+++ b/lib/python/Screens/Menu.py
@@ -1,5 +1,5 @@
 from Screen import Screen
-from Components.Sources.MenuList import MenuList
+from Components.Sources.List import List
 from Components.ActionMap import ActionMap
 from Components.Header import Header
 from Components.Button import Button
@@ -11,8 +11,6 @@ from Components.PluginComponent import plugins
 
 from Tools.Directories import resolveFilename, SCOPE_SKIN
 
-from enigma import quitMainloop
-
 import xml.dom.minidom
 from xml.dom import EMPTY_NAMESPACE
 from skin import elementsWithTag
@@ -24,7 +22,6 @@ from Tools import XMLTools
 #		<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>
 
 
@@ -113,11 +110,11 @@ class Menu(Screen):
 
 		self.openDialog(*eval(arg[1]))
 
-	def nothing(self):																	#dummy
+	def nothing(self): #dummy
 		pass
 
 	def openDialog(self, *dialog):				# in every layer needed
-		self.session.open(*dialog)
+		self.session.openWithCallback(self.menuClosed, *dialog)
 
 	def openSetup(self, dialog):
 		self.session.openWithCallback(self.menuClosed, Setup, dialog)
@@ -212,7 +209,7 @@ class Menu(Screen):
 			for l in plugins.getPluginsForMenu(menuID):
 				list.append((l[0], boundFunction(l[1], self.session)))
 
-		self["menu"] = MenuList(list)	
+		self["menu"] = List(list)	
 							
 		self["actions"] = ActionMap(["OkCancelActions", "MenuActions"], 
 			{
@@ -242,21 +239,3 @@ class MainMenu(Menu):
 	def __init__(self, *x):
 		Menu.__init__(self, *x)
 		self.skinName = "Menu"
-
-	def openDialog(self, dialog):
-		self.session.open(dialog)
-
-	def openSetup(self, dialog):
-		self.session.open(Setup, dialog)
-
-	def setModeTV(self):
-		print "set Mode to TV"
-		pass
-
-	def setModeRadio(self):
-		print "set Mode to Radio"
-		pass
-
-	def setModeFile(self):
-		print "set Mode to File"
-		pass