Qt4: more media browser (PL Selector) beautification

modules/gui/qt4/components/playlist/playlist.cpp

@@ -33,6 +33,9 @@
 #include "input_manager.hpp" /* art signal */
 #include "main_interface.hpp" /* DropEvent TODO remove this*/
 
+#include <QGroupBox>
+
+#include <iostream>
 /**********************************************************************
  * Playlist Widget. The embedded playlist
  **********************************************************************/
@@ -46,7 +49,12 @@ PlaylistWidget::PlaylistWidget( intf_thread_t *_p_i ) : p_intf ( _p_i )
 
     /* Source Selector */
     selector = new PLSelector( this, p_intf );
-    leftW->addWidget( selector );
+    QVBoxLayout *selBox = new QVBoxLayout();
+    selBox->setContentsMargins(0,5,0,0);
+    selBox->addWidget( selector );
+    QGroupBox *selGroup = new QGroupBox( qtr( "Media Browser") );
+    selGroup->setLayout( selBox );
+    leftW->addWidget( selGroup );
 
     /* Create a Container for the Art Label
        in order to have a beautiful resizing for the selector above it */
@@ -140,3 +148,54 @@ void PlaylistWidget::closeEvent( QCloseEvent *event )
         event->ignore();
     }
 }
+
+PlaylistEventManager::PlaylistEventManager( playlist_t *_pl )
+    : pl( _pl )
+{
+  var_AddCallback( pl, "playlist-item-append", itemAddedCb, this );
+  var_AddCallback( pl, "playlist-item-deleted", itemRemovedCb, this );
+}
+
+PlaylistEventManager::~PlaylistEventManager()
+{
+  var_DelCallback( pl, "playlist-item-append", itemAddedCb, this );
+  var_DelCallback( pl, "playlist-item-deleted", itemRemovedCb, this );
+}
+
+int PlaylistEventManager::itemAddedCb
+( vlc_object_t * obj, const char *var, vlc_value_t old, vlc_value_t cur, void *data )
+{
+    PlaylistEventManager *p_this = static_cast<PlaylistEventManager*>(data);
+    p_this->trigger( cur, ItemAddedEv );
+    return VLC_SUCCESS;
+}
+
+int PlaylistEventManager::itemRemovedCb
+( vlc_object_t * obj, const char *var, vlc_value_t old, vlc_value_t cur, void *data )
+{
+    PlaylistEventManager *p_this = static_cast<PlaylistEventManager*>(data);
+    p_this->trigger( cur, ItemRemovedEv );
+    return VLC_SUCCESS;
+}
+
+void PlaylistEventManager::trigger( vlc_value_t val, int type )
+{
+    if( type == ItemAddedEv )
+    {
+        playlist_add_t *p_add = static_cast<playlist_add_t*>( val.p_address );
+        QApplication::postEvent( this, new PLEMEvent( type, p_add->i_item, p_add->i_node ) );
+    }
+    else
+    {
+        QApplication::postEvent( this, new PLEMEvent( type, val.i_int, 0 ) );
+    }
+}
+
+void PlaylistEventManager::customEvent( QEvent *e )
+{
+    PLEMEvent *ev = static_cast<PLEMEvent*>(e);
+    if( (int) ev->type() == ItemAddedEv )
+        emit itemAdded( ev->item, ev->parent );
+    else
+        emit itemRemoved( ev->item );
+}

modules/gui/qt4/components/playlist/playlist.hpp

@@ -34,6 +34,7 @@
 
 #include "dialogs_provider.hpp" /* Media Info from ArtLabel */
 #include "components/interface_widgets.hpp"
+//#include <vlc_playlist.h>
 
 #include <QSplitter>
 #include <QLabel>
@@ -75,5 +76,39 @@ public:
     }
 };
 
+enum PLEventType {
+    ItemAddedEv = QEvent::User,
+    ItemRemovedEv
+};
 
+class PLEMEvent : public QEvent
+{
+public:
+    PLEMEvent( int t, int i, int p )
+        : QEvent( (QEvent::Type)t ), item(i), parent(p) {}
+    int item;
+    int parent;
+};
+
+class PlaylistEventManager : public QObject
+{
+    Q_OBJECT;
+
+public:
+    PlaylistEventManager( playlist_t* );
+    ~PlaylistEventManager();
+
+signals:
+    void itemAdded( int, int );
+    void itemRemoved( int );
+
+private:
+    static int itemAddedCb ( vlc_object_t *, const char *,
+                              vlc_value_t, vlc_value_t, void * );
+    static int itemRemovedCb ( vlc_object_t *, const char *,
+                                vlc_value_t, vlc_value_t, void * );
+    void trigger( vlc_value_t, int );
+    void customEvent( QEvent* );
+    playlist_t *pl;
+};
 #endif

modules/gui/qt4/components/playlist/selector.hpp

@@ -32,38 +32,92 @@
 #include <QTreeWidget>
 #include <QTreeWidgetItem>
 #include <QStyledItemDelegate>
