X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fcomponents%2Fplaylist%2Fselector.cpp;h=5b53c3bc67cb4c001c0952e67c4953ab35963d05;hb=b2e1a820e1e7aa041f2d52bf75d9363c10e0c7ac;hp=17de1f2fa70d678102f498820370562249a8016b;hpb=6b45f1bbd5c3386078ecad1a138a017c3811793e;p=vlc

diff --git a/modules/gui/qt4/components/playlist/selector.cpp b/modules/gui/qt4/components/playlist/selector.cpp
index 17de1f2fa7..5b53c3bc67 100644
--- a/modules/gui/qt4/components/playlist/selector.cpp
+++ b/modules/gui/qt4/components/playlist/selector.cpp
@@ -26,38 +26,48 @@
 # include "config.h"
 #endif
 
-#include <assert.h>
-
-#include "components/playlist/selector.hpp"
-#include "playlist_item.hpp"
 #include "qt4.hpp"
-#include "../../dialogs_provider.hpp"
-#include "playlist.hpp"
-#include "util/customwidgets.hpp"
+#include "components/playlist/selector.hpp"
+#include "playlist_model.hpp"                /* plMimeData */
+#include "input_manager.hpp"                 /* MainInputManager, for podcast */
 
-#include <QVBoxLayout>
-#include <QHeaderView>
-#include <QMimeData>
 #include <QInputDialog>
 #include <QMessageBox>
+#include <QMimeData>
+#include <QDragMoveEvent>
+#include <QTreeWidgetItem>
+#include <QHBoxLayout>
+#include <QPainter>
 
 #include <vlc_playlist.h>
 #include <vlc_services_discovery.h>
 
+void SelectorActionButton::paintEvent( QPaintEvent *event )
+{
+    QPainter p( this );
+    QColor color = palette().color( QPalette::HighlightedText );
+    color.setAlpha( 80 );
+    if( underMouse() )
+        p.fillRect( rect(), color );
+    p.setPen( color );
+    int frame = style()->pixelMetric( QStyle::PM_DefaultFrameWidth, 0, this );
+    p.drawLine( rect().topLeft() + QPoint( 0, frame ),
+                rect().bottomLeft() - QPoint( 0, frame ) );
+    QVLCFramelessButton::paintEvent( event );
+}
+
 PLSelItem::PLSelItem ( QTreeWidgetItem *i, const QString& text )
     : qitem(i), lblAction( NULL)
 {
-    layout = new QHBoxLayout();
+    layout = new QHBoxLayout( this );
     layout->setContentsMargins(0,0,0,0);
     layout->addSpacing( 3 );
 
-    lbl = new QLabel( text );
-
+    lbl = new QVLCElidingLabel( text );
     layout->addWidget(lbl, 1);
 
-    setLayout( layout );
-
-    setMinimumHeight( 22 ); //Action icon height plus 6
+    int height = qMax( 22, fontMetrics().height() + 8 );
+    setMinimumHeight( height );
 }
 
 void PLSelItem::addAction( ItemAction act, const QString& tooltip )
@@ -74,54 +84,54 @@ void PLSelItem::addAction( ItemAction act, const QString& tooltip )
         icon = QIcon( ":/buttons/playlist/playlist_remove" ); break;
     }
 
-    lblAction = new QVLCIconLabel( icon );
+    lblAction = new SelectorActionButton();
+    lblAction->setIcon( icon );
+    lblAction->setMinimumWidth( lblAction->sizeHint().width() + 6 );
 
     if( !tooltip.isEmpty() ) lblAction->setToolTip( tooltip );
 
     layout->addWidget( lblAction, 0 );
     lblAction->hide();
-    layout->addSpacing( 3 );
 
     CONNECT( lblAction, clicked(), this, triggerAction() );
 }
 
