listbox: add ability to disable selection highlight

diff --git a/data/skin.xml b/data/skin.xml
index 91219277f62be06de850b44b6281ea18fad417f7..f36874b2341f2d4ec7dd4b0c33d06f70b7fa18c4 100644 (file)
--- a/data/skin.xml
+++ b/data/skin.xml
@@ -43,7 +43,7 @@
                <screen name="ScartLoopThrough" position="0,0" size="720,576">
                </screen>
                <screen name="ServiceInfo" position="180,120" size="360,330" title="Serviceinfo">
                <screen name="ScartLoopThrough" position="0,0" size="720,576">
                </screen>
                <screen name="ServiceInfo" position="180,120" size="360,330" title="Serviceinfo">

-                       <widget name="infolist" position="20,10" size="320,325" />
+                       <widget name="infolist" position="20,10" size="320,325" selectionDisabled="1"/>

                </screen>
                <screen name="AudioSelection" position="210,150" size="300,170" title="Audio">
                        <widget name="tracks" position="20,10" size="260,150" />
                </screen>
                <screen name="AudioSelection" position="210,150" size="300,170" title="Audio">
                        <widget name="tracks" position="20,10" size="260,150" />

diff --git a/lib/gui/elistbox.cpp b/lib/gui/elistbox.cpp
index c3dd659bb40f5fb560d68b004972ac952b8009a6..28d220a2dc20e74c5d4ab4b8351c8eca22e4a02d 100644 (file)
--- a/lib/gui/elistbox.cpp
+++ b/lib/gui/elistbox.cpp
@@ -10,6 +10,7 @@ eListbox::eListbox(eWidget *parent): eWidget(parent)
        eActionMap::getInstance(ptr);
        
        m_itemheight = 25;
        eActionMap::getInstance(ptr);
        
        m_itemheight = 25;

+       m_selection_enabled = 1;

        
        ptr->bindAction("ListboxActions", 0, 0, this);
 }
        
        ptr->bindAction("ListboxActions", 0, 0, this);
 }


@@ -144,7 +145,7 @@ int eListbox::event(int event, void *data, void *data2)
                
                for (int y = 0, i = 0; i <= m_items_per_page; y += m_itemheight, ++i)
                {
                
                for (int y = 0, i = 0; i <= m_items_per_page; y += m_itemheight, ++i)
                {

-                       m_content->paint(painter, *style, ePoint(0, y), m_selected == m_content->cursorGet() && m_content->size());
+                       m_content->paint(painter, *style, ePoint(0, y), m_selected == m_content->cursorGet() && m_content->size() && m_selection_enabled);

                        m_content->cursorMove(+1);
                }
                
                        m_content->cursorMove(+1);
                }
                


@@ -183,6 +184,14 @@ void eListbox::setItemHeight(int h)
        recalcSize();
 }
 
        recalcSize();
 }
 

+void eListbox::setSelectionEnable(int en)
+{
+       if (m_selection_enabled == en)
+               return;
+       m_selection_enabled = en;
+       entryChanged(m_selected); /* redraw current entry */
+}
+

 void eListbox::entryAdded(int index)
 {
                /* manage our local pointers. when the entry was added before the current position, we have to advance. */
 void eListbox::entryAdded(int index)
 {
                /* manage our local pointers. when the entry was added before the current position, we have to advance. */

diff --git a/lib/gui/elistbox.h b/lib/gui/elistbox.h
index 29349cbb2779255213d0ef8b0775891b67dbf8ad..a7ed637d55ff70836c734b25e5f175afa3847c0f 100644 (file)
--- a/lib/gui/elistbox.h
+++ b/lib/gui/elistbox.h
@@ -75,6 +75,7 @@ public:
        };
        
        void setItemHeight(int h);
        };
        
        void setItemHeight(int h);

+       void setSelectionEnable(int en);

 
 #ifndef SWIG
                /* entryAdded: an entry was added *before* the given index. it's index is the given number. */
 
 #ifndef SWIG
                /* entryAdded: an entry was added *before* the given index. it's index is the given number. */


@@ -89,11 +90,12 @@ public:
 protected:
        int event(int event, void *data=0, void *data2=0);
        void recalcSize();
 protected:
        int event(int event, void *data=0, void *data2=0);
        void recalcSize();

-       
+

 private:
        int m_top, m_selected;
        int m_itemheight;
        int m_items_per_page;
 private:
        int m_top, m_selected;
        int m_itemheight;
        int m_items_per_page;

+       int m_selection_enabled;

        ePtr<iListboxContent> m_content;
 #endif
 
        ePtr<iListboxContent> m_content;
 #endif
 

diff --git a/skin.py b/skin.py
index f5a67185af488c3e2a839642dcb06238d29a7e33..a40952041530cfe4428d6eeb5359ab0724896c5b 100644 (file)
--- a/skin.py
+++ b/skin.py
@@ -126,6 +126,8 @@ def applySingleAttribute(guiObject, desktop, attrib, value):
                        guiObject.setBackgroundColor(parseColor(value))
                elif attrib == "foregroundColor":
                        guiObject.setForegroundColor(parseColor(value))
                        guiObject.setBackgroundColor(parseColor(value))
                elif attrib == "foregroundColor":
                        guiObject.setForegroundColor(parseColor(value))

+               elif attrib == "selectionDisabled":
+                       guiObject.setSelectionEnable(0)

                elif attrib != 'name':
                        print "unsupported attribute " + attrib + "=" + value
        except int:
                elif attrib != 'name':
                        print "unsupported attribute " + attrib + "=" + value
        except int: