X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/44985357544c5a3bf67a758c8612102ac59a74cc..46fd0ceb0b4850ffa9f2f3e1efd42b914eeef748:/lib/python/Screens/InfoBarGenerics.py

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index a3e56a40..a6b22e5c 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -26,13 +26,14 @@ from Screens.PictureInPicture import PictureInPicture
 from Screens.SubtitleDisplay import SubtitleDisplay
 from Screens.RdsDisplay import RdsInfoDisplay, RassInteractive
 from Screens.TimeDateInput import TimeDateInput
+from Screens.UnhandledKey import UnhandledKey
 from ServiceReference import ServiceReference
 
 from Tools import Notifications
 from Tools.Directories import fileExists
 
 from enigma import eTimer, eServiceCenter, eDVBServicePMTHandler, iServiceInformation, \
-	iPlayableService, eServiceReference, eEPGCache
+	iPlayableService, eServiceReference, eEPGCache, eActionMap
 
 from time import time, localtime, strftime
 from os import stat as os_stat
@@ -47,6 +48,39 @@ class InfoBarDish:
 	def __init__(self):
 		self.dishDialog = self.session.instantiateDialog(Dish)
 
+class InfoBarUnhandledKey:
+	def __init__(self):
+		self.unhandledKeyDialog = self.session.instantiateDialog(UnhandledKey)
+		self.hideUnhandledKeySymbolTimer = eTimer()
+		self.hideUnhandledKeySymbolTimer.callback.append(self.unhandledKeyDialog.hide)
+		self.checkUnusedTimer = eTimer()
+		self.checkUnusedTimer.callback.append(self.checkUnused)
+		self.onLayoutFinish.append(self.unhandledKeyDialog.hide)
+		eActionMap.getInstance().bindAction('', -0x7FFFFFFF, self.actionA) #highest prio
+		eActionMap.getInstance().bindAction('', 0x7FFFFFFF, self.actionB) #lowest prio
+		self.flags = (1<<1);
+		self.uflags = 0;
+
+	#this function is called on every keypress!
+	def actionA(self, key, flag):
+		if flag != 4:
+			if self.flags & (1<<1):
+				self.flags = self.uflags = 0
+			self.flags |= (1<<flag)
+			if flag == 1: # break
+				self.checkUnusedTimer.start(0, True)
+		return 0
+
+	#this function is only called when no other action has handled this key
+	def actionB(self, key, flag):
+		if flag != 4:
+			self.uflags |= (1<<flag)
+
+	def checkUnused(self):
+		if self.flags == self.uflags:
+			self.unhandledKeyDialog.show()
+			self.hideUnhandledKeySymbolTimer.start(2000, True)
+
 class InfoBarShowHide:
 	""" InfoBar show/hide control, accepts toggleShow and hide actions, might start
 	fancy animations. """
@@ -453,7 +487,7 @@ class InfoBarEPG:
 		self["EPGActions"] = HelpableActionMap(self, "InfobarEPGActions",
 			{
 				"showEventInfo": (self.openEventView, _("show EPG...")),
-				"showEventInfoPlugin": (self.showEventInfoPlugins, _("show single service EPG...")),
+				"showEventInfoPlugin": (self.showEventInfoPlugins, _("list of EPG views...")),
 				"showInfobarOrEpgWhenInfobarAlreadyVisible": self.showEventInfoWhenNotVisible,
 			})
 
@@ -691,6 +725,7 @@ class InfoBarSeek:
 				iPlayableService.evEOF: self.__evEOF,
 				iPlayableService.evSOF: self.__evSOF,
 			})
+		self.fast_winding_hint_message_showed = False
 
 		class InfoBarSeekActionMap(HelpableActionMap):
 			def __init__(self, screen, *args, **kwargs):
@@ -817,6 +852,7 @@ class InfoBarSeek:
 #			print "seekable"
 
 	def __serviceStarted(self):
+		self.fast_winding_hint_message_showed = False
 		self.seekstate = self.SEEK_STATE_PLAY
 		self.__seekableStatusChanged()
 
@@ -907,6 +943,13 @@ class InfoBarSeek:
 			self.showAfterSeek()
 
 	def seekFwd(self):
