X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/2080cf6c4aa2d89b1f08c28968724be5dc71cf09..8bfa53742165d0893dbd623d217bc855390a5663:/lib/python/Screens/InfoBarGenerics.py

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 9fd676e9..978e7319 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -406,8 +406,16 @@ class InfoBarEPG:
 		self["EPGActions"] = HelpableActionMap(self, "InfobarEPGActions", 
 			{
 				"showEventInfo": (self.openEventView, _("show EPG...")),
+				"showInfobarOrEpgWhenInfobarAlreadyVisible": self.showEventInfoWhenNotVisible,
 			})
 
+	def showEventInfoWhenNotVisible(self):
+		if self.shown:
+			self.openEventView()
+		else:
+			self.toggleShow()
+			return 1
+
 	def zapToService(self, service):
 		if not service is None:
 			if self.servicelist.getRoot() != self.epg_bouquet: #already in correct bouquet?
@@ -1221,6 +1229,7 @@ class InfoBarPiP:
 			self.session.pipshown = False
 		else:
 			self.session.pip = self.session.instantiateDialog(PictureInPicture)
+			self.session.pip.show()
 			newservice = self.session.nav.getCurrentlyPlayingServiceReference()
 			if self.session.pip.playService(newservice):
 				self.session.pipshown = True
@@ -1803,13 +1812,23 @@ class InfoBarCueSheetSupport:
 		if onlyreturn:
 			return None
 
+	def showAfterCuesheetOperation(self):
+		if isinstance(self, InfoBarShowHide):
+			self.doShow()
+
 	def addMark(self, point):
 		insort(self.cut_list, point)
 		self.uploadCuesheet()
+		self.showAfterCuesheetOperation()
 
 	def removeMark(self, point):
 		self.cut_list.remove(point)
 		self.uploadCuesheet()
+		self.showAfterCuesheetOperation()
+
+	def showAfterCuesheetOperation(self):
+		if isinstance(self, InfoBarShowHide):
+			self.doShow()
 
 	def __getCuesheet(self):
 		service = self.session.nav.getCurrentService()
@@ -1829,9 +1848,10 @@ class InfoBarCueSheetSupport:
 		cue = self.__getCuesheet()
 
 		if cue is None:
-			print "upload failed, no cuesheet interface"
-			return
-		self.cut_list = cue.getCutList()
+			print "download failed, no cuesheet interface"
+			self.cut_list = [ ]
+		else:
+			self.cut_list = cue.getCutList()
 
 class InfoBarSummary(Screen):
 	skin = """