Merge branch 'bug_539_add_multicontent_pixmap_progress' into experimental

diff --combined lib/gui/elistboxcontent.cpp
index 43fbc59,2eea146..97e2cc6
--- 1/lib/gui/elistboxcontent.cpp
--- 2/lib/gui/elistboxcontent.cpp
+++ b/lib/gui/elistboxcontent.cpp
@@@ -343,6 -343,7 +343,6 @@@ void eListboxPythonConfigContent::paint
                if (PyTuple_Check(item))
                {
                                /* 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! */
                        const char *string = (text && PyString_Check(text)) ? PyString_AsString(text) : "<not-a-string>";
@@@ -356,9 -357,7 +356,9 @@@
                        int value_alignment_left = !*string;
  
                                /* now, handle the value. get 2nd part from tuple*/
 -                      value = PyTuple_GET_ITEM(item, 1);
 +                      if (PyTuple_Size(item) >= 2) // when no 2nd entry is in tuple this is a non selectable entry without config part
 +                              value = PyTuple_GET_ITEM(item, 1);
 +
                        if (value)
                        {
                                ePyObject args = PyTuple_New(1);
@@@ -469,7 -468,7 +469,7 @@@
                                        }
                                }
                                        /* type is borrowed */
 -                      } else
 +                      } else if (value)
                                eWarning("eListboxPythonConfigContent: second value of tuple is not a tuple.");
                        if (value)
                                Py_DECREF(value);
@@@ -516,7 -515,7 +516,7 @@@ void eListboxPythonMultiContent::setSel
                m_listbox->entryChanged(m_cursor);
  }
  
 -static void clearRegionHelper(gPainter &painter, eListboxStyle *local_style, const ePoint &offset, ePyObject &pbackColor, bool cursorValid)
 +static void clearRegionHelper(gPainter &painter, eListboxStyle *local_style, const ePoint &offset, ePyObject &pbackColor, bool cursorValid, bool clear=true)
  {
        if (pbackColor)
        {
@@@ -538,11 -537,10 +538,11 @@@
                else if (local_style->m_transparent_background)
                        return;
        }
 -      painter.clear();
 +      if (clear)
 +              painter.clear();
  }
  
 -static void clearRegionSelectedHelper(gPainter &painter, eListboxStyle *local_style, const ePoint &offset, ePyObject &pbackColorSelected, bool cursorValid)
 +static void clearRegionSelectedHelper(gPainter &painter, eListboxStyle *local_style, const ePoint &offset, ePyObject &pbackColorSelected, bool cursorValid, bool clear=true)
  {
        if (pbackColorSelected)
        {
@@@ -562,11 -560,10 +562,11 @@@
                        return;
                }
        }
 -      painter.clear();
 +      if (clear)
 +              painter.clear();
  }
  
 -static void clearRegion(gPainter &painter, eWindowStyle &style, eListboxStyle *local_style, ePyObject pforeColor, ePyObject pforeColorSelected, ePyObject pbackColor, ePyObject pbackColorSelected, int selected, gRegion &rc, eRect &sel_clip, const ePoint &offset, bool cursorValid)
 +static void clearRegion(gPainter &painter, eWindowStyle &style, eListboxStyle *local_style, ePyObject pforeColor, ePyObject pforeColorSelected, ePyObject pbackColor, ePyObject pbackColorSelected, int selected, gRegion &rc, eRect &sel_clip, const ePoint &offset, bool cursorValid, bool clear=true)
  {
        if (selected && sel_clip.valid())
        {
@@@ -575,7 -572,7 +575,7 @@@
                {
                        painter.clip(part);
                        style.setStyle(painter, eWindowStyle::styleListboxNormal);
 -                      clearRegionHelper(painter, local_style, offset, pbackColor, cursorValid);
 +                      clearRegionHelper(painter, local_style, offset, pbackColor, cursorValid, clear);
                        painter.clippop();
                        selected = 0;
                }
@@@ -584,7 -581,7 +584,7 @@@
                {
                        painter.clip(part);
                        style.setStyle(painter, eWindowStyle::styleListboxSelected);
 -                      clearRegionSelectedHelper(painter, local_style, offset, pbackColorSelected, cursorValid);
 +                      clearRegionSelectedHelper(painter, local_style, offset, pbackColorSelected, cursorValid, clear);
                        painter.clippop();
                        selected = 1;
                }
@@@ -592,14 -589,14 +592,14 @@@
        else if (selected)
        {
                style.setStyle(painter, eWindowStyle::styleListboxSelected);
 -              clearRegionSelectedHelper(painter, local_style, offset, pbackColorSelected, cursorValid);
 +              clearRegionSelectedHelper(painter, local_style, offset, pbackColorSelected, cursorValid, clear);
                if (local_style && local_style->m_selection)
                        painter.blit(local_style->m_selection, offset, eRect(), gPainter::BT_ALPHATEST);
        }
        else
        {
                style.setStyle(painter, eWindowStyle::styleListboxNormal);
 -              clearRegionHelper(painter, local_style, offset, pbackColor, cursorValid);
 +              clearRegionHelper(painter, local_style, offset, pbackColor, cursorValid, clear);
        }
  
        if (selected)
@@@ -822,8 -819,7 +822,8 @@@ void eListboxPythonMultiContent::paint(
  
                                {
                                        gRegion rc(rect);
 -                                      clearRegion(painter, style, local_style, pforeColor, pforeColorSelected, pbackColor, pbackColorSelected, selected, rc, sel_clip, offset, cursorValid);
 +                                      bool mustClear = (selected && pbackColorSelected) || (!selected && pbackColor);
 +                                      clearRegion(painter, style, local_style, pforeColor, pforeColorSelected, pbackColor, pbackColorSelected, selected, rc, sel_clip, offset, cursorValid, mustClear);
                                }
  
                                painter.setFont(m_font[fnt]);
@@@ -944,8 -940,7 +944,8 @@@
  
                                {
                                        gRegion rc(rect);
 -                                      clearRegion(painter, style, local_style, pforeColor, pforeColorSelected, pbackColor, pbackColorSelected, selected, rc, sel_clip, offset, cursorValid);
 +                                      bool mustClear = (selected && pbackColorSelected) || (!selected && pbackColor);
 +                                      clearRegion(painter, style, local_style, pforeColor, pforeColorSelected, pbackColor, pbackColorSelected, selected, rc, sel_clip, offset, cursorValid, mustClear);
                                }
  
                                // border
@@@ -967,6 -962,9 +967,9 @@@
                                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");
@@@ -1031,8 -1029,7 +1034,8 @@@
  
                                {
                                        gRegion rc(rect);
 -                                      clearRegion(painter, style, local_style, ePyObject(), ePyObject(), pbackColor, pbackColorSelected, selected, rc, sel_clip, offset, cursorValid);
 +                                      bool mustClear = (selected && pbackColorSelected) || (!selected && pbackColor);
 +                                      clearRegion(painter, style, local_style, ePyObject(), ePyObject(), pbackColor, pbackColorSelected, selected, rc, sel_clip, offset, cursorValid, mustClear);
                                }
  
                                painter.blit(pixmap, rect.topLeft(), rect, (type == TYPE_PIXMAP_ALPHATEST) ? gPainter::BT_ALPHATEST : (type == TYPE_PIXMAP_ALPHABLEND) ? gPainter::BT_ALPHABLEND : 0);