X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/f372e30ee47557091c643660761fb5fb822827ec..f2e876d93f457fa24a4fe5251a8cc3edd326c7de:/lib/python/Screens/InfoBarGenerics.py

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index ee51eb9f..1824eb5d 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -81,6 +81,10 @@ class InfoBarShowHide:
 	def __onHide(self):
 		self.__state = self.STATE_HIDDEN
 
+	def doShow(self):
+		self.show()
+		self.startHideTimer()
+
 	def doTimerHide(self):
 		self.hideTimer.stop()
 		if self.__state == self.STATE_SHOWN:
@@ -212,7 +216,7 @@ class InfoBarNumberZap:
 #		print "You pressed number " + str(number)
 		if number == 0:
 			self.servicelist.recallPrevService()
-			self.show()
+			self.doShow()
 		else:
 			self.session.openWithCallback(self.numberEntered, NumberZap, number)
 
@@ -283,15 +287,21 @@ class InfoBarChannelSelection:
 		self.servicelist.moveDown()
 		self.session.execDialog(self.servicelist)
 
-	def	zapUp(self):
+	def zapUp(self):
+		if currentConfigSelectionElement(config.usage.quickzap_bouquet_change) == "yes":
+			if self.servicelist.inBouquet() and self.servicelist.atBegin():
+				self.servicelist.prevBouquet()
 		self.servicelist.moveUp()
 		self.servicelist.zap()
-		self.show()
+		self.doShow()
 
-	def	zapDown(self):
-		self.servicelist.moveDown()
+	def zapDown(self):
+		if currentConfigSelectionElement(config.usage.quickzap_bouquet_change) == "yes" and self.servicelist.inBouquet() and self.servicelist.atEnd():
+			self.servicelist.nextBouquet()
+		else:
+			self.servicelist.moveDown()
 		self.servicelist.zap()
-		self.show()
+		self.doShow()
 
 class InfoBarMenu:
 	""" Handles a menu action, to open the (main) menu """
@@ -830,6 +840,16 @@ class InfoBarTimeshift:
 		ts = self.getTimeshift()
 		if ts is None:
 			return
+		self.session.openWithCallback(self.stopTimeshiftConfirmed, MessageBox, _("Stop Timeshift?"), MessageBox.TYPE_YESNO)
+
+	def stopTimeshiftConfirmed(self, confirmed):
+		if not confirmed:
+			return
+
+		ts = self.getTimeshift()
+		if ts is None:
+			return
+
 		ts.stopTimeshift()
 		self.timeshift_enabled = 0
 
@@ -894,15 +914,14 @@ class InfoBarInstantRecord:
 				"instantRecord": (self.instantRecord, "Instant Record..."),
 			})
 		self.recording = None
-		
 		self["BlinkingPoint"] = BlinkingPixmapConditional()
-		self.onShown.append(self["BlinkingPoint"].hideWidget)
+		self.onLayoutFinish.append(self["BlinkingPoint"].hideWidget)
 		self["BlinkingPoint"].setConnect(self.session.nav.RecordTimer.isRecording)
-		
+
 	def stopCurrentRecording(self):	
 		self.session.nav.RecordTimer.removeEntry(self.recording)
 		self.recording = None
-			
+
 	def startInstantRecording(self):
 		serviceref = self.session.nav.getCurrentlyPlayingServiceReference()
 		
@@ -918,15 +937,8 @@ class InfoBarInstantRecord:
 		
 		if event is not None:
 			data = parseEvent(event)
-			begin = data[0]
-			if begin < time.time():
-				begin = time.time()
-			
-			end = data[1]
-			if end < begin:
-				end = begin
-			
-			end += 3600 * 10
+			begin = time.time()
+			end = begin + 3600 * 10
 			
 			data = (begin, end, data[2], data[3], data[4])
 		else: