small code cleanup, fix memleaks

[enigma2.git] / lib / service / listboxservice.h

diff --git a/lib/service/listboxservice.h b/lib/service/listboxservice.h
index b64e875f0c4a600a078ffe90f98027269b2e11bb..589afba633d78a8fa4feaadd7e49d5469a4b37b3 100644 (file)
--- a/lib/service/listboxservice.h
+++ b/lib/service/listboxservice.h
@@ -1,6 +1,7 @@
 #ifndef __lib_service_listboxservice_h
 #define __lib_service_listboxservice_h
 
+#include <lib/gdi/gpixmap.h>
 #include <lib/gui/elistbox.h>
 #include <lib/service/iservice.h>
 #include <set>
@@ -48,6 +49,7 @@ public:
                celServiceNumber,
                celMarkerPixmap,
                celFolderPixmap,
+               celServiceEventProgressbar,
                celServiceName,
                celServiceTypePixmap,
                celServiceInfo, // "now" event
@@ -61,6 +63,7 @@ public:
                picServiceGroup,
                picFolder,
                picMarker,
+               picServiceEventProgressbar,
                picElements
        };
 
@@ -75,8 +78,24 @@ public:
        void setNumberOffset(int offset) { m_numberoffset = offset; }
        
        int getItemHeight() { return m_itemheight; }
-       int setItemHeight(int height);
+       void setItemHeight(int height);
+
+       enum {
+               markedForeground,
+               markedForegroundSelected,
+               markedBackground,
+               markedBackgroundSelected,
+               serviceNotAvail,
+               serviceEventProgressbarColor,
+               serviceEventProgressbarColorSelected,
+               serviceEventProgressbarBorderColor,
+               serviceEventProgressbarBorderColorSelected,
+               serviceDescriptionColor,
+               serviceDescriptionColorSelected,
+               colorElements
+       };
        
+       void setColor(int color, gRGB &col);
 protected:
        void cursorHome();
        void cursorEnd();
@@ -100,6 +119,8 @@ protected:
        eRect m_element_position[celElements];
        ePtr<gFont> m_element_font[celElements];
        ePtr<gPixmap> m_pixmaps[picElements];
+       gRGB m_color[colorElements];
+       bool m_color_set[colorElements];
 private:
        typedef std::list<eServiceReference> list;