X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/962b249aab7d6be0a4d6b9c8605a3ac60a13aa6c..1e1c01fece5a4a86a762af265e382da5dbb2d8cb:/lib/python/Screens/ChannelSelection.py

diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
index 93b55a8e..b98df0f3 100644
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -34,25 +34,25 @@ class ChannelContextMenu(FixedMenu):
 
 		if not csel.bouquet_mark_edit and not csel.movemode and not inBouquetRootList:
 			if (csel.getCurrentSelection().type & eServiceReference.flagDirectory) != eServiceReference.flagDirectory:
-				menu.append(("add service to bouquet", self.addServiceToBouquetSelected))
+				menu.append((_("add service to bouquet"), self.addServiceToBouquetSelected))
 			if inBouquet:
-				menu.append(("remove service", self.removeCurrentService))
+				menu.append((_("remove service"), self.removeCurrentService))
 
 		if inBouquet: # current list is editable?
 			if not csel.bouquet_mark_edit:
 				if not csel.movemode:
-					menu.append(("enable move mode", self.toggleMoveMode))
+					menu.append((_("enable move mode"), self.toggleMoveMode))
 					if not inBouquetRootList:
-						menu.append(("enable bouquet edit", self.bouquetMarkStart))
+						menu.append((_("enable bouquet edit"), self.bouquetMarkStart))
 				else:
-					menu.append(("disable move mode", self.toggleMoveMode))
+					menu.append((_("disable move mode"), self.toggleMoveMode))
 			elif not inBouquetRootList:
-				menu.append(("end bouquet edit", self.bouquetMarkEnd))
-				menu.append(("abort bouquet edit", self.bouquetMarkAbort))
+				menu.append((_("end bouquet edit"), self.bouquetMarkEnd))
+				menu.append((_("abort bouquet edit"), self.bouquetMarkAbort))
 
-		menu.append(("back", self.close))
+		menu.append((_("back"), self.close))
 
-		FixedMenu.__init__(self, session, "Channel Selection", menu)
+		FixedMenu.__init__(self, session, _("Channel Selection"), menu)
 		self.skinName = "Menu"
 
 	def addServiceToBouquetSelected(self):
@@ -217,13 +217,13 @@ class ChannelSelectionBase(Screen):
 
 		self.service_types = self.service_types_tv
 
-		self.bouquet_root = eServiceReference('1:7:1:0:0:0:0:0:0:0:(type == 1) FROM BOUQUET "bouquets.tv" ORDER BY bouquet')
-		#self.bouquet_root = eServiceReference('%s FROM BOUQUET "userbouquet.favourites.tv" ORDER BY bouquet'%(self.service_types))
+		#self.bouquet_root = eServiceReference('1:7:1:0:0:0:0:0:0:0:(type == 1) FROM BOUQUET "bouquets.tv" ORDER BY bouquet')
+		self.bouquet_root = eServiceReference('%s FROM BOUQUET "userbouquet.favourites.tv" ORDER BY bouquet'%(self.service_types))
 
-		self["key_red"] = Button("All")
-		self["key_green"] = Button("Satellites")
-		self["key_yellow"] = Button("Provider")
-		self["key_blue"] = Button("Favourites")
+		self["key_red"] = Button(_("All"))
+		self["key_green"] = Button(_("Satellites"))
+		self["key_yellow"] = Button(_("Provider"))
+		self["key_blue"] = Button(_("Favourites"))
 
 		self["list"] = ServiceList()
 		self.servicelist = self["list"]
@@ -232,12 +232,6 @@ class ChannelSelectionBase(Screen):
 
 		self.numericalTextInput = NumericalTextInput()
 
-		self.lastService = None
-
-		self.lastServiceTimer = eTimer()
-		self.lastServiceTimer.timeout.get().append(self.lastService)
-		self.lastServiceTimer.start(100)
-
 	def getBouquetNumOffset(self, bouquet):
 		if self.bouquet_root.getPath().find('FROM BOUQUET "bouquets.') == -1: #FIXME HACK
 			return 0
