Merge commit 'dm/experimental' into test

[vuplus_dvbapp] / lib / python / Screens / ChannelSelection.py

diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
index 7ddbcbf..c9cb5db 100755 (executable)
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -111,9 +111,16 @@ class ChannelContextMenu(Screen):
                                                else:
                                                        append_when_current_valid(current, menu, (_("remove from parental protection"), boundFunction(self.removeParentalProtection, csel.getCurrentSelection())), level = 0)
                                        if haveBouquets:
-                                               append_when_current_valid(current, menu, (_("add service to bouquet"), self.addServiceToBouquetSelected), level = 0)
+                                               bouquets = self.csel.getBouquetList()
+                                               if bouquets is None:
+                                                       bouquetCnt = 0
+                                               else:
+                                                       bouquetCnt = len(bouquets)
+                                               if not inBouquet or bouquetCnt > 1:
+                                                       append_when_current_valid(current, menu, (_("add service to bouquet"), self.addServiceToBouquetSelected), level = 0)
                                        else:
-                                               append_when_current_valid(current, menu, (_("add service to favourites"), self.addServiceToBouquetSelected), level = 0)
+                                               if not inBouquet:
+                                                       append_when_current_valid(current, menu, (_("add service to favourites"), self.addServiceToBouquetSelected), level = 0)
                                else:
                                        if current_root.getPath().find('FROM SATELLITES') != -1:
                                                append_when_current_valid(current, menu, (_("remove selected satellite"), self.removeSatelliteServices), level = 0)
@@ -223,7 +230,7 @@ class ChannelContextMenu(Screen):
                if cnt > 1: # show bouquet list
                        self.bsel = self.session.openWithCallback(self.bouquetSelClosed, BouquetSelector, bouquets, self.addCurrentServiceToBouquet)
                elif cnt == 1: # add to only one existing bouquet
-                       self.addCurrentServiceToBouquet(bouquets[0][1])
+                       self.addCurrentServiceToBouquet(bouquets[0][1], closeBouquetSelection = False)
 
        def bouquetSelClosed(self, recursive):
                self.bsel = None
@@ -257,12 +264,12 @@ class ChannelContextMenu(Screen):
                        self.csel.addMarker(marker)
                self.close()
 
-       def addCurrentServiceToBouquet(self, dest):
+       def addCurrentServiceToBouquet(self, dest, closeBouquetSelection = True):
                self.csel.addServiceToBouquet(dest)
                if self.bsel is not None:
                        self.bsel.close(True)
                else:
-                       self.close(True) # close bouquet selection
+                       self.close(closeBouquetSelection) # close bouquet selection
 
        def removeCurrentService(self):
                self.csel.removeCurrentService()
@@ -1400,9 +1407,9 @@ class ChannelSelectionRadio(ChannelSelectionBase, ChannelSelectionEdit, ChannelS
 
                self["actions"] = ActionMap(["OkCancelActions", "TvRadioActions"],
                        {
-                               "keyTV": self.closeRadio,
-                               "keyRadio": self.closeRadio,
-                               "cancel": self.closeRadio,
+                               "keyTV": self.cancel,
+                               "keyRadio": self.cancel,
+                               "cancel": self.cancel,
                                "ok": self.channelSelected,
                        })
 
@@ -1440,7 +1447,7 @@ class ChannelSelectionRadio(ChannelSelectionBase, ChannelSelectionEdit, ChannelS
                self["RdsActions"].setEnabled(state)
 ########## RDS Radiotext / Rass Support END
 
-       def closeRadio(self):
+       def cancel(self):
                self.infobar.rds_display.onRassInteractivePossibilityChanged.remove(self.RassInteractivePossibilityChanged)
                self.info.hide()
                #set previous tv service