X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/18d75f10661cbd4b83b2deb49f56ee7c4c2435cf..ca4309210fb3d5d3f7e2bd4a7a59c3fb86919977:/lib/python/Screens/ChannelSelection.py

diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
index 4c8b2486..d66353c9 100644
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -2,6 +2,7 @@ from Screen import Screen
 from Components.Button import Button
 from Components.ServiceList import ServiceList
 from Components.ActionMap import NumberActionMap, ActionMap
+from Components.MenuList import MenuList
 from EpgSelection import EPGSelection
 from enigma import eServiceReference, eEPGCache, eEPGCachePtr, eServiceCenter, eServiceCenterPtr, iMutableServiceListPtr, iStaticServiceInformationPtr, eTimer, eDVBDB
 from Components.config import config, configElement, ConfigSubsection, configText, currentConfigSelectionElement
@@ -17,17 +18,27 @@ from os import remove
 
 import xml.dom.minidom
 
-class BouquetSelector(FixedMenu):
+class BouquetSelector(Screen):
 	def __init__(self, session, bouquets, selectedFunc):
+		Screen.__init__(self, session)
+
 		self.selectedFunc=selectedFunc
+
+		self["actions"] = ActionMap(["OkCancelActions"],
+			{
+				"ok": self.okbuttonClick,
+				"cancel": self.cancelClick
+			})
 		entrys = [ ]
 		for x in bouquets:
-			entrys.append((x[0], self.bouquetSelected, x[1]))
-		FixedMenu.__init__(self, session, "Bouquetlist", entrys)
-		self.skinName = "Menu"
+			entrys.append((x[0], x[1]))
+		self["menu"] = MenuList(entrys)
 
-	def bouquetSelected(self):
-		self.selectedFunc(self["menu"].getCurrent()[2])
+	def okbuttonClick(self):
+		self.selectedFunc(self["menu"].getCurrent()[1])
+
+	def cancelClick(self):
+		self.close(False)
 
 class ChannelContextMenu(FixedMenu):
 	def __init__(self, session, csel):
@@ -683,13 +694,13 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit, ChannelSelect
 				"cancel": self.cancel,
 				"ok": self.channelSelected,
 			})
-		self.onShown.append(self.onShow)
+		self.onShown.append(self.__onShown)
 
 		self.lastChannelRootTimer = eTimer()
-		self.lastChannelRootTimer.timeout.get().append(self.onCreate)
+		self.lastChannelRootTimer.timeout.get().append(self.__onCreate)
 		self.lastChannelRootTimer.start(100,True)
 
-	def onCreate(self):
+	def __onCreate(self):
 		self.setTvMode()
 		self.servicePathTV = [ ]
 		self.restoreRoot()
@@ -698,7 +709,7 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit, ChannelSelect
 			self.setCurrentSelection(lastservice)
 			self.session.nav.playService(lastservice)
 
-	def onShow(self):
+	def __onShown(self):
 		self.recallBouquetMode()
 		ref = self.session.nav.getCurrentlyPlayingServiceReference()
 		if ref is not None and ref.valid() and ref.getPath() == "":
@@ -876,7 +887,7 @@ class ChannelSelectionRadio(ChannelSelectionBase, ChannelSelectionEdit, ChannelS
 			self.servicelist.setCurrent(lastservice)
 			self.session.nav.playService(lastservice)
 			self.servicelist.setPlayableIgnoreService(lastservice)
-		self.info.instance.show()
+		self.info.show()
 
 	def channelSelected(self): # just return selected service
 		ref = self.getCurrentSelection()
@@ -896,7 +907,7 @@ class ChannelSelectionRadio(ChannelSelectionBase, ChannelSelectionEdit, ChannelS
 			self.saveRoot()
 
 	def closeRadio(self):
-		self.info.instance.hide()
+		self.info.hide()
 		#set previous tv service
 		lastservice=eServiceReference(config.tv.lastservice.value)
 		self.session.nav.playService(lastservice)
@@ -906,7 +917,7 @@ class SimpleChannelSelection(ChannelSelectionBase):
 	def __init__(self, session, title):
 		ChannelSelectionBase.__init__(self, session)
 		self.title = title
-		self.onShown.append(self.onExecCallback)
+		self.onShown.append(self.__onExecCallback)
 
 		self["actions"] = ActionMap(["OkCancelActions", "TvRadioActions"],
 			{
@@ -916,7 +927,7 @@ class SimpleChannelSelection(ChannelSelectionBase):
 				"keyTV": self.setModeTv,
 			})
 
-	def onExecCallback(self):
+	def __onExecCallback(self):
 		self.session.currentDialog.instance.setTitle(self.title)
 		self.setModeTv()