X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/72340ff944f651577e6175f030ab2f761e971ee6..0b3d548fcc6f9033c428b7c8dee84ac12ad8dee6:/lib/python/Screens/Menu.py
diff --git a/lib/python/Screens/Menu.py b/lib/python/Screens/Menu.py
index db41cd57..41818748 100644
--- a/lib/python/Screens/Menu.py
+++ b/lib/python/Screens/Menu.py
@@ -1,10 +1,12 @@
-from Screen import *
-from Components.MenuList import MenuList
+from Screen import Screen
+from Components.Sources.MenuList import MenuList
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 Tools.Directories import resolveFilename, SCOPE_SKIN
@@ -18,11 +20,6 @@ from Screens.Setup import *
from Tools import XMLTools
-# some screens
-def doGlobal(screen):
- screen["clock"] = Clock()
-
-
# - self.setModeTV()
# - self.setModeRadio()
# - self.setModeFile()
@@ -72,7 +69,36 @@ class MenuUpdater:
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])
+
class Menu(Screen):
def okbuttonClick(self):
print "okbuttonClick"
@@ -81,7 +107,7 @@ class Menu(Screen):
def execText(self, text):
exec text
-
+
def runScreen(self, arg):
# arg[0] is the module (as string)
# arg[1] is Screen inside this module
@@ -89,7 +115,6 @@ class Menu(Screen):
# string (as we want to reference
# stuff which is just imported)
# FIXME. somehow
- print arg
if arg[0] != "":
exec "from " + arg[0] + " import *"
@@ -107,10 +132,18 @@ class Menu(Screen):
def addMenu(self, destList, node):
MenuTitle = _(getValbyAttr(node, "text"))
if MenuTitle != "": #check for title
- a = boundFunction(self.session.openWithCallback, self.menuClosed, Menu, node, node.childNodes)
+ x = getValbyAttr(node, "flushConfigOnClose")
+ if x == "1":
+ 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))
+ def menuClosedWithConfigFlush(self, *res):
+ configfile.save()
+ self.menuClosed(*res)
+
def menuClosed(self, *res):
if len(res) and res[0]:
self.close(True)
@@ -189,6 +222,7 @@ class Menu(Screen):
if a == "": #if empty use name
a = _(getValbyAttr(parent, "text"))
self["title"] = Header(a)
+ self.menu_title = a
def closeNonRecursive(self):
self.close(False)
@@ -196,6 +230,9 @@ class Menu(Screen):
def closeRecursive(self):
self.close(True)
+ def createSummary(self):
+ return MenuSummary
+
class MainMenu(Menu):
#add file load functions for the xml-file