X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FPlugins%2FExtensions%2FGraphMultiEPG%2Fplugin.py;h=9f901e9645547dabef8e3fa6358875e07e96fae1;hp=21d1bfe8bf72585e3c6549603a7c5a7e075fb488;hb=dc5629b2e25dfa0e0bfba45eba44c5d7385399bf;hpb=4c2cba9ccb6f754aac9378e2fc2c7b546e6d589c

diff --git a/lib/python/Plugins/Extensions/GraphMultiEPG/plugin.py b/lib/python/Plugins/Extensions/GraphMultiEPG/plugin.py
index 21d1bfe..9f901e9 100644
--- a/lib/python/Plugins/Extensions/GraphMultiEPG/plugin.py
+++ b/lib/python/Plugins/Extensions/GraphMultiEPG/plugin.py
@@ -1,6 +1,6 @@
 from Plugins.Plugin import PluginDescriptor
 from GraphMultiEpg import GraphMultiEPG
-from Screens.ChannelSelection import BouquetSelector
+from Screens.ChannelSelection import SilentBouquetSelector
 from enigma import eServiceCenter, eServiceReference
 from ServiceReference import ServiceReference
 
@@ -69,6 +69,7 @@ def changeBouquetCB(direction, epg):
 		bouquet = bouquetSel.getCurrent()
 		services = getBouquetServices(bouquet)
 		if len(services):
+			global epg_bouquet
 			epg_bouquet = bouquet
 			epg.setServices(services)
 
@@ -78,19 +79,20 @@ def main(session, servicelist, **kwargs):
 	global Servicelist
 	Servicelist = servicelist
 	bouquets = Servicelist.getBouquetList()
+	root = Servicelist.getRoot()
 	if bouquets is None:
 		cnt = 0
 	else:
 		cnt = len(bouquets)
-	if cnt > 1: # show bouquet list
+	if cnt > 1: # create bouquet list
 		global bouquetSel
-		bouquetSel = Session.openWithCallback(closed, BouquetSelector, bouquets, openBouquetEPG, enableWrapAround=True)
-		dlg_stack.append(bouquetSel)
-	elif cnt == 1:
-		if not openBouquetEPG(bouquets[0][1]):
+		bouquetSel = SilentBouquetSelector(bouquets, True, Servicelist.getBouquetNumOffset(root))
+	if cnt >= 1: # open current bouquet
+		if not openBouquetEPG(root):
 			cleanup()
 
 def Plugins(**kwargs):
 	name = _("Graphical Multi EPG")
 	descr = _("A graphical EPG for all services of an specific bouquet")
- 	return [ PluginDescriptor(name=name, description=descr, where = PluginDescriptor.WHERE_EVENTINFO, fnc=main) ]
+	return [PluginDescriptor(name=name, description=descr, where = PluginDescriptor.WHERE_EVENTINFO, needsRestart = False, fnc=main),
+		PluginDescriptor(name=name, description=descr, where = PluginDescriptor.WHERE_EXTENSIONSMENU, needsRestart = False, fnc=main)]