aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAndreas Monzner <andreas.monzner@multimedia-labs.de>2007-07-22 10:05:09 +0000
committerAndreas Monzner <andreas.monzner@multimedia-labs.de>2007-07-22 10:05:09 +0000
commit296fb4a470bd2ec2e4163fdda29401b6140a52ad (patch)
tree938b88b53b062919a089a570ef88acf52acbeef2 /lib
parent825e9d77d51cfc0e42be576229dc180f442ee20e (diff)
downloadenigma2-296fb4a470bd2ec2e4163fdda29401b6140a52ad.tar.gz
enigma2-296fb4a470bd2ec2e4163fdda29401b6140a52ad.zip
add support for service group pixmap in servicelist
Diffstat (limited to 'lib')
-rw-r--r--lib/python/Components/ServiceList.py4
-rw-r--r--lib/service/listboxservice.cpp1
-rw-r--r--lib/service/listboxservice.h1
3 files changed, 6 insertions, 0 deletions
diff --git a/lib/python/Components/ServiceList.py b/lib/python/Components/ServiceList.py
index b255cd99..a113eb9b 100644
--- a/lib/python/Components/ServiceList.py
+++ b/lib/python/Components/ServiceList.py
@@ -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
diff --git a/lib/service/listboxservice.cpp b/lib/service/listboxservice.cpp
index b97c469c..b6d07f44 100644
--- a/lib/service/listboxservice.cpp
+++ b/lib/service/listboxservice.cpp
@@ -552,6 +552,7 @@ void eListboxServiceContent::paint(gPainter &painter, eWindowStyle &style, const
ePtr<gPixmap> &pixmap =
(e == celFolderPixmap) ? m_pixmaps[picFolder] :
(e == celMarkerPixmap) ? m_pixmaps[picMarker] :
+ (m_cursor->flags & eServiceReference::isGroup) ? m_pixmaps[picServiceGroup] :
(orbpos == 0xFFFF) ? m_pixmaps[picDVB_C] :
(orbpos == 0xEEEE) ? m_pixmaps[picDVB_T] : m_pixmaps[picDVB_S];
if (pixmap)
diff --git a/lib/service/listboxservice.h b/lib/service/listboxservice.h
index 01b3d3c6..b64e875f 100644
--- a/lib/service/listboxservice.h
+++ b/lib/service/listboxservice.h
@@ -58,6 +58,7 @@ public:
picDVB_S,
picDVB_T,
picDVB_C,
+ picServiceGroup,
picFolder,
picMarker,
picElements