aboutsummaryrefslogtreecommitdiff
path: root/lib/python
diff options
context:
space:
mode:
authorghost <andreas.monzner@multimedia-labs.de>2010-02-25 13:44:59 +0100
committerghost <andreas.monzner@multimedia-labs.de>2010-02-25 13:44:59 +0100
commit36a87ee437c42a5755400821ff2f39077be9bef3 (patch)
tree5bb0dad13b106bdb129f942aba30a448033e5462 /lib/python
parent7f8ef60cd4d75bb4a453403747614700b290fab8 (diff)
downloadenigma2-36a87ee437c42a5755400821ff2f39077be9bef3.tar.gz
enigma2-36a87ee437c42a5755400821ff2f39077be9bef3.zip
lib/python/Screens/InfoBarGenerics.py: [PATCH 2/3] use non-visual bouquet selector in multiepg
Diffstat (limited to 'lib/python')
-rw-r--r--lib/python/Screens/InfoBarGenerics.py15
1 files changed, 6 insertions, 9 deletions
diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index ca9ba550..108610e3 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -1,4 +1,4 @@
-from ChannelSelection import ChannelSelection, BouquetSelector
+from ChannelSelection import ChannelSelection, BouquetSelector, SilentBouquetSelector
from Components.ActionMap import ActionMap, HelpableActionMap
from Components.ActionMap import NumberActionMap
@@ -555,18 +555,15 @@ class InfoBarEPG:
def openMultiServiceEPG(self, withCallback=True):
bouquets = self.servicelist.getBouquetList()
+ root = self.servicelist.getRoot()
if bouquets is None:
cnt = 0
else:
cnt = len(bouquets)
- if cnt > 1: # show bouquet list
- if withCallback:
- self.bouquetSel = self.session.openWithCallback(self.closed, BouquetSelector, bouquets, self.openBouquetEPG, enableWrapAround=True)
- self.dlg_stack.append(self.bouquetSel)
- else:
- self.bouquetSel = self.session.open(BouquetSelector, bouquets, self.openBouquetEPG, enableWrapAround=True)
- elif cnt == 1:
- self.openBouquetEPG(bouquets[0][1], withCallback)
+ if cnt > 1: # create bouquet list for bouq+/-
+ self.bouquetSel = SilentBouquetSelector(bouquets, True, self.servicelist.getBouquetNumOffset(root))
+ if cnt >= 1:
+ self.openBouquetEPG(root, withCallback)
def changeServiceCB(self, direction, epg):
if self.serviceSel: