X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fcomponents%2Fplaylist%2Fstandardpanel.cpp;h=daad1afb4590e41376288faead8306d971ebce3a;hb=de7b2fd2e8b58059bfe2f2ff7080385ab0a44f56;hp=ae4d309a491d73754a6685a0ff2db561763cf688;hpb=7c1fe4832347b316e0aa9f0bc6537758b751385c;p=vlc

diff --git a/modules/gui/qt4/components/playlist/standardpanel.cpp b/modules/gui/qt4/components/playlist/standardpanel.cpp
index ae4d309a49..daad1afb45 100644
--- a/modules/gui/qt4/components/playlist/standardpanel.cpp
+++ b/modules/gui/qt4/components/playlist/standardpanel.cpp
@@ -26,23 +26,24 @@
 # include "config.h"
 #endif
 
-#include "dialogs_provider.hpp"
-
-#include "components/playlist/playlist_model.hpp"
 #include "components/playlist/standardpanel.hpp"
-#include "components/playlist/icon_view.hpp"
-#include "util/customwidgets.hpp"
 
-#include <vlc_intf_strings.h>
+#include "components/playlist/playlist_model.hpp" /* PLModel */
+#include "components/playlist/views.hpp"          /* 3 views */
+#include "components/playlist/selector.hpp"       /* PLSelector */
+#include "menus.hpp"                              /* Popup */
+#include "input_manager.hpp"                      /* THEMIM */
+
+#include <vlc_services_discovery.h> /* SD_CMD_SEARCH */
 
-#include <QPushButton>
 #include <QHeaderView>
-#include <QKeyEvent>
 #include <QModelIndexList>
-#include <QLabel>
 #include <QMenu>
-#include <QSignalMapper>
+#include <QKeyEvent>
 #include <QWheelEvent>
+#include <QStackedLayout>
+#include <QSignalMapper>
+#include <QSettings>
 
 #include <assert.h>
 
@@ -51,60 +52,45 @@
 StandardPLPanel::StandardPLPanel( PlaylistWidget *_parent,
                                   intf_thread_t *_p_intf,
                                   playlist_t *p_playlist,
-                                  playlist_item_t *p_root ):
-                                  QWidget( _parent ), p_intf( _p_intf )
+                                  playlist_item_t *p_root,
+                                  PLSelector *_p_selector,
+                                  PLModel *_p_model
+                                  ):
+                                  QWidget( _parent ), p_intf( _p_intf ),
+                                  p_selector( _p_selector )
 {
-    layout = new QGridLayout( this );
+    QGridLayout *layout = new QGridLayout( this );
     layout->setSpacing( 0 ); layout->setMargin( 0 );
     setMinimumWidth( 300 );
 
-    model = new PLModel( p_playlist, p_intf, p_root, this );
-
     iconView = NULL;
     treeView = NULL;
+    listView = NULL;
+    viewStack = new QStackedLayout();
+    layout->addLayout( viewStack, 1, 0, 1, -1 );
+
+    model = _p_model;
+    currentRootId = -1;
+    currentRootIndexId = -1;
+    lastActivatedId = -1;
 
     /* Saved Settings */
     getSettings()->beginGroup("Playlist");
 
     int i_viewMode = getSettings()->value( "view-mode", TREE_VIEW ).toInt();
-    if( i_viewMode == ICON_VIEW )
-        iconView = new PlIconView( model, this );
-    else
-        createTreeView();
 
     getSettings()->endGroup();
 
-    currentRootId = -1;
+    showView( i_viewMode );
+
+    DCONNECT( THEMIM, leafBecameParent( input_item_t *),
+              this, browseInto( input_item_t * ) );
+
+    CONNECT( model, currentChanged( const QModelIndex& ),
+             this, handleExpansion( const QModelIndex& ) );
+    CONNECT( model, rootChanged(), this, handleRootChange() );
 
-    /* Title label */
-    title = new QLabel;
-    QFont titleFont;
-    titleFont.setPointSize( titleFont.pointSize() + 6 );
-    titleFont.setFamily( "Verdana" );
-    title->setFont( titleFont );
-    layout->addWidget( title, 0, 0 );
-
-    /* A Spacer and the search possibilities */
-    layout->setColumnStretch( 1, 10 );
-
-    SearchLineEdit *search = new SearchLineEdit( this );
-    search->setMaximumWidth( 200 );
-    layout->addWidget( search, 0, 4 );
-    CONNECT( search, textChanged( const QString& ),
-             this, search( const QString& ) );
-    layout->setColumnStretch( 4, 1 );
-
-    /* Add item to the playlist button */
-    addButton = new QPushButton;
-    addButton->setIcon( QIcon( ":/buttons/playlist/playlist_add" ) );
-    addButton->setMaximumWidth( 30 );
-    BUTTONACT( addButton, popupAdd() );
-    layout->addWidget( addButton, 0, 3 );
-
-    QPushButton *viewButton = new QPushButton( this );
-    viewButton->setIcon( QIcon( ":/buttons/playlist/playlist_add" ) );
-    layout->addWidget( viewButton, 0, 2 );
-    BUTTONACT( viewButton, toggleView() );
+    setRoot( p_root );
 }
 
 StandardPLPanel::~StandardPLPanel()