+#include <QPainter>
+#include <QPushButton>
+#include <QLabel>
+#include <QHBoxLayout>
 
 #include <vlc_playlist.h>
 
 #include "qt4.hpp"
 
 class PlaylistWidget;
+class PlaylistEventManager;
 
-enum {
-    PL_TYPE,
-    ML_TYPE,
+enum SelectorItemType {
+    CATEGORY_TYPE,
     SD_TYPE,
+    PL_ITEM_TYPE
+};
+
+enum SpecialData {
+    IS_PODCAST = 1,
+    IS_PL,
+    IS_ML
 };
 
 enum {
     TYPE_ROLE = Qt::UserRole,
-    PPL_ITEM_ROLE,
-    NAME_ROLE,
-    LONGNAME_ROLE,
+    NAME_ROLE, //QString
+    LONGNAME_ROLE, //QString
+    PL_ITEM_ROLE, //playlist_item_t*
+    PL_ITEM_ID_ROLE, //playlist_item_t->i_id
+    IN_ITEM_ROLE, //input_item_t->i_id
+    SPECIAL_ROLE //SpecialData
+};
+
+enum ItemAction {
+    ADD_ACTION,
+    RM_ACTION
+};
+
+class PLSelItem : public QWidget
+{
+    Q_OBJECT;
+public:
+    PLSelItem( QTreeWidgetItem*, const QString& );
+    void setText( const QString& );
+    void addAction( ItemAction, const QString& toolTip = 0 );
+    QTreeWidgetItem *treeItem() { return qitem; }
+    QString text() { return lbl->text(); }
+public slots:
+    void showAction();
+    void hideAction();
+private slots:
+    void triggerAction() { emit action( this ); }
+signals:
+    void action( PLSelItem* );
+private:
+    void enterEvent( QEvent* );
+    void leaveEvent( QEvent* );
+    QTreeWidgetItem* qitem;
+    QPushButton* btnAction;
+    QLabel *lbl;
+    QHBoxLayout *layout;
 };
 
 class PLSelectorDelegate : public QStyledItemDelegate
 {
-  private:
+private:
+    /*void paint ( QPainter * painter,
+        const QStyleOptionViewItem & option, const QModelIndex & index ) const
+    {
+        if( index.data( TYPE_ROLE ).toInt() == CATEGORY_TYPE )
+            painter->fillRect( option.rect, QColor( 200,200,200 ) );
+        QRect r = option.rect;
+        r.setLeft( r.left() + 5 );
+        painter->drawText( r, Qt::AlignLeft | Qt::AlignVCenter, index.data().toString() );
+    }*/
     QSize sizeHint ( const QStyleOptionViewItem& option, const QModelIndex& index ) const
     {
         QSize sz = QStyledItemDelegate::sizeHint( option, index );
-      if( sz.height() < 25 ) sz.setHeight(25);
+        if( sz.height() < 23 ) sz.setHeight(23);
         return sz;
     }
 };
 
 Q_DECLARE_METATYPE( playlist_item_t *);
+Q_DECLARE_METATYPE( input_item_t *);
 class PLSelector: public QTreeWidget
 {
     Q_OBJECT;
@@ -74,12 +128,25 @@ protected:
     friend class PlaylistWidget;
 private:
     QStringList mimeTypes () const;
-    void makeStandardItem( QTreeWidgetItem*, const QString& );
     bool dropMimeData ( QTreeWidgetItem * parent, int index, const QMimeData * data, Qt::DropAction action );
     void createItems();
+    PLSelItem * addItem (
+        SelectorItemType type, const QString& str, bool drop,
+        QTreeWidgetItem* parentItem = 0 );
+    PLSelItem * addPodcastItem( playlist_item_t *p_item );
+    inline PLSelItem * itemWidget( QTreeWidgetItem * );
     intf_thread_t *p_intf;
+    PlaylistEventManager *plEM;
+    QTreeWidgetItem *podcastsParent;
+    int podcastsParentId;
 private slots:
     void setSource( QTreeWidgetItem *item );
+    void plItemAdded( int, int );
+    void plItemRemoved( int );
+    void inputItemUpdate( input_item_t * );
+    void podcastAdd( PLSelItem* );
+    void podcastRemove( PLSelItem* );
+
 signals:
     void activated( playlist_item_t * );
 };

modules/gui/qt4/components/playlist/standardpanel.cpp

@@ -295,7 +295,8 @@ void StandardPLPanel::setRoot( playlist_item_t *p_item )
     QPL_LOCK;
     assert( p_item );
 
-    p_item = playlist_GetPreferredNode( THEPL, p_item );
+    playlist_item_t *p_pref_item = playlist_GetPreferredNode( THEPL, p_item );
+    if( p_pref_item ) p_item = p_pref_item;
 
     /* needed for popupAdd() */
     currentRootId = p_item->i_id;