git.cweiske.de / enigma2.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge branch 'master' of fraxinas@git.opendreambox.org:/git/enigma2
[enigma2.git] / lib / python / Screens / InfoBar.py
diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index 065097f8839a001a512ec003b78159549c6d7f4d..01b77f3f6823100d714b7addc3d9928b1c89422d 100644 (file)
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -1,261 +1,235 @@
-from Screen import Screen
-from EpgSelection import EPGSelection
-from ChannelSelection import ChannelSelection
-from Components.Clock import Clock
-from Components.ActionMap import ActionMap
-from Components.ActionMap import NumberActionMap
-from Components.Button import Button
-from Components.ServiceName import ServiceName
-from Components.EventInfo import EventInfo
-from Components.ServicePosition import ServicePosition
-from Components.config import configfile
-from Components.Label import Label
-
-from Screens.MessageBox import MessageBox
-from Screens.MovieSelection import MovieSelection
-from Screens.Volume import Volume
-from Screens.Mute import Mute
-
-from enigma import *
+from Tools.Profile import profile
 
 
-import time
-
-# hack alert!
-from Menu import MainMenu, mdom
-
-class NumberZap(Screen):
-       def quit(self):
-               self.Timer.stop()
-               self.close()
+# workaround for required config entry dependencies.
+from Screens.MovieSelection import MovieSelection
 
 
-       def keyOK(self):
-               self.Timer.stop()
-               print "do the action here"
-               self.close()
+from Screen import Screen
 
 
-       def keyNumberGlobal(self, number):
-               self.Timer.start(3000)          #reset timer
-               self.field = self.field + str(number)
-               self["number"].setText(self.field)
+profile("LOAD:enigma")
+from enigma import iPlayableService
+
+profile("LOAD:InfoBarGenerics")
+from Screens.InfoBarGenerics import InfoBarShowHide, \
+       InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarRdsDecoder, \
+       InfoBarEPG, InfoBarSeek, InfoBarInstantRecord, \
+       InfoBarAudioSelection, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, \
+       InfoBarSubserviceSelection, InfoBarShowMovies, InfoBarTimeshift,  \
+       InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarSimpleEventView, \
+       InfoBarSummarySupport, InfoBarMoviePlayerSummarySupport, InfoBarTimeshiftState, InfoBarTeletextPlugin, InfoBarExtensions, \
+       InfoBarSubtitleSupport, InfoBarPiP, InfoBarPlugins, InfoBarSleepTimer, InfoBarServiceErrorPopupSupport, InfoBarJobman
+
+profile("LOAD:InitBar_Components")
+from Components.ActionMap import HelpableActionMap
+from Components.config import config
+from Components.ServiceEventTracker import ServiceEventTracker, InfoBarBase
+
+profile("LOAD:HelpableScreen")
+from Screens.HelpMenu import HelpableScreen
+
+class InfoBar(InfoBarBase, InfoBarShowHide,
+       InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, InfoBarRdsDecoder,
+       InfoBarInstantRecord, InfoBarAudioSelection, 
+       HelpableScreen, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish,
+       InfoBarSubserviceSelection, InfoBarTimeshift, InfoBarSeek,
+       InfoBarSummarySupport, InfoBarTimeshiftState, InfoBarTeletextPlugin, InfoBarExtensions,
+       InfoBarPiP, InfoBarPlugins, InfoBarSubtitleSupport, InfoBarSleepTimer, InfoBarServiceErrorPopupSupport, InfoBarJobman,
+       Screen):
+       
+       ALLOW_SUSPEND = True
+       instance = None
 
 
-       def __init__(self, session, number):
+       def __init__(self, session):
                Screen.__init__(self, session)
                Screen.__init__(self, session)
