flush config (to flash) on close setup list

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

diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index e98ebbaee7c12cf40a74acd4dc8d4c96414c01d0..51e77a8b6e469bb13a674847acc8cd5092ac5080 100644 (file)
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -1,153 +1,105 @@
 from Screen import Screen
 from Screen import Screen

-from ChannelSelection import ChannelSelection
+
+from Screens.MovieSelection import MovieSelection
+from Screens.ChannelSelection import ChannelSelectionRadio
+from Screens.MessageBox import MessageBox
+from ServiceReference import ServiceReference
+

 from Components.Clock import Clock
 from Components.Clock import Clock

-from Components.VolumeBar import VolumeBar
-from Components.ActionMap import ActionMap
-from Components.Button import Button
-from Components.ServiceName import ServiceName
-from Components.EventInfo import EventInfo
+from Components.ActionMap import ActionMap, HelpableActionMap

 from Components.ServicePosition import ServicePosition
 
 from Components.ServicePosition import ServicePosition
 

-from Screens.MessageBox import MessageBox
-from Screens.MovieSelection import MovieSelection
+from Tools.Notifications import AddNotificationWithCallback
+
+from Screens.InfoBarGenerics import InfoBarShowHide, \
+       InfoBarPowerKey, InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, \
+       InfoBarEPG, InfoBarEvent, InfoBarServiceName, InfoBarSeek, InfoBarInstantRecord, \
+       InfoBarAudioSelection, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, \
+       InfoBarSubserviceSelection, InfoBarTuner, InfoBarShowMovies, InfoBarTimeshift,  \
+       InfoBarServiceNotifications, InfoBarPVRState
+
+from Screens.HelpMenu import HelpableScreen, HelpMenu

 
 from enigma import *
 
 import time
 
 
 from enigma import *
 
 import time
 

-# hack alert!
-from Menu import MainMenu, mdom
+class InfoBar(Screen, InfoBarShowHide, InfoBarPowerKey,
+       InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG,
+       InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection, 
+       HelpableScreen, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish,
+       InfoBarSubserviceSelection, InfoBarTuner, InfoBarTimeshift, InfoBarSeek):

 
 

-class InfoBar(Screen):
-       STATE_HIDDEN = 0
-       STATE_HIDING = 1
-       STATE_SHOWING = 2
-       STATE_SHOWN = 3
-       

        def __init__(self, session):
                Screen.__init__(self, session)
 
        def __init__(self, session):
                Screen.__init__(self, session)
 

-               #instantiate forever
-               self.servicelist = self.session.instantiateDialog(ChannelSelection)
-               self.volumeBar = VolumeBar()            
-               
-               self.state = self.STATE_HIDDEN
-
-               self["actions"] = ActionMap( [ "InfobarActions" ], 
+               self["actions"] = HelpableActionMap(self, "InfobarActions",

                        {
                        {

-                               "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
+                               "showMovies": (self.showMovies, _("Play recorded movies...")),
+                               "showRadio": (self.showRadio, _("Show the radio player..."))

                        })
                        })

-#              self["okbutton"] = Button("mainMenu", [self.mainMenu])

                
                

+               for x in HelpableScreen, \
+                               InfoBarShowHide, InfoBarPowerKey, \
+                               InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, \
+                               InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection, \
+                               InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, InfoBarSubserviceSelection, \
+                               InfoBarTuner, InfoBarTimeshift, InfoBarSeek:
+                       x.__init__(self)
+
+               self.helpList.append((self["actions"], "InfobarActions", [("showMovies", "Watch a Movie...")]))
+               self.helpList.append((self["actions"], "InfobarActions", [("showRadio", "Hear Radio...")]))
+

                self["CurrentTime"] = Clock()
                self["CurrentTime"] = Clock()

-               # ServicePosition(self.session.nav, ServicePosition.TYPE_REMAINING)
-               # Clock()

 
 

