new fontsize in servicelist

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

diff --git a/lib/service/listboxservice.cpp b/lib/service/listboxservice.cpp
index 24090f73dcbb1b71896d7b8e4ddbd02cd1e4b2d8..f413f2e25323eae4b0b5a0c3f526c714fa8789ab 100644 (file)
--- a/lib/service/listboxservice.cpp
+++ b/lib/service/listboxservice.cpp
@@ -80,32 +80,93 @@ int eListboxServiceContent::lookupService(const eServiceReference &ref)
        return index;
 }
 
+void eListboxServiceContent::setVisualMode(int mode)
+{
+       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("Arial", 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;
+       }
+}
+
+void eListboxServiceContent::setElementPosition(int element, eRect where)
+{
+       if ((element >= 0) && (element < celElements))
+               m_element_position[element] = where;
+}
+
+void eListboxServiceContent::setElementFont(int element, gFont *font)
+{
+       if ((element >= 0) && (element < celElements))
+               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()
+       :m_visual_mode(visModeSimple), m_size(0), m_current_marked(false), m_swap(m_list.end())
 {
-       m_size = 0;
        cursorHome();
        eServiceCenter::getInstance(m_service_center);
 }
 
 void eListboxServiceContent::cursorHome()
 {
+       list::iterator old = m_cursor;
+
        m_cursor = m_list.begin();
        m_cursor_number = 0;
+
+       if ( m_current_marked && m_saved_cursor == m_list.end() )
+               std::iter_swap( old, m_cursor );
 }
 
 void eListboxServiceContent::cursorEnd()
 {
+       if ( m_current_marked && m_saved_cursor == m_list.end() && m_cursor != m_list.end() )
+               m_swap = m_cursor;
        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);
+
+       return 0;
+}
+
 int eListboxServiceContent::cursorMove(int count)
 {
+       list::iterator old = m_cursor;
+
        if (count > 0)
        {
-               while (count && (m_cursor != m_list.end()))
+               while(count && (m_cursor != m_list.end()))
                {
                        ++m_cursor;
                        ++m_cursor_number;
@@ -120,7 +181,20 @@ int eListboxServiceContent::cursorMove(int count)
                        ++count;
                }
        }
-       
+
+       if ( m_current_marked && m_saved_cursor == m_list.end() )
+       {
+               if ( m_cursor == m_list.end() )
+                       m_swap = old;
+               else if ( old == m_list.end() )
+               {
+                       std::iter_swap( m_swap, m_cursor );
+                       m_swap = m_list.end();
+               }
+               else
+                       std::iter_swap( old, m_cursor );
+       }
+
        return 0;
 }
 
@@ -152,6 +226,7 @@ void eListboxServiceContent::cursorRestore()
 {
        m_cursor = m_saved_cursor;
        m_cursor_number = m_saved_cursor_number;
+       m_saved_cursor = m_list.end();
 }
 
 int eListboxServiceContent::size()
@@ -162,13 +237,16 @@ int eListboxServiceContent::size()
 void eListboxServiceContent::setSize(const eSize &size)
 {
        m_itemsize = size;
+       setVisualMode(m_visual_mode);
 }
 
 void eListboxServiceContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected)
 {
-       ePtr<gFont> fnt = new gFont("Arial", 14);
        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);
@@ -176,19 +254,47 @@ void eListboxServiceContent::paint(gPainter &painter, eWindowStyle &style, const
        
        if (cursorValid())
        {
-               painter.setFont(fnt);
-               
-               ePoint text_offset = offset + (selected ? ePoint(2, 2) : ePoint(1, 1));
-               
-                       /* get name of service */
+                       /* get service information */
                ePtr<iStaticServiceInformation> service_info;
                m_service_center->info(*m_cursor, service_info);
-               std::string name = "<n/a>";
-               
-               if (service_info)
-                       service_info->getName(*m_cursor, name);
                
-               painter.renderText(eRect(text_offset, m_itemsize), name);
+               for (int e = 0; e < celElements; ++e)
+               {
+                       if (!m_element_font[e])
+                               continue;
+                       painter.setFont(m_element_font[e]);
+                       
+                       std::string text = "<n/a>";
+                       
+                       switch (e)
+                       {
+                       case celServiceName:
+                       {
+                               if (service_info)
+                                       service_info->getName(*m_cursor, text);
+                               break;
+                       }
+                       case celServiceNumber:
+                       {
+                               char bla[10];
+                               sprintf(bla, "%d", m_cursor_number + 1);
+                               text = bla;
+                               break;
+                       }
+                       case celServiceInfo:
+                       {
+                               text = "now&next";
+                               break;
+                       }
+                       case celIcon:
+                               continue;
+                       }
+                       
+                       eRect area = m_element_position[e];
+                       area.moveBy(offset.x(), offset.y());
+                       
+                       painter.renderText(area, text);
+               }
                
                if (selected)
                        style.drawFrame(painter, eRect(offset, m_itemsize), eWindowStyle::frameListboxEntry);