-               self.field = str(number)
+               self["actions"] = HelpableActionMap(self, "InfobarActions",
+                       {
+                               "showMovies": (self.showMovies, _("Play recorded movies...")),
+                               "showRadio": (self.showRadio, _("Show the radio player...")),
+                               "showTv": (self.showTv, _("Show the tv player...")),
+                       }, prio=2)
                
                
-               self["number"] = Label(self.field)
-
-               self["actions"] = NumberActionMap( [ "SetupActions" ], 
+               for x in HelpableScreen, \
+                               InfoBarBase, InfoBarShowHide, \
+                               InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, InfoBarRdsDecoder, \
+                               InfoBarInstantRecord, InfoBarAudioSelection, \
+                               InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, InfoBarSubserviceSelection, \
+                               InfoBarTimeshift, InfoBarSeek, InfoBarSummarySupport, InfoBarTimeshiftState, \
+                               InfoBarTeletextPlugin, InfoBarExtensions, InfoBarPiP, InfoBarSubtitleSupport, InfoBarJobman, \
+                               InfoBarSleepTimer, InfoBarPlugins, InfoBarServiceErrorPopupSupport:
+                       x.__init__(self)
+
+               self.helpList.append((self["actions"], "InfobarActions", [("showMovies", _("view recordings..."))]))
+               self.helpList.append((self["actions"], "InfobarActions", [("showRadio", _("hear radio..."))]))
+
+               self.__event_tracker = ServiceEventTracker(screen=self, eventmap=
                        {
                        {
-                               "cancel": self.quit,
-                               "ok": self.keyOK,
-                               "1": self.keyNumberGlobal,
-                               "2": self.keyNumberGlobal,
-                               "3": self.keyNumberGlobal,
-                               "4": self.keyNumberGlobal,
-                               "5": self.keyNumberGlobal,
-                               "6": self.keyNumberGlobal,
-                               "7": self.keyNumberGlobal,
-                               "8": self.keyNumberGlobal,
-                               "9": self.keyNumberGlobal,
-                               "0": self.keyNumberGlobal
+                               iPlayableService.evUpdatedEventInfo: self.__eventInfoChanged
                        })
 
                        })
 
