add support for service group pixmap in servicelist

[enigma2.git] / lib / python / Components / ServiceList.py

diff --git a/lib/python/Components/ServiceList.py b/lib/python/Components/ServiceList.py
index 0532d248a1b30e4f3ede7a56596cad2669fe4404..a113eb9b694b81265bc1c955faca4bb3e305f6b0 100644 (file)
--- a/lib/python/Components/ServiceList.py
+++ b/lib/python/Components/ServiceList.py
@@ -1,11 +1,11 @@
-from HTMLComponent import *
-from GUIComponent import *
+from HTMLComponent import HTMLComponent
+from GUIComponent import GUIComponent
 
 from enigma import loadPNG, eListboxServiceContent, eListbox, eServiceCenter, eServiceReference, gFont, eRect
 
 from string import upper
 
-from Tools.Directories import resolveFilename, SCOPE_SKIN, SCOPE_SKIN_IMAGE, SCOPE_FONTS
+from Tools.Directories import resolveFilename, SCOPE_SKIN_IMAGE
 
 class ServiceList(HTMLComponent, GUIComponent):
        MODE_NORMAL = 0
@@ -35,6 +35,10 @@ class ServiceList(HTMLComponent, GUIComponent):
                if pic:
                        self.l.setPixmap(self.l.picDVB_T, pic)
 
+               pic = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "ico_service_group-fs8.png"))
+               if pic:
+                       self.l.setPixmap(self.l.picServiceGroup, pic)
+
                self.root = None
                self.mode = self.MODE_NORMAL
 
@@ -160,13 +164,13 @@ class ServiceList(HTMLComponent, GUIComponent):
                self.mode = mode
 
                if mode == self.MODE_NORMAL:
-                       self.instance.setItemHeight(28)
+                       self.l.setItemHeight(28)
                        self.l.setVisualMode(eListboxServiceContent.visModeComplex)
                        self.l.setElementFont(self.l.celServiceName, gFont("Regular", 22))
                        self.l.setElementPosition(self.l.celServiceName, eRect(0, 0, self.instance.size().width(), 28))
                        self.l.setElementFont(self.l.celServiceInfo, gFont("Regular", 18))
                else:
-                       self.instance.setItemHeight(28)
+                       self.l.setItemHeight(28)
                        self.l.setVisualMode(eListboxServiceContent.visModeComplex)
                        self.l.setElementFont(self.l.celServiceNumber, gFont("Regular", 20))
                        self.l.setElementPosition(self.l.celServiceNumber, eRect(0, 0, 50, 28))