aboutsummaryrefslogtreecommitdiff
path: root/lib/python
diff options
context:
space:
mode:
authorAndreas Monzner <andreas.monzner@multimedia-labs.de>2006-11-22 22:19:59 +0000
committerAndreas Monzner <andreas.monzner@multimedia-labs.de>2006-11-22 22:19:59 +0000
commitcac2aa02e62d9515f5a3f4a8ad9658b70bd6ed07 (patch)
tree4b275ae4cde1d52ea43ed7a5c08d4816f9ca3f08 /lib/python
parent9271d9f1d01d3f9df9987445f80929b595cb4926 (diff)
downloadenigma2-cac2aa02e62d9515f5a3f4a8ad9658b70bd6ed07.tar.gz
enigma2-cac2aa02e62d9515f5a3f4a8ad9658b70bd6ed07.zip
fix pre selection in subservice selector,
fix adding subservice to favouritelist (when multiple bouquets is not enabled)
Diffstat (limited to 'lib/python')
-rw-r--r--lib/python/Screens/InfoBarGenerics.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index dc5ddecc..91222617 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -1478,11 +1478,13 @@ class InfoBarSubserviceSelection:
tlist = [(_("Quickzap"), "quickzap", service.subServices()), (_("Add to bouquet"), "CALLFUNC", self.addSubserviceToBouquetCallback), ("--", "")] + tlist
else:
tlist = [(_("Quickzap"), "quickzap", service.subServices()), (_("Add to favourites"), "CALLFUNC", self.addSubserviceToBouquetCallback), ("--", "")] + tlist
+ selection += 3
else:
tlist = [(_("Quickzap"), "quickzap", service.subServices()), ("--", "")] + tlist
keys = ["red", "", "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" ] + [""] * n
+ selection += 2
- self.session.openWithCallback(self.subserviceSelected, ChoiceBox, title=_("Please select a subservice..."), list = tlist, selection = selection + 2, keys = keys)
+ self.session.openWithCallback(self.subserviceSelected, ChoiceBox, title=_("Please select a subservice..."), list = tlist, selection = selection, keys = keys)
def subserviceSelected(self, service):
del self.bouquets
@@ -1508,8 +1510,6 @@ class InfoBarSubserviceSelection:
self.bsel = self.session.openWithCallback(self.bouquetSelClosed, BouquetSelector, self.bouquets, self.addSubserviceToBouquet)
elif cnt == 1: # add to only one existing bouquet
self.addSubserviceToBouquet(self.bouquets[0][1])
- else: #no bouquets in root.. so assume only one favourite list is used
- self.addSubserviceToBouquet(self.servicelist.bouquet_root)
def bouquetSelClosed(self, **args):
self.bsel = None