+		seek = self.getSeek()
+		if seek and not (seek.isCurrentlySeekable() & 2):
+			if not self.fast_winding_hint_message_showed and (seek.isCurrentlySeekable() & 1):
+				self.session.open(MessageBox, _("No fast winding possible yet.. but you can use the number buttons to skip forward/backward!"), MessageBox.TYPE_INFO, timeout=10)
+				self.fast_winding_hint_message_showed = True
+				return
+			return 0 # trade as unhandled action
 		if self.seekstate == self.SEEK_STATE_PLAY:
 			self.setSeekState(self.makeStateForward(int(config.seek.enter_forward.value)))
 		elif self.seekstate == self.SEEK_STATE_PAUSE:
@@ -936,6 +979,13 @@ class InfoBarSeek:
 			self.setSeekState(self.makeStateSlowMotion(speed))
 
 	def seekBack(self):
+		seek = self.getSeek()
+		if seek and not (seek.isCurrentlySeekable() & 2):
+			if not self.fast_winding_hint_message_showed and (seek.isCurrentlySeekable() & 1):
+				self.session.open(MessageBox, _("No fast winding possible yet.. but you can use the number buttons to skip forward/backward!"), MessageBox.TYPE_INFO, timeout=10)
+				self.fast_winding_hint_message_showed = True
+				return
+			return 0 # trade as unhandled action
 		seekstate = self.seekstate
 		if seekstate == self.SEEK_STATE_PLAY:
 			self.setSeekState(self.makeStateBackward(int(config.seek.enter_backward.value)))
@@ -1060,15 +1110,21 @@ class InfoBarPVRState:
 			self.pvrStateDialog.hide()
 		else:
 			self._mayShow()
-			
 
 class InfoBarTimeshiftState(InfoBarPVRState):
 	def __init__(self):
 		InfoBarPVRState.__init__(self, screen=TimeshiftState, force_show = True)
+		self.__hideTimer = eTimer()
+		self.__hideTimer.callback.append(self.__hideTimeshiftState)
 
 	def _mayShow(self):
-		if self.execing and self.timeshift_enabled and self.seekstate != self.SEEK_STATE_PLAY:
+		if self.execing and self.timeshift_enabled:
 			self.pvrStateDialog.show()
+			if self.seekstate == self.SEEK_STATE_PLAY and not self.shown:
+				self.__hideTimer.start(5*1000, True)
+
+	def __hideTimeshiftState(self):
+		self.pvrStateDialog.hide()
 
 class InfoBarShowMovies:
 
@@ -1616,126 +1672,11 @@ class InfoBarAudioSelection:
 			})
 
 	def audioSelection(self):
