X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FMenu.py;h=da07be16b19a421539ba2d804c2c894eb82cb35a;hb=3a9a9d2a3eb9cb382b1ccaa978c532d2423dfe73;hp=f1a013483dba6ff255686caaed3f5f82ac0cedb1;hpb=305d92d58b314186599126d5dfe01352db0890fb;p=vuplus_dvbapp
diff --git a/lib/python/Screens/Menu.py b/lib/python/Screens/Menu.py
index f1a0134..da07be1 100644
--- a/lib/python/Screens/Menu.py
+++ b/lib/python/Screens/Menu.py
@@ -1,12 +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.Clock import Clock
+from Components.Sources.Clock import Clock
from Tools.Directories import resolveFilename, SCOPE_SKIN
@@ -16,15 +16,10 @@ import xml.dom.minidom
from xml.dom import EMPTY_NAMESPACE
from skin import elementsWithTag
-from Screens.Setup import *
+from Screens.Setup import Setup, getSetupTitle
from Tools import XMLTools
-# some screens
-def doGlobal(screen):
- screen["clock"] = Clock()
-
-
# - self.setModeTV()
# - self.setModeRadio()
# - self.setModeFile()
@@ -37,17 +32,6 @@ menufile = file(resolveFilename(SCOPE_SKIN, 'menu.xml'), 'r')
mdom = xml.dom.minidom.parseString(menufile.read())
menufile.close()
-
-def getValbyAttr(x, attr):
- for p in range(x.attributes.length):
- a = x.attributes.item(p)
- attrib = str(a.name)
- value = str(a.value)
- if attrib == attr:
- return value
-
- return ""
-
class boundFunction:
def __init__(self, fnc, *args):
self.fnc = fnc
@@ -80,14 +64,16 @@ class MenuSummary(Screen):
-
+
+ WithSeconds
+
"""
def __init__(self, session, parent):
Screen.__init__(self, session)
self["MenuTitle"] = Label(parent.menu_title)
self["MenuEntry"] = Label("")
- self["Clock"] = Clock()
+ self["CurrentTime"] = Clock()
self.parent = parent
self.onShow.append(self.addWatcher)
self.onHide.append(self.removeWatcher)
@@ -133,15 +119,14 @@ class Menu(Screen):
self.session.openWithCallback(self.menuClosed, Setup, dialog)
def addMenu(self, destList, node):
- MenuTitle = _(getValbyAttr(node, "text"))
- if MenuTitle != "": #check for title
- 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))
+ MenuTitle = _(node.getAttribute("text").encode("UTF-8") or "??")
+ 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))
def menuClosedWithConfigFlush(self, *res):
configfile.save()
@@ -152,37 +137,43 @@ class Menu(Screen):
self.close(True)
def addItem(self, destList, node):
- ItemText = _(getValbyAttr(node, "text"))
- if ItemText != "": #check for name
- for x in node.childNodes:
- if x.nodeType != xml.dom.minidom.Element.nodeType:
- continue
- elif x.tagName == 'screen':
- module = getValbyAttr(x, "module")
- screen = getValbyAttr(x, "screen")
-
- if len(screen) == 0:
- screen = module
-
- if module != "":
- module = "Screens." + module
-
- # check for arguments. they will be appended to the
- # openDialog call
- args = XMLTools.mergeText(x.childNodes)
- screen += ", " + args
+ item_text = node.getAttribute("text").encode("UTF-8")
+ for x in node.childNodes:
+ if x.nodeType != xml.dom.minidom.Element.nodeType:
+ continue
+ elif x.tagName == 'screen':
+ module = x.getAttribute("module") or None
+ screen = x.getAttribute("screen") or None
+
+ if screen is None:
+ screen = module
+
+ print module, screen
+ if module:
+ module = "Screens." + module
+ else:
+ module = ""
+
+ # check for arguments. they will be appended to the
+ # openDialog call
+ args = XMLTools.mergeText(x.childNodes)
+ screen += ", " + args
- destList.append((ItemText, boundFunction(self.runScreen, (module, screen))))
- return
- elif x.tagName == 'code':
- destList.append((ItemText, boundFunction(self.execText, XMLTools.mergeText(x.childNodes))))
- return
- elif x.tagName == 'setup':
- id = getValbyAttr(x, "id")
- destList.append((ItemText, boundFunction(self.openSetup, id)))
- return
-
- destList.append((ItemText,self.nothing))
+ destList.append((_(item_text or "??"), boundFunction(self.runScreen, (module, screen))))
+ return
+ elif x.tagName == 'code':
+ destList.append((_(item_text or "??"), boundFunction(self.execText, XMLTools.mergeText(x.childNodes))))
+ return
+ elif x.tagName == 'setup':
+ id = x.getAttribute("id")
+ if item_text == "":
+ item_text = _(getSetupTitle(id)) + "..."
+ else:
+ item_text = _(item_text)
+ destList.append((item_text, boundFunction(self.openSetup, id)))
+ return
+
+ destList.append((item_text,self.nothing))
def __init__(self, session, parent, childNode):
@@ -202,7 +193,7 @@ class Menu(Screen):
self.addMenu(list, x)
count += 1
elif x.tagName == "id":
- menuID = getValbyAttr(x, "val")
+ menuID = x.getAttribute("val")
count = 0
if menuID != -1:
if menuupdater.updatedMenuAvailable(menuID):
@@ -221,9 +212,9 @@ class Menu(Screen):
"menu": self.closeRecursive
})
- a = getValbyAttr(parent, "title")
- if a == "": #if empty use name
- a = _(getValbyAttr(parent, "text"))
+ 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.menu_title = a