move more code to onCreate

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

diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
index 565655f9f75188669170347b9dac1694af2ad5e7..93b55a8e8ff56ca512a8482612568b5972f69bcc 100644 (file)
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -29,11 +29,12 @@ 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))
 
@@ -41,11 +42,11 @@ class ChannelContextMenu(FixedMenu):
                        if not csel.bouquet_mark_edit:
                                if not csel.movemode:
                                        menu.append(("enable move mode", self.toggleMoveMode))
-                                       if not inBouquetRootList: 
+                                       if not inBouquetRootList:
                                                menu.append(("enable bouquet edit", self.bouquetMarkStart))
                                else:
                                        menu.append(("disable move mode", self.toggleMoveMode))
-                       elif not inBouquetRootList: 
+                       elif not inBouquetRootList:
                                menu.append(("end bouquet edit", self.bouquetMarkEnd))
                                menu.append(("abort bouquet edit", self.bouquetMarkAbort))
 
@@ -210,23 +211,27 @@ class ChannelSelectionBase(Screen):
        def __init__(self, session):
                Screen.__init__(self, session)
 
-               #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')
+               # 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("Provider")
-               #self["key_yellow"] = Button("Satellite")
-               self["key_green"] = Button("")
-               self["key_yellow"] = Button("")
+               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()
-               
+
                self.lastService = None
 
                self.lastServiceTimer = eTimer()
@@ -234,7 +239,7 @@ class ChannelSelectionBase(Screen):
                self.lastServiceTimer.start(100)
 
        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()
@@ -258,8 +263,8 @@ class ChannelSelectionBase(Screen):
                return offsetCount
 
        def setRootBase(self, root):
-               inBouquetRootList = root.toString().find('FROM BOUQUET "bouquets.') != -1 #FIXME HACK
-               if not inBouquetRootList and ((root.flags & eServiceReference.flagDirectory) == eServiceReference.flagDirectory):
+               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:
@@ -272,13 +277,26 @@ class ChannelSelectionBase(Screen):
        def moveDown(self):
                self.servicelist.moveDown()
 
+       def showAllServices(self):
+               ref = eServiceReference('%s ORDER BY name'%(self.service_types))
+               self.setRoot(ref)
+
+       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(self.numericalTextInput.getKey(number))
-               # TODO let the servicelist jump to the next entry strating with the chosen character
+               print "You would go to character " + str(char)
+               self.servicelist.moveToChar(char)
 
        def enterBouquet(self, action):
                if action[:7] == "bouquet":
@@ -314,8 +332,6 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit):
                #if config.tv.lastroot.value == "":
                #allways defaults to fav
                #self.servicelist.setRoot(eServiceReference('1:7:1:0:0:0:0:0:0:0:(type == 1) FROM BOUQUET "userbouquet.favourites.tv" ORDER BY bouquet'))
-               self.showFavourites()
-               self.session.nav.playService(eServiceReference(config.tv.lastservice.value))
 
                class ChannelActionMap(NumberActionMap):
                        def action(self, contexts, action):
@@ -330,6 +346,9 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit):
                                "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,
@@ -343,6 +362,26 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit):
                                "0": self.keyNumberGlobal
                        })
                self["actions"].csel = self
+               self.onShown.append(self.onShow)
+               self.onLayoutFinish.append(self.onCreate)
+
+       def onCreate(self):
+               lastroot=eServiceReference(config.tv.lastroot.value)
+               if lastroot.valid():
+                       self.setRoot(lastroot)
+               else:
+                       self.showFavourites()
+               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.servicelist.getCurrent()
@@ -409,6 +448,9 @@ class SimpleChannelSelection(ChannelSelectionBase):
                                "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,
@@ -424,6 +466,7 @@ class SimpleChannelSelection(ChannelSelectionBase):
 
        def onExecCallback(self):
                print "onExecCallback"
+               self.showFavourites()
                self.session.currentDialog.instance.setTitle(self.title)
 
        def channelSelected(self): # just return selected service