X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/9ef4b143f371d6b1b38a3abebcf38b336e03a583..9b6b96172d1d20d9daf3c11bc5f0222f487d53d7:/lib/gui/elistboxcontent.cpp

diff --git a/lib/gui/elistboxcontent.cpp b/lib/gui/elistboxcontent.cpp
index ae66e40a..f5ae2b38 100644
--- a/lib/gui/elistboxcontent.cpp
+++ b/lib/gui/elistboxcontent.cpp
@@ -374,10 +374,11 @@ void eListboxPythonStringContent::setList(PyObject *list)
 
 PyObject *eListboxPythonStringContent::getCurrentSelection()
 {
-	if (!m_list)
-		return 0;
-	if (!cursorValid())
-		return 0;
+	if (!(m_list && cursorValid()))
+	{
+		Py_INCREF(Py_None);
+		return Py_None;
+	}
 	PyObject *r = PyList_GET_ITEM(m_list, m_cursor);
 	Py_XINCREF(r);
 	return r;
@@ -424,12 +425,16 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style,
 				/* handle left part. get item from tuple, convert to string, display. */
 				
 			text = PyTuple_GET_ITEM(item, 0);
-//			text = PyObject_Str(text); /* creates a new object - old object was borrowed! */
+			text = PyObject_Str(text); /* creates a new object - old object was borrowed! */
 			const char *string = (text && PyString_Check(text)) ? PyString_AsString(text) : "<not-a-string>";
 			eSize item_left = eSize(m_seperation, m_itemsize.height());
 			eSize item_right = eSize(m_itemsize.width() - m_seperation, m_itemsize.height());
 			painter.renderText(eRect(offset, item_left), string, gPainter::RT_HALIGN_LEFT);
-//			Py_XDECREF(text);
+			Py_XDECREF(text);
+			
+				/* when we have no label, align value to the left. (FIXME: 
+				   don't we want to specifiy this individually?) */
+			int value_alignment_left = !*string;
 			
 				/* now, handle the value. get 2nd part from tuple*/
 			value = PyTuple_GET_ITEM(item, 1);
@@ -462,18 +467,23 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style,
 						PyObject *pvalue = PyTuple_GET_ITEM(value, 1);
 						const char *value = (pvalue && PyString_Check(pvalue)) ? PyString_AsString(pvalue) : "<not-a-string>";
 						painter.setFont(fnt2);
-						painter.renderText(eRect(offset + eSize(m_seperation, 0), item_right), value, gPainter::RT_HALIGN_RIGHT);
+						if (value_alignment_left)
+							painter.renderText(eRect(offset, item_right), value, gPainter::RT_HALIGN_LEFT);
+						else
+							painter.renderText(eRect(offset + eSize(m_seperation, 0), item_right), value, gPainter::RT_HALIGN_RIGHT);
 
 							/* pvalue is borrowed */
 					} else if (!strcmp(atype, "slider"))
 					{
 						PyObject *pvalue = PyTuple_GET_ITEM(value, 1);
+						PyObject *psize = PyTuple_GET_ITEM(value, 2);
 						
 							/* convert value to Long. fallback to -1 on error. */
 						int value = (pvalue && PyInt_Check(pvalue)) ? PyInt_AsLong(pvalue) : -1;
+						int size = (pvalue && PyInt_Check(psize)) ? PyInt_AsLong(psize) : 100;
 						
 							/* calc. slider length */
-						int width = item_right.width() * value / 100;
+						int width = item_right.width() * value / size;
 						int height = item_right.height();
 						
 												
@@ -487,11 +497,11 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style,
 					{
 						PyObject *pvalue = PyTuple_GET_ITEM(value, 1);
 						const char *text = (pvalue && PyString_Check(pvalue)) ? PyString_AsString(pvalue) : "<not-a-string>";
-						
-						ePtr<eTextPara> para = new eTextPara(eRect(offset + eSize(m_seperation, 0), item_right));
+						int xoffs = value_alignment_left ? 0 : m_seperation;
+						ePtr<eTextPara> para = new eTextPara(eRect(offset + eSize(xoffs, 0), item_right));
 						para->setFont(fnt2);
 						para->renderString(text, 0);
-						para->realign(eTextPara::dirRight);
+						para->realign(value_alignment_left ? eTextPara::dirLeft : eTextPara::dirRight);
 						int glyphs = para->size();
 						
 						PyObject *plist = 0;
@@ -510,7 +520,7 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style,
 							int num = PyInt_Check(entry) ? PyInt_AsLong(entry) : -1;
 							
 							if ((num < 0) || (num >= glyphs))
-								eWarning("glyph index %d in PythonConfigList out of bounds!");
+								eWarning("glyph index %d in PythonConfigList out of bounds!", num);
 							else
 							{
 								para->setGlyphFlag(num, GS_INVERT);
@@ -706,6 +716,7 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
 
 				break;
 			}
+			case TYPE_PIXMAP_ALPHATEST:
 			case TYPE_PIXMAP: // pixmap
 			{
 				if (!(px && py && pwidth && pheight && pfnt))
@@ -729,7 +740,7 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
 				r &= itemrect;
 				
 				painter.clip(r);
-				painter.blit(pixmap, r.topLeft(), r);
+				painter.blit(pixmap, r.topLeft(), r, (type == TYPE_PIXMAP_ALPHATEST) ? gPainter::BT_ALPHATEST : 0);
 				painter.clippop();
 
 				break;