Qt4: fix faulty playlist show / hide logic

[vlc] / modules / gui / qt4 / components / playlist / selector.cpp

diff --git a/modules/gui/qt4/components/playlist/selector.cpp b/modules/gui/qt4/components/playlist/selector.cpp
index 456b2b3bb4fcac81f314b8cc3467a5118c72e1cc..fce873d4063c2feec8468cbe8c796911fe46c4d6 100644 (file)
--- a/modules/gui/qt4/components/playlist/selector.cpp
+++ b/modules/gui/qt4/components/playlist/selector.cpp
@@ -31,10 +31,13 @@
 #include "components/playlist/selector.hpp"
 #include "playlist_item.hpp"
 #include "qt4.hpp"
+#include "../../dialogs_provider.hpp"
 
 #include <QVBoxLayout>
 #include <QHeaderView>
 #include <QMimeData>
+#include <QPushButton>
+#include <QLabel>
 
 #include <vlc_playlist.h>
 #include <vlc_services_discovery.h>
@@ -42,13 +45,14 @@
 PLSelector::PLSelector( QWidget *p, intf_thread_t *_p_intf )
            : QTreeWidget( p ), p_intf(_p_intf)
 {
+    setItemDelegate( new PLSelectorDelegate() );
+    setFrameStyle( QFrame::StyledPanel | QFrame::Plain );
     setIconSize( QSize( 24,24 ) );
-//    view->setAlternatingRowColors( true );
-    setIndentation( 10 );
+    setIndentation( 15 );
     header()->hide();
     setRootIsDecorated( false );
-//    model = new PLModel( THEPL, p_intf, THEPL->p_root_category, 1, this );
-//    view->setModel( model );
+    setAlternatingRowColors( true );
+
     viewport()->setAcceptDrops(true);
     setDropIndicatorShown(true);
     invisibleRootItem()->setFlags( invisibleRootItem()->flags() & ~Qt::ItemIsDropEnabled );
@@ -70,7 +74,10 @@ void PLSelector::setSource( QTreeWidgetItem *item )
     if( !item )
         return;
 
-    int i_type = item->data( 0, TYPE_ROLE ).toInt();
+    bool b_ok;
+    int i_type = item->data( 0, TYPE_ROLE ).toInt( &b_ok );
+    if( !b_ok )
+        return;
 
     assert( ( i_type == PL_TYPE || i_type == ML_TYPE || i_type == SD_TYPE ) );
     if( i_type == SD_TYPE )
@@ -79,47 +86,56 @@ void PLSelector::setSource( QTreeWidgetItem *item )
         if( !playlist_IsServicesDiscoveryLoaded( THEPL, qtu( qs ) ) )
         {
             playlist_ServicesDiscoveryAdd( THEPL, qtu( qs ) );
-#warning FIXME
-            playlist_item_t *pl_item =
-                    THEPL->p_root_category->pp_children[THEPL->p_root_category->i_children-1];
-            item->setData( 0, PPL_ITEM_ROLE, QVariant::fromValue( pl_item ) );
-
-            emit activated( pl_item );
-            return;
         }
     }
 
     if( i_type == SD_TYPE )
         msg_Dbg( p_intf, "SD already loaded, reloading" );
 
-    playlist_item_t *pl_item =
-            item->data( 0, PPL_ITEM_ROLE ).value<playlist_item_t *>();
+    playlist_Lock( THEPL );
+    playlist_item_t *pl_item = NULL;
+    if( i_type == SD_TYPE )
+       pl_item = playlist_ChildSearchName( THEPL->p_root_category, qtu( item->data(0, LONGNAME_ROLE ).toString() ) );
+    else if ( i_type == PL_TYPE )
+       pl_item = THEPL->p_local_category;
+    else if ( i_type == ML_TYPE )
+       pl_item = THEPL->p_ml_category;
+    playlist_Unlock( THEPL );
+
     if( pl_item )
