X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/9a1eb9bbf5d26648c761459ec7019f9c6eae24d7..ee7a4508e2a846ab03bb1885bab4424f04e40519:/lib/gui/elistboxcontent.cpp?ds=sidebyside diff --git a/lib/gui/elistboxcontent.cpp b/lib/gui/elistboxcontent.cpp index d51729d2..1c27f766 100644 --- a/lib/gui/elistboxcontent.cpp +++ b/lib/gui/elistboxcontent.cpp @@ -377,6 +377,12 @@ PyObject *eListboxPythonStringContent::getCurrentSelection() return r; } +void eListboxPythonStringContent::invalidateEntry(int index) +{ + if (m_listbox) + m_listbox->entryChanged(index); +} + ////////////////////////////////////// void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected) @@ -389,43 +395,195 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style, if (m_list && cursorValid()) { + /* get current list item */ PyObject *item = PyList_GetItem(m_list, m_cursor); // borrowed reference! PyObject *text = 0, *value = 0; painter.setFont(fnt); - /* the user can supply tuples, in this case the first one will be displayed. */ + /* the first tuple element is a string for the left side. + the second one will be called, and the result shall be an tuple. + + of this tuple, + the first one is the type (string). + the second one is the value. */ if (PyTuple_Check(item)) { + /* handle left part. get item from tuple, convert to string, display. */ + text = PyTuple_GetItem(item, 0); + text = PyObject_Str(text); + const char *string = (text && PyString_Check(text)) ? PyString_AsString(text) : ""; + 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); + + /* now, handle the value. get 2nd part from tuple*/ value = PyTuple_GetItem(item, 1); + if (value) + /* CallObject will call __call__ which should return the value tuple */ + value = PyObject_CallObject(value, 0); + + /* check if this is really a tuple */ + if (PyTuple_Check(value)) + { + /* convert type to string */ + PyObject *type = PyTuple_GetItem(value, 0); + const char *atype = (type && PyString_Check(type)) ? PyString_AsString(type) : 0; + + if (atype) + { + if (!strcmp(atype, "text")) + { + PyObject *pvalue = PyTuple_GetItem(value, 1); + const char *value = (pvalue && PyString_Check(pvalue)) ? PyString_AsString(pvalue) : ""; + painter.setFont(fnt2); + 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_GetItem(value, 1); + + /* convert value to Long. fallback to -1 on error. */ + int value = (pvalue && PyInt_Check(pvalue)) ? PyInt_AsLong(pvalue) : -1; + + /* calc. slider length */ + int width = item_right.width() * value / 100; + int height = item_right.height(); + + + /* draw slider */ + //painter.fill(eRect(offset.x() + m_seperation, offset.y(), width, height)); + //hack - make it customizable + painter.fill(eRect(offset.x() + m_seperation, offset.y() + 5, width, height-10)); + + /* pvalue is borrowed */ + } + } + Py_XDECREF(type); + } + /* value is borrowed */ } + + if (selected) + style.drawFrame(painter, eRect(offset, m_itemsize), eWindowStyle::frameListboxEntry); + } + + painter.clippop(); +} + +////////////////////////////////////// + +void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected) +{ + painter.clip(eRect(offset, m_itemsize)); + style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal); + painter.clear(); + + if (m_list && cursorValid()) + { + PyObject *items = PyList_GetItem(m_list, m_cursor); // borrowed reference! - text = PyObject_Str(text); - value = PyObject_Str(value); - - const char *string = (text && PyString_Check(text)) ? PyString_AsString(text) : ""; - const char *string_val = (value && PyString_Check(value)) ? PyString_AsString(value) : ""; - - eSize item_left = eSize(m_seperation, m_itemsize.height()); - eSize item_right = eSize(m_itemsize.width() - m_seperation, m_itemsize.height()); + if (!items) + { + eDebug("eListboxPythonMultiContent: error getting item %d", m_cursor); + painter.clippop(); + return; + } - painter.renderText(eRect(offset, item_left), string, gPainter::RT_HALIGN_LEFT); + if (!PyList_Check(items)) + { + eDebug("eListboxPythonMultiContent: list entry %d is not a list", m_cursor); + painter.clippop(); + return; + } - painter.setFont(fnt2); - painter.renderText(eRect(offset + eSize(m_seperation, 0), item_right), string_val, gPainter::RT_HALIGN_RIGHT); + int size = PyList_Size(items); + for (int i = 1; i < size; ++i) + { + PyObject *item = PyList_GetItem(items, i); // borrowed reference! + + if (!item) + { + eDebug("eListboxPythonMultiContent: ?"); + painter.clippop(); + return; + } + + + PyObject *px, *py, *pwidth, *pheight, *pfnt, *pstring, *pflags; - Py_XDECREF(text); - Py_XDECREF(value); + /* + we have a list of tuples: + + (x, y, width, height, fnt, flags, "bla" ), + + */ + + if (!PyTuple_Check(item)) + { + eDebug("eListboxPythonMultiContent did not receive a tuple."); + painter.clippop(); + return; + } - if (selected) - style.drawFrame(painter, eRect(offset, m_itemsize), eWindowStyle::frameListboxEntry); + px = PyTuple_GetItem(item, 0); + py = PyTuple_GetItem(item, 1); + pwidth = PyTuple_GetItem(item, 2); + pheight = PyTuple_GetItem(item, 3); + pfnt = PyTuple_GetItem(item, 4); + pflags = PyTuple_GetItem(item, 5); + pstring = PyTuple_GetItem(item, 6); + + if (!(px && py && pwidth && pheight && pfnt && pstring)) + { + eDebug("eListboxPythonMultiContent received too small tuple (must be (x, y, width, height, fnt, flags, string[, ...])"); + painter.clippop(); + return; + } + + pstring = PyObject_Str(pstring); + + const char *string = (PyString_Check(pstring)) ? PyString_AsString(pstring) : ""; + + int x = PyInt_AsLong(px); + int y = PyInt_AsLong(py); + int width = PyInt_AsLong(pwidth); + int height = PyInt_AsLong(pheight); + int flags = PyInt_AsLong(pflags); + + int fnt = PyInt_AsLong(pfnt); + + if (m_font.find(fnt) == m_font.end()) + { + eDebug("eListboxPythonMultiContent: specified font %d was not found!", fnt); + Py_XDECREF(pstring); + painter.clippop(); + return; + } + + eRect r = eRect(x, y, width, height); + r.moveBy(offset); + + painter.setFont(m_font[fnt]); + + painter.renderText(r, string, flags); + + Py_XDECREF(pstring); + + if (selected) + style.drawFrame(painter, eRect(offset, m_itemsize), eWindowStyle::frameListboxEntry); + } } painter.clippop(); } -void eListboxPythonConfigContent::invalidateEntry(int index) +void eListboxPythonMultiContent::setFont(int fnt, gFont *font) { - m_listbox->entryChanged(index); + if (font) + m_font[fnt] = font; + else + m_font.erase(fnt); } -