diff options
Diffstat (limited to 'lib/python/Screens/Menu.py')
| -rw-r--r-- | lib/python/Screens/Menu.py | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/lib/python/Screens/Menu.py b/lib/python/Screens/Menu.py index 4d112abb..41818748 100644 --- a/lib/python/Screens/Menu.py +++ b/lib/python/Screens/Menu.py @@ -1,4 +1,4 @@ -from Screen import * +from Screen import Screen from Components.Sources.MenuList import MenuList from Components.ActionMap import ActionMap from Components.Header import Header @@ -6,7 +6,7 @@ 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 @@ -20,11 +20,6 @@ from Screens.Setup import * from Tools import XMLTools -# some screens -def doGlobal(screen): - screen["clock"] = Clock() - - # <item text="TV-Mode">self.setModeTV()</item> # <item text="Radio-Mode">self.setModeRadio()</item> # <item text="File-Mode">self.setModeFile()</item> @@ -80,14 +75,16 @@ class MenuSummary(Screen): <screen position="0,0" size="132,64"> <widget name="MenuTitle" position="0,4" size="132,21" font="Regular;18" /> <widget name="MenuEntry" position="0,25" size="132,21" font="Regular;16" /> - <widget name="Clock" position="50,46" size="82,18" font="Regular;16" /> + <widget source="CurrentTime" render="Label" position="50,46" size="82,18" font="Regular;16" > + <convert type="ClockToText">WithSeconds</convert> + </widget> </screen>""" 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) |