X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d8db49b1ebcfd2a886be1536bbbc12d214e185a5..5c190ae9fad609392f8f91ae931168acf862dbd9:/lib/python/Screens/InfoBarGenerics.py

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 2f368537..5065fb15 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -276,8 +276,8 @@ class InfoBarChannelSelection:
 			{
 				"switchChannelUp": self.switchChannelUp,
 				"switchChannelDown": self.switchChannelDown,
-				"zapUp": (self.zapUp, _("next channel")),
-				"zapDown": (self.zapDown, _("previous channel")),
+				"zapUp": (self.zapUp, _("previous channel")),
+				"zapDown": (self.zapDown, _("next channel")),
 				"historyBack": (self.historyBack, _("previous channel in history")),
 				"historyNext": (self.historyNext, _("next channel in history"))
 			})
@@ -344,7 +344,7 @@ class InfoBarEPG:
 			self.servicelist.setCurrentSelection(service) #select the service in servicelist
 			self.servicelist.zap()
 
-	def openBouquetEPG(self, bouquet):
+	def openBouquetEPG(self, bouquet, withCallback=True):
 		ptr=eEPGCache.getInstance()
 		services = [ ]
 		servicelist = eServiceCenter.getInstance().list(bouquet)
@@ -358,22 +358,28 @@ class InfoBarEPG:
 				services.append(ServiceReference(service))
 		if len(services):
 			self.epg_bouquet = bouquet
-			self.session.openWithCallback(self.closed, EPGSelection, services, self.zapToService)
+			if withCallback:
+				self.session.openWithCallback(self.closed, EPGSelection, services, self.zapToService)
+			else:
+				self.session.open(EPGSelection, services, self.zapToService)
 
 	def closed(self, ret):
 		if ret:
 			self.close(ret)
 
-	def openMultiServiceEPG(self):
+	def openMultiServiceEPG(self, withCallback=True):
 		bouquets = self.servicelist.getBouquetList()
 		if bouquets is None:
 			cnt = 0
 		else:
 			cnt = len(bouquets)
 		if cnt > 1: # show bouquet list
-			self.session.openWithCallback(self.closed, BouquetSelector, bouquets, self.openBouquetEPG)
+			if withCallback:
+				self.session.openWithCallback(self.closed, BouquetSelector, bouquets, self.openBouquetEPG)
+			else:
+				self.session.open(BouquetSelector, bouquets, self.openBouquetEPG)
 		elif cnt == 1: 
-			self.openBouquetEPG(bouquets[0][1])
+			self.openBouquetEPG(bouquets[0][1], withCallback)
 
 	def openSingleServiceEPG(self):
 		ref=self.session.nav.getCurrentlyPlayingServiceReference()
@@ -403,7 +409,7 @@ class InfoBarEPG:
 			self.session.open(EventViewEPGSelect, self.epglist[0], ServiceReference(ref), self.eventViewCallback, self.openSingleServiceEPG, self.openMultiServiceEPG)
 		else:
 			print "no epg for the service avail.. so we show multiepg instead of eventinfo"
-			self.openMultiServiceEPG()
+			self.openMultiServiceEPG(False)
 
 	def eventViewCallback(self, setEvent, setService, val): #used for now/next displaying
 		if len(self.epglist) > 1:
@@ -487,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")
@@ -633,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"
@@ -654,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,
@@ -671,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,
@@ -679,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,
@@ -724,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)
@@ -1032,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