X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/ead18eb53880ecff8c41fa2e2db7ae87e2b950de..87b1a41106c4561a400536558d10dc703b3f81f4:/lib/python/Components/ChoiceList.py

diff --git a/lib/python/Components/ChoiceList.py b/lib/python/Components/ChoiceList.py
index a7a5e483..07bb56d0 100644
--- a/lib/python/Components/ChoiceList.py
+++ b/lib/python/Components/ChoiceList.py
@@ -1,8 +1,9 @@
-from HTMLComponent import *
-from GUIComponent import *
+from HTMLComponent import HTMLComponent
+from GUIComponent import GUIComponent
 from MenuList import MenuList
 from Tools.Directories import SCOPE_SKIN_IMAGE, resolveFilename
-from enigma import RT_HALIGN_LEFT, eListboxPythonMultiContent, eListbox, gFont, loadPNG
+from enigma import RT_HALIGN_LEFT, eListboxPythonMultiContent, eListbox, gFont
+from Tools.LoadPixmap import LoadPixmap
 
 def ChoiceEntryComponent(key, text):
 	res = [ text ]
@@ -11,7 +12,7 @@ def ChoiceEntryComponent(key, text):
 	else:
 		res.append((eListboxPythonMultiContent.TYPE_TEXT, 32, 00, 800, 25, 0, RT_HALIGN_LEFT, text[0]))
 	
-		png = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "key_" + key + "-fs8.png"))
+		png = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "key_" + key + "-fs8.png"))
 		if png is not None:
 			res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, 0, 0, 30, 20, png))