from Screens.MovieSelection import MovieSelection
from Screens.ChannelSelection import ChannelSelectionRadio
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
from Screens.InfoBarGenerics import InfoBarShowHide, \
- InfoBarPowerKey, InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, \
+ InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, \
InfoBarEPG, InfoBarEvent, InfoBarServiceName, InfoBarSeek, InfoBarInstantRecord, \
InfoBarAudioSelection, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, \
InfoBarSubserviceSelection, InfoBarTuner, InfoBarShowMovies, InfoBarTimeshift, \
InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarSimpleEventView, \
- InfoBarSummarySupport, InfoBarTimeshiftState, InfoBarTeletextPlugin
+ InfoBarSummarySupport, InfoBarTimeshiftState, InfoBarTeletextPlugin, InfoBarExtensions, \
+ InfoBarSubtitleSupport
from Screens.HelpMenu import HelpableScreen, HelpMenu
import time
-class InfoBar(InfoBarShowHide, InfoBarPowerKey,
+class InfoBar(InfoBarShowHide,
InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG,
InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection,
HelpableScreen, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish,
InfoBarSubserviceSelection, InfoBarTuner, InfoBarTimeshift, InfoBarSeek,
- InfoBarSummarySupport, InfoBarTimeshiftState, InfoBarTeletextPlugin, Screen):
+ InfoBarSummarySupport, InfoBarTimeshiftState, InfoBarTeletextPlugin, InfoBarExtensions,
+ InfoBarSubtitleSupport, Screen):
def __init__(self, session):
Screen.__init__(self, session)
+ CiHandler.setSession(session)
+
self["actions"] = HelpableActionMap(self, "InfobarActions",
{
"showMovies": (self.showMovies, _("Play recorded movies...")),
- "showRadio": (self.showRadio, _("Show the radio player..."))
- })
+ "showRadio": (self.showRadio, _("Show the radio player...")),
+ "showTv": (self.showTv, _("Show the tv player...")),
+ }, prio=2)
for x in HelpableScreen, \
- InfoBarShowHide, InfoBarPowerKey, \
+ InfoBarShowHide, \
InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, \
InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection, \
InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, InfoBarSubserviceSelection, \
InfoBarTuner, InfoBarTimeshift, InfoBarSeek, InfoBarSummarySupport, InfoBarTimeshiftState, \
- InfoBarTeletextPlugin:
+ 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)
def showRadio(self):
- self.session.open(ChannelSelectionRadio)
+ if currentConfigSelectionElement(config.usage.e1like_radio_mode) == "yes":
+ self.showRadioChannelList(True)
+ else:
+ self.session.open(ChannelSelectionRadio)
def showMovies(self):
self.session.openWithCallback(self.movieSelected, MovieSelection)
if service is not None:
self.session.open(MoviePlayer, service)
-class MoviePlayer(InfoBarShowHide, InfoBarPowerKey, \
+class MoviePlayer(InfoBarShowHide, \
InfoBarMenu, \
InfoBarServiceName, InfoBarSeek, InfoBarShowMovies, InfoBarAudioSelection, HelpableScreen, InfoBarNotifications,
InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarSimpleEventView,
- InfoBarSummarySupport, Screen):
+ InfoBarSummarySupport, InfoBarTeletextPlugin, InfoBarSubtitleSupport, Screen):
def __init__(self, session, service):
Screen.__init__(self, session)
"leavePlayer": (self.leavePlayer, _("leave movie player..."))
})
- for x in HelpableScreen, InfoBarShowHide, InfoBarPowerKey, InfoBarMenu, \
+ for x in HelpableScreen, InfoBarShowHide, InfoBarMenu, \
InfoBarServiceName, InfoBarSeek, InfoBarShowMovies, \
InfoBarAudioSelection, InfoBarNotifications, InfoBarSimpleEventView, \
InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, \
- InfoBarSummarySupport:
+ 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)