-void PLSelItem::showAction() { if( lblAction ) lblAction->show(); }
-
-void PLSelItem::hideAction() { if( lblAction ) lblAction->hide(); }
-
-void PLSelItem::setText( const QString& text ) { lbl->setText( text ); }
-
-void PLSelItem::enterEvent( QEvent *ev ){ showAction(); }
-
-void PLSelItem::leaveEvent( QEvent *ev ){ hideAction(); }
 
 PLSelector::PLSelector( QWidget *p, intf_thread_t *_p_intf )
            : QTreeWidget( p ), p_intf(_p_intf)
 {
+    /* Properties */
     setFrameStyle( QFrame::NoFrame );
     viewport()->setAutoFillBackground( false );
     setIconSize( QSize( 24,24 ) );
-    setIndentation( 10 );
-    header()->hide();
-    setRootIsDecorated( false );
+    setIndentation( 12 );
+    setHeaderHidden( true );
+    setRootIsDecorated( true );
     setAlternatingRowColors( false );
-    podcastsParent = NULL;
-    podcastsParentId = -1;
 
+    /* drops */
     viewport()->setAcceptDrops(true);
     setDropIndicatorShown(true);
     invisibleRootItem()->setFlags( invisibleRootItem()->flags() & ~Qt::ItemIsDropEnabled );
 
+    /* Podcasts */
+    podcastsParent = NULL;
+    podcastsParentId = -1;
+
+    /* Podcast connects */
     CONNECT( THEMIM, playlistItemAppended( int, int ),
              this, plItemAdded( int, int ) );
     CONNECT( THEMIM, playlistItemRemoved( int ),
              this, plItemRemoved( int ) );
-    CONNECT( THEMIM->getIM(), metaChanged( input_item_t *),
-            this, inputItemUpdate( input_item_t * ) );
+    DCONNECT( THEMIM->getIM(), metaChanged( input_item_t *),
+              this, inputItemUpdate( input_item_t * ) );
 
     createItems();
     CONNECT( this, itemActivated( QTreeWidgetItem *, int ),
              this, setSource( QTreeWidgetItem *) );
+    CONNECT( this, itemClicked( QTreeWidgetItem *, int ),
+             this, setSource( QTreeWidgetItem *) );
+
     /* I believe this is unnecessary, seeing
        QStyle::SH_ItemView_ActivateItemOnSingleClick
         CONNECT( view, itemClicked( QTreeWidgetItem *, int ),
@@ -145,6 +155,94 @@ PLSelector::~PLSelector()
     }
 }
 
+PLSelItem * putSDData( PLSelItem* item, const char* name, const char* longname )
+{
+    item->treeItem()->setData( 0, NAME_ROLE, qfu( name ) );
+    item->treeItem()->setData( 0, LONGNAME_ROLE, qfu( longname ) );
+    return item;
+}
+
+PLSelItem * putPLData( PLSelItem* item, playlist_item_t* plItem )
+{
+    item->treeItem()->setData( 0, PL_ITEM_ROLE, QVariant::fromValue( plItem ) );
+/*    item->setData( 0, PL_ITEM_ID_ROLE, plItem->i_id );
+    item->setData( 0, IN_ITEM_ROLE, QVariant::fromValue( (void*) plItem->p_input ) ); );*/
+    return item;
+}
+
+void PLSelector::createItems()
+{
+    /* PL */
+    PLSelItem *pl = putPLData( addItem( PL_ITEM_TYPE, "Playlist", true ),
+                              THEPL->p_playing );
+    pl->treeItem()->setData( 0, SPECIAL_ROLE, QVariant( IS_PL ) );
+
+    /* ML */
+    PLSelItem *ml = putPLData( addItem( PL_ITEM_TYPE, "Media Library", true ),
+                              THEPL->p_media_library );
+    ml->treeItem()->setData( 0, SPECIAL_ROLE, QVariant( IS_ML ) );
+
+    /* SD nodes */
+    QTreeWidgetItem *mycomp = addItem( CATEGORY_TYPE, "My Computer" )->treeItem();
+    QTreeWidgetItem *devices = addItem( CATEGORY_TYPE, "Devices" )->treeItem();
+    QTreeWidgetItem *lan = addItem( CATEGORY_TYPE, "Local Network" )->treeItem();
+    QTreeWidgetItem *internet = addItem( CATEGORY_TYPE, "Internet" )->treeItem();
+
+    /* SD subnodes */
+    char **ppsz_longnames;
+    int *p_categories;
+    char **ppsz_names = vlc_sd_GetNames( THEPL, &ppsz_longnames, &p_categories );
+    if( !ppsz_names )
+        return;
+
+    char **ppsz_name = ppsz_names, **ppsz_longname = ppsz_longnames;
+    int *p_category = p_categories;
+    for( ; *ppsz_name; ppsz_name++, ppsz_longname++, p_category++ )
+    {
+        //msg_Dbg( p_intf, "Adding a SD item: %s", *ppsz_longname );
+
+        PLSelItem *selItem;
+        switch( *p_category )
+        {
+        case SD_CAT_INTERNET:
+            {
+            selItem = addItem( SD_TYPE, *ppsz_longname, false, internet );
+            if( !strncmp( *ppsz_name, "podcast", 7 ) )
+            {
+                selItem->treeItem()->setData( 0, SPECIAL_ROLE, QVariant( IS_PODCAST ) );
+                selItem->addAction( ADD_ACTION, qtr( "Subscribe to a podcast" ) );
+                CONNECT( selItem, action( PLSelItem* ), this, podcastAdd( PLSelItem* ) );
+                podcastsParent = selItem->treeItem();
+            }
+            }
+            break;
+        case SD_CAT_DEVICES:
+            selItem = addItem( SD_TYPE, *ppsz_longname, false, devices );
+            break;
+        case SD_CAT_LAN:
+            selItem = addItem( SD_TYPE, *ppsz_longname, false, lan );
+            break;
+        case SD_CAT_MYCOMPUTER:
+            selItem = addItem( SD_TYPE, *ppsz_longname, false, mycomp );
+            break;
+        default:
+            selItem = addItem( SD_TYPE, *ppsz_longname );
+        }
+
+        putSDData( selItem, *ppsz_name, *ppsz_longname );
+        free( *ppsz_name );
+        free( *ppsz_longname );
+    }
+    free( ppsz_names );
+    free( ppsz_longnames );
+    free( p_categories );
+
+    if( mycomp->childCount() == 0 ) delete mycomp;
+    if( devices->childCount() == 0 ) delete devices;
+    if( lan->childCount() == 0 ) delete lan;
+    if( internet->childCount() == 0 ) delete internet;
+}
+
 void PLSelector::setSource( QTreeWidgetItem *item )
 {
     if( !item )
@@ -164,13 +262,17 @@ void PLSelector::setSource( QTreeWidgetItem *item )
             playlist_ServicesDiscoveryAdd( THEPL, qtu( qs ) );
     }
 
