X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/301bab11f8453a6899153b7be338a352803b22cb..68b9abe0ee621954569f4c6920c1972f9c0ade3f:/lib/gui/elistboxcontent.cpp

diff --git a/lib/gui/elistboxcontent.cpp b/lib/gui/elistboxcontent.cpp
index 1c27f766..35618786 100644
--- a/lib/gui/elistboxcontent.cpp
+++ b/lib/gui/elistboxcontent.cpp
@@ -1,5 +1,6 @@
 #include <lib/gui/elistbox.h>
 #include <lib/gui/elistboxcontent.h>
+#include <lib/gdi/font.h>
 #include <Python.h>
 
 /*
@@ -109,7 +110,7 @@ void eListboxTestContent::setSize(const eSize &size)
 
 void eListboxTestContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected)
 {
-	ePtr<gFont> fnt = new gFont("Arial", 14);
+	ePtr<gFont> fnt = new gFont("Arial", 20);
 	painter.clip(eRect(offset, m_size));
 	style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal);
 	painter.clear();
@@ -218,7 +219,7 @@ void eListboxStringContent::setSize(const eSize &size)
 
 void eListboxStringContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected)
 {
-	ePtr<gFont> fnt = new gFont("Arial", 14);
+	ePtr<gFont> fnt = new gFont("Arial", 20);
 	painter.clip(eRect(offset, m_itemsize));
 	style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal);
 	painter.clear();
@@ -326,7 +327,7 @@ void eListboxPythonStringContent::setSize(const eSize &size)
 
 void eListboxPythonStringContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected)
 {
-	ePtr<gFont> fnt = new gFont("Arial", 14);
+	ePtr<gFont> fnt = new gFont("Arial", 20);
 	painter.clip(eRect(offset, m_itemsize));
 	style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal);
 	painter.clear();
@@ -364,6 +365,10 @@ void eListboxPythonStringContent::setList(PyObject *list)
 		m_list = list;
 		Py_INCREF(m_list);
 	}
+
+	//always invalidate when we get a new list
+	if (m_listbox)
+		m_listbox->invalidate();
 }
 
 PyObject *eListboxPythonStringContent::getCurrentSelection()
@@ -383,11 +388,17 @@ void eListboxPythonStringContent::invalidateEntry(int index)
 		m_listbox->entryChanged(index);
 }
 
+void eListboxPythonStringContent::invalidate()
+{
+	if (m_listbox)
+		m_listbox->invalidate();
+}
+
 //////////////////////////////////////
 
 void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected)
 {
-	ePtr<gFont> fnt = new gFont("Arial", 14);
+	ePtr<gFont> fnt = new gFont("Arial", 20);
 	ePtr<gFont> fnt2 = new gFont("Arial", 16);
 	painter.clip(eRect(offset, m_itemsize));
 	style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal);
@@ -421,11 +432,22 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style,
 				/* now, handle the value. get 2nd part from tuple*/
 			value = PyTuple_GetItem(item, 1);
 			if (value)
+			{
+				PyObject *args = PyTuple_New(1);
+				PyTuple_SetItem(args, 0, PyInt_FromLong(selected));
+				
 					/* CallObject will call __call__ which should return the value tuple */
-				value = PyObject_CallObject(value, 0);
+				value = PyObject_CallObject(value, args);
+				
+				if (PyErr_Occurred())
+					PyErr_Print();
+
+				Py_DECREF(args);
+					/* the PyInt was stolen. */
+			}
 			
 				/*  check if this is really a tuple */
-			if (PyTuple_Check(value))
+			if (value && PyTuple_Check(value))
 			{
 					/* convert type to string */
 				PyObject *type = PyTuple_GetItem(value, 0);
@@ -459,10 +481,53 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style,
 						painter.fill(eRect(offset.x() + m_seperation, offset.y() + 5, width, height-10));
 						
 							/* pvalue is borrowed */
+					} else if (!strcmp(atype, "mtext"))
+					{
+						PyObject *pvalue = PyTuple_GetItem(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));
+						para->setFont(fnt2);
+						para->renderString(text, 0);
+						para->realign(eTextPara::dirRight);
+						int glyphs = para->size();
+						
+						PyObject *plist = 0;
+						
+						if (PyTuple_Size(value) >= 3)
+							plist = PyTuple_GetItem(value, 2);
+						
+						int entries = 0;
+
+						if (plist && PyList_Check(plist))
+							entries = PyList_Size(plist);
+						
+						for (int i = 0; i < entries; ++i)
+						{
+							PyObject *entry = PyList_GetItem(plist, i);
+							int num = PyInt_Check(entry) ? PyInt_AsLong(entry) : -1;
+							
+							if ((num < 0) || (num >= glyphs))
+								eWarning("glyph index %d in PythonConfigList out of bounds!");
+							else
+							{
+								para->setGlyphFlag(num, GS_INVERT);
+								eRect bbox;
+								bbox = para->getGlyphBBox(num);
+								bbox = eRect(bbox.left(), offset.y(), bbox.width(), m_itemsize.height());
+								painter.fill(bbox);
+							}
+								/* entry is borrowed */
+						}
+						
+						painter.renderPara(para, ePoint(0, 0));
+							/* pvalue is borrowed */
+							/* plist is 0 or borrowed */
 					}
 				}
 				Py_XDECREF(type);
-			}
+			} else
+				eWarning("eListboxPythonConfigContent: second value of tuple is not a tuple.");
 				/* value is borrowed */
 		}