-               self["Volume"] = self.volumeBar
-               
-               self["ServiceName"] = ServiceName(self.session.nav)
-               
-               self["Event_Now"] = EventInfo(self.session.nav, EventInfo.Now)
-               self["Event_Next"] = EventInfo(self.session.nav, EventInfo.Next)
+       def showRadio(self):
+               self.session.open(ChannelSelectionRadio)
+
+       def showMovies(self):
+               self.session.openWithCallback(self.movieSelected, MovieSelection)
+
+       def movieSelected(self, service):
+               if service is not None:
+                       self.session.open(MoviePlayer, service)

 
 

-               self["Event_Now_Duration"] = EventInfo(self.session.nav, EventInfo.Now_Duration)
-               self["Event_Next_Duration"] = EventInfo(self.session.nav, EventInfo.Next_Duration)
+class MoviePlayer(Screen, InfoBarShowHide, InfoBarPowerKey, \
+               InfoBarMenu, \
+               InfoBarServiceName, InfoBarSeek, InfoBarShowMovies, InfoBarAudioSelection, HelpableScreen, InfoBarNotifications,
+               InfoBarServiceNotifications, InfoBarPVRState):

                
                

-               self.recording = None
+       def __init__(self, session, service):
+               Screen.__init__(self, session)

                
                

-               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 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.state == self.STATE_SHOWN:
-#                      self.instance.hide()
-                       self.startHide()
-               else:
-#                      self.instance.show()
-                       self.startShow()
-
-       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.volumeBar.setValue(eDVBVolumecontrol.getInstance().getVolume())
-
-       def     volDown(self):
-               eDVBVolumecontrol.getInstance().volumeDown()
-               self.volumeBar.setValue(eDVBVolumecontrol.getInstance().getVolume())
+               self["actions"] = HelpableActionMap(self, "MoviePlayerActions",
+                       {
+                               "leavePlayer": (self.leavePlayer, _("leave movie player..."))
+                       })

                
                

-       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     volMute(self):
-               eDVBVolumecontrol.getInstance().volumeToggleMute()
-               self.volumeBar.setValue(eDVBVolumecontrol.getInstance().getVolume())
-
-       def     quit(self):
-               quitMainloop()
+               for x in HelpableScreen, InfoBarShowHide, InfoBarPowerKey, InfoBarMenu, \
+                               InfoBarServiceName, InfoBarSeek, InfoBarShowMovies, \
+                               InfoBarAudioSelection, InfoBarNotifications, \
+                               InfoBarServiceNotifications, InfoBarPVRState:
+                       x.__init__(self)
+
+               self["CurrentTime"] = ServicePosition(self.session.nav, ServicePosition.TYPE_REMAINING)
+               self["ElapsedTime"] = ServicePosition(self.session.nav, ServicePosition.TYPE_POSITION)
+               # TYPE_LENGTH?

                
                

-       def instantRecord(self):
-               #self.session.open(MessageBox, "this would be an instant recording! do you really know what you're doing?!")
-               #return
+               self.lastservice = self.session.nav.getCurrentlyPlayingServiceReference()
+               self.session.nav.playService(service)
+
+       def leavePlayer(self):
+               self.session.openWithCallback(self.leavePlayerConfirmed, MessageBox, _("Stop playing this movie?"))

        
        

-               if self.recording != None:
-                       print "remove entry"
-                       self.session.nav.RecordTimer.removeEntry(self.recording)
-                       self.recording = None
-               else:
-                       serviceref = self.session.nav.getCurrentlyPlayingServiceReference()
+       def leavePlayerConfirmed(self, answer):
+               if answer == True:
+                       self.session.nav.playService(self.lastservice)
+                       self.close()

                        
                        

-                       # 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")
-       

        def showMovies(self):
        def showMovies(self):

-               self.session.open(MovieSelection)
+               ref = self.session.nav.getCurrentlyPlayingServiceReference()
+               self.session.openWithCallback(self.movieSelected, MovieSelection, ref)

 
 

+       def movieSelected(self, service):
+               if service is not None:
+                       self.session.nav.playService(service)