+    /* */
     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() ) );
+        /* Find the right item for the SD */
+        pl_item = playlist_ChildSearchName( THEPL->p_root,
+                      qtu( item->data(0, LONGNAME_ROLE ).toString() ) );
+
+        /* Podcasts */
         if( item->data( 0, SPECIAL_ROLE ).toInt() == IS_PODCAST )
         {
             if( pl_item && !sd_loaded )
@@ -187,17 +289,19 @@ void PLSelector::setSource( QTreeWidgetItem *item )
 
     playlist_Unlock( THEPL );
 
+    /* */
     if( pl_item )
-       emit activated( pl_item );
+        emit activated( pl_item );
 }
 
 PLSelItem * PLSelector::addItem (
-  SelectorItemType type, const QString& str, bool drop,
-  QTreeWidgetItem* parentItem )
+    SelectorItemType type, const char* str, bool drop,
+    QTreeWidgetItem* parentItem )
 {
   QTreeWidgetItem *item = parentItem ?
       new QTreeWidgetItem( parentItem ) : new QTreeWidgetItem( this );
-  PLSelItem *selItem = new PLSelItem( item, str );
+
+  PLSelItem *selItem = new PLSelItem( item, qtr( str ) );
   setItemWidget( item, 0, selItem );
   item->setData( 0, TYPE_ROLE, (int)type );
   if( !drop ) item->setFlags( item->flags() & ~Qt::ItemIsDropEnabled );
@@ -205,148 +309,70 @@ PLSelItem * PLSelector::addItem (
   return selItem;
 }
 
-PLSelItem * putSDData( PLSelItem* item, const char* name, const char* longname )
-{
-    item->treeItem()->setData( 0, NAME_ROLE, qfu( name ) );
-    item->treeItem()->setData( 0, LONGNAME_ROLE, qfu( longname ) );
-    return item;
-}
-
-PLSelItem * putPLData( PLSelItem* item, playlist_item_t* plItem )
-{
-    item->treeItem()->setData( 0, PL_ITEM_ROLE, QVariant::fromValue( plItem ) );
-/*    item->setData( 0, PL_ITEM_ID_ROLE, plItem->i_id );
-    item->setData( 0, IN_ITEM_ROLE, QVariant::fromValue( (void*) plItem->p_input ) ); );*/
-    return item;
-}
-
 PLSelItem *PLSelector::addPodcastItem( playlist_item_t *p_item )
 {
-  vlc_gc_incref( p_item->p_input );
-  char *psz_name = input_item_GetName( p_item->p_input );
-  PLSelItem *item = addItem(
-      PL_ITEM_TYPE, qfu( psz_name ), false, podcastsParent );
-  item->addAction( RM_ACTION, qtr( "Remove this podcast subscription" ) );
-  item->treeItem()->setData( 0, PL_ITEM_ROLE, QVariant::fromValue( p_item ) );
-  item->treeItem()->setData( 0, PL_ITEM_ID_ROLE, QVariant(p_item->i_id) );
-  item->treeItem()->setData( 0, IN_ITEM_ROLE, QVariant::fromValue( p_item->p_input ) );
-  CONNECT( item, action( PLSelItem* ), this, podcastRemove( PLSelItem* ) );
-  free( psz_name );
-  return item;
-}
-
-void PLSelector::createItems()
-{
-    PLSelItem *pl = putPLData( addItem( PL_ITEM_TYPE, qtr( "Playlist" ), true ),
-                              THEPL->p_local_category );
-    pl->treeItem()->setData( 0, SPECIAL_ROLE, QVariant( IS_PL ) );
-
-    PLSelItem *ml = putPLData( addItem( PL_ITEM_TYPE, qtr( "Media Library" ), true ),
-                              THEPL->p_ml_category );
-    ml->treeItem()->setData( 0, SPECIAL_ROLE, QVariant( IS_ML ) );
-
-    QTreeWidgetItem *msrc = addItem( CATEGORY_TYPE, qtr( "Media Sources" ),
-                                      false )->treeItem();
-
-    QTreeWidgetItem *mfldrs = NULL;
-
-    QTreeWidgetItem *shouts = NULL;
-
-    msrc->setExpanded( true );
-
-    char **ppsz_longnames;
-    char **ppsz_names = vlc_sd_GetNames( &ppsz_longnames );
-    if( !ppsz_names )
-        return;
-
-    char **ppsz_name = ppsz_names, **ppsz_longname = ppsz_longnames;
-    for( ; *ppsz_name; ppsz_name++, ppsz_longname++ )
-    {
-        //msg_Dbg( p_intf, "Adding a SD item: %s", *ppsz_longname );
-#define SD_IS( name ) ( !strcmp( *ppsz_name, name ) )
-
-        if( SD_IS("shoutcast") || SD_IS("shoutcasttv") ||
-            SD_IS("frenchtv") || SD_IS("freebox") )
-        {
-            if( !shouts ) shouts = addItem( CATEGORY_TYPE, qtr( "Shoutcast" ),
-                                            false, msrc )->treeItem();
-            putSDData( addItem( SD_TYPE, *ppsz_longname, false, shouts ),
-                       *ppsz_name, *ppsz_longname );
-        }
-        else if( SD_IS("video_dir") || SD_IS("audio_dir") || SD_IS("picture_dir") )
-        {
-            if( !mfldrs ) mfldrs = addItem( CATEGORY_TYPE, qtr( "Media Folders" ),
-                                            false, msrc )->treeItem();
-            putSDData( addItem( SD_TYPE, *ppsz_longname, false, mfldrs ),
-                       *ppsz_name, *ppsz_longname );
-        }
-        else if( SD_IS("podcast") )
-        {
-
-            PLSelItem *podItem = addItem( SD_TYPE, qtr( "Podcasts" ), false, msrc );
-            putSDData( podItem, *ppsz_name, *ppsz_longname );
-            podItem->treeItem()->setData( 0, SPECIAL_ROLE, QVariant( IS_PODCAST ) );
-            podItem->addAction( ADD_ACTION, qtr( "Subscribe to a podcast" ) );
-            CONNECT( podItem, action( PLSelItem* ), this, podcastAdd( PLSelItem* ) );
-
-            podcastsParent = podItem->treeItem();
-        }
-        else
-        {
-            putSDData( addItem( SD_TYPE, qtr( *ppsz_longname ), false, msrc ),
-                       *ppsz_name, *ppsz_longname );
-        }
+    vlc_gc_incref( p_item->p_input );
 
-#undef SD_IS
+    char *psz_name = input_item_GetName( p_item->p_input );
+    PLSelItem *item = addItem( PL_ITEM_TYPE,  psz_name, false, podcastsParent );
+    free( psz_name );
 
-        free( *ppsz_name );
-        free( *ppsz_longname );
-    }
-    free( ppsz_names );
-    free( ppsz_longnames );
+    item->addAction( RM_ACTION, qtr( "Remove this podcast subscription" ) );
+    item->treeItem()->setData( 0, PL_ITEM_ROLE, QVariant::fromValue( p_item ) );
+    item->treeItem()->setData( 0, PL_ITEM_ID_ROLE, QVariant(p_item->i_id) );
+    item->treeItem()->setData( 0, IN_ITEM_ROLE, QVariant::fromValue( p_item->p_input ) );
+    CONNECT( item, action( PLSelItem* ), this, podcastRemove( PLSelItem* ) );
+    return item;
 }
 
 QStringList PLSelector::mimeTypes() const
 {
     QStringList types;
-    types << "vlc/qt-playlist-item";
+    types << "vlc/qt-input-items";
     return types;
 }
 
 bool PLSelector::dropMimeData ( QTreeWidgetItem * parent, int index,
-  const QMimeData * data, Qt::DropAction action )
+    const QMimeData * data, Qt::DropAction action )
 {
     if( !parent ) return false;
 
     QVariant type = parent->data( 0, TYPE_ROLE );
     if( type == QVariant() ) return false;
-    int i_truth = parent->data( 0, SPECIAL_ROLE ).toInt();
 
+    int i_truth = parent->data( 0, SPECIAL_ROLE ).toInt();
     if( i_truth != IS_PL && i_truth != IS_ML ) return false;
+
     bool to_pl = ( i_truth == IS_PL );
 
-    if( data->hasFormat( "vlc/qt-playlist-item" ) )
+    const PlMimeData *plMimeData = qobject_cast<const PlMimeData*>( data );
+    if( !plMimeData ) return false;
+
+    QList<input_item_t*> inputItems = plMimeData->inputItems();
+
+    playlist_Lock( THEPL );
+
+    foreach( input_item_t *p_input, inputItems )
     {
-        QByteArray encodedData = data->data( "vlc/qt-playlist-item" );
-        QDataStream stream( &encodedData, QIODevice::ReadOnly );
-        playlist_Lock( THEPL );
-        while( !stream.atEnd() )
-        {
-            PLItem *item;
-            stream.readRawData( (char*)&item, sizeof(PLItem*) );
-            input_item_t *pl_input =item->inputItem();
-            playlist_AddExt ( THEPL,
-                pl_input->psz_uri, pl_input->psz_name,
-                PLAYLIST_APPEND | PLAYLIST_SPREPARSE, PLAYLIST_END,
-                pl_input->i_duration,
-                pl_input->i_options, pl_input->ppsz_options, pl_input->optflagc,
-                to_pl, true );
-        }
-        playlist_Unlock( THEPL );
+        playlist_item_t *p_item = playlist_ItemGetByInput( THEPL, p_input );
+        if( !p_item ) continue;
+
+        playlist_NodeAddCopy( THEPL, p_item,
+                              to_pl ? THEPL->p_playing : THEPL->p_media_library,
+                              PLAYLIST_END );
     }
+
+    playlist_Unlock( THEPL );
+
     return true;
 }
 
