Merge branch 'master' into tmbinc/FixTimingBugs

Conflicts:

	lib/dvb/sec.cpp
	lib/python/Components/Network.py
	lib/python/Components/Playlist.py
	lib/python/Plugins/Extensions/DVDBurn/Process.py
	lib/python/Plugins/Extensions/MediaPlayer/plugin.py
	lib/python/Screens/TimerEdit.py
	po/lt.po
	po/nl.po
	po/tr.po

1 files changed, 19 insertions, 3 deletions

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index aab2b649..cdaa2c1e 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -403,8 +403,8 @@ class InfoBarEPG:
 		self.eventView = None
 		self["EPGActions"] = HelpableActionMap(self, "InfobarEPGActions",
 			{
-				"showEventInfo": (self.openEventView, _("show EPG...")),
-				"showSingleServiceEPG": (self.openSingleServiceEPG, _("show single service EPG...")),
+				"showEventView": (self.openEventView, _("show EPG...")),
+				"showEventInfoPlugin": (self.showEventInfoPlugins, _("show single service EPG...")),
 				"showInfobarOrEpgWhenInfobarAlreadyVisible": self.showEventInfoWhenNotVisible,
 			})
 
@@ -489,6 +489,23 @@ class InfoBarEPG:
 		ref=self.session.nav.getCurrentlyPlayingServiceReference()
 		self.session.open(EPGSelection, ref)
 
+	def showEventInfoPlugins(self):
+		list = []
+		for p in plugins.getPlugins(where = PluginDescriptor.WHERE_EVENTINFO):
+			list.append((p.name, boundFunction(self.runPlugin, p)))
+		if len(list):
+			list.append((_("show single service EPG..."), self.openSingleServiceEPG))
+			self.session.openWithCallback(self.EventInfoPluginChosen, ChoiceBox, title=_("Please choose an extension..."), list = list)
+		else:
+			self.openSingleServiceEPG()
+			
+	def runPlugin(self, plugin):
+		plugin(session = self.session, servicelist = self.servicelist)
+		
+	def EventInfoPluginChosen(self, answer):
+		if answer is not None:
+			answer[1]()
+
 	def openSimilarList(self, eventid, refstr):
 		self.session.open(EPGSelection, refstr, None, eventid)
 
@@ -1258,7 +1275,6 @@ class InfoBarExtensions:
 from Tools.BoundFunction import boundFunction
 
 # depends on InfoBarExtensions
-from Components.PluginComponent import plugins
 
 class InfoBarPlugins:
 	def __init__(self):