X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/ba1d94b0fcdf6a9766160794a6d8605ee359529a..cd038ce28d53719a27e7009365dd74fec19357df:/lib/service/listboxservice.cpp diff --git a/lib/service/listboxservice.cpp b/lib/service/listboxservice.cpp index f413f2e2..035658ee 100644 --- a/lib/service/listboxservice.cpp +++ b/lib/service/listboxservice.cpp @@ -1,5 +1,8 @@ #include #include +#include +#include +#include void eListboxServiceContent::setRoot(const eServiceReference &root) { @@ -22,6 +25,18 @@ void eListboxServiceContent::setRoot(const eServiceReference &root) m_listbox->entryReset(); } +void eListboxServiceContent::setCurrent(const eServiceReference &ref) +{ + int index=0; + for (list::iterator i(m_list.begin()); i != m_list.end(); ++i, ++index) + if ( *i == ref ) + { + m_cursor = i; + m_cursor_number = index; + break; + } +} + void eListboxServiceContent::getCurrent(eServiceReference &ref) { if (cursorValid()) @@ -30,6 +45,33 @@ void eListboxServiceContent::getCurrent(eServiceReference &ref) ref = eServiceReference(); } +int eListboxServiceContent::getNextBeginningWithChar(char c) +{ +// printf("Char: %c\n", c); + int index=0; + for (list::iterator i(m_list.begin()); i != m_list.end(); ++i, ++index) + { + std::string text; + ePtr service_info; + m_service_center->info(*i, service_info); + service_info->getName(*i, text); +// printf("%c\n", text.c_str()[0]); + int idx=0; + int len=text.length(); + while ( idx <= len ) + { + char cc = text[idx++]; + if ( cc >= 33 && cc < 127) + { + if (cc == c) + return index; + break; + } + } + } + return 0; +} + void eListboxServiceContent::initMarked() { m_marked.clear(); @@ -111,8 +153,8 @@ void eListboxServiceContent::setElementFont(int element, gFont *font) void eListboxServiceContent::sort() { ePtr lst; - if (!m_service_center->list(m_root, lst)) - { + if (!m_service_center->list(m_root, lst)) + { m_list.sort(iListableServiceCompare(lst)); /* FIXME: is this really required or can we somehow keep the current entry? */ cursorHome(); @@ -124,7 +166,7 @@ void eListboxServiceContent::sort() DEFINE_REF(eListboxServiceContent); eListboxServiceContent::eListboxServiceContent() - :m_visual_mode(visModeSimple), m_size(0), m_current_marked(false), m_swap(m_list.end()) + :m_visual_mode(visModeSimple), m_size(0), m_current_marked(false), m_numberoffset(0) { cursorHome(); eServiceCenter::getInstance(m_service_center); @@ -132,21 +174,44 @@ eListboxServiceContent::eListboxServiceContent() void eListboxServiceContent::cursorHome() { - list::iterator old = m_cursor; - - m_cursor = m_list.begin(); - m_cursor_number = 0; - - if ( m_current_marked && m_saved_cursor == m_list.end() ) - std::iter_swap( old, m_cursor ); + if (m_current_marked && m_saved_cursor == m_list.end()) + { + while (m_cursor_number) + { + std::iter_swap(m_cursor--, m_cursor); + --m_cursor_number; + if (m_listbox && m_cursor_number) + m_listbox->entryChanged(m_cursor_number); + } + } + else + { + m_cursor = m_list.begin(); + m_cursor_number = 0; + } } void eListboxServiceContent::cursorEnd() { - if ( m_current_marked && m_saved_cursor == m_list.end() && m_cursor != m_list.end() ) - m_swap = m_cursor; - m_cursor = m_list.end(); - m_cursor_number = m_size; + if (m_current_marked && m_saved_cursor == m_list.end()) + { + while (m_cursor != m_list.end()) + { + list::iterator prev = m_cursor++; + ++m_cursor_number; + if ( prev != m_list.end() && m_cursor != m_list.end() ) + { + std::iter_swap(m_cursor, prev); + if ( m_listbox ) + m_listbox->entryChanged(m_cursor_number); + } + } + } + else + { + m_cursor = m_list.end(); + m_cursor_number = m_size; + } } int eListboxServiceContent::setCurrentMarked(bool state) @@ -155,46 +220,73 @@ int eListboxServiceContent::setCurrentMarked(bool state) m_current_marked = state; if (state != prev && m_listbox) + { m_listbox->entryChanged(m_cursor_number); + if (!state) + { + ePtr lst; + if (m_service_center->list(m_root, lst)) + eDebug("no list available!"); + else + { + ePtr list; + if (lst->startEdit(list)) + eDebug("no editable list"); + else + { + eServiceReference ref; + getCurrent(ref); + if(!ref) + eDebug("no valid service selected"); + else + { + int pos = cursorGet(); + eDebugNoNewLine("move %s to %d ", ref.toString().c_str(), pos); + if (list->moveService(ref, cursorGet())) + eDebug("failed"); + else + eDebug("ok"); + } + } + } + } + } return 0; } int eListboxServiceContent::cursorMove(int count) { - list::iterator old = m_cursor; - + int prev = m_cursor_number, last = m_cursor_number + count; if (count > 0) { - while(count && (m_cursor != m_list.end())) + while(count && m_cursor != m_list.end()) { - ++m_cursor; + list::iterator prev_it = m_cursor++; + if ( m_current_marked && m_cursor != m_list.end() && m_saved_cursor == m_list.end() ) + { + std::iter_swap(prev_it, m_cursor); + if ( m_listbox && prev != m_cursor_number && last != m_cursor_number ) + m_listbox->entryChanged(m_cursor_number); + } ++m_cursor_number; --count; - } + } } else if (count < 0) { - while (count && (m_cursor != m_list.begin())) + while (count && m_cursor != m_list.begin()) { - --m_cursor; + list::iterator prev_it = m_cursor--; + if ( m_current_marked && m_cursor != m_list.end() && prev_it != m_list.end() && m_saved_cursor == m_list.end() ) + { + std::iter_swap(prev_it, m_cursor); + if ( m_listbox && prev != m_cursor_number && last != m_cursor_number ) + m_listbox->entryChanged(m_cursor_number); + } --m_cursor_number; ++count; } } - - if ( m_current_marked && m_saved_cursor == m_list.end() ) - { - if ( m_cursor == m_list.end() ) - m_swap = old; - else if ( old == m_list.end() ) - { - std::iter_swap( m_swap, m_cursor ); - m_swap = m_list.end(); - } - else - std::iter_swap( old, m_cursor ); - } - return 0; } @@ -207,7 +299,6 @@ int eListboxServiceContent::cursorSet(int n) { cursorHome(); cursorMove(n); - return 0; } @@ -257,43 +348,83 @@ void eListboxServiceContent::paint(gPainter &painter, eWindowStyle &style, const /* get service information */ ePtr service_info; m_service_center->info(*m_cursor, service_info); - + + if (m_is_playable_ignore.valid() && !service_info->isPlayable(*m_cursor, m_is_playable_ignore)) + painter.setForegroundColor(gRGB(0xbbbbbb)); + for (int e = 0; e < celElements; ++e) { if (!m_element_font[e]) continue; - painter.setFont(m_element_font[e]); - + int flags=gPainter::RT_VALIGN_CENTER; + + eRect area = m_element_position[e]; + std::string text = ""; - + switch (e) { + case celIcon: + // render icon here... + continue; + case celServiceNumber: + { + char bla[10]; + sprintf(bla, "%d", m_numberoffset + m_cursor_number + 1); + text = bla; + flags|=gPainter::RT_HALIGN_RIGHT; + break; + } case celServiceName: { if (service_info) service_info->getName(*m_cursor, text); break; } - case celServiceNumber: + case celServiceInfo: { - char bla[10]; - sprintf(bla, "%d", m_cursor_number + 1); - text = bla; + ePtr evt; + if ( !service_info->getEvent(*m_cursor, evt) ) + text = '(' + evt->getEventName() + ')'; + else + continue; break; } - case celServiceInfo: + } + + eTextPara *para = new eTextPara(area); + + para->setFont(m_element_font[e]); + para->renderString(text); + + if (e == celServiceName) { - text = "now&next"; - break; + eRect bbox = para->getBoundBox(); + int name_width = bbox.width()+10; + m_element_position[celServiceInfo].setLeft(area.left()+name_width); + m_element_position[celServiceInfo].setTop(area.top()); + m_element_position[celServiceInfo].setWidth(area.width()-name_width); + m_element_position[celServiceInfo].setHeight(area.height()); } - case celIcon: - continue; + + if (flags & gPainter::RT_HALIGN_RIGHT) + para->realign(eTextPara::dirRight); + else if (flags & gPainter::RT_HALIGN_CENTER) + para->realign(eTextPara::dirCenter); + else if (flags & gPainter::RT_HALIGN_BLOCK) + para->realign(eTextPara::dirBlock); + + ePoint offs = offset; + + if (flags & gPainter::RT_VALIGN_CENTER) + { + eRect bbox = para->getBoundBox(); + int vcentered_top = (area.height() - bbox.height()) / 2; + int correction = vcentered_top - bbox.top(); + offs += ePoint(0, correction); } - - eRect area = m_element_position[e]; - area.moveBy(offset.x(), offset.y()); - - painter.renderText(area, text); + + painter.renderPara(para, offs); } if (selected) @@ -303,3 +434,7 @@ void eListboxServiceContent::paint(gPainter &painter, eWindowStyle &style, const painter.clippop(); } +void eListboxServiceContent::setIgnoreService( const eServiceReference &service ) +{ + m_is_playable_ignore=service; +}