X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/9ef4b143f371d6b1b38a3abebcf38b336e03a583..8d1f62f6525ccfdbcb83c64f701dbbc325c37dbd:/lib/gui/elistboxcontent.cpp diff --git a/lib/gui/elistboxcontent.cpp b/lib/gui/elistboxcontent.cpp index ae66e40a..fdb270f8 100644 --- a/lib/gui/elistboxcontent.cpp +++ b/lib/gui/elistboxcontent.cpp @@ -39,214 +39,9 @@ void iListboxContent::setListbox(eListbox *lb) m_listbox = lb; } -DEFINE_REF(eListboxTestContent); - -void eListboxTestContent::cursorHome() -{ - m_cursor = 0; -} - -void eListboxTestContent::cursorEnd() -{ - m_cursor = size(); -} - -int eListboxTestContent::cursorMove(int count) -{ - m_cursor += count; - - if (m_cursor < 0) - cursorHome(); - else if (m_cursor > size()) - cursorEnd(); - return 0; -} - -int eListboxTestContent::cursorValid() -{ - return m_cursor < size(); -} - -int eListboxTestContent::cursorSet(int n) -{ - m_cursor = n; - - if (m_cursor < 0) - cursorHome(); - else if (m_cursor > size()) - cursorEnd(); - return 0; -} - -int eListboxTestContent::cursorGet() -{ - return m_cursor; -} - -void eListboxTestContent::cursorSave() -{ - m_saved_cursor = m_cursor; -} - -void eListboxTestContent::cursorRestore() -{ - m_cursor = m_saved_cursor; -} - -int eListboxTestContent::size() -{ - return 10; -} - -RESULT eListboxTestContent::connectItemChanged(const Slot0 &itemChanged, ePtr &connection) -{ - return 0; -} - -void eListboxTestContent::setSize(const eSize &size) -{ - m_size = size; -} - -void eListboxTestContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected) -{ - ePtr fnt = new gFont("Regular", 20); - painter.clip(eRect(offset, m_size)); - style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal); - painter.clear(); - - if (cursorValid()) - { - painter.setFont(fnt); - char string[10]; - sprintf(string, "%d.)", m_cursor); - - ePoint text_offset = offset + (selected ? ePoint(2, 2) : ePoint(1, 1)); - - painter.renderText(eRect(text_offset, m_size), string); - - if (selected) - style.drawFrame(painter, eRect(offset, m_size), eWindowStyle::frameListboxEntry); - } - - painter.clippop(); -} - -////////////////////////////////////// - -DEFINE_REF(eListboxStringContent); - -eListboxStringContent::eListboxStringContent() -{ - m_size = 0; - cursorHome(); -} - -void eListboxStringContent::cursorHome() -{ - m_cursor = m_list.begin(); - m_cursor_number = 0; -} - -void eListboxStringContent::cursorEnd() -{ - m_cursor = m_list.end(); - m_cursor_number = m_size; -} - -int eListboxStringContent::cursorMove(int count) -{ - if (count > 0) - { - while (count && (m_cursor != m_list.end())) - { - ++m_cursor; - ++m_cursor_number; - --count; - } - } else if (count < 0) - { - while (count && (m_cursor != m_list.begin())) - { - --m_cursor; - --m_cursor_number; - ++count; - } - } - - return 0; -} - -int eListboxStringContent::cursorValid() -{ - return m_cursor != m_list.end(); -} - -int eListboxStringContent::cursorSet(int n) -{ - cursorHome(); - cursorMove(n); - - return 0; -} - -int eListboxStringContent::cursorGet() -{ - return m_cursor_number; -} - -void eListboxStringContent::cursorSave() -{ - m_saved_cursor = m_cursor; - m_saved_cursor_number = m_cursor_number; -} - -void eListboxStringContent::cursorRestore() -{ - m_cursor = m_saved_cursor; - m_cursor_number = m_saved_cursor_number; -} - -int eListboxStringContent::size() -{ - return m_size; -} - -void eListboxStringContent::setSize(const eSize &size) -{ - m_itemsize = size; -} - -void eListboxStringContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected) -{ - ePtr fnt = new gFont("Regular", 20); - painter.clip(eRect(offset, m_itemsize)); - style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal); - painter.clear(); - - eDebug("item %d", m_cursor_number); - if (cursorValid()) - { - eDebug("is valid.."); - painter.setFont(fnt); - - ePoint text_offset = offset + (selected ? ePoint(2, 2) : ePoint(1, 1)); - - painter.renderText(eRect(text_offset, m_itemsize), *m_cursor); - - if (selected) - style.drawFrame(painter, eRect(offset, m_itemsize), eWindowStyle::frameListboxEntry); - } - - painter.clippop(); -} - -void eListboxStringContent::setList(std::list &list) +int iListboxContent::currentCursorSelectable() { - m_list = list; - m_size = list.size(); - cursorHome(); - m_listbox->entryReset(false); + return 1; } ////////////////////////////////////// @@ -305,6 +100,20 @@ int eListboxPythonStringContent::cursorGet() return m_cursor; } +int eListboxPythonStringContent::currentCursorSelectable() +{ + if (m_list && cursorValid()) + { + PyObject *item = PyList_GET_ITEM(m_list, m_cursor); + if (PyTuple_Check(item)) + item = PyTuple_GET_ITEM(item, 0); + + if (item != Py_None) + return 1; + } + return 0; +} + void eListboxPythonStringContent::cursorSave() { m_saved_cursor = m_cursor; @@ -343,11 +152,17 @@ void eListboxPythonStringContent::paint(gPainter &painter, eWindowStyle &style, if (PyTuple_Check(item)) item = PyTuple_GET_ITEM(item, 0); - const char *string = PyString_Check(item) ? PyString_AsString(item) : ""; - - ePoint text_offset = offset + (selected ? ePoint(2, 2) : ePoint(1, 1)); - - painter.renderText(eRect(text_offset, m_itemsize), string); + if (item == Py_None) + { + int half_height = m_itemsize.height() / 2; + + painter.fill(eRect(offset.x() + half_height, offset.y() + half_height - 2, m_itemsize.width() - m_itemsize.height(), 4)); + } else + { + const char *string = PyString_Check(item) ? PyString_AsString(item) : ""; + ePoint text_offset = offset + (selected ? ePoint(2, 2) : ePoint(1, 1)); + painter.renderText(eRect(text_offset, m_itemsize), string); + } if (selected) style.drawFrame(painter, eRect(offset, m_itemsize), eWindowStyle::frameListboxEntry); @@ -374,10 +189,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 +240,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) : ""; 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 +282,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) : ""; 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 +312,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) : ""; - - ePtr para = new eTextPara(eRect(offset + eSize(m_seperation, 0), item_right)); + int xoffs = value_alignment_left ? 0 : m_seperation; + ePtr 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 +335,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); @@ -540,6 +365,11 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style, painter.clippop(); } +int eListboxPythonConfigContent::currentCursorSelectable() +{ + return eListboxPythonStringContent::currentCursorSelectable(); +} + ////////////////////////////////////// /* todo: make a real infrastructure here! */ @@ -706,6 +536,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 +560,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; @@ -748,6 +579,11 @@ error_out: painter.clippop(); } +int eListboxPythonMultiContent::currentCursorSelectable() +{ + return eListboxPythonStringContent::currentCursorSelectable(); +} + void eListboxPythonMultiContent::setFont(int fnt, gFont *font) { if (font)