Merge commit '6ff491caab739113f212543e4a70a0773cf6ce37' into megamerge
authorMike Looijmans <milo-software@users.sourceforge.net>
Sat, 16 Oct 2010 11:34:38 +0000 (13:34 +0200)
committerMike Looijmans <milo-software@users.sourceforge.net>
Sat, 16 Oct 2010 11:34:38 +0000 (13:34 +0200)
Conflicts:
lib/python/Screens/ChannelSelection.py

1  2 
RecordTimer.py
ServiceReference.py
lib/python/Components/config.py
lib/python/Screens/ChannelSelection.py
lib/python/Screens/Wizard.py

diff --cc RecordTimer.py
Simple merge
Simple merge
Simple merge
@@@ -116,18 -111,16 +116,25 @@@ 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)
 +
 +                                      if SystemInfo.get("NumVideoDecoders", 1) > 1:
 +                                              # only allow the service to be played directly in pip / mainwindow when the service is not under parental control
 +                                              if not config.ParentalControl.configured.value or parentalControl.getProtectionLevel(csel.getCurrentSelection().toCompareString()) == -1:
 +                                                      if not csel.dopipzap:
 +                                                              append_when_current_valid(current, menu, (_("play as picture in picture"), self.showServiceInPiP), level = 0, key = "blue")
 +                                                              self.pipAvailable = True
 +                                                      else:
 +                                                              append_when_current_valid(current, menu, (_("play in mainwindow"), self.playMain), level = 0)
                                else:
                                        if current_root.getPath().find('FROM SATELLITES') != -1:
                                                append_when_current_valid(current, menu, (_("remove selected satellite"), self.removeSatelliteServices), level = 0)