@@ -112,45 +98,43 @@ StandardPLPanel::~StandardPLPanel()
     getSettings()->beginGroup("Playlist");
     if( treeView )
         getSettings()->setValue( "headerStateV2", treeView->header()->saveState() );
+    if( currentView == treeView )
+        getSettings()->setValue( "view-mode", TREE_VIEW );
+    else if( currentView == listView )
+        getSettings()->setValue( "view-mode", LIST_VIEW );
+    else if( currentView == iconView )
+        getSettings()->setValue( "view-mode", ICON_VIEW );
     getSettings()->endGroup();
 }
 
 /* Unused anymore, but might be useful, like in right-click menu */
 void StandardPLPanel::gotoPlayingItem()
 {
-    if( treeView )
-        treeView->scrollTo( model->currentIndex() );
+    currentView->scrollTo( model->currentIndex() );
 }
 
 void StandardPLPanel::handleExpansion( const QModelIndex& index )
 {
-    assert( treeView );
-    treeView->scrollTo( index );
+    assert( currentView );
+    if( currentRootIndexId != -1 && currentRootIndexId != model->itemId( index.parent() ) )
+        browseInto( index.parent() );
+    currentView->scrollTo( index );
 }
 
-/* PopupAdd Menu for the Add Menu */
-void StandardPLPanel::popupAdd()
+void StandardPLPanel::handleRootChange()
 {
-    QMenu popup;
-    if( currentRootId == THEPL->p_local_category->i_id ||
-        currentRootId == THEPL->p_local_onelevel->i_id )
-    {
-        popup.addAction( qtr(I_PL_ADDF), THEDP, SLOT( simplePLAppendDialog()) );
-        popup.addAction( qtr(I_PL_ADDDIR), THEDP, SLOT( PLAppendDir()) );
-        popup.addAction( qtr(I_OP_ADVOP), THEDP, SLOT( PLAppendDialog()) );
-    }
-    else if( ( THEPL->p_ml_category &&
-                currentRootId == THEPL->p_ml_category->i_id ) ||
-             ( THEPL->p_ml_onelevel &&
-                currentRootId == THEPL->p_ml_onelevel->i_id ) )
-    {
-        popup.addAction( qtr(I_PL_ADDF), THEDP, SLOT( simpleMLAppendDialog()) );
-        popup.addAction( qtr(I_PL_ADDDIR), THEDP, SLOT( MLAppendDir() ) );
-        popup.addAction( qtr(I_OP_ADVOP), THEDP, SLOT( MLAppendDialog() ) );
-    }
+    browseInto();
+}
+
+void StandardPLPanel::popupPlView( const QPoint &point )
+{
+    QModelIndex index = currentView->indexAt( point );
+    QPoint globalPoint = currentView->viewport()->mapToGlobal( point );
+    QItemSelectionModel *selection = currentView->selectionModel();
+    QModelIndexList list = selection->selectedIndexes();
 
-    popup.exec( QCursor::pos() - addButton->mapFromGlobal( QCursor::pos() )
-                        + QPoint( 0, addButton->height() ) );
+    if( !model->popup( index, globalPoint, list ) )
+        QVLCMenu::PopupMenu( p_intf, true );
 }
 
 void StandardPLPanel::popupSelectColumn( QPoint pos )
