#include <lib/dvb/pmt.h>
#include <lib/python/connections.h>
-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);
+ else
+ m_list.push_back(service);
+ 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)
+ {
+ if (m_cursor_number == --m_size)
+ {
+ m_list.erase(m_cursor--);
+ 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);
+ }
+ }
}
void eListboxServiceContent::FillFinished()
m_root = root;
if (justSet)
+ {
+ m_lst=0;
return;
+ }
assert(m_service_center);
- ePtr<iListableService> 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();
}
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();
void eListboxServiceContent::setVisualMode(int mode)
{
+ for (int i=0; i < celElements; ++i)
+ {
+ m_element_position[i] = eRect();
+ m_element_font[i] = 0;
+ }
+
m_visual_mode = mode;
-
+
if (m_visual_mode == visModeSimple)
{
m_element_position[celServiceName] = eRect(ePoint(0, 0), m_itemsize);
m_element_font[celServiceName] = new gFont("Regular", 23);
- m_element_position[celServiceNumber] = eRect();
- m_element_font[celServiceNumber] = 0;
- m_element_position[celServiceInfo] = eRect();
- m_element_font[celServiceInfo] = 0;
}
}
void eListboxServiceContent::sort()
{
- ePtr<iListableService> 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)
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)
{
cursorHome();
eServiceCenter::getInstance(m_service_center);
m_listbox->entryChanged(m_cursor_number);
if (!state)
{
- ePtr<iListableService> 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<iMutableServiceList> list;
- if (lst->startEdit(list))
+ if (m_lst->startEdit(list))
eDebug("no editable list");
else
{
}
}
}
+ else
+ eDebug("no list available!");
}
}
void eListboxServiceContent::setSize(const eSize &size)
{
m_itemsize = size;
- setVisualMode(m_visual_mode);
+ if (m_visual_mode == visModeSimple)
+ setVisualMode(m_visual_mode);
}
void eListboxServiceContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected)
/* get service information */
ePtr<iStaticServiceInformation> service_info;
m_service_center->info(*m_cursor, service_info);
+ eServiceReference ref = *m_cursor;
+ bool isPlayable = !(ref.flags & eServiceReference::isDirectory || ref.flags & eServiceReference::isMarker);
- if (m_is_playable_ignore.valid() && service_info && !service_info->isPlayable(*m_cursor, m_is_playable_ignore))
+ if (isPlayable && 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 symbol
+ int xoffset=0; // used as offset when painting the folder/marker symbol
for (int e = 0; e < celElements; ++e)
{
{
case celServiceNumber:
{
+ if (m_cursor->flags & eServiceReference::isMarker)
+ continue;
char bla[10];
- sprintf(bla, "%d", m_numberoffset + m_cursor_number + 1);
+ /* 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 celServiceInfo:
{
ePtr<eServiceEvent> evt;
- if ( !service_info->getEvent(*m_cursor, evt) )
+ if ( service_info && !service_info->getEvent(*m_cursor, evt) )
{
std::string name = evt->getEventName();
if (!name.length())
eTextPara *para = new eTextPara(tmp);
para->setFont(m_element_font[e]);
- para->renderString(text);
+ para->renderString(text.c_str());
if (e == celServiceName)
{
painter.renderPara(para, offset+ePoint(xoffs, yoffs));
}
- else if (e == celServiceTypePixmap || e == celFolderPixmap)
+ else if (e == celServiceTypePixmap || e == celFolderPixmap || e == celMarkerPixmap)
{
int orbpos = m_cursor->getUnsignedData(4) >> 16;
ePtr<gPixmap> &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)
{
eSize pixmap_size = pixmap->size();
- eRect area = m_element_position[e == celFolderPixmap ? celServiceName : celServiceInfo];
+ 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 (isPlayable)
+ {
+ 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);
+ }
+ else if (m_cursor->flags & eServiceReference::isDirectory)
{
if (e != celFolderPixmap)
continue;
xoffset = pixmap_size.width() + 8;
}
- else
+ else if (m_cursor->flags & eServiceReference::isMarker)
{
- if (e != celServiceTypePixmap)
+ if (e != celMarkerPixmap)
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);
}
+ else
+ eFatal("unknown service type in listboxservice");
area.moveBy(offset);
painter.clip(area);
{
m_is_playable_ignore=service;
}
+
+int eListboxServiceContent::setItemHeight(int height)
+{
+ m_itemheight = height;
+ if (m_listbox)
+ m_listbox->setItemHeight(height);
+}
git.cweiske.de / enigma2.git / blobdiff