X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/2828914fb949a9f120285e7473512937ea184694..77a115baa70d23d342a1b54aa5cedd57bc5d6282:/lib/python/Screens/InfoBarGenerics.py

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index fed7287c..8d436013 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -493,7 +493,7 @@ class InfoBarSeek:
 	SEEK_STATE_FF_64X = (0, 64, 0, ">> 64x")
 	SEEK_STATE_FF_128X = (0, 128, 0, ">> 128x")
 	
-	SEEK_STATE_BACK_4X = (0, -4, 0, "<< 4x")
+	SEEK_STATE_BACK_16X = (0, -16, 0, "<< 16x")
 	SEEK_STATE_BACK_32X = (0, -32, 0, "<< 32x")
 	SEEK_STATE_BACK_64X = (0, -64, 0, "<< 64x")
 	SEEK_STATE_BACK_128X = (0, -128, 0, "<< 128x")
@@ -639,12 +639,12 @@ class InfoBarSeek:
 	def seekFwd(self):
 		print "start fwd timer"
 		self.fwdtimer = True
-		self.fwdKeyTimer.start(500)
+		self.fwdKeyTimer.start(1000)
 
 	def seekBack(self):
 		print "start rewind timer"
 		self.rwdtimer = True
-		self.rwdKeyTimer.start(500)
+		self.rwdKeyTimer.start(1000)
 
 	def seekFwdUp(self):
 		print "seekFwdUp"
@@ -660,8 +660,8 @@ class InfoBarSeek:
 					self.SEEK_STATE_FF_32X: self.SEEK_STATE_FF_64X,
 					self.SEEK_STATE_FF_64X: self.SEEK_STATE_FF_128X,
 					self.SEEK_STATE_FF_128X: self.SEEK_STATE_FF_128X,
-					self.SEEK_STATE_BACK_4X: self.SEEK_STATE_PLAY,
-					self.SEEK_STATE_BACK_32X: self.SEEK_STATE_BACK_4X,
+					self.SEEK_STATE_BACK_16X: self.SEEK_STATE_PLAY,
+					self.SEEK_STATE_BACK_32X: self.SEEK_STATE_BACK_16X,
 					self.SEEK_STATE_BACK_64X: self.SEEK_STATE_BACK_32X,
 					self.SEEK_STATE_BACK_128X: self.SEEK_STATE_BACK_64X,
 					self.SEEK_STATE_SM_HALF: self.SEEK_STATE_SM_HALF,
@@ -677,7 +677,7 @@ class InfoBarSeek:
 			self.rwdtimer = False
 		
 			lookup = {
-					self.SEEK_STATE_PLAY: self.SEEK_STATE_BACK_4X,
+					self.SEEK_STATE_PLAY: self.SEEK_STATE_BACK_16X,
 					self.SEEK_STATE_PAUSE: self.SEEK_STATE_PAUSE,
 					self.SEEK_STATE_FF_2X: self.SEEK_STATE_PLAY,
 					self.SEEK_STATE_FF_4X: self.SEEK_STATE_FF_2X,
@@ -685,7 +685,7 @@ class InfoBarSeek:
 					self.SEEK_STATE_FF_32X: self.SEEK_STATE_FF_8X,
 					self.SEEK_STATE_FF_64X: self.SEEK_STATE_FF_32X,
 					self.SEEK_STATE_FF_128X: self.SEEK_STATE_FF_64X,
-					self.SEEK_STATE_BACK_4X: self.SEEK_STATE_BACK_32X,
+					self.SEEK_STATE_BACK_16X: self.SEEK_STATE_BACK_32X,
 					self.SEEK_STATE_BACK_32X: self.SEEK_STATE_BACK_64X,
 					self.SEEK_STATE_BACK_64X: self.SEEK_STATE_BACK_128X,
 					self.SEEK_STATE_BACK_128X: self.SEEK_STATE_BACK_128X,
@@ -730,7 +730,13 @@ class InfoBarSeek:
 			self.lockedBecauseOfSkipping = True
 
 	def __evEOF(self):
-		self.setSeekState(self.SEEK_STATE_PAUSE)
+		if self.seekstate != self.SEEK_STATE_PLAY:
+			self.setSeekState(self.SEEK_STATE_PAUSE)
+			# HACK
+			self.getSeek().seekRelative(1, -90000)
+			self.setSeekState(self.SEEK_STATE_PLAY)
+		else:
+			self.setSeekState(self.SEEK_STATE_PAUSE)
 	
 	def __evSOF(self):
 		self.setSeekState(self.SEEK_STATE_PLAY)
@@ -1038,19 +1044,27 @@ class InfoBarAdditionalInfo:
 		
 		self["ButtonRed"] = PixmapConditional(withTimer = False)
 		self["ButtonRed"].setConnect(lambda: harddiskmanager.HDDCount() > 0)
-		self.onShown.append(self["ButtonRed"].update)
+		self.onLayoutFinish.append(self["ButtonRed"].update)
 		self["ButtonRedText"] = LabelConditional(text = _("Record"), withTimer = False)
 		self["ButtonRedText"].setConnect(lambda: harddiskmanager.HDDCount() > 0)
-		self.onShown.append(self["ButtonRedText"].update)
+		self.onLayoutFinish.append(self["ButtonRedText"].update)
 
 		self["ButtonGreen"] = Pixmap()
 		self["ButtonGreenText"] = Label(_("Subservices"))
 
 		self["ButtonYellow"] = PixmapConditional(withTimer = False)
-		self["ButtonYellow"].setConnect(lambda: False)
+		self["ButtonYellow"].setConnect(lambda: harddiskmanager.HDDCount() > 0)
+		self["ButtonYellowText"] = LabelConditional(text = _("Timeshifting"), withTimer = False)
+		self["ButtonYellowText"].setConnect(lambda: harddiskmanager.HDDCount() > 0)
+		self.onLayoutFinish.append(self["ButtonYellow"].update)
+		self.onLayoutFinish.append(self["ButtonYellowText"].update)
 
 		self["ButtonBlue"] = PixmapConditional(withTimer = False)
 		self["ButtonBlue"].setConnect(lambda: False)
+		self["ButtonBlueText"] = LabelConditional(text = _("Extensions"), withTimer = False)
+		self["ButtonBlueText"].setConnect(lambda: False)
+		self.onLayoutFinish.append(self["ButtonBlue"].update)
+		self.onLayoutFinish.append(self["ButtonBlueText"].update)
 
 		self.session.nav.event.append(self.gotServiceEvent) # we like to get service events