-		service = self.session.nav.getCurrentService()
-		self.audioTracks = audio = service and service.audioTracks()
-		n = audio and audio.getNumberOfTracks() or 0
-		tlist = []
-		if n > 0:
-			self.audioChannel = service.audioChannel()
-
-			idx = 0
-			while idx < n:
-				cnt = 0
-				i = audio.getTrackInfo(idx)
-				languages = i.getLanguage().split('/')
-				description = i.getDescription()
-				language = ""
-
-				for lang in languages:
-					if cnt:
-						language += ' / '
-					if LanguageCodes.has_key(lang):
-						language += LanguageCodes[lang][0]
-					else:
-						language += lang
-					cnt += 1
-
-				if len(description):
-					description += " (" + language + ")"
-				else:
-					description = language
-
-				tlist.append((description, idx))
-				idx += 1
-
-			tlist.sort(key=lambda x: x[0])
-
-			selectedAudio = self.audioTracks.getCurrentTrack()
-
-			selection = 0
-
-			for x in tlist:
-				if x[1] != selectedAudio:
-					selection += 1
-				else:
-					break
-
-			availableKeys = []
-			usedKeys = []
-
-			if SystemInfo["CanDownmixAC3"]:
-				flist = [(_("AC3 downmix") + " - " +(_("Off"), _("On"))[config.av.downmix_ac3.value and 1 or 0], "CALLFUNC", self.changeAC3Downmix),
-					((_("Left"), _("Stereo"), _("Right"))[self.audioChannel.getCurrentChannel()], "mode")]
-				usedKeys.extend(["red", "green"])
-				availableKeys.extend(["yellow", "blue"])
-				selection += 2
-			else:
-				flist = [((_("Left"), _("Stereo"), _("Right"))[self.audioChannel.getCurrentChannel()], "mode")]
-				usedKeys.extend(["red"])
-				availableKeys.extend(["green", "yellow", "blue"])
-				selection += 1
-
-			if hasattr(self, "runPlugin"):
-				class PluginCaller:
-					def __init__(self, fnc, *args):
-						self.fnc = fnc
-						self.args = args
-					def __call__(self, *args, **kwargs):
-						self.fnc(*self.args)
-
-				Plugins = [ (p.name, PluginCaller(self.runPlugin, p)) for p in plugins.getPlugins(where = PluginDescriptor.WHERE_AUDIOMENU) ]
-
-				for p in Plugins:
-					selection += 1
-					flist.append((p[0], "CALLFUNC", p[1]))
-					if availableKeys:
-						usedKeys.append(availableKeys[0])
-						del availableKeys[0]
-					else:
-						usedKeys.append("")
-
-			flist.append(("--", ""))
-			usedKeys.append("")
-			selection += 1
-
-			keys = usedKeys + [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "0" ] + [""] * n
-			self.session.openWithCallback(self.audioSelected, ChoiceBox, title=_("Select audio track"), list = flist + tlist, selection = selection, keys = keys, skin_name = "AudioTrackSelection")
-		else:
-			del self.audioTracks
-
-	def changeAC3Downmix(self, arg):
-		choicelist = self.session.current_dialog["list"]
-		list = choicelist.list
-		t = list[0][1]
-		list[0][1]=(t[0], t[1], t[2], t[3], t[4], t[5], t[6],
-			_("AC3 downmix") + " - " + (_("On"), _("Off"))[config.av.downmix_ac3.value and 1 or 0])
-		choicelist.setList(list)
-		if config.av.downmix_ac3.value:
-			config.av.downmix_ac3.value = False
-		else:
-			config.av.downmix_ac3.value = True
-		config.av.downmix_ac3.save()
-
-	def audioSelected(self, audio):
-		if audio is not None:
-			if isinstance(audio[1], str):
-				if audio[1] == "mode":
-					keys = ["red", "green", "yellow"]
-					selection = self.audioChannel.getCurrentChannel()
-					tlist = ((_("left"), 0), (_("stereo"), 1), (_("right"), 2))
-					self.session.openWithCallback(self.modeSelected, ChoiceBox, title=_("Select audio mode"), list = tlist, selection = selection, keys = keys, skin_name ="AudioModeSelection")
-			else:
-				del self.audioChannel
-				if self.session.nav.getCurrentService().audioTracks().getNumberOfTracks() > audio[1]:
-					self.audioTracks.selectTrack(audio[1])
-		else:
-			del self.audioChannel
-		del self.audioTracks
-
-	def modeSelected(self, mode):
-		if mode is not None:
-			self.audioChannel.selectChannel(mode[1])
-		del self.audioChannel
+		from Screens.AudioSelection import AudioSelection
+		self.session.openWithCallback(self.audioSelected, AudioSelection, infobar=self)
+		
+	def audioSelected(self, ret=None):
+		print "[infobar::audioSelected]", ret
 
 class InfoBarSubserviceSelection:
 	def __init__(self):
@@ -1964,8 +1905,10 @@ class InfoBarCueSheetSupport:
 
 			if last is not None:
 				self.resume_point = last
+				
+				l = last / 90000
 				if config.usage.on_movie_start.value == "ask":
-					Notifications.AddNotificationWithCallback(self.playLastCB, MessageBox, _("Do you want to resume this playback?"), timeout=10)
+					Notifications.AddNotificationWithCallback(self.playLastCB, MessageBox, _("Do you want to resume this playback?") + "\n" + (_("Resume position at %s") % ("%d:%02d:%02d" % (l/3600, l%3600/60, l%60))), timeout=10)
 				elif config.usage.on_movie_start.value == "resume":
 # TRANSLATORS: The string "Resuming playback" flashes for a moment
 # TRANSLATORS: at the start of a movie, when the user has selected