-               self.Timer = eTimer()
-               self.Timer.timeout.get().append(self.keyOK)
-               self.Timer.start(3000)
+               self.current_begin_time=0
+               assert InfoBar.instance is None, "class InfoBar is a singleton class and just one instance of this class is allowed!"
+               InfoBar.instance = self
 
 
+       def __onClose(self):
+               InfoBar.instance = None
 
 
-class InfoBar(Screen):
-       STATE_HIDDEN = 0
-       STATE_HIDING = 1
-       STATE_SHOWING = 2
-       STATE_SHOWN = 3
-       
-       def __init__(self, session):
-               Screen.__init__(self, session)
+       def __eventInfoChanged(self):
+               if self.execing:
+                       service = self.session.nav.getCurrentService()
+                       old_begin_time = self.current_begin_time
+                       info = service and service.info()
+                       ptr = info and info.getEvent(0)
+                       self.current_begin_time = ptr and ptr.getBeginTime() or 0
+                       if config.usage.show_infobar_on_event_change.value:
+                               if old_begin_time and old_begin_time != self.current_begin_time:
+                                       self.doShow()
+
+       def __checkServiceStarted(self):
+               self.__serviceStarted(True)
+               self.onExecBegin.remove(self.__checkServiceStarted)
+
+       def serviceStarted(self):  #override from InfoBarShowHide
+               new = self.servicelist.newServicePlayed()
+               if self.execing:
+                       InfoBarShowHide.serviceStarted(self)
+                       self.current_begin_time=0
+               elif not self.__checkServiceStarted in self.onShown and new:
+                       self.onShown.append(self.__checkServiceStarted)
+
+       def __checkServiceStarted(self):
+               self.serviceStarted()
+               self.onShown.remove(self.__checkServiceStarted)
+
+       def showTv(self):
+               self.showTvChannelList(True)
+
+       def showRadio(self):
+               if config.usage.e1like_radio_mode.value:
+                       self.showRadioChannelList(True)
+               else:
+                       self.rds_display.hide() # in InfoBarRdsDecoder
+                       from Screens.ChannelSelection import ChannelSelectionRadio
+                       self.session.openWithCallback(self.ChannelSelectionRadioClosed, ChannelSelectionRadio, self)
 
 
-               #instantiate forever
-               self.servicelist = self.session.instantiateDialog(ChannelSelection)
-               
-               self.state = self.STATE_HIDDEN
-               
-               self.volumeDialog = self.session.instantiateDialog(Volume)
-               self.muteDialog = self.session.instantiateDialog(Mute)
+       def ChannelSelectionRadioClosed(self, *arg):
+               self.rds_display.show()  # in InfoBarRdsDecoder
+
+       def showMovies(self):
+               from Screens.MovieSelection import MovieSelection
+               self.session.openWithCallback(self.movieSelected, MovieSelection)
+
+       def movieSelected(self, service):
+               if service is not None:
+                       self.session.open(MoviePlayer, service)
+
+class MoviePlayer(InfoBarBase, InfoBarShowHide, \
+               InfoBarMenu, \
+               InfoBarSeek, InfoBarShowMovies, InfoBarAudioSelection, HelpableScreen, InfoBarNotifications,
+               InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarSimpleEventView,
+               InfoBarMoviePlayerSummarySupport, InfoBarSubtitleSupport, Screen, InfoBarTeletextPlugin,
+               InfoBarServiceErrorPopupSupport):
+
+       ENABLE_RESUME_SUPPORT = True
+       ALLOW_SUSPEND = True
                
                
-               self.hideTimer = eTimer()
-               self.hideTimer.timeout.get().append(self.doTimerHide)
-               #self.hideTimer.start(1000)
+       def __init__(self, session, service):
+               Screen.__init__(self, session)
                
                
-               self.hideVolTimer = eTimer()
-               self.hideVolTimer.timeout.get().append(self.volHide)
-
-               #self["actions"] = ActionMap( [ "InfobarActions" ], 
-               self["actions"] = NumberActionMap( [ "InfobarActions" ], 
+               self["actions"] = HelpableActionMap(self, "MoviePlayerActions",
                        {
                        {
-                               "switchChannelUp": self.switchChannelUp,
-                               "switchChannelDown": self.switchChannelDown,
-                               "mainMenu": self.mainMenu,
-                               "zapUp": self.zapUp,
-                               "zapDown": self.zapDown,
-                               "volumeUp": self.volUp,
-                               "volumeDown": self.volDown,
-                               "volumeMute": self.volMute,
-                               "instantRecord": self.instantRecord,
-                               "hide": self.hide,
-                               "toggleShow": self.toggleShow,
-                               "showMovies": self.showMovies,
-                               "quit": self.quit,
-                               "1": self.keyNumberGlobal,
-                               "2": self.keyNumberGlobal,
-                               "3": self.keyNumberGlobal,
-                               "4": self.keyNumberGlobal,
-                               "5": self.keyNumberGlobal,
-                               "6": self.keyNumberGlobal,
-                               "7": self.keyNumberGlobal,
-                               "8": self.keyNumberGlobal,
-                               "9": self.keyNumberGlobal,
-                               "0": self.keyNumberGlobal,
-                               "showEPGList": self.showEPGList
+                               "leavePlayer": (self.leavePlayer, _("leave movie player..."))
                        })
                        })
