implement often wished feature :)

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

diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index 5112a00d0f2a579357fc4bc34ec072fa2de95b1f..a48cb75c6ec3b9ba3f07717aefc71b5a7d4698cb 100644 (file)
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -1,98 +1,82 @@
 from Screen import Screen
-from ChannelSelection import ChannelSelection
+
+from Screens.MovieSelection import MovieSelection
+from Screens.MessageBox import MessageBox
+
 from Components.Clock import Clock
 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 Tools.Notifications import AddNotificationWithCallback
+
+from Screens.InfoBarGenerics import InfoBarVolumeControl, InfoBarShowHide, \
+       InfoBarPowerKey, InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, \
+       InfoBarEPG, InfoBarEvent, InfoBarServiceName, InfoBarPVR, InfoBarInstantRecord, \
+       InfoBarAudioSelection, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, \
+       InfoBarSubserviceSelection, InfoBarTuner
+
+from Screens.HelpMenu import HelpableScreen, HelpMenu
 
 from enigma import *
 
 import time
 
-# hack alert!
-from Menu import *
+class InfoBar(Screen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey,
+       InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG,
+       InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection, 
+       HelpableScreen, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish,
+       InfoBarSubserviceSelection, InfoBarTuner):
 
-class InfoBar(Screen):
        def __init__(self, session):
                Screen.__init__(self, session)
 
-               #instantiate forever
-               self.servicelist = self.session.instantiateDialog(ChannelSelection)
-               
-               self["actions"] = ActionMap( [ "InfobarActions" ], 
+               self["actions"] = ActionMap( [ "InfobarActions" ],
                        {
-                               "switchChannelUp": self.switchChannelUp,
-                               "switchChannelDown": self.switchChannelDown,
-                               "mainMenu": self.mainMenu,
-                               "zapUp": self.zapUp,
-                               "zapDown": self.zapDown,
-                               "instantRecord": self.instantRecord,
-                               "hide": self.hide,
-                               "toggleShow": self.toggleShow
+                               "showMovies": self.showMovies,
                        })
-               self["okbutton"] = Button("mainMenu", [self.mainMenu])
                
+               for x in HelpableScreen, \
+                               InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, \
+                               InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, \
+                               InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection, \
+                               InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, InfoBarSubserviceSelection, InfoBarTuner:
+                       x.__init__(self)
+
+               self.helpList.append((self["actions"], "InfobarActions", [("showMovies", "Watch a Movie...")]))
+
                self["CurrentTime"] = Clock()
+
+       def showMovies(self):
+               self.session.openWithCallback(self.movieSelected, MovieSelection)
+
+       def movieSelected(self, service):
+               if service is not None:
+                       self.session.open(MoviePlayer, service)
+
+class MoviePlayer(Screen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, \
+               InfoBarMenu, \
+               InfoBarServiceName, InfoBarPVR, InfoBarAudioSelection, HelpableScreen, InfoBarNotifications):
                
-               self["ServiceName"] = ServiceName(self.session.nav)
+       def __init__(self, session, service):
+               Screen.__init__(self, session)
                
-               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["actions"] = ActionMap( [ "MoviePlayerActions" ],
+                       {
+                               "leavePlayer": self.leavePlayer
+                       })
                
-               self.recording = None
-       
-       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(Menu, menu, menu.childNodes)
-
-       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 toggleShow(self):
-               if self.instance.isVisible():
-                       self.instance.hide()
-               else:
-                       self.instance.show()
-
-       def     zapUp(self):
-               self.servicelist.moveUp()
-               self.servicelist.zap()
-
-       def     zapDown(self):
-               self.servicelist.moveDown()
-               self.servicelist.zap()
+               for x in HelpableScreen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, InfoBarMenu, InfoBarServiceName, InfoBarPVR, InfoBarAudioSelection, InfoBarNotifications:
+                       x.__init__(self)
+
+               self["CurrentTime"] = ServicePosition(self.session.nav, ServicePosition.TYPE_REMAINING)
                
-       def instantRecord(self):
-               if self.recording != None:
-                       print "remove entry"
-                       self.session.nav.RecordTimer.removeEntry(self.recording)
-                       self.recording = None
-               else:
-                       serviceref = self.session.nav.getCurrentlyPlayingServiceReference()
-                       
-                       # try to get event info
-                       epg = None
-                       service = self.session.nav.getCurrentService()
-                       if service != None:
-                               info = iServiceInformationPtr()
-                               if not service.info(info):
-                                       ev = eServiceEventPtr()
-                                       if info.getEvent(ev, 0) == 0:
-                                               epg = ev
-                       # fix me, description. 
-                       self.recording = self.session.nav.recordWithTimer(time.time(), time.time() + 30, serviceref, epg, "instant record")
+               self.lastservice = self.session.nav.getCurrentlyPlayingServiceReference()
+               self.session.nav.playService(service)
 
+       def leavePlayer(self):
+               self.session.openWithCallback(self.leavePlayerConfirmed, MessageBox, _("Stop playing this movie?"))
+       
+       def leavePlayerConfirmed(self, answer):
+               if answer == True:
+                       self.session.nav.playService(self.lastservice)
+                       self.close()