X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/2cd1d9f6f550f89747a579fe923299ac9916afe0..16f9d918460fb645b3e64c65437fda2161abd93c:/lib/service/listboxservice.h

diff --git a/lib/service/listboxservice.h b/lib/service/listboxservice.h
index b06e7ef8..b64e875f 100644
--- a/lib/service/listboxservice.h
+++ b/lib/service/listboxservice.h
@@ -3,7 +3,6 @@
 
 #include <lib/gui/elistbox.h>
 #include <lib/service/iservice.h>
-
 #include <set>
 
 class eListboxServiceContent: public virtual iListboxContent
@@ -11,9 +10,19 @@ class eListboxServiceContent: public virtual iListboxContent
 	DECLARE_REF(eListboxServiceContent);
 public:
 	eListboxServiceContent();
-	void setRoot(const eServiceReference &ref);
-	void getCurrent(eServiceReference &ref);
 
+	void addService(const eServiceReference &ref, bool beforeCurrent=false);
+	void removeCurrent();
+	void FillFinished();
+
+	void setIgnoreService( const eServiceReference &service );
+	void setRoot(const eServiceReference &ref, bool justSet=false);
+	void getCurrent(eServiceReference &ref);
+	
+	int getNextBeginningWithChar(char c);
+	int getPrevMarkerPos();
+	int getNextMarkerPos();
+	
 		/* support for marked services */
 	void initMarked();
 	void addMarked(const eServiceReference &ref);
@@ -36,21 +45,38 @@ public:
 	
 		/* only in complex mode: */
 	enum {
-		celServiceName,
 		celServiceNumber,
-		celIcon,
+		celMarkerPixmap,
+		celFolderPixmap,
+		celServiceName,
+		celServiceTypePixmap,
 		celServiceInfo, // "now" event
 		celElements
 	};
-	
+
+	enum {
+		picDVB_S,
+		picDVB_T,
+		picDVB_C,
+		picServiceGroup,
+		picFolder,
+		picMarker,
+		picElements
+	};
+
 	void setElementPosition(int element, eRect where);
 	void setElementFont(int element, gFont *font);
+	void setPixmap(int type, ePtr<gPixmap> &pic);
 	
 	void sort();
 
 	int setCurrentMarked(bool);
 
 	void setNumberOffset(int offset) { m_numberoffset = offset; }
+	
+	int getItemHeight() { return m_itemheight; }
+	int setItemHeight(int height);
+	
 protected:
 	void cursorHome();
 	void cursorEnd();
@@ -73,6 +99,7 @@ protected:
 		/* for complex mode */
 	eRect m_element_position[celElements];
 	ePtr<gFont> m_element_font[celElements];
+	ePtr<gPixmap> m_pixmaps[picElements];
 private:
 	typedef std::list<eServiceReference> list;
 	
@@ -84,6 +111,7 @@ private:
 	
 	eSize m_itemsize;
 	ePtr<iServiceHandler> m_service_center;
+	ePtr<iListableService> m_lst;
 	
 	eServiceReference m_root;
 
@@ -93,9 +121,12 @@ private:
 
 		/* support for movemode */
 	bool m_current_marked;
-	list::iterator m_swap;
 
 	int m_numberoffset;
+
+	eServiceReference m_is_playable_ignore;
+
+	int m_itemheight;
 };
 
 #endif