X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/eaa8bc374ff5eca1bb3caf9517dc6772cae34dd6..6893ffd757d0f2fced0ceb0dac6706d63ee25f2e:/lib/python/Components/SelectionList.py

diff --git a/lib/python/Components/SelectionList.py b/lib/python/Components/SelectionList.py
index 1500254a..d5215dc0 100644
--- a/lib/python/Components/SelectionList.py
+++ b/lib/python/Components/SelectionList.py
@@ -1,9 +1,9 @@
-from GUIComponent import GUIComponent
 from MenuList import MenuList
 from Tools.Directories import resolveFilename, SCOPE_SKIN_IMAGE
-from enigma import eListboxPythonMultiContent, loadPNG, eListbox, gFont, RT_HALIGN_LEFT
+from enigma import eListboxPythonMultiContent, eListbox, gFont, RT_HALIGN_LEFT
+from Tools.LoadPixmap import LoadPixmap
 
-selectionpng = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "selectioncross-fs8.png"))
+selectionpng = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "selectioncross-fs8.png"))
 
 def SelectionEntryComponent(description, value, index, selected):
 	res = [ (description, value, index, selected) ]
@@ -12,32 +12,24 @@ def SelectionEntryComponent(description, value, index, selected):
 		res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, 0, 0, 30, 30, selectionpng))
 	return res
 
-class SelectionList(MenuList, GUIComponent):
-	def __init__(self, list = []):
-		GUIComponent.__init__(self)
-		self.l = eListboxPythonMultiContent()
-		self.list = list
-		self.setList(list)
+class SelectionList(MenuList):
+	def __init__(self, list = None, enableWrapAround = False):
+		MenuList.__init__(self, list or [], enableWrapAround, content = eListboxPythonMultiContent)
 		self.l.setFont(0, gFont("Regular", 20))
-
-	GUI_WIDGET = eListbox
-		
-	def postWidgetCreate(self, instance):
-		instance.setContent(self.l)
-		instance.setItemHeight(30)
+		self.l.setItemHeight(30)
 
 	def addSelection(self, description, value, index, selected = True):
 		self.list.append(SelectionEntryComponent(description, value, index, selected))
 		self.setList(self.list)
-		
+
 	def toggleSelection(self):
 		item = self.list[self.getSelectedIndex()][0]
 		self.list[self.getSelectedIndex()] = SelectionEntryComponent(item[0], item[1], item[2], not item[3])
 		self.setList(self.list)
-		
+
 	def getSelectionsList(self):
 		list = []
 		for item in self.list:
 			if item[0][3]:
 				list.append((item[0][0], item[0][1], item[0][2]))
-		return list
\ No newline at end of file
+		return list