X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/5cb2d3d4e46a40693cee0173425f8bc2ade2f09b..d04e6435efecf42a192a4f6c71dca9a1a053d5fb:/lib/service/listboxservice.cpp diff --git a/lib/service/listboxservice.cpp b/lib/service/listboxservice.cpp index d87e3155..cc8c32b5 100644 --- a/lib/service/listboxservice.cpp +++ b/lib/service/listboxservice.cpp @@ -11,25 +11,40 @@ void eListboxServiceContent::addService(const eServiceReference &service, bool b m_list.insert(m_cursor, service); else m_list.push_back(service); - ++m_size; - ++m_cursor_number; - if (m_listbox) - m_listbox->entryAdded(m_cursor_number-1); + if (m_size++) + { + ++m_cursor_number; + if (m_listbox) + m_listbox->entryAdded(m_cursor_number-1); + } + else + { + m_cursor = m_list.begin(); + m_cursor_number=0; + m_listbox->entryAdded(0); + } } void eListboxServiceContent::removeCurrent() { if (m_size && m_listbox) { - --m_size; - if (m_cursor_number == m_size-1) + if (m_cursor_number == --m_size) { m_list.erase(m_cursor--); - --m_cursor_number; + if (m_size) + { + --m_cursor_number; + m_listbox->entryRemoved(m_cursor_number+1); + } + else + m_listbox->entryRemoved(m_cursor_number); } else + { m_list.erase(m_cursor++); - m_listbox->entryRemoved(m_cursor_number+1); + m_listbox->entryRemoved(m_cursor_number); + } } } @@ -52,7 +67,7 @@ void eListboxServiceContent::setRoot(const eServiceReference &root, bool justSet m_lst=0; return; } - assert(m_service_center); + ASSERT(m_service_center); if (m_service_center->list(m_root, m_lst)) eDebug("no list available!"); @@ -245,12 +260,22 @@ void eListboxServiceContent::sort() DEFINE_REF(eListboxServiceContent); eListboxServiceContent::eListboxServiceContent() - :m_visual_mode(visModeSimple), m_size(0), m_current_marked(false), m_numberoffset(0) + :m_visual_mode(visModeSimple), m_size(0), m_current_marked(false), m_numberoffset(0), m_itemheight(25) { + memset(m_color_set, 0, sizeof(m_color_set)); cursorHome(); eServiceCenter::getInstance(m_service_center); } +void eListboxServiceContent::setColor(int color, gRGB &col) +{ + if ((color >= 0) && (color < colorElements)) + { + m_color_set[color] = true; + m_color[color] = col; + } +} + void eListboxServiceContent::cursorHome() { if (m_current_marked && m_saved_cursor == m_list.end()) @@ -421,26 +446,106 @@ void eListboxServiceContent::paint(gPainter &painter, eWindowStyle &style, const { painter.clip(eRect(offset, m_itemsize)); + int marked = 0; + if (m_current_marked && selected) - style.setStyle(painter, eWindowStyle::styleListboxMarked); + marked = 2; else if (cursorValid() && isMarked(*m_cursor)) - style.setStyle(painter, selected ? eWindowStyle::styleListboxMarkedAndSelected : eWindowStyle::styleListboxMarked); + { + if (selected) + marked = 2; + else + marked = 1; + } else style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal); - painter.clear(); - + + eListboxStyle *local_style = 0; + + /* get local listbox style, if present */ + if (m_listbox) + local_style = m_listbox->getLocalStyle(); + + if (marked == 1) // marked + { + style.setStyle(painter, eWindowStyle::styleListboxMarked); + if (m_color_set[markedForeground]) + painter.setForegroundColor(m_color[markedForeground]); + if (m_color_set[markedBackground]) + painter.setBackgroundColor(m_color[markedBackground]); + } + else if (marked == 2) // marked and selected + { + style.setStyle(painter, eWindowStyle::styleListboxMarkedAndSelected); + if (m_color_set[markedForegroundSelected]) + painter.setForegroundColor(m_color[markedForegroundSelected]); + if (m_color_set[markedBackgroundSelected]) + painter.setBackgroundColor(m_color[markedBackgroundSelected]); + } + else if (local_style) + { + if (selected) + { + /* if we have a local background color set, use that. */ + if (local_style->m_background_color_selected_set) + painter.setBackgroundColor(local_style->m_background_color_selected); + /* same for foreground */ + if (local_style->m_foreground_color_selected_set) + painter.setForegroundColor(local_style->m_foreground_color_selected); + } + else + { + /* if we have a local background color set, use that. */ + if (local_style->m_background_color_set) + painter.setBackgroundColor(local_style->m_background_color); + /* same for foreground */ + if (local_style->m_foreground_color_set) + painter.setForegroundColor(local_style->m_foreground_color); + } + } + + if (!local_style || !local_style->m_transparent_background) + /* if we have no transparent background */ + { + /* blit background picture, if available (otherwise, clear only) */ + if (local_style && local_style->m_background) + painter.blit(local_style->m_background, offset, eRect(), 0); + else + painter.clear(); + } else + { + if (local_style->m_background) + painter.blit(local_style->m_background, offset, eRect(), gPainter::BT_ALPHATEST); + else if (selected && !local_style->m_selection) + painter.clear(); + } + if (cursorValid()) { /* get service information */ ePtr service_info; m_service_center->info(*m_cursor, service_info); eServiceReference ref = *m_cursor; - bool isPlayable = !(ref.flags & eServiceReference::isDirectory || ref.flags & eServiceReference::isMarker); + bool isMarker = ref.flags & eServiceReference::isMarker; + bool isPlayable = !(ref.flags & eServiceReference::isDirectory || isMarker); + bool paintProgress = false; + ePtr evt; - if (isPlayable && m_is_playable_ignore.valid() && service_info && !service_info->isPlayable(*m_cursor, m_is_playable_ignore)) - painter.setForegroundColor(gRGB(0xbbbbbb)); + bool serviceAvail = true; - int xoffset=0; // used as offset when painting the folder/marker symbol + if (!marked && isPlayable && service_info && m_is_playable_ignore.valid() && !service_info->isPlayable(*m_cursor, m_is_playable_ignore)) + { + if (m_color_set[serviceNotAvail]) + painter.setForegroundColor(m_color[serviceNotAvail]); + else + painter.setForegroundColor(gRGB(0xbbbbbb)); + serviceAvail = false; + } + + if (selected && local_style && local_style->m_selection) + painter.blit(local_style->m_selection, offset, eRect(), gPainter::BT_ALPHATEST); + + int xoffset=0; // used as offset when painting the folder/marker symbol or the serviceevent progress for (int e = 0; e < celElements; ++e) { @@ -484,13 +589,19 @@ void eListboxServiceContent::paint(gPainter &painter, eWindowStyle &style, const } case celServiceInfo: { - ePtr evt; - if ( service_info && !service_info->getEvent(*m_cursor, evt) ) + if ( isPlayable && !service_info->getEvent(*m_cursor, evt) ) { std::string name = evt->getEventName(); if (!name.length()) continue; text = '(' + evt->getEventName() + ')'; + if (serviceAvail) + { + if (!selected && m_color_set[serviceDescriptionColor]) + painter.setForegroundColor(m_color[serviceDescriptionColor]); + else if (selected && m_color_set[serviceDescriptionColorSelected]) + painter.setForegroundColor(m_color[serviceDescriptionColorSelected]); + } } else continue; @@ -509,9 +620,9 @@ void eListboxServiceContent::paint(gPainter &painter, eWindowStyle &style, const { eRect bbox = para->getBoundBox(); int name_width = bbox.width()+8; - m_element_position[celServiceInfo].setLeft(area.left()+name_width); + m_element_position[celServiceInfo].setLeft(area.left()+name_width+xoffs); m_element_position[celServiceInfo].setTop(area.top()); - m_element_position[celServiceInfo].setWidth(area.width()-name_width); + m_element_position[celServiceInfo].setWidth(area.width()-(name_width+xoffs)); m_element_position[celServiceInfo].setHeight(area.height()); } @@ -537,6 +648,7 @@ void eListboxServiceContent::paint(gPainter &painter, eWindowStyle &style, const ePtr &pixmap = (e == celFolderPixmap) ? m_pixmaps[picFolder] : (e == celMarkerPixmap) ? m_pixmaps[picMarker] : + (m_cursor->flags & eServiceReference::isGroup) ? m_pixmaps[picServiceGroup] : (orbpos == 0xFFFF) ? m_pixmaps[picDVB_C] : (orbpos == 0xEEEE) ? m_pixmaps[picDVB_T] : m_pixmaps[picDVB_S]; if (pixmap) @@ -578,16 +690,75 @@ void eListboxServiceContent::paint(gPainter &painter, eWindowStyle &style, const painter.clippop(); } } + else if (e == celServiceEventProgressbar) + { + eRect area = m_element_position[celServiceEventProgressbar]; + if (area.width() > 0 && (isPlayable || isMarker)) + { + // we schedule it to paint it as last element.. so we dont need to reset fore/background color + paintProgress = isPlayable; + xoffset = area.width() + 10; + } + } } - - if (selected) + if (selected && (!local_style || !local_style->m_selection)) style.drawFrame(painter, eRect(offset, m_itemsize), eWindowStyle::frameListboxEntry); + if (paintProgress && evt) + { + eRect area = m_element_position[celServiceEventProgressbar]; + if (!selected && m_color_set[serviceEventProgressbarBorderColor]) + painter.setForegroundColor(m_color[serviceEventProgressbarBorderColor]); + else if (selected && m_color_set[serviceEventProgressbarBorderColorSelected]) + painter.setForegroundColor(m_color[serviceEventProgressbarBorderColorSelected]); + + int border = 1; + int progressH = 6; + int progressX = area.left() + offset.x(); + int progressW = area.width() - 2 * border; + int progressT = offset.y() + (m_itemsize.height() - progressH - 2*border) / 2; + + // paint progressbar frame + painter.fill(eRect(progressX, progressT, area.width(), border)); + painter.fill(eRect(progressX, progressT + border, border, progressH)); + painter.fill(eRect(progressX, progressT + progressH + border, area.width(), border)); + painter.fill(eRect(progressX + area.width() - border, progressT + border, border, progressH)); + + // calculate value + time_t now = time(0); + int value = progressW * (now - evt->getBeginTime()) / evt->getDuration(); + + eRect tmp = eRect(progressX + border, progressT + border, value, progressH); + ePtr &pixmap = m_pixmaps[picServiceEventProgressbar]; + if (pixmap) + { + area.moveBy(offset); + painter.clip(area); + painter.blit(pixmap, ePoint(progressX + border, progressT + border), tmp, gPainter::BT_ALPHATEST); + painter.clippop(); + } + else + { + if (!selected && m_color_set[serviceEventProgressbarColor]) + painter.setForegroundColor(m_color[serviceEventProgressbarColor]); + else if (selected && m_color_set[serviceEventProgressbarColorSelected]) + painter.setForegroundColor(m_color[serviceEventProgressbarColorSelected]); + painter.fill(tmp); + } + } } - painter.clippop(); } void eListboxServiceContent::setIgnoreService( const eServiceReference &service ) { m_is_playable_ignore=service; + if (m_listbox && m_listbox->isVisible()) + m_listbox->invalidate(); +} + +void eListboxServiceContent::setItemHeight(int height) +{ + m_itemheight = height; + if (m_listbox) + m_listbox->setItemHeight(height); }