void eListboxServiceContent::addService(const eServiceReference &service, bool beforeCurrent)
{
if (beforeCurrent && m_size)
- {
m_list.insert(m_cursor, service);
- ++m_size;
- --m_cursor;
- }
else
m_list.push_back(service);
+ ++m_size;
+ ++m_cursor_number;
+ if (m_listbox)
+ m_listbox->entryAdded(m_cursor_number-1);
}
void eListboxServiceContent::removeCurrent()
{
if (m_size && m_listbox)
{
+ --m_size;
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);
+ m_listbox->entryRemoved(m_cursor_number+1);
}
}
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();
}
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)
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!");
}
}
/* 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 && 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
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())
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;
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);
- }
+ eFatal("unknown service type in listboxservice");
area.moveBy(offset);
painter.clip(area);