X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/1b7c72ab3e418455c7da93b16e07f690328e3362..9a9d54ceb81e2f7637af6c5153f248208138f29a:/lib/python/Screens/ChannelSelection.py

diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
index d3bf1b40..565655f9 100644
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -210,8 +210,8 @@ class ChannelSelectionBase(Screen):
 	def __init__(self, session):
 		Screen.__init__(self, session)
 
-		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('1:7:1:0:0:0:0:0:0:0:(type == 1) FROM BOUQUET "userbouquet.favourites.tv" ORDER BY bouquet')
+		#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('1:7:1:0:0:0:0:0:0:0:(type == 1) FROM BOUQUET "userbouquet.favourites.tv" ORDER BY bouquet')
 
 		self["key_red"] = Button("All")
 		#self["key_green"] = Button("Provider")
@@ -278,7 +278,7 @@ class ChannelSelectionBase(Screen):
 	def keyNumberGlobal(self, number):
 		print "You pressed number " + str(number)
 		print "You would go to character " + str(self.numericalTextInput.getKey(number))
-		pass
+		# TODO let the servicelist jump to the next entry strating with the chosen character
 
 	def enterBouquet(self, action):
 		if action[:7] == "bouquet":
@@ -311,8 +311,11 @@ 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 == "":
-			self.servicelist.setRoot(eServiceReference("""1:0:1:0:0:0:0:0:0:0:(type == 1)"""))
+		#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'))
+		self.showFavourites()
+		self.session.nav.playService(eServiceReference(config.tv.lastservice.value))
 
 		class ChannelActionMap(NumberActionMap):
 			def action(self, contexts, action):
@@ -329,15 +332,15 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit):
 				"showFavourites": self.showFavourites,
 				"showEPGList": self.showEPGList,
 				"1": self.keyNumberGlobal,
-            	"2": self.keyNumberGlobal,
-            	"3": self.keyNumberGlobal,
-            	"4": self.keyNumberGlobal,
-            	"5": self.keyNumberGlobal,
-            	"6": self.keyNumberGlobal,
-            	"7": self.keyNumberGlobal,
-            	"8": self.keyNumberGlobal,
-            	"9": self.keyNumberGlobal,
-            	"0": self.keyNumberGlobal
+				"2": self.keyNumberGlobal,
+				"3": self.keyNumberGlobal,
+				"4": self.keyNumberGlobal,
+				"5": self.keyNumberGlobal,
+				"6": self.keyNumberGlobal,
+				"7": self.keyNumberGlobal,
+				"8": self.keyNumberGlobal,
+				"9": self.keyNumberGlobal,
+				"0": self.keyNumberGlobal
 			})
 		self["actions"].csel = self
 
@@ -364,6 +367,7 @@ 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):
@@ -387,7 +391,7 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit):
 	def lastService(self):
 		self.lastServiceTimer.stop()
 		#zap to last running tv service
-		self.setRoot(eServiceReference(config.tv.lastroot.value))
+		#self.setRoot(eServiceReference(config.tv.lastroot.value))
 		self.session.nav.playService(eServiceReference(config.tv.lastservice.value))
 
 class SimpleChannelSelection(ChannelSelectionBase):
@@ -396,25 +400,25 @@ class SimpleChannelSelection(ChannelSelectionBase):
 		self.title = title
 		self.onShown.append(self.onExecCallback)
 
-		class ChannelActionMap(ActionMap):
+		class ChannelActionMap(NumberActionMap):
 			def action(self, contexts, action):
 				if not self.csel.enterBouquet(action):
-					ActionMap.action(self, contexts, action)
+					NumberActionMap.action(self, contexts, action)
 		self["actions"] = ChannelActionMap(["ChannelSelectActions", "OkCancelActions", "ContextMenuActions"],
 			{
 				"cancel": self.cancel,
 				"ok": self.channelSelected,
 				"showFavourites": self.showFavourites,
 				"1": self.keyNumberGlobal,
-            	"2": self.keyNumberGlobal,
-            	"3": self.keyNumberGlobal,
-            	"4": self.keyNumberGlobal,
-            	"5": self.keyNumberGlobal,
-            	"6": self.keyNumberGlobal,
-            	"7": self.keyNumberGlobal,
-            	"8": self.keyNumberGlobal,
-            	"9": self.keyNumberGlobal,
-            	"0": self.keyNumberGlobal
+				"2": self.keyNumberGlobal,
+				"3": self.keyNumberGlobal,
+				"4": self.keyNumberGlobal,
+				"5": self.keyNumberGlobal,
+				"6": self.keyNumberGlobal,
+				"7": self.keyNumberGlobal,
+				"8": self.keyNumberGlobal,
+				"9": self.keyNumberGlobal,
+				"0": self.keyNumberGlobal
 			})
 		self["actions"].csel = self