X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/6ac5293d96c9fcd2961d3a71c635c485cf254a1d..20706bda37359411c6e53600763bdcbf8bc0ea53:/lib/python/Screens/Menu.py
diff --git a/lib/python/Screens/Menu.py b/lib/python/Screens/Menu.py
index d6ec9015..6ea0f647 100644
--- a/lib/python/Screens/Menu.py
+++ b/lib/python/Screens/Menu.py
@@ -1,21 +1,13 @@
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.Sources.StaticText import StaticText
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 +16,6 @@ from Tools import XMLTools
# - self.setModeTV()
# - self.setModeRadio()
# - self.setModeFile()
-# - self.openDialog(ScartLoopThrough)
#
@@ -57,37 +48,23 @@ class MenuUpdater:
def getUpdatedMenu(self, id):
return self.updatedMenuItems[id]
-
+
menuupdater = MenuUpdater()
class MenuSummary(Screen):
skin = """
-
-
-
+
+
+
+
+
WithSeconds
"""
def __init__(self, session, parent):
- Screen.__init__(self, session)
- self["MenuTitle"] = Label(parent.menu_title)
- self["MenuEntry"] = Label("")
- self["CurrentTime"] = Clock()
- self.parent = parent
- self.onShow.append(self.addWatcher)
- self.onHide.append(self.removeWatcher)
-
- def addWatcher(self):
- self.parent["menu"].onSelectionChanged.append(self.selectionChanged)
- self.selectionChanged()
-
- def removeWatcher(self):
- self.parent["menu"].onSelectionChanged.remove(self.selectionChanged)
-
- def selectionChanged(self):
- self["MenuEntry"].setText(self.parent["menu"].getCurrent()[0])
+ Screen.__init__(self, session, parent)
class Menu(Screen):
@@ -113,24 +90,25 @@ 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)
def addMenu(self, destList, node):
MenuTitle = _(node.getAttribute("text").encode("UTF-8") or "??")
+ entryID = node.getAttribute("entryID") or "undefined"
x = node.getAttribute("flushConfigOnClose")
if x:
a = boundFunction(self.session.openWithCallback, self.menuClosedWithConfigFlush, Menu, node, node.childNodes)
else:
a = boundFunction(self.session.openWithCallback, self.menuClosed, Menu, node, node.childNodes)
#TODO add check if !empty(node.childNodes)
- destList.append((MenuTitle, a))
+ destList.append((MenuTitle, a, entryID))
def menuClosedWithConfigFlush(self, *res):
configfile.save()
@@ -142,6 +120,7 @@ class Menu(Screen):
def addItem(self, destList, node):
item_text = node.getAttribute("text").encode("UTF-8")
+ entryID = node.getAttribute("entryID") or "undefined"
for x in node.childNodes:
if x.nodeType != xml.dom.minidom.Element.nodeType:
continue
@@ -157,16 +136,16 @@ class Menu(Screen):
module = "Screens." + module
else:
module = ""
-
- # check for arguments. they will be appended to the
+
+ # check for arguments. they will be appended to the
# openDialog call
args = XMLTools.mergeText(x.childNodes)
screen += ", " + args
-
- destList.append((_(item_text or "??"), boundFunction(self.runScreen, (module, screen))))
+
+ destList.append((_(item_text or "??"), boundFunction(self.runScreen, (module, screen)), entryID))
return
elif x.tagName == 'code':
- destList.append((_(item_text or "??"), boundFunction(self.execText, XMLTools.mergeText(x.childNodes))))
+ destList.append((_(item_text or "??"), boundFunction(self.execText, XMLTools.mergeText(x.childNodes)), entryID))
return
elif x.tagName == 'setup':
id = x.getAttribute("id")
@@ -174,10 +153,9 @@ class Menu(Screen):
item_text = _(getSetupTitle(id)) + "..."
else:
item_text = _(item_text)
- destList.append((item_text, boundFunction(self.openSetup, id)))
+ destList.append((item_text, boundFunction(self.openSetup, id), entryID))
return
-
- destList.append((item_text,self.nothing))
+ destList.append((item_text, self.nothing, entryID))
def __init__(self, session, parent, childNode):
@@ -212,8 +190,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_, 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,
@@ -224,7 +208,7 @@ class Menu(Screen):
a = parent.getAttribute("title").encode("UTF-8") or None
if a is None:
a = _(parent.getAttribute("text").encode("UTF-8"))
- self["title"] = Header(a)
+ self["title"] = StaticText(a)
self.menu_title = a
def closeNonRecursive(self):
@@ -240,23 +224,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)