add 'templates' in listboxcontent, to split the layout from actual data content

[enigma2.git] / lib / gui / elistboxcontent.cpp

diff --git a/lib/gui/elistboxcontent.cpp b/lib/gui/elistboxcontent.cpp
index fd7341a979c8306d3acd8da35ca82758309013bb..beb120445729bff9ab425f40c014e041f1ff0047 100644 (file)
--- a/lib/gui/elistboxcontent.cpp
+++ b/lib/gui/elistboxcontent.cpp
@@ -262,7 +262,8 @@ void eListboxPythonStringContent::invalidate()
                int s = size();
                if ( m_cursor >= s )
                        m_listbox->moveSelectionTo(s?s-1:0);
-               m_listbox->invalidate();
+               else
+                       m_listbox->invalidate();
        }
 }
 
@@ -430,6 +431,8 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style,
                                                if (plist && PyList_Check(plist))
                                                        entries = PyList_Size(plist);
                                                
+                                               int left=0, right=0, last=-1;
+                                               eRect bbox;
                                                for (int i = 0; i < entries; ++i)
                                                {
                                                        ePyObject entry = PyList_GET_ITEM(plist, i);
@@ -439,15 +442,23 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style,
                                                                eWarning("glyph index %d in PythonConfigList out of bounds!", num);
                                                        else
                                                        {
+                                                               if (last+1 != num && last != -1) {
+                                                                       bbox = eRect(left, offset.y(), right-left, m_itemsize.height());
+                                                                       painter.fill(bbox);
+                                                               }
                                                                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);
+                                                               if (last+1 != num || last == -1)
+                                                                       left = bbox.left();
+                                                               right = bbox.left() + bbox.width();
+                                                               last = num;
                                                        }
                                                                /* entry is borrowed */
                                                }
-                                               
+                                               if (last != -1) {
+                                                       bbox = eRect(left, offset.y(), right-left, m_itemsize.height());
+                                                       painter.fill(bbox);
+                                               }
                                                painter.renderPara(para, ePoint(0, 0));
                                                        /* pvalue is borrowed */
                                                        /* plist is 0 or borrowed */
@@ -615,6 +626,11 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
 
        if (m_list && cursorValid())
        {
+                       /* a multicontent list can be used in two ways:
+                               either each item is a list of (TYPE,...)-tuples,
+                               or there is a template defined, which is a list of (TYPE,...)-tuples,
+                               and the list is an unformatted tuple. The template then references items from the list.
+                       */
                items = PyList_GET_ITEM(m_list, m_cursor); // borrowed reference!
 
                if (m_buildFunc)
@@ -636,14 +652,37 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
                        goto error_out;
                }
 
-               if (!PyList_Check(items))
+               if (!m_template)
                {
-                       eDebug("eListboxPythonMultiContent: list entry %d is not a list", m_cursor);
-                       goto error_out;
+                       if (!PyList_Check(items))
+                       {
+                               eDebug("eListboxPythonMultiContent: list entry %d is not a list (non-templated)", m_cursor);
+                               goto error_out;
+                       }
+               } else
+               {
+                       if (!PyTuple_Check(items))
+                       {
+                               eDebug("eListboxPythonMultiContent: list entry %d is not a tuple (templated)", m_cursor);
+                               goto error_out;
+                       }
+               }
+
+               ePyObject data;
+
+                       /* if we have a template, use the template for the actual formatting. 
+                               we will later detect that "data" is present, and refer to that, instead
+                               of the immediate value. */
+               int start = 1;
+               if (m_template)
+               {
+                       data = items;
+                       items = m_template;
+                       start = 0;
                }
 
                int size = PyList_Size(items);
-               for (int i = 1; i < size; ++i)
+               for (int i = start; i < size; ++i)
                {
                        ePyObject item = PyList_GET_ITEM(items, i); // borrowed reference!
 
@@ -728,6 +767,9 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
                                                pborderColor=ePyObject();
                                }
 
+                               if (PyInt_Check(pstring) && data) /* if the string is in fact a number, it refers to the 'data' list. */
+                                       pstring = PyTuple_GetItem(data, PyInt_AsLong(pstring));
+
                                const char *string = (PyString_Check(pstring)) ? PyString_AsString(pstring) : "<not-a-string>";
                                int x = PyInt_AsLong(px) + offset.x();
                                int y = PyInt_AsLong(py) + offset.y();
@@ -836,6 +878,10 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
                                int width = PyInt_AsLong(pwidth);
                                int height = PyInt_AsLong(pheight);
                                int filled = PyInt_AsLong(pfilled_perc);
+
+                               if ((filled < 0) && data) /* if the string is in a negative number, it refers to the 'data' list. */
+                                       filled = PyInt_AsLong(PyTuple_GetItem(data, -filled));
+
                                int bwidth = pborderWidth ? PyInt_AsLong(pborderWidth) : 2;
 
                                eRect rect(x, y, width, height);
@@ -887,6 +933,9 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
                                        goto error_out;
                                }
 
+                               if (PyInt_Check(ppixmap) && data) /* if the pixemap is in fact a number, it refers to the 'data' list. */
+                                       ppixmap = PyTuple_GetItem(data, PyInt_AsLong(ppixmap));
+
                                int x = PyInt_AsLong(px) + offset.x();
                                int y = PyInt_AsLong(py) + offset.y();
                                int width = PyInt_AsLong(pwidth);
@@ -980,6 +1029,11 @@ int eListboxPythonMultiContent::currentCursorSelectable()
                                item = PyList_GET_ITEM(item, 0);
                                if (item != Py_None)
                                        return 1;
+                       } else if (PyTuple_Check(item))
+                       {
+                               item = PyTuple_GET_ITEM(item, 0);
+                               if (item != Py_None)
+                                       return 1;
                        }
                        else if (m_buildFunc && PyCallable_Check(m_buildFunc))
                                return 1;
@@ -1021,3 +1075,14 @@ void eListboxPythonMultiContent::updateClip(gRegion &clip)
        else
                m_old_clip = m_clip = gRegion::invalidRegion();
 }
+
+void eListboxPythonMultiContent::entryRemoved(int idx)
+{
+       if (m_listbox)
+               m_listbox->entryRemoved(idx);
+}
+
+void eListboxPythonMultiContent::setTemplate(ePyObject tmplate)
+{
+       m_template = tmplate;
+}