move xml files into web/, support hierarchy

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

diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index 567211767d9d776e1cbcc825db36c9ccfb2ee9ad..9d3e327cae06d789d8edbb84930c3bd6c8ac5e8a 100644 (file)
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -6,9 +6,8 @@ from Screens.MessageBox import MessageBox
 from Screens.Ci import CiHandler
 from ServiceReference import ServiceReference
 
-from Components.Clock import Clock
+from Components.Sources.Clock import Clock
 from Components.ActionMap import ActionMap, HelpableActionMap
-from Components.ServicePosition import ServicePosition, ServicePositionGauge
 from Components.config import currentConfigSelectionElement, config
 
 from Tools.Notifications import AddNotificationWithCallback
@@ -46,7 +45,7 @@ class InfoBar(InfoBarShowHide,
                                "showMovies": (self.showMovies, _("Play recorded movies...")),
                                "showRadio": (self.showRadio, _("Show the radio player...")),
                                "showTv": (self.showTv, _("Show the tv player...")),
-                       })
+                       }, prio=2)
                
                for x in HelpableScreen, \
                                InfoBarShowHide, \
@@ -57,11 +56,10 @@ class InfoBar(InfoBarShowHide,
                                InfoBarTeletextPlugin, InfoBarExtensions, InfoBarSubtitleSupport:
                        x.__init__(self)
 
-               self.helpList.append((self["actions"], "InfobarActions", [("showMovies", "Watch a Movie...")]))
-               self.helpList.append((self["actions"], "InfobarActions", [("showRadio", "Hear Radio...")]))
+               self.helpList.append((self["actions"], "InfobarActions", [("showMovies", _("view recordings..."))]))
+               self.helpList.append((self["actions"], "InfobarActions", [("showRadio", _("hear radio..."))]))
 
                self["CurrentTime"] = Clock()
-               # ServicePosition(self.session.nav, ServicePosition.TYPE_REMAINING)
 
        def showTv(self):
                self.showTvChannelList(True)
@@ -100,12 +98,6 @@ class MoviePlayer(InfoBarShowHide, \
                                InfoBarSummarySupport, InfoBarTeletextPlugin, InfoBarSubtitleSupport:
                        x.__init__(self)
 
-               self["CurrentTime"] = ServicePosition(self.session.nav, ServicePosition.TYPE_REMAINING)
-               self["ElapsedTime"] = ServicePosition(self.session.nav, ServicePosition.TYPE_POSITION)
-               self["PositionGauge"] = ServicePositionGauge(self.session.nav)
-               
-               # TYPE_LENGTH?
-               
                self.lastservice = self.session.nav.getCurrentlyPlayingServiceReference()
                self.session.nav.playService(service)