-#              self["okbutton"] = Button("mainMenu", [self.mainMenu])
-               
-               self["CurrentTime"] = Clock()
-               # ServicePosition(self.session.nav, ServicePosition.TYPE_REMAINING)
-               # Clock()
-
-               self["ServiceName"] = ServiceName(self.session.nav)
-               
-               self["Event_Now"] = EventInfo(self.session.nav, EventInfo.Now)
-               self["Event_Next"] = EventInfo(self.session.nav, EventInfo.Next)
-
-               self["Event_Now_Duration"] = EventInfo(self.session.nav, EventInfo.Now_Duration)
-               self["Event_Next_Duration"] = EventInfo(self.session.nav, EventInfo.Next_Duration)
                
                
-               self.recording = None
-               
-               self.pos = 0
-       
-       def mainMenu(self):
-               print "loading mainmenu XML..."
-               menu = mdom.childNodes[0]
-               assert menu.tagName == "menu", "root element in menu must be 'menu'!"
-               self.session.open(MainMenu, menu, menu.childNodes)
-
-       def keyNumberGlobal(self, number):
-               print "You pressed number " + str(number)
-               self.session.open(NumberZap, number)
-
-       def switchChannelUp(self):      
-               self.servicelist.moveUp()
-               self.session.execDialog(self.servicelist)
-
-       def switchChannelDown(self):    
-               self.servicelist.moveDown()
-               self.session.execDialog(self.servicelist)
-
-       def hide(self): 
-               self.instance.hide()
-
-       def doTimerHide(self):
-               if self.state == self.STATE_SHOWN:
-                       self.instance.hide()
-                       self.state = self.STATE_HIDDEN
-
-       def toggleShow(self):
-               if self.state == self.STATE_SHOWN:
-                       self.instance.hide()
-                       #pls check animation support, sorry
-#                      self.startHide()
-                       self.state = self.STATE_HIDDEN
+               for x in HelpableScreen, InfoBarShowHide, InfoBarMenu, \
+                               InfoBarBase, InfoBarSeek, InfoBarShowMovies, \
+                               InfoBarAudioSelection, InfoBarNotifications, InfoBarSimpleEventView, \
+                               InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, \
+                               InfoBarMoviePlayerSummarySupport, InfoBarSubtitleSupport, \
+                               InfoBarTeletextPlugin, InfoBarServiceErrorPopupSupport:
+                       x.__init__(self)
+
+               self.lastservice = self.session.nav.getCurrentlyPlayingServiceReference()
+               self.session.nav.playService(service)
+               self.returning = False
+               self.onClose.append(self.__onClose)
+
+       def __onClose(self):
+               self.session.nav.playService(self.lastservice)
+
+       def handleLeave(self, how):
+               self.is_closing = True
+               if how == "ask":
+                       list = []
+                       list.append((_("Yes"), "quit"))
+                       if config.usage.setup_level.index >= 2: # expert+
+                               list.append((_("Yes, returning to movie list"), "movielist"))
+                       if config.usage.setup_level.index >= 2: # expert+
+                               list.append((_("Yes, and delete this movie"), "quitanddelete"))
+                       list.append((_("No"), "continue"))
+                       if config.usage.setup_level.index >= 2: # expert+
+                               list.append((_("No, but restart from begin"), "restart"))
+
+                       from Screens.ChoiceBox import ChoiceBox
+                       self.session.openWithCallback(self.leavePlayerConfirmed, ChoiceBox, title=_("Stop playing this movie?"), list = list)
                else:
                else:
