diff options
Diffstat (limited to 'lib/python/Screens')
| -rw-r--r-- | lib/python/Screens/ChannelSelection.py | 12 | ||||
| -rw-r--r-- | lib/python/Screens/InfoBar.py | 4 |
2 files changed, 13 insertions, 3 deletions
diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py index 465d3de3..3155c44d 100644 --- a/lib/python/Screens/ChannelSelection.py +++ b/lib/python/Screens/ChannelSelection.py @@ -69,7 +69,9 @@ class ChannelSelection(Screen): def action(self, contexts, action): if action[:7] == "bouquet": print "setting root to " + action[8:] - self.csel["list"].setRoot(eServiceReference("1:0:1:0:0:0:0:0:0:0:" + action[8:])) + l = self.csel["list"] + l.setMode(l.MODE_NORMAL) + l.setRoot(eServiceReference("1:0:1:0:0:0:0:0:0:0:" + action[8:])) else: ActionMap.action(self, contexts, action) @@ -78,7 +80,8 @@ class ChannelSelection(Screen): "cancel": self.close, "ok": self.channelSelected, "mark": self.doMark, - "contextMenu": self.doContext + "contextMenu": self.doContext, + "showFavourites": self.showFavourites }) self["actions"].csel = self @@ -119,6 +122,7 @@ class ChannelSelection(Screen): # ... def channelSelected(self): self.session.nav.playService(self["list"].getCurrent()) + print "current: " + self["list"].getCurrent().toString() self.close() #called from infoBar @@ -137,3 +141,7 @@ class ChannelSelection(Screen): def setMoveMode(self, mode): self.movemode = mode + def showFavourites(self): + l = self["list" ] + l.setRoot(eServiceReference('1:0:1:0:0:0:0:0:0:0:(provider == "fav")')) + l.setMode(l.MODE_FAVOURITES) diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py index 6f8dde1b..0ead7221 100644 --- a/lib/python/Screens/InfoBar.py +++ b/lib/python/Screens/InfoBar.py @@ -6,6 +6,7 @@ from Components.ActionMap import ActionMap from Components.Button import Button from Components.ServiceName import ServiceName from Components.EventInfo import EventInfo +from Components.ServicePosition import ServicePosition from Screens.MessageBox import MessageBox from Screens.MovieSelection import MovieSelection @@ -43,7 +44,8 @@ class InfoBar(Screen): }) # self["okbutton"] = Button("mainMenu", [self.mainMenu]) - self["CurrentTime"] = Clock() + self["CurrentTime"] = ServicePosition(self.session.nav, ServicePosition.TYPE_REMAINING) + # Clock() self["Volume"] = self.volumeBar |