@@ -173,20 +157,6 @@ void StandardPLPanel::popupSelectColumn( QPoint pos )
     menu.exec( QCursor::pos() );
 }
 
-void StandardPLPanel::popupPlView( const QPoint &point )
-{
-    QAbstractItemView *aView;
-    if ( treeView && treeView->isVisible() ) aView = treeView;
-    else if( iconView && iconView->isVisible() ) aView = iconView;
-    else return;
-
-    QModelIndex index = aView->indexAt( point );
-    QPoint globalPoint = aView->viewport()->mapToGlobal( point );
-    QItemSelectionModel *selection = aView->selectionModel();
-    QModelIndexList list = selection->selectedIndexes();
-    model->popup( index, globalPoint, list );
-}
-
 void StandardPLPanel::toggleColumnShown( int i )
 {
     treeView->setColumnHidden( i, !treeView->isColumnHidden( i ) );
@@ -195,72 +165,80 @@ void StandardPLPanel::toggleColumnShown( int i )
 /* Search in the playlist */
 void StandardPLPanel::search( const QString& searchText )
 {
-    model->search( searchText );
+    int type;
+    QString name;
+    p_selector->getCurrentSelectedItem( &type, &name );
+    if( type != SD_TYPE )
+    {
+        bool flat = currentView == iconView || currentView == listView;
+        model->search( searchText,
+                       flat ? currentView->rootIndex() : QModelIndex(),
+                       !flat );
+    }
+}
+
+void StandardPLPanel::searchDelayed( const QString& searchText )
+{
+    int type;
+    QString name;
+    p_selector->getCurrentSelectedItem( &type, &name );
+
+    if( type == SD_TYPE )
+    {
+        if( !name.isEmpty() && !searchText.isEmpty() )
+            playlist_ServicesDiscoveryControl( THEPL, qtu( name ), SD_CMD_SEARCH, qtu( searchText ) );
+    }
 }
 
 /* Set the root of the new Playlist */
 /* This activated by the selector selection */
 void StandardPLPanel::setRoot( playlist_item_t *p_item )
 {
-    QPL_LOCK;
-    assert( 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;
-
-    /* cosmetics, ..still need playlist locking.. */
-    char *psz_title = input_item_GetName( p_item->p_input );
-    title->setText( qfu(psz_title) );
-    free( psz_title );
-
-    QPL_UNLOCK;
-
-    /* do THE job */
     model->rebuild( p_item );
+}
 
-    /* enable/disable adding */
-    if( p_item == THEPL->p_local_category ||
-        p_item == THEPL->p_local_onelevel )
-    {
-        addButton->setEnabled( true );
-        addButton->setToolTip( qtr(I_PL_ADDPL) );
-    }
-    else if( ( THEPL->p_ml_category && p_item == THEPL->p_ml_category) ||
-              ( THEPL->p_ml_onelevel && p_item == THEPL->p_ml_onelevel ) )
+void StandardPLPanel::browseInto( const QModelIndex &index )
+{
+    if( currentView == iconView || currentView == listView )
     {
-        addButton->setEnabled( true );
-        addButton->setToolTip( qtr(I_PL_ADDML) );
+        currentRootIndexId = model->itemId( index );
+        currentView->setRootIndex( index );
     }
-    else
-        addButton->setEnabled( false );
+
+    emit viewChanged( index );
+}
+
+void StandardPLPanel::browseInto( )
+{
+    browseInto( currentRootIndexId != -1 && currentView != treeView ?
+                model->index( currentRootIndexId, 0 ) :
+                QModelIndex() );
 }
 
-void StandardPLPanel::removeItem( int i_id )
+void StandardPLPanel::wheelEvent( QWheelEvent *e )
 {
-    model->removeItem( i_id );
+    // Accept this event in order to prevent unwanted volume up/down changes
+    e->accept();
 }
 
-/* Delete and Suppr key remove the selection
-   FilterKey function and code function */
-void StandardPLPanel::keyPressEvent( QKeyEvent *e )
+bool StandardPLPanel::eventFilter ( QObject * watched, QEvent * event )
 {
-    switch( e->key() )
+    if (event->type() == QEvent::KeyPress)
     {
-    case Qt::Key_Back:
-    case Qt::Key_Delete:
-        deleteSelection();
-        break;
+        QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
+        if( keyEvent->key() == Qt::Key_Delete ||
+            keyEvent->key() == Qt::Key_Backspace )
+        {
+            deleteSelection();
+            return true;
+        }
     }
+    return false;
 }
 
 void StandardPLPanel::deleteSelection()
 {
-    //FIXME
-    if( !treeView ) return;
-    QItemSelectionModel *selection = treeView->selectionModel();
+    QItemSelectionModel *selection = currentView->selectionModel();
     QModelIndexList list = selection->selectedIndexes();
     model->doDelete( list );
 }
@@ -271,15 +249,29 @@ void StandardPLPanel::createIconView()
     iconView->setContextMenuPolicy( Qt::CustomContextMenu );
     CONNECT( iconView, customContextMenuRequested( const QPoint & ),
              this, popupPlView( const QPoint & ) );
+    CONNECT( iconView, activated( const QModelIndex & ),
+             this, activate( const QModelIndex & ) );
+    iconView->installEventFilter( this );
+    viewStack->addWidget( iconView );
+}
 
-    layout->addWidget( iconView, 1, 0, 1, -1 );
+void StandardPLPanel::createListView()
+{
+    listView = new PlListView( model, this );
+    listView->setContextMenuPolicy( Qt::CustomContextMenu );
+    CONNECT( listView, customContextMenuRequested( const QPoint & ),
+             this, popupPlView( const QPoint & ) );
+    CONNECT( listView, activated( const QModelIndex & ),
+             this, activate( const QModelIndex & ) );
+    listView->installEventFilter( this );
+    viewStack->addWidget( listView );
 }
 
+
 void StandardPLPanel::createTreeView()
 {
     /* Create and configure the QTreeView */
-    treeView = new QTreeView;
-    treeView->setModel( model );
+    treeView = new PlTreeView;
 
     treeView->setIconSize( QSize( 20, 20 ) );
     treeView->setAlternatingRowColors( true );
@@ -298,6 +290,11 @@ void StandardPLPanel::createTreeView()
     treeView->setDropIndicatorShown( true );
     treeView->setContextMenuPolicy( Qt::CustomContextMenu );
 
+    /* setModel after setSortingEnabled(true), or the model will sort immediately! */
+    treeView->setModel( model );
+
+    getSettings()->beginGroup("Playlist");
+
     if( getSettings()->contains( "headerStateV2" ) )
     {
         treeView->header()->restoreState(
@@ -307,21 +304,22 @@ void StandardPLPanel::createTreeView()
     {
         for( int m = 1, c = 0; m != COLUMN_END; m <<= 1, c++ )
         {
-            treeView->setClumnHidden( c, !( m & COLUMN_DEFAULT ) );
+            treeView->setColumnHidden( c, !( m & COLUMN_DEFAULT ) );
             if( m == COLUMN_TITLE ) treeView->header()->resizeSection( c, 200 );
             else if( m == COLUMN_DURATION ) treeView->header()->resizeSection( c, 80 );
         }
     }
 
+    getSettings()->endGroup();
+
     /* Connections for the TreeView */
     CONNECT( treeView, activated( const QModelIndex& ),
-             model,activateItem( const QModelIndex& ) );
+             this, activate( const QModelIndex& ) );
     CONNECT( treeView->header(), customContextMenuRequested( const QPoint & ),
              this, popupSelectColumn( QPoint ) );
     CONNECT( treeView, customContextMenuRequested( const QPoint & ),
              this, popupPlView( const QPoint & ) );
-    CONNECT( model, currentChanged( const QModelIndex& ),
-             this, handleExpansion( const QModelIndex& ) );
+    treeView->installEventFilter( this );
 
     /* SignalMapper for columns */
     selectColumnsSigMapper = new QSignalMapper( this );
@@ -329,28 +327,96 @@ void StandardPLPanel::createTreeView()
              this, toggleColumnShown( int ) );
 
     /* Finish the layout */
-    layout->addWidget( treeView, 1, 0, 1, -1 );
+    viewStack->addWidget( treeView );
 }
 
-void StandardPLPanel::toggleView()
+void StandardPLPanel::showView( int i_view )
 {
-    if( treeView && treeView->isVisible() )
+    switch( i_view )
+    {
+    case TREE_VIEW:
+    {
+        if( treeView == NULL )
+            createTreeView();
+        currentView = treeView;
+        break;
+    }
+    case ICON_VIEW:
     {
         if( iconView == NULL )
             createIconView();
+        currentView = iconView;
+        break;
+    }
+    case LIST_VIEW:
+    {
+        if( listView == NULL )
+            createListView();
+        currentView = listView;
+        break;
+    }
+    default: return;
+    }
 
-        treeView->hide();
-        iconView->show();
+    viewStack->setCurrentWidget( currentView );
+    //viewActions[i_view]->setChecked( true );
+    browseInto();
+    gotoPlayingItem();
+}
+
+void StandardPLPanel::cycleViews()
+{
+    if( currentView == iconView )
+        showView( TREE_VIEW );
+    else if( currentView == treeView )
+        showView( LIST_VIEW );
+    else if( currentView == listView )
+        showView( ICON_VIEW );
+    else
+        assert( 0 );
+}
+
+void StandardPLPanel::activate( const QModelIndex &index )
+{
+    if( !index.data( PLModel::IsLeafNodeRole ).toBool() )
+    {
+        if( currentView != treeView )
+            browseInto( index );
     }
     else
     {
-        iconView->hide();
-        treeView->show();
+        playlist_Lock( THEPL );
+        playlist_item_t *p_item = playlist_ItemGetById( THEPL, model->itemId( index ) );
+        p_item->i_flags |= PLAYLIST_SUBITEM_STOP_FLAG;
+        lastActivatedId = p_item->p_input->i_id;
+        playlist_Unlock( THEPL );
+        model->activateItem( index );
     }
 }
 
-void StandardPLPanel::wheelEvent( QWheelEvent *e )
+void StandardPLPanel::browseInto( input_item_t *p_input )
 {
-    // Accept this event in order to prevent unwanted volume up/down changes
-    e->accept();
+
+    if( p_input->i_id != lastActivatedId ) return;
+
+    playlist_Lock( THEPL );
+
+    playlist_item_t *p_item = playlist_ItemGetByInput( THEPL, p_input );
+    if( !p_item )
+    {
+        playlist_Unlock( THEPL );
+        return;
+    }
+
+    QModelIndex index = model->index( p_item->i_id, 0 );
+
+    playlist_Unlock( THEPL );
+
+    if( currentView == treeView )
+        treeView->setExpanded( index, true );
+    else
+        browseInto( index );
+
+    lastActivatedId = -1;
+
 }