X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/87bfe5dfced0fb7a4e9839fdafa898261a39c86c..5697c8db5f4c96eb1658e708911bf904eae7c268:/lib/python/Screens/InfoBar.py diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py index da2509e2..516d44c5 100644 --- a/lib/python/Screens/InfoBar.py +++ b/lib/python/Screens/InfoBar.py @@ -1,15 +1,20 @@ from Screen import Screen +from EpgSelection import EPGSelection from ChannelSelection import ChannelSelection from Components.Clock import Clock -from Components.VolumeBar import VolumeBar 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 * @@ -18,6 +23,48 @@ import time # hack alert! from Menu import MainMenu, mdom +class NumberZap(Screen): + def quit(self): + self.Timer.stop() + self.close() + + def keyOK(self): + self.Timer.stop() + print "do the action here" + self.close() + + def keyNumberGlobal(self, number): + self.Timer.start(3000) #reset timer + self.field = self.field + str(number) + self["number"].setText(self.field) + + def __init__(self, session, number): + Screen.__init__(self, session) + self.field = str(number) + + self["number"] = Label(self.field) + + self["actions"] = NumberActionMap( [ "SetupActions" ], + { + "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 + }) + + self.Timer = eTimer() + self.Timer.timeout.get().append(self.keyOK) + self.Timer.start(3000) + + class InfoBar(Screen): STATE_HIDDEN = 0 STATE_HIDING = 1 @@ -29,9 +76,21 @@ class InfoBar(Screen): #instantiate forever self.servicelist = self.session.instantiateDialog(ChannelSelection) - self.volumeBar = VolumeBar() + + self.state = self.STATE_HIDDEN + + self.volumeDialog = self.session.instantiateDialog(Volume) + self.muteDialog = self.session.instantiateDialog(Mute) + + self.hideTimer = eTimer() + self.hideTimer.timeout.get().append(self.doTimerHide) + #self.hideTimer.start(1000) + + self.hideVolTimer = eTimer() + self.hideVolTimer.timeout.get().append(self.volHide) - self["actions"] = ActionMap( [ "InfobarActions" ], + #self["actions"] = ActionMap( [ "InfobarActions" ], + self["actions"] = NumberActionMap( [ "InfobarActions" ], { "switchChannelUp": self.switchChannelUp, "switchChannelDown": self.switchChannelDown, @@ -45,15 +104,25 @@ class InfoBar(Screen): "hide": self.hide, "toggleShow": self.toggleShow, "showMovies": self.showMovies, - "quit": self.quit + "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 }) # self["okbutton"] = Button("mainMenu", [self.mainMenu]) - self["CurrentTime"] = ServicePosition(self.session.nav, ServicePosition.TYPE_REMAINING) + 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) @@ -72,6 +141,10 @@ class InfoBar(Screen): 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) @@ -83,13 +156,23 @@ class InfoBar(Screen): 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.instance.isVisible(): -# self.instance.hide() - self.startHide() + if self.state == self.STATE_SHOWN: + self.instance.hide() + #pls check animation support, sorry +# self.startHide() + self.state = self.STATE_HIDDEN else: -# self.instance.show() - self.startShow() + self.instance.show() +# self.startShow() + self.state = self.STATE_SHOWN + #TODO: make it customizable + self.hideTimer.start(5000) def zapUp(self): self.servicelist.moveUp() @@ -101,48 +184,80 @@ class InfoBar(Screen): def volUp(self): eDVBVolumecontrol.getInstance().volumeUp() - self.volumeBar.setValue(eDVBVolumecontrol.getInstance().getVolume()) + self.volumeDialog.instance.show() + self.volumeDialog.setValue(eDVBVolumecontrol.getInstance().getVolume()) + self.hideVolTimer.start(3000) def volDown(self): eDVBVolumecontrol.getInstance().volumeDown() - self.volumeBar.setValue(eDVBVolumecontrol.getInstance().getVolume()) + self.volumeDialog.instance.show() + self.volumeDialog.setValue(eDVBVolumecontrol.getInstance().getVolume()) + self.hideVolTimer.start(3000) + def volHide(self): + self.volumeDialog.instance.hide() + def startShow(self): - self.instance.m_animation.startMoveAnimation(ePoint(0, 500), ePoint(0, 380), 100) + 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, 500), 100) + 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()) + self.volumeDialog.setValue(eDVBVolumecontrol.getInstance().getVolume()) + + if (eDVBVolumecontrol.getInstance().isMuted()): + self.muteDialog.instance.show() + else: + self.muteDialog.instance.hide() + + def showEPGList(self): +# TODO hier irgendwie EPGSelection benutzen und setRoot benutzen um nen service zu uebergeben +# self.session.nav.getCurrentlyPlayingServiceReference() sollte das wohl sein + self.session.open(EPGSelection) - def quit(self): + 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") + + def recordQuestionCallback(self, answer): + if answer == False: + return + if self.recording != None: + self.stopCurrentRecording() + else: + self.startInstantRecording() + def instantRecord(self): - #self.session.open(MessageBox, "this would be an instant recording! do you really know what you're doing?!") - #return - if self.recording != None: - print "remove entry" - self.session.nav.RecordTimer.removeEntry(self.recording) - self.recording = None + self.session.openWithCallback(self.recordQuestionCallback, MessageBox, "Do you want to stop the current\n(instant) recording?") 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.session.openWithCallback(self.recordQuestionCallback, MessageBox, "Start recording?") + def showMovies(self): self.session.open(MovieSelection) -