add onShown eventlist for executing stuff after the screen is drawn

[enigma2.git] / lib / service / listboxservice.cpp

diff --git a/lib/service/listboxservice.cpp b/lib/service/listboxservice.cpp
index 0783872230ed6b5e54fb91279062fd2642e65762..fe6906080dd466d3babbbd084d214e820bdf146d 100644 (file)
--- a/lib/service/listboxservice.cpp
+++ b/lib/service/listboxservice.cpp
@@ -22,6 +22,18 @@ void eListboxServiceContent::setRoot(const eServiceReference &root)
                m_listbox->entryReset();
 }
 
                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())
 void eListboxServiceContent::getCurrent(eServiceReference &ref)
 {
        if (cursorValid())


@@ -87,7 +99,7 @@ void eListboxServiceContent::setVisualMode(int mode)
        if (m_visual_mode == visModeSimple)
        {
                m_element_position[celServiceName] = eRect(ePoint(0, 0), m_itemsize);
        if (m_visual_mode == visModeSimple)
        {
                m_element_position[celServiceName] = eRect(ePoint(0, 0), m_itemsize);

-               m_element_font[celServiceName] = new gFont("Arial", 14);
+               m_element_font[celServiceName] = new gFont("Arial", 23);

                m_element_position[celServiceNumber] = eRect();
                m_element_font[celServiceNumber] = 0;
                m_element_position[celIcon] = eRect();
                m_element_position[celServiceNumber] = eRect();
                m_element_font[celServiceNumber] = 0;
                m_element_position[celIcon] = eRect();


@@ -108,48 +120,143 @@ void eListboxServiceContent::setElementFont(int element, gFont *font)
                m_element_font[element] = font;
 }
 
                m_element_font[element] = font;
 }
 

+void eListboxServiceContent::sort()
+{
+       ePtr<iListableService> 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();
+               if (m_listbox)
+                       m_listbox->entryReset();
+       }
+}
+

 DEFINE_REF(eListboxServiceContent);
 
 eListboxServiceContent::eListboxServiceContent()
 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;

        cursorHome();
        eServiceCenter::getInstance(m_service_center);
 }
 
 void eListboxServiceContent::cursorHome()
 {
        cursorHome();
        eServiceCenter::getInstance(m_service_center);
 }
 
 void eListboxServiceContent::cursorHome()
 {

-       m_cursor = m_list.begin();
-       m_cursor_number = 0;
+       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()
 {
 }
 
 void eListboxServiceContent::cursorEnd()
 {

-       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)
+{
+       bool prev = m_current_marked;
+       m_current_marked = state;
+
+       if (state != prev && 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
+                       {
+                               ePtr<iMutableServiceList> 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)
 {
 }
 
 int eListboxServiceContent::cursorMove(int count)
 {

+       int prev = m_cursor_number, last = m_cursor_number + count;

        if (count > 0)
        {
        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;
                        ++m_cursor_number;
                        --count;

-               }
+       }

        } else if (count < 0)
        {
        } 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;
                }
        }
                        --m_cursor_number;
                        ++count;
                }
        }

-       

        return 0;
 }
 
        return 0;
 }
 


@@ -181,6 +288,7 @@ void eListboxServiceContent::cursorRestore()
 {
        m_cursor = m_saved_cursor;
        m_cursor_number = m_saved_cursor_number;
 {
        m_cursor = m_saved_cursor;
        m_cursor_number = m_saved_cursor_number;

+       m_saved_cursor = m_list.end();

 }
 
 int eListboxServiceContent::size()
 }
 
 int eListboxServiceContent::size()


@@ -197,7 +305,10 @@ void eListboxServiceContent::setSize(const eSize &size)
 void eListboxServiceContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected)
 {
        painter.clip(eRect(offset, m_itemsize));
 void eListboxServiceContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected)
 {
        painter.clip(eRect(offset, m_itemsize));

-       if (cursorValid() && isMarked(*m_cursor))
+
+       if (m_current_marked && selected)
+               style.setStyle(painter, eWindowStyle::styleListboxMarked);
+       else if (cursorValid() && isMarked(*m_cursor))

                style.setStyle(painter, eWindowStyle::styleListboxMarked);
        else
                style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal);
                style.setStyle(painter, eWindowStyle::styleListboxMarked);
        else
                style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal);


@@ -228,7 +339,7 @@ void eListboxServiceContent::paint(gPainter &painter, eWindowStyle &style, const
                        case celServiceNumber:
                        {
                                char bla[10];
                        case celServiceNumber:
                        {
                                char bla[10];

-                               sprintf(bla, "%d", m_cursor_number + 1);
+                               sprintf(bla, "%d", m_numberoffset + m_cursor_number + 1);

                                text = bla;
                                break;
                        }
                                text = bla;
                                break;
                        }