X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/127c6c59e89dbdf96a93659104efd91428569a06..7caeea037b04c7da1cec7ee2f0eac016db0da689:/lib/service/listboxservice.cpp diff --git a/lib/service/listboxservice.cpp b/lib/service/listboxservice.cpp index c869b49c..2b1c7551 100644 --- a/lib/service/listboxservice.cpp +++ b/lib/service/listboxservice.cpp @@ -5,9 +5,32 @@ #include #include -void eListboxServiceContent::addService(const eServiceReference &service) +void eListboxServiceContent::addService(const eServiceReference &service, bool beforeCurrent) { - m_list.push_back(service); + if (beforeCurrent && m_size) + { + m_list.insert(m_cursor, service); + --m_cursor; + } + else + m_list.push_back(service); + ++m_size; +} + +void eListboxServiceContent::removeCurrent() +{ + if (m_size && m_listbox) + { + if (m_cursor_number == m_size-1) + { + m_list.erase(m_cursor--); + --m_cursor_number; + } + else + m_list.erase(m_cursor++); + --m_size; + m_listbox->entryRemoved(m_cursor_number); + } } void eListboxServiceContent::FillFinished() @@ -25,15 +48,16 @@ void eListboxServiceContent::setRoot(const eServiceReference &root, bool justSet m_root = root; if (justSet) + { + m_lst=0; return; + } assert(m_service_center); - ePtr lst; - if (m_service_center->list(m_root, lst)) + if (m_service_center->list(m_root, m_lst)) eDebug("no list available!"); - else - if (lst->getContent(m_list)) - eDebug("getContent failed"); + else if (m_lst->getContent(m_list)) + eDebug("getContent failed"); FillFinished(); } @@ -87,6 +111,38 @@ int eListboxServiceContent::getNextBeginningWithChar(char c) return 0; } +int eListboxServiceContent::getPrevMarkerPos() +{ + if (!m_listbox) + return 0; + list::iterator i(m_cursor); + int index = m_cursor_number; + while (index) + { + --i; + --index; + if (i->flags & eServiceReference::isMarker) + break; + } + return index; +} + +int eListboxServiceContent::getNextMarkerPos() +{ + if (!m_listbox) + return 0; + list::iterator i(m_cursor); + int index = m_cursor_number; + while (index < (m_size-1)) + { + ++i; + ++index; + if (i->flags & eServiceReference::isMarker) + break; + } + return index; +} + void eListboxServiceContent::initMarked() { m_marked.clear(); @@ -147,7 +203,6 @@ void eListboxServiceContent::setVisualMode(int mode) m_element_font[celServiceName] = new gFont("Regular", 23); m_element_position[celServiceNumber] = eRect(); m_element_font[celServiceNumber] = 0; - m_element_position[celIcon] = eRect(); m_element_position[celServiceInfo] = eRect(); m_element_font[celServiceInfo] = 0; } @@ -165,12 +220,19 @@ void eListboxServiceContent::setElementFont(int element, gFont *font) m_element_font[element] = font; } +void eListboxServiceContent::setPixmap(int type, ePtr &pic) +{ + if ((type >=0) && (type < picElements)) + m_pixmaps[type] = pic; +} + void eListboxServiceContent::sort() { - ePtr lst; - if (!m_service_center->list(m_root, lst)) + if (!m_lst) + m_service_center->list(m_root, m_lst); + if (m_lst) { - m_list.sort(iListableServiceCompare(lst)); + m_list.sort(iListableServiceCompare(m_lst)); /* FIXME: is this really required or can we somehow keep the current entry? */ cursorHome(); if (m_listbox) @@ -244,13 +306,12 @@ int eListboxServiceContent::setCurrentMarked(bool state) m_listbox->entryChanged(m_cursor_number); if (!state) { - ePtr lst; - if (m_service_center->list(m_root, lst)) - eDebug("no list available!"); - else + if (!m_lst) + m_service_center->list(m_root, m_lst); + if (m_lst) { ePtr list; - if (lst->startEdit(list)) + if (m_lst->startEdit(list)) eDebug("no editable list"); else { @@ -269,6 +330,8 @@ int eListboxServiceContent::setCurrentMarked(bool state) } } } + else + eDebug("no list available!"); } } @@ -369,82 +432,145 @@ void eListboxServiceContent::paint(gPainter &painter, eWindowStyle &style, const 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)) + if (m_is_playable_ignore.valid() && service_info && !service_info->isPlayable(*m_cursor, m_is_playable_ignore)) painter.setForegroundColor(gRGB(0xbbbbbb)); + int xoffset=0; // used as offset when painting the folder/marker symbol + for (int e = 0; e < celElements; ++e) { - if (!m_element_font[e]) - continue; - int flags=gPainter::RT_VALIGN_CENTER; - - eRect area = m_element_position[e]; - - std::string text = ""; - - switch (e) + if (m_element_font[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 celServiceInfo: - { - ePtr evt; - if ( !service_info->getEvent(*m_cursor, evt) ) - text = '(' + evt->getEventName() + ')'; - else - continue; - break; - } - } + int flags=gPainter::RT_VALIGN_CENTER, + yoffs = 0, + xoffs = xoffset; + eRect &area = m_element_position[e]; + std::string text = ""; + xoffset=0; + + switch (e) + { + case celServiceNumber: + { + if (m_cursor->flags & eServiceReference::isMarker) + continue; + char bla[10]; + /* how we can do this better? :) */ + int markers_before=0; + { + list::iterator tmp=m_cursor; + while(tmp != m_list.begin()) + { + --tmp; + if (tmp->flags & eServiceReference::isMarker) + ++markers_before; + } + } + sprintf(bla, "%d", m_numberoffset + m_cursor_number + 1 - markers_before); + text = bla; + flags|=gPainter::RT_HALIGN_RIGHT; + break; + } + case celServiceName: + { + if (service_info) + service_info->getName(*m_cursor, text); + break; + } + case celServiceInfo: + { + ePtr evt; + if ( !service_info->getEvent(*m_cursor, evt) ) + { + std::string name = evt->getEventName(); + if (!name.length()) + continue; + text = '(' + evt->getEventName() + ')'; + } + else + continue; + break; + } + } - eTextPara *para = new eTextPara(area); + eRect tmp = area; + tmp.setWidth(tmp.width()-xoffs); - para->setFont(m_element_font[e]); - para->renderString(text); + eTextPara *para = new eTextPara(tmp); + para->setFont(m_element_font[e]); + para->renderString(text.c_str()); - if (e == celServiceName) - { - 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()); - } + if (e == celServiceName) + { + eRect bbox = para->getBoundBox(); + int name_width = bbox.width()+8; + 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()); + } - 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); + 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; + yoffs = vcentered_top - bbox.top(); + } - 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); + painter.renderPara(para, offset+ePoint(xoffs, yoffs)); } + else if (e == celServiceTypePixmap || e == celFolderPixmap || e == celMarkerPixmap) + { + int orbpos = m_cursor->getUnsignedData(4) >> 16; + ePtr &pixmap = + (e == celFolderPixmap) ? m_pixmaps[picFolder] : + (e == celMarkerPixmap) ? m_pixmaps[picMarker] : + (orbpos == 0xFFFF) ? m_pixmaps[picDVB_C] : + (orbpos == 0xEEEE) ? m_pixmaps[picDVB_T] : m_pixmaps[picDVB_S]; + if (pixmap) + { + eSize pixmap_size = pixmap->size(); + int p = celServiceInfo; + if (e == celFolderPixmap) + p = celServiceName; + else if (e == celMarkerPixmap) + p = celServiceNumber; + eRect area = m_element_position[p]; + int correction = (area.height() - pixmap_size.height()) / 2; + + if (m_cursor->flags & eServiceReference::flagDirectory) + { + if (e != celFolderPixmap) + continue; + xoffset = pixmap_size.width() + 8; + } + else if (m_cursor->flags & eServiceReference::isMarker) + { + if (e != celMarkerPixmap) + continue; + } + else + { + if (e != celServiceTypePixmap) + continue; + m_element_position[celServiceInfo] = area; + m_element_position[celServiceInfo].setLeft(area.left() + pixmap_size.width() + 8); + m_element_position[celServiceInfo].setWidth(area.width() - pixmap_size.width() - 8); + } - painter.renderPara(para, offs); + area.moveBy(offset); + painter.clip(area); + painter.blit(pixmap, offset+ePoint(area.left(), correction), area, gPainter::BT_ALPHATEST); + painter.clippop(); + } + } } if (selected)