allow different skins by specifying a list as skinName, use menu_<menuid> as alternat...

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

diff --git a/lib/python/Screens/Menu.py b/lib/python/Screens/Menu.py
index d6ec9015eb0dad2f3f3d3f7f4c03c523214f69be..5ff929c6e912982ca4b57662d8c7b95350056fdd 100644 (file)
--- a/lib/python/Screens/Menu.py
+++ b/lib/python/Screens/Menu.py
@@ -1,21 +1,15 @@
 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
 from Components.Label import Label
-from Components.ProgressBar import ProgressBar
 from Components.config import configfile
 from Components.Sources.Clock import Clock
 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
 
 from Screens.Setup import Setup, getSetupTitle
 
@@ -24,7 +18,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 +106,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,8 +205,14 @@ class Menu(Screen):
                        for l in plugins.getPluginsForMenu(menuID):
                                list.append((l[0], boundFunction(l[1], self.session)))
 
-               self["menu"] = MenuList(list)   
-                                                       
+               # for the skin: first try a menu_<menuID>, then Menu
+               self.skinName = [ ]
+               if menuID is not None:
+                       self.skinName.append("menu_" + menuID)
+               self.skinName.append("Menu")
+
+               self["menu"] = List(list)       
+
                self["actions"] = ActionMap(["OkCancelActions", "MenuActions"], 
                        {
                                "ok": self.okbuttonClick,
@@ -240,23 +239,5 @@ class MainMenu(Menu):
        #add file load functions for the xml-file
        
        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
+               Menu.__init__(self, *x)