do not let create bouquets in favlist when multi bouquet mode ist disabled
authorAndreas Monzner <andreas.monzner@multimedia-labs.de>
Wed, 19 Jul 2006 19:26:18 +0000 (19:26 +0000)
committerAndreas Monzner <andreas.monzner@multimedia-labs.de>
Wed, 19 Jul 2006 19:26:18 +0000 (19:26 +0000)
lib/python/Screens/ChannelSelection.py

index 905d4558ffb37956f55edf93fed8792eb479aa9a..84e99516546c51c93594940fd7d0e81d00f32530 100644 (file)
@@ -89,14 +89,16 @@ class ChannelContextMenu(Screen):
                                        menu.append((_("remove service"), self.removeCurrentService))
                                if current_root.getPath().find("flags == %d" %(FLAG_SERVICE_NEW_FOUND)) != -1:
                                        menu.append((_("remove new found flag"), self.removeNewFoundFlag))
-                       elif haveBouquets:
-                               menu.append((_("remove bouquet"), self.removeBouquet))
+
+                       if haveBouquets:
+                               menu.append((_("add bouquet..."), self.showBouquetInputBox))
+                               if inBouquetRootList:
+                                       menu.append((_("remove bouquet"), self.removeBouquet))
 
                if inBouquet: # current list is editable?
                        if not csel.bouquet_mark_edit:
                                if not csel.movemode:
                                        menu.append((_("enable move mode"), self.toggleMoveMode))
-                                       menu.append((_("add bouquet..."), self.showBouquetInputBox))
                                        if not inBouquetRootList:
                                                if haveBouquets:
                                                        menu.append((_("enable bouquet edit"), self.bouquetMarkStart))