[vlc-devel] commit: qt4: selector: switch source on single click (Jakob Leben )

[git version control]

vlc | branch: master | Jakob Leben <jleben at videolan.org> | Mon Sep  7 01:39:42 2009 +0200| [2d23529861a5eb27647adaa42ae8f4de5c23ce18] | committer: Jakob Leben 

qt4: selector: switch source on single click

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2d23529861a5eb27647adaa42ae8f4de5c23ce18
---

 modules/gui/qt4/components/playlist/selector.cpp |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/modules/gui/qt4/components/playlist/selector.cpp b/modules/gui/qt4/components/playlist/selector.cpp
index 9f8097a..a89c1cd 100644
--- a/modules/gui/qt4/components/playlist/selector.cpp
+++ b/modules/gui/qt4/components/playlist/selector.cpp
@@ -54,12 +54,15 @@ PLSelector::PLSelector( QWidget *p, intf_thread_t *_p_intf )
 //    view->setDropIndicatorShown(true);
 
     createItems();
-    CONNECT( view, itemActivated( QTreeWidgetItem *, int ),
-             this, setSource( QTreeWidgetItem *) );
-    /* I believe this is unnecessary, seeing
-       QStyle::SH_ItemView_ActivateItemOnSingleClick
-        CONNECT( view, itemClicked( QTreeWidgetItem *, int ),
+    /* CONNECT( view, itemActivated( QTreeWidgetItem *, int ),
              this, setSource( QTreeWidgetItem *) ); */
+    /* I believe this is unnecessary, seeing
+       QStyle::SH_ItemView_ActivateItemOnSingleClick */
+    /* <jleben> No, you can only make custom styles by creating whole new
+       or subclassing an existing QStyle.
+       Connecting itemClicked signal is easier, of course */
+    CONNECT( view, itemClicked( QTreeWidgetItem *, int ),
+          this, setSource( QTreeWidgetItem *) );
 
     QVBoxLayout *layout = new QVBoxLayout;
     layout->setSpacing( 0 ); layout->setMargin( 0 );
@@ -75,7 +78,10 @@ void PLSelector::setSource( QTreeWidgetItem *item )
     if( !item )
         return;
 
-    int i_type = item->data( 0, TYPE_ROLE ).toInt();
+    QVariant type = item->data( 0, TYPE_ROLE );
+    if( type == QVariant() ) return;
+
+    int i_type = type.toInt();
 
     assert( ( i_type == PL_TYPE || i_type == ML_TYPE || i_type == SD_TYPE ) );
     if( i_type == SD_TYPE )