-                       self.instance.show()
-#                      self.startShow()
-                       self.state = self.STATE_SHOWN
-                       #TODO: make it customizable
-                       self.hideTimer.start(5000)
-
-       def     zapUp(self):
-               self.servicelist.moveUp()
-               self.servicelist.zap()
-
-       def     zapDown(self):
-               self.servicelist.moveDown()
-               self.servicelist.zap()
-
-       def     volUp(self):
-               eDVBVolumecontrol.getInstance().volumeUp()
-               self.volumeDialog.instance.show()
-               self.volumeDialog.setValue(eDVBVolumecontrol.getInstance().getVolume())
-               self.hideVolTimer.start(3000)
-
-       def     volDown(self):
-               eDVBVolumecontrol.getInstance().volumeDown()
-               self.volumeDialog.instance.show()
-               self.volumeDialog.setValue(eDVBVolumecontrol.getInstance().getVolume())
-               self.hideVolTimer.start(3000)
-               
-       def volHide(self):
-               self.volumeDialog.instance.hide()
+                       self.leavePlayerConfirmed([True, how])
 
 
-       def startShow(self):
-               self.instance.m_animation.startMoveAnimation(ePoint(0, 600), ePoint(0, 380), 100)
-               self.state = self.STATE_SHOWN
-       
-       def startHide(self):
-               self.instance.m_animation.startMoveAnimation(ePoint(0, 380), ePoint(0, 600), 100)
-               self.state = self.STATE_HIDDEN
+       def leavePlayer(self):
+               self.handleLeave(config.usage.on_movie_stop.value)
 
 
-       def     volMute(self):
-               eDVBVolumecontrol.getInstance().volumeToggleMute()
-               self.volumeDialog.setValue(eDVBVolumecontrol.getInstance().getVolume())
-               
-               if (eDVBVolumecontrol.getInstance().isMuted()):
-                       self.muteDialog.instance.show()
-               else:
-                       self.muteDialog.instance.hide()
+       def deleteConfirmed(self, answer):
+               if answer:
+                       self.leavePlayerConfirmed((True, "quitanddeleteconfirmed"))
 
 
-       def showEPGList(self):
-               self.session.open(EPGSelection, self.session.nav.getCurrentlyPlayingServiceReference())
+       def leavePlayerConfirmed(self, answer):
+               answer = answer and answer[1]
 
 
-       def quit(self):
-               configfile.save()
-               quitMainloop()
-       
-       def stopCurrentRecording(self): 
-               print "remove entry"
-               self.session.nav.RecordTimer.removeEntry(self.recording)
-               self.recording = None
-       
-       def startInstantRecording(self):
-               serviceref = self.session.nav.getCurrentlyPlayingServiceReference()
-                       
-               # try to get event info
-               epg = None
-               try:
-                       service = self.session.nav.getCurrentService()
-                       info = service.info()
-                       ev = info.getEvent(0)
-                       epg = ev
-               except:
-                       pass
-               
-               # fix me, description. 
-               self.recording = self.session.nav.recordWithTimer(time.time(), time.time() + 30, serviceref, epg, "instant record")
+               if answer in ["quitanddelete", "quitanddeleteconfirmed"]:
+                       ref = self.session.nav.getCurrentlyPlayingServiceReference()
+                       from enigma import eServiceCenter
+                       serviceHandler = eServiceCenter.getInstance()
+                       info = serviceHandler.info(ref)
+                       name = info and info.getName(ref) or _("this recording")
 
 
-       def recordQuestionCallback(self, answer):
-               if answer == False:
+               if answer == "quitanddelete":
+                       from Screens.MessageBox import MessageBox
+                       self.session.openWithCallback(self.deleteConfirmed, MessageBox, _("Do you really want to delete %s?") % name)
                        return
                        return
-               
-               if self.recording != None:
-                       self.stopCurrentRecording()
-               else:
-                       self.startInstantRecording()
 
 
-       def instantRecord(self):
-               if self.recording != None:
-                       self.session.openWithCallback(self.recordQuestionCallback, MessageBox, "Do you want to stop the current\n(instant) recording?")
-               else:
-                       self.session.openWithCallback(self.recordQuestionCallback, MessageBox, "Start recording?")
+               if answer == "quitanddeleteconfirmed":
+                       offline = serviceHandler.offlineOperations(ref)
+                       if offline.deleteFromDisk(0):
+                               from Screens.MessageBox import MessageBox
+                               self.session.openWithCallback(self.close, MessageBox, _("You cannot delete this!"), MessageBox.TYPE_ERROR)
+                               return
+
+               if answer in ["quit", "quitanddeleteconfirmed"]:
+                       config.movielist.last_videodir.cancel()
+                       self.close()
+               elif answer == "movielist":
+                       ref = self.session.nav.getCurrentlyPlayingServiceReference()
+                       self.returning = True
+                       from Screens.MovieSelection import MovieSelection
+                       self.session.openWithCallback(self.movieSelected, MovieSelection, ref)
+                       self.session.nav.stopService()
+               elif answer == "restart":
+                       self.doSeek(0)
+
+       def doEofInternal(self, playing):
+               if not self.execing:
+                       return
+               if not playing :
+                       return
+               self.handleLeave(config.usage.on_movie_eof.value)
 
        def showMovies(self):
 
        def showMovies(self):
-               self.session.open(MovieSelection)
+               ref = self.session.nav.getCurrentlyPlayingServiceReference()
+               from Screens.MovieSelection import MovieSelection
+               self.session.openWithCallback(self.movieSelected, MovieSelection, ref)
+
+       def movieSelected(self, service):
+               if service is not None:
+                       self.is_closing = False
+                       self.session.nav.playService(service)
+                       self.returning = False
+               elif self.returning:
+                       self.close()
Clone of git://git.opendreambox.org/git/enigma2.git before dream multimedia removed all the engima2 sources