@@ -329,10 +323,6 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit):
 		config.tv.lastservice = configElement("config.tv.lastservice", configText, "", 0);
 		config.tv.lastroot = configElement("config.tv.lastroot", configText, "", 0);
 
-		#if config.tv.lastroot.value == "":
-		#allways defaults to fav
-		#self.servicelist.setRoot(eServiceReference('1:7:1:0:0:0:0:0:0:0:(type == 1) FROM BOUQUET "userbouquet.favourites.tv" ORDER BY bouquet'))
-
 		class ChannelActionMap(NumberActionMap):
 			def action(self, contexts, action):
 				if not self.csel.enterBouquet(action):
@@ -363,7 +353,11 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit):
 			})
 		self["actions"].csel = self
 		self.onShown.append(self.onShow)
-		self.onLayoutFinish.append(self.onCreate)
+
+#		self.onLayoutFinish.append(self.onCreate)
+		self.lastChannelRootTimer = eTimer()
+		self.lastChannelRootTimer.timeout.get().append(self.onCreate)
+		self.lastChannelRootTimer.start(100,True)
 
 	def onCreate(self):
 		lastroot=eServiceReference(config.tv.lastroot.value)
@@ -371,6 +365,7 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit):
 			self.setRoot(lastroot)
 		else:
 			self.showFavourites()
+			self.saveRoot(self.getRoot())
 		lastservice=eServiceReference(config.tv.lastservice.value)
 		if lastservice.valid():
 			self.session.nav.playService(lastservice)
@@ -384,7 +379,7 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit):
 			self.servicelist.setPlayableIgnoreService(eServiceReference())
 
 	def showEPGList(self):
-		ref=self.servicelist.getCurrent()
+		ref=self.getCurrentSelection()
 		ptr=eEPGCache.getInstance()
 		if ptr.startTimeQuery(ref) != -1:
 			self.session.open(EPGSelection, ref)
@@ -392,7 +387,7 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit):
 			print 'no epg for service', ref.toString()
 
 	def channelSelected(self):
-		ref = self.servicelist.getCurrent()
+		ref = self.getCurrentSelection()
 		if self.movemode:
 			self.toggleMoveMarked()
 		elif (ref.flags & 7) == 7:
@@ -406,11 +401,11 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit):
 	def setRoot(self, root):
 		if not self.movemode:
 			self.setRootBase(root)
-			self.saveRoot(root)
 
 	#called from infoBar and channelSelected
 	def zap(self):
-		self.session.nav.playService(self.servicelist.getCurrent())
+		self.session.nav.playService(self.getCurrentSelection())
+		self.saveRoot(self.getRoot())
 		self.saveChannel()
 
 	def saveRoot(self, root):
@@ -427,11 +422,14 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit):
 		config.tv.lastservice.value = refstr
 		config.tv.lastservice.save()
 
-	def lastService(self):
-		self.lastServiceTimer.stop()
-		#zap to last running tv service
-		#self.setRoot(eServiceReference(config.tv.lastroot.value))
-		self.session.nav.playService(eServiceReference(config.tv.lastservice.value))
+	def cancel(self):
+		self.close(None)
+		lastroot=eServiceReference(config.tv.lastroot.value)
+		lastservice=eServiceReference(config.tv.lastservice.value)
+		if lastroot.valid() and self.getRoot() != lastroot:
+			self.setRoot(lastroot)
+		if lastservice.valid() and self.getCurrentSelection() != lastservice:
+			self.servicelist.setCurrent(lastservice)
 
 class SimpleChannelSelection(ChannelSelectionBase):
 	def __init__(self, session, title):
@@ -470,7 +468,7 @@ class SimpleChannelSelection(ChannelSelectionBase):
 		self.session.currentDialog.instance.setTitle(self.title)
 
 	def channelSelected(self): # just return selected service
-		ref = self.servicelist.getCurrent()
+		ref = self.getCurrentSelection()
 		self.close(ref)
 
 	def setRoot(self, root):