+void PLSelector::dragMoveEvent ( QDragMoveEvent * event )
+{
+    event->setDropAction( Qt::CopyAction );
+    QAbstractItemView::dragMoveEvent( event );
+}
+
 void PLSelector::plItemAdded( int item, int parent )
 {
     if( parent != podcastsParentId ) return;
@@ -429,14 +455,13 @@ void PLSelector::podcastAdd( PLSelItem* item )
     if( !p_obj ) return;
 
     QString request("ADD:");
-    request += url;
+    request += url.trimmed();
     var_SetString( p_obj, "podcast-request", qtu( request ) );
     vlc_object_release( p_obj );
 }
 
 void PLSelector::podcastRemove( PLSelItem* item )
 {
-    //FIXME will translators know to leave that %1 somewhere inside?
     QString question ( qtr( "Do you really want to unsubscribe from %1?" ) );
     question = question.arg( item->text() );
     QMessageBox::StandardButton res =
@@ -465,3 +490,13 @@ PLSelItem * PLSelector::itemWidget( QTreeWidgetItem *item )
     return ( static_cast<PLSelItem*>( QTreeWidget::itemWidget( item, 0 ) ) );
 }
 
+void PLSelector::drawBranches ( QPainter * painter, const QRect & rect, const QModelIndex & index ) const
+{
+    if( !model()->hasChildren( index ) ) return;
+    QStyleOption option;
+    option.initFrom( this );
+    option.rect = rect.adjusted( rect.width() - indentation(), 0, 0, 0 );
+    style()->drawPrimitive( isExpanded( index ) ?
+                            QStyle::PE_IndicatorArrowDown :
+                            QStyle::PE_IndicatorArrowRight, &option, painter );
+}