X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fgui%2Felistboxcontent.cpp;h=a19e11a34f7e69cd17a8af9ec9a1d6875143b9d9;hp=1c671fa0a51820de556220436fc6fd219a4f7cff;hb=1a2a0e2f94f8f9ba64b1e2d11b42bec88ed612d0;hpb=453af6ce0630079409e4245c6f7c74a117ee3de2

diff --git a/lib/gui/elistboxcontent.cpp b/lib/gui/elistboxcontent.cpp
index 1c671fa..a19e11a 100644
--- a/lib/gui/elistboxcontent.cpp
+++ b/lib/gui/elistboxcontent.cpp
@@ -501,6 +501,7 @@ eListboxPythonMultiContent::~eListboxPythonMultiContent()
 {
 	Py_XDECREF(m_buildFunc);
 	Py_XDECREF(m_selectableFunc);
+	Py_XDECREF(m_template);
 }
 
 void eListboxPythonMultiContent::setSelectionClip(eRect &rect, bool update)
@@ -857,6 +858,10 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
 				}
 				break;
 			}
+			case TYPE_PROGRESS_PIXMAP: // Progress
+			/*
+				(1, x, y, width, height, filled_percent, pixmap [, borderWidth, foreColor, backColor, backColorSelected] )
+			*/
 			case TYPE_PROGRESS: // Progress
 			{
 			/*
@@ -867,41 +872,55 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
 							pwidth = PyTuple_GET_ITEM(item, 3),
 							pheight = PyTuple_GET_ITEM(item, 4),
 							pfilled_perc = PyTuple_GET_ITEM(item, 5),
-							pborderWidth, pforeColor, pforeColorSelected, pbackColor, pbackColorSelected;
-
-				if (!(px && py && pwidth && pheight && pfilled_perc))
+							ppixmap, pborderWidth, pforeColor, pforeColorSelected, pbackColor, pbackColorSelected;
+				int idx = 6;
+				if (type == TYPE_PROGRESS)
 				{
-					eDebug("eListboxPythonMultiContent received too small tuple (must be (TYPE_PROGRESS, x, y, width, height, filled percent [,border width, foreColor, backColor, backColorSelected]))");
-					goto error_out;
+					if (!(px && py && pwidth && pheight && pfilled_perc))
+					{
+						eDebug("eListboxPythonMultiContent received too small tuple (must be (TYPE_PROGRESS, x, y, width, height, filled percent [,border width, foreColor, backColor, backColorSelected]))");
+						goto error_out;
+					}
+				}
+				else
+				{
+					ppixmap = PyTuple_GET_ITEM(item, idx++);
+					if (ppixmap == Py_None)
+						continue;
+					if (!(px && py && pwidth && pheight && pfilled_perc, ppixmap))
+					{
+						eDebug("eListboxPythonMultiContent received too small tuple (must be (TYPE_PROGRESS_PIXMAP, x, y, width, height, filled percent, pixmap, [,border width, foreColor, backColor, backColorSelected]))");
+						goto error_out;
+					}
 				}
 
-				if (size > 6)
+				if (size > idx)
 				{
-					pborderWidth = PyTuple_GET_ITEM(item, 6);
+					pborderWidth = PyTuple_GET_ITEM(item, idx++);
 					if (pborderWidth == Py_None)
 						pborderWidth = ePyObject();
 				}
-				if (size > 7)
+				if (size > idx)
 				{
-					pforeColor = PyTuple_GET_ITEM(item, 7);
+					pforeColor = PyTuple_GET_ITEM(item, idx++);
 					if (pforeColor == Py_None)
 						pforeColor = ePyObject();
 				}
-				if (size > 8)
+				if (size > idx)
 				{
-					pforeColorSelected = PyTuple_GET_ITEM(item, 8);
+					pforeColorSelected = PyTuple_GET_ITEM(item, idx++);
 					if (pforeColorSelected == Py_None)
 						pforeColorSelected=ePyObject();
 				}
-				if (size > 9)
+				if (size > idx)
 				{
-					pbackColor = PyTuple_GET_ITEM(item, 9);
+					pbackColor = PyTuple_GET_ITEM(item, idx++);
 					if (pbackColor == Py_None)
 						pbackColor=ePyObject();
 				}
-				if (size > 10)
+				if (size > idx)
 				{
-					pbackColorSelected = PyTuple_GET_ITEM(item, 10);
+					pbackColorSelected = PyTuple_GET_ITEM(item, idx++);
 					if (pbackColorSelected == Py_None)
 						pbackColorSelected=ePyObject();
 				}
@@ -943,12 +962,27 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
 				rect.setRect(x+width-bwidth, y+bwidth, bwidth, height-bwidth);
 				painter.fill(rect);
 
-				// progress
 				rect.setRect(x+bwidth, y+bwidth, (width-bwidth*2) * filled / 100, height-bwidth*2);
-				painter.fill(rect);
 
-				painter.clippop();
+				// progress
+				if (ppixmap)
+				{
+					ePtr<gPixmap> pixmap;
+					if (PyInt_Check(ppixmap) && data) /* if the pixmap is in fact a number, it refers to the data list */
+						ppixmap = PyTuple_GetItem(data, PyInt_AsLong(ppixmap));
 
+					if (SwigFromPython(pixmap, ppixmap))
+					{
+						eDebug("eListboxPythonMultiContent (Pixmap) get pixmap failed");
+						painter.clippop();
+						continue;
+					}
+					painter.blit(pixmap, rect.topLeft(), rect, 0);
+				}
+				else
+					painter.fill(rect);
+
+				painter.clippop();
 				break;
 			}
 			case TYPE_PIXMAP_ALPHABLEND:
@@ -1125,5 +1159,7 @@ void eListboxPythonMultiContent::entryRemoved(int idx)
 
 void eListboxPythonMultiContent::setTemplate(ePyObject tmplate)
 {
+	Py_XDECREF(m_template);
 	m_template = tmplate;
+	Py_XINCREF(m_template);
 }