X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/1d434656236b098f062f174dee390e8d34435d4c..1e1c01fece5a4a86a762af265e382da5dbb2d8cb:/lib/python/Screens/ChannelSelection.py?ds=sidebyside diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py index 1c1e4503..b98df0f3 100644 --- a/lib/python/Screens/ChannelSelection.py +++ b/lib/python/Screens/ChannelSelection.py @@ -1,11 +1,12 @@ from Screen import Screen from Components.Button import Button from Components.ServiceList import ServiceList -from Components.ActionMap import ActionMap +from Components.ActionMap import NumberActionMap from EpgSelection import EPGSelection from enigma import eServiceReference, eEPGCache, eEPGCachePtr, eServiceCenter, eServiceCenterPtr, iMutableServiceListPtr, iStaticServiceInformationPtr, eTimer from Components.config import config, configElement, ConfigSubsection, configText from Screens.FixedMenu import FixedMenu +from Tools.NumericalTextInput import NumericalTextInput import xml.dom.minidom @@ -28,29 +29,30 @@ class ChannelContextMenu(FixedMenu): menu = [ ] - inBouquetRootList = csel.servicelist.getRoot().toString().find('FROM BOUQUET "bouquets.') != -1 #FIXME HACK + inBouquetRootList = csel.servicelist.getRoot().getPath().find('FROM BOUQUET "bouquets.') != -1 #FIXME HACK inBouquet = csel.getMutableList() is not None if not csel.bouquet_mark_edit and not csel.movemode and not inBouquetRootList: - menu.append(("add service to bouquet", self.addServiceToBouquetSelected)) + if (csel.getCurrentSelection().type & eServiceReference.flagDirectory) != eServiceReference.flagDirectory: + menu.append((_("add service to bouquet"), self.addServiceToBouquetSelected)) if inBouquet: - menu.append(("remove service", self.removeCurrentService)) + menu.append((_("remove service"), self.removeCurrentService)) if inBouquet: # current list is editable? if not csel.bouquet_mark_edit: if not csel.movemode: - menu.append(("enable move mode", self.toggleMoveMode)) - if not inBouquetRootList: - menu.append(("enable bouquet edit", self.bouquetMarkStart)) + menu.append((_("enable move mode"), self.toggleMoveMode)) + if not inBouquetRootList: + menu.append((_("enable bouquet edit"), self.bouquetMarkStart)) else: - menu.append(("disable move mode", self.toggleMoveMode)) - elif not inBouquetRootList: - menu.append(("end bouquet edit", self.bouquetMarkEnd)) - menu.append(("abort bouquet edit", self.bouquetMarkAbort)) + menu.append((_("disable move mode"), self.toggleMoveMode)) + elif not inBouquetRootList: + menu.append((_("end bouquet edit"), self.bouquetMarkEnd)) + menu.append((_("abort bouquet edit"), self.bouquetMarkAbort)) - menu.append(("back", self.close)) + menu.append((_("back"), self.close)) - FixedMenu.__init__(self, session, "Channel Selection", menu) + FixedMenu.__init__(self, session, _("Channel Selection"), menu) self.skinName = "Menu" def addServiceToBouquetSelected(self): @@ -98,83 +100,14 @@ class ChannelContextMenu(FixedMenu): self.csel.endMarkedEdit(abort=True) self.close() -class ChannelSelection(Screen): - def lastService(self): - self.lastServiceTimer.stop() - #zap to last running tv service - self.setRoot(eServiceReference(config.tv.lastroot.value)) - self.session.nav.playService(eServiceReference(config.tv.lastservice.value)) - - def __init__(self, session): - Screen.__init__(self, session) - - #config for lastservice - config.tv = ConfigSubsection(); - config.tv.lastservice = configElement("config.tv.lastservice", configText, "", 0); - config.tv.lastroot = configElement("config.tv.lastroot", configText, "", 0); - +class ChannelSelectionEdit: + def __init__(self): self.entry_marked = False self.movemode = False self.bouquet_mark_edit = False - #self.bouquet_root = eServiceReference('1:7:1:0:0:0:0:0:0:0:(type == 1) FROM BOUQUET "bouquets.tv" ORDER BY bouquet') - self.bouquet_root = eServiceReference('1:7:1:0:0:0:0:0:0:0:(type == 1) FROM BOUQUET "userbouquet.favourites.tv" ORDER BY bouquet') self.mutableList = None - self.__marked = [ ] - self["key_red"] = Button("All") - self["key_green"] = Button("Provider") - self["key_yellow"] = Button("Satellite") - self["key_blue"] = Button("Favourites") - - self["list"] = ServiceList() - self.servicelist = self["list"] - - if config.tv.lastroot.value == "": - self.servicelist.setRoot(eServiceReference("""1:0:1:0:0:0:0:0:0:0:(type == 1)""")) - #self["okbutton"] = Button("ok", [self.channelSelected]) - - self.lastServiceTimer = eTimer() - self.lastServiceTimer.timeout.get().append(self.lastService) - self.lastServiceTimer.start(100) - - class ChannelActionMap(ActionMap): - def action(self, contexts, action): - if action[:7] == "bouquet": - l = self.csel - if action.find("FROM BOUQUET") != -1: - l.setRoot(eServiceReference("1:7:1:0:0:0:0:0:0:0:" + action[8:])) - else: - l.setRoot(eServiceReference("1:0:1:0:0:0:0:0:0:0:" + action[8:])) - else: - if action == "cancel": - l = self.csel - if l.movemode: #movemode active? - l.channelSelected() # unmark - l.toggleMoveMode() # disable move mode - elif l.bouquet_mark_edit: - l.endMarkedEdit(True) # abort edit mode - ActionMap.action(self, contexts, action) - - self["actions"] = ChannelActionMap(["ChannelSelectActions", "OkCancelActions", "ContextMenuActions"], - { - "cancel": self.close, - "ok": self.channelSelected, - "mark": self.doMark, - "contextMenu": self.doContext, - "showFavourites": self.showFavourites, - "showEPGList": self.showEPGList - }) - self["actions"].csel = self - - def showEPGList(self): - ref=self.servicelist.getCurrent() - ptr=eEPGCache.getInstance() - if ptr.startTimeQuery(ref) != -1: - self.session.open(EPGSelection, ref) - else: - print 'no epg for service', ref.toString() - def getMutableList(self, root=eServiceReference()): if not self.mutableList is None: return self.mutableList @@ -245,44 +178,62 @@ class ChannelSelection(Screen): mutableList.flushChanges() self.close() - def searchNumberHelper(self, serviceHandler, num, bouquet): - servicelist = serviceHandler.list(bouquet) - if not servicelist is None: - while num: - serviceIterator = servicelist.getNext() - if not serviceIterator.valid(): #check end of list - break - if serviceIterator.flags: #assume normal dvb service have no flags set - continue - num -= 1; - if not num: #found service with searched number ? - return serviceIterator, 0 - return None, num - - def zapToNumber(self, number): - bouquet = self.bouquet_root - service = None - serviceHandler = eServiceCenter.getInstance() - if bouquet.toString().find('FROM BOUQUET "bouquets.') == -1: #FIXME HACK - service, number = self.searchNumberHelper(serviceHandler, number, bouquet) + def toggleMoveMode(self): + if self.movemode: + if self.entry_marked: + self.toggleMoveMarked() # unmark current entry + self.movemode = False + self.mutableList.flushChanges() # FIXME add check if changes was made + self.mutableList = None + else: + self.mutableList = self.getMutableList() + self.movemode = True + + def handleEditCancel(self): + if self.movemode: #movemode active? + self.channelSelected() # unmark + self.toggleMoveMode() # disable move mode + elif self.bouquet_mark_edit: + self.endMarkedEdit(True) # abort edit mode + + def toggleMoveMarked(self): + if self.entry_marked: + self.servicelist.setCurrentMarked(False) + self.entry_marked = False else: - bouquetlist = serviceHandler.list(bouquet) - if not bouquetlist is None: - while number: - bouquet = bouquetlist.getNext() - if not bouquet.valid(): #check end of list - break - if ((bouquet.flags & eServiceReference.flagDirectory) != eServiceReference.flagDirectory): - continue - service, number = self.searchNumberHelper(serviceHandler, number, bouquet) - if not service is None: - self.session.nav.playService(service) #play service - if self.servicelist.getRoot() != bouquet: #already in correct bouquet? - self.setRoot(bouquet) - self.servicelist.setCurrent(service) #select the service in servicelist + self.servicelist.setCurrentMarked(True) + self.entry_marked = True + + def doContext(self): + self.session.open(ChannelContextMenu, self) + +class ChannelSelectionBase(Screen): + def __init__(self, session): + Screen.__init__(self, session) + + # this makes it much simple to implement a selectable radio or tv mode :) + self.service_types_tv = '1:7:1:0:0:0:0:0:0:0:(type == 1) || (type == 17)' + self.service_types_radio = '1:7:1:0:0:0:0:0:0:0:(type == 2)' + + self.service_types = self.service_types_tv + + #self.bouquet_root = eServiceReference('1:7:1:0:0:0:0:0:0:0:(type == 1) FROM BOUQUET "bouquets.tv" ORDER BY bouquet') + self.bouquet_root = eServiceReference('%s FROM BOUQUET "userbouquet.favourites.tv" ORDER BY bouquet'%(self.service_types)) + + self["key_red"] = Button(_("All")) + self["key_green"] = Button(_("Satellites")) + self["key_yellow"] = Button(_("Provider")) + self["key_blue"] = Button(_("Favourites")) + + self["list"] = ServiceList() + self.servicelist = self["list"] + + #self["okbutton"] = Button("ok", [self.channelSelected]) + + self.numericalTextInput = NumericalTextInput() def getBouquetNumOffset(self, bouquet): - if self.bouquet_root.toString().find('FROM BOUQUET "bouquets.') == -1: #FIXME HACK + if self.bouquet_root.getPath().find('FROM BOUQUET "bouquets.') == -1: #FIXME HACK return 0 offsetCount = 0 serviceHandler = eServiceCenter.getInstance() @@ -305,38 +256,14 @@ class ChannelSelection(Screen): offsetCount += 1 return offsetCount - def setRoot(self, root): - if not self.movemode: # dont change root when movemode is enabled - inBouquetRootList = root.toString().find('FROM BOUQUET "bouquets.') != -1 #FIXME HACK - if not inBouquetRootList and ((root.flags & eServiceReference.flagDirectory) == eServiceReference.flagDirectory): - self.servicelist.setMode(ServiceList.MODE_FAVOURITES) - self.servicelist.setNumberOffset(self.getBouquetNumOffset(root)) - else: - self.servicelist.setMode(ServiceList.MODE_NORMAL) - self.servicelist.setRoot(root) - - def channelSelected(self): - ref = self.servicelist.getCurrent() - if self.movemode: - if self.entry_marked: - self.servicelist.setCurrentMarked(False) - self.entry_marked = False - else: - self.servicelist.setCurrentMarked(True) - self.entry_marked = True - elif (ref.flags & 7) == 7: - self.setRoot(ref) - elif self.bouquet_mark_edit: - self.doMark() + def setRootBase(self, root): + inBouquetRootList = root.getPath().find('FROM BOUQUET "bouquets.') != -1 #FIXME HACK + if not inBouquetRootList and (root.getPath().find('FROM BOUQUET') != -1): + self.servicelist.setMode(ServiceList.MODE_FAVOURITES) + self.servicelist.setNumberOffset(self.getBouquetNumOffset(root)) else: - self.session.nav.playService(ref) - self.saveChannel() - self.close() - - #called from infoBar - def zap(self): - self.session.nav.playService(self.servicelist.getCurrent()) - self.saveChannel() + self.servicelist.setMode(ServiceList.MODE_NORMAL) + self.servicelist.setRoot(root) def moveUp(self): self.servicelist.moveUp() @@ -344,23 +271,143 @@ class ChannelSelection(Screen): def moveDown(self): self.servicelist.moveDown() - def doContext(self): - self.session.open(ChannelContextMenu, self) + def showAllServices(self): + ref = eServiceReference('%s ORDER BY name'%(self.service_types)) + self.setRoot(ref) - def toggleMoveMode(self): - if self.movemode: - if self.entry_marked: - self.channelSelected() # unmark current entry - self.movemode = False - self.mutableList.flushChanges() # FIXME add check if changes was made - self.mutableList = None - else: - self.mutableList = self.getMutableList() - self.movemode = True + def showSatellites(self): + ref = eServiceReference('%s FROM SATELLITES ORDER BY satellitePosition'%(self.service_types)) + self.setRoot(ref) + + def showProviders(self): + ref = eServiceReference('%s FROM PROVIDERS ORDER BY name'%(self.service_types)) + self.setRoot(ref) def showFavourites(self): self.setRoot(self.bouquet_root) + def keyNumberGlobal(self, number): + char = self.numericalTextInput.getKey(number) + print "You pressed number " + str(number) + print "You would go to character " + str(char) + self.servicelist.moveToChar(char) + + def enterBouquet(self, action): + if action[:7] == "bouquet": + if action.find("FROM BOUQUET") != -1: + self.setRoot(eServiceReference("1:7:1:0:0:0:0:0:0:0:" + action[8:])) + else: + self.setRoot(eServiceReference("1:0:1:0:0:0:0:0:0:0:" + action[8:])) + return True + return False + + def getRoot(self): + return self.servicelist.getRoot() + + def getCurrentSelection(self): + return self.servicelist.getCurrent() + + def setCurrentSelection(self, service): + self.servicelist.setCurrent(service) + + def cancel(self): + self.close(None) + +class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit): + def __init__(self, session): + ChannelSelectionBase.__init__(self,session) + ChannelSelectionEdit.__init__(self) + + #config for lastservice + config.tv = ConfigSubsection(); + config.tv.lastservice = configElement("config.tv.lastservice", configText, "", 0); + config.tv.lastroot = configElement("config.tv.lastroot", configText, "", 0); + + class ChannelActionMap(NumberActionMap): + def action(self, contexts, action): + if not self.csel.enterBouquet(action): + if action == "cancel": + self.csel.handleEditCancel() + NumberActionMap.action(self, contexts, action) + self["actions"] = ChannelActionMap(["ChannelSelectActions", "OkCancelActions", "ContextMenuActions"], + { + "cancel": self.cancel, + "ok": self.channelSelected, + "mark": self.doMark, + "contextMenu": self.doContext, + "showFavourites": self.showFavourites, + "showAllServices": self.showAllServices, + "showProviders": self.showProviders, + "showSatellites": self.showSatellites, + "showEPGList": self.showEPGList, + "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["actions"].csel = self + self.onShown.append(self.onShow) + +# self.onLayoutFinish.append(self.onCreate) + self.lastChannelRootTimer = eTimer() + self.lastChannelRootTimer.timeout.get().append(self.onCreate) + self.lastChannelRootTimer.start(100,True) + + def onCreate(self): + lastroot=eServiceReference(config.tv.lastroot.value) + if lastroot.valid(): + self.setRoot(lastroot) + else: + self.showFavourites() + self.saveRoot(self.getRoot()) + lastservice=eServiceReference(config.tv.lastservice.value) + if lastservice.valid(): + self.session.nav.playService(lastservice) + self.servicelist.setCurrent(lastservice) + + def onShow(self): + ref = self.session.nav.getCurrentlyPlayingServiceReference() + if ref is not None and ref.valid() and ref.getPath() == "": + self.servicelist.setPlayableIgnoreService(ref) + else: + self.servicelist.setPlayableIgnoreService(eServiceReference()) + + def showEPGList(self): + ref=self.getCurrentSelection() + ptr=eEPGCache.getInstance() + if ptr.startTimeQuery(ref) != -1: + self.session.open(EPGSelection, ref) + else: + print 'no epg for service', ref.toString() + + def channelSelected(self): + ref = self.getCurrentSelection() + if self.movemode: + self.toggleMoveMarked() + elif (ref.flags & 7) == 7: + self.setRoot(ref) + elif self.bouquet_mark_edit: + self.doMark() + else: + self.zap() + self.close(ref) + + def setRoot(self, root): + if not self.movemode: + self.setRootBase(root) + + #called from infoBar and channelSelected + def zap(self): + self.session.nav.playService(self.getCurrentSelection()) + self.saveRoot(self.getRoot()) + self.saveChannel() + def saveRoot(self, root): if root is not None: config.tv.lastroot.value = root.toString() @@ -375,15 +422,55 @@ class ChannelSelection(Screen): config.tv.lastservice.value = refstr config.tv.lastservice.save() -class SimpleChannelSelection(ChannelSelection): - def __init__(self, session, args): - ChannelSelection.__init__(self, session) - self.args = args - + def cancel(self): + self.close(None) + lastroot=eServiceReference(config.tv.lastroot.value) + lastservice=eServiceReference(config.tv.lastservice.value) + if lastroot.valid() and self.getRoot() != lastroot: + self.setRoot(lastroot) + if lastservice.valid() and self.getCurrentSelection() != lastservice: + self.servicelist.setCurrent(lastservice) + +class SimpleChannelSelection(ChannelSelectionBase): + def __init__(self, session, title): + ChannelSelectionBase.__init__(self, session) + self.title = title + self.onShown.append(self.onExecCallback) + + class ChannelActionMap(NumberActionMap): + def action(self, contexts, action): + if not self.csel.enterBouquet(action): + NumberActionMap.action(self, contexts, action) + self["actions"] = ChannelActionMap(["ChannelSelectActions", "OkCancelActions", "ContextMenuActions"], + { + "cancel": self.cancel, + "ok": self.channelSelected, + "showFavourites": self.showFavourites, + "showAllServices": self.showAllServices, + "showProviders": self.showProviders, + "showSatellites": self.showSatellites, + "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["actions"].csel = self + + def onExecCallback(self): + print "onExecCallback" + self.showFavourites() + self.session.currentDialog.instance.setTitle(self.title) + def channelSelected(self): # just return selected service - ref = self.servicelist.getCurrent() + ref = self.getCurrentSelection() self.close(ref) - - def doContext(self): # don't show context menu - pass - \ No newline at end of file + + def setRoot(self, root): + self.setRootBase(root) +