-            emit activated( pl_item );
+       emit activated( pl_item );
+}
+
+void PLSelector::makeStandardItem( QTreeWidgetItem* item, const QString& str )
+{
+  item->setText( 0,str );
 }
 
 void PLSelector::createItems()
 {
     QTreeWidgetItem *pl = new QTreeWidgetItem( this );
-    pl->setText( 0, qtr( "Playlist" ) );
+    makeStandardItem( pl, qtr( "Playlist" ) );
     pl->setData( 0, TYPE_ROLE, PL_TYPE );
     pl->setData( 0, PPL_ITEM_ROLE, QVariant::fromValue( THEPL->p_local_category ) );
-/*  QTreeWidgetItem *empty = new QTreeWidgetItem( view );
-    empty->setFlags(Qt::NoItemFlags); */
 
     QTreeWidgetItem *lib = new QTreeWidgetItem( this );
-    lib->setText( 0, qtr( "Library" ) );
+    makeStandardItem( lib, qtr( "Media Library" ) );
     lib->setData( 0, TYPE_ROLE, ML_TYPE );
     lib->setData( 0, PPL_ITEM_ROLE, QVariant::fromValue( THEPL->p_ml_category ) );
 
-/*  QTreeWidgetItem *empty2 = new QTreeWidgetItem( view );
-    empty2->setFlags(Qt::NoItemFlags);*/
-
     QTreeWidgetItem *sds = new QTreeWidgetItem( this );
+    makeStandardItem( sds, qtr( "Services" ) );
     sds->setExpanded( true );
-    sds->setText( 0, qtr( "Libraries" ) );
     sds->setFlags( sds->flags() & ~Qt::ItemIsDropEnabled );
 
+    QTreeWidgetItem *mfldrs = new QTreeWidgetItem( sds );
+    makeStandardItem( mfldrs, qtr( "Media Folders" ) );
+    mfldrs->setFlags( mfldrs->flags() & ~Qt::ItemIsDropEnabled );
+
+    QTreeWidgetItem *shouts = new QTreeWidgetItem( sds );
+    makeStandardItem( shouts, qtr( "Shoutcast" ) );
+    shouts->setFlags( shouts->flags() & ~Qt::ItemIsDropEnabled );
+
     char **ppsz_longnames;
     char **ppsz_names = vlc_sd_GetNames( &ppsz_longnames );
     if( !ppsz_names )
@@ -129,15 +145,59 @@ void PLSelector::createItems()
     QTreeWidgetItem *sd_item;
     for( ; *ppsz_name; ppsz_name++, ppsz_longname++ )
     {
-        sd_item = new QTreeWidgetItem( QStringList( *ppsz_longname ) );
+        sd_item = new QTreeWidgetItem(  );
+
+#define SD_IS( name ) ( !strcmp( *ppsz_name, name ) )
+
+        if( SD_IS("shoutcast") || SD_IS("shoutcasttv") ||
+            SD_IS("frenchtv") || SD_IS("freebox") )
+        {
+            shouts->addChild( sd_item );
+            makeStandardItem( sd_item, qfu(*ppsz_longname) );
+        }
+        else if( SD_IS("video_dir") || SD_IS("audio_dir") || SD_IS("picture_dir") )
+        {
+            mfldrs->addChild( sd_item );
+            makeStandardItem( sd_item, qfu(*ppsz_longname) );
+        }
+        else if( SD_IS("podcast") )
+        {
+            sds->addChild( sd_item );
+
+            QLabel *lbl = new QLabel("Podcasts");
+            lbl->setMargin(3);
+            QPushButton *btn = new QPushButton();
+            btn->setMaximumWidth(30);
+            btn->setIcon( QIcon( ":/menu/preferences" ) );
+            QHBoxLayout *hbox = new QHBoxLayout();
+            hbox->setContentsMargins(0,0,0,0);
+            hbox->addWidget(lbl);
+            hbox->addWidget(btn);
+            QWidget *w = new QWidget();
+            w->setLayout(hbox);
+
+            CONNECT( btn, clicked(), THEDP, podcastConfigureDialog() );
+            setItemWidget( sd_item, 0, w );
+        }
+        else
+        {
+            sds->addChild( sd_item );
+            makeStandardItem( sd_item, qfu(*ppsz_longname) );
+        }
+
+#undef SD_IS
+
         sd_item->setData( 0, TYPE_ROLE, SD_TYPE );
         sd_item->setData( 0, NAME_ROLE, qfu( *ppsz_name ) );
+        sd_item->setData( 0, LONGNAME_ROLE, qfu( *ppsz_longname ) );
         sd_item->setFlags( sd_item->flags() & ~Qt::ItemIsDropEnabled );
-        sds->addChild( sd_item );
+        free( *ppsz_name );
+        free( *ppsz_longname );
     }
+    free( ppsz_names );
+    free( ppsz_longnames );
 }
 
-#include <iostream>
 QStringList PLSelector::mimeTypes() const
 {
     QStringList types;