X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fcomponents%2Fplaylist%2Fstandardpanel.cpp;h=4ac1da2240845f635b0430e7267306f4ec1a71ac;hb=5a38d2b20e1c04853679206bf2e7ec839d450563;hp=b237baccf16b76d83a1a8bba362dc002b94a64b1;hpb=9f13f7269bc42bae27d043688745c1eae9f26eb5;p=vlc

diff --git a/modules/gui/qt4/components/playlist/standardpanel.cpp b/modules/gui/qt4/components/playlist/standardpanel.cpp
index b237baccf1..4ac1da2240 100644
--- a/modules/gui/qt4/components/playlist/standardpanel.cpp
+++ b/modules/gui/qt4/components/playlist/standardpanel.cpp
@@ -21,150 +21,348 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include "playlist_model.hpp"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "qt4.hpp"
+#include "dialogs_provider.hpp"
+
+#include "components/playlist/playlist_model.hpp"
 #include "components/playlist/panels.hpp"
-#include <QTreeView>
+#include "util/customwidgets.hpp"
+
+#include <vlc_intf_strings.h>
+
 #include <QPushButton>
 #include <QHBoxLayout>
 #include <QVBoxLayout>
 #include <QHeaderView>
 #include <QKeyEvent>
-#include "qt4.hpp"
-#include <assert.h>
 #include <QModelIndexList>
-#include <QToolBar>
 #include <QLabel>
 #include <QSpacerItem>
-#include "util/views.hpp"
-#include "util/customwidgets.hpp"
+#include <QMenu>
+#include <QSignalMapper>
+#include <assert.h>
+
+#include "sorting.h"
 
-StandardPLPanel::StandardPLPanel( QWidget *_parent, intf_thread_t *_p_intf,
+StandardPLPanel::StandardPLPanel( PlaylistWidget *_parent,
+                                  intf_thread_t *_p_intf,
                                   playlist_t *p_playlist,
                                   playlist_item_t *p_root ):
                                   PLPanel( _parent, _p_intf )
 {
-    model = new PLModel( p_playlist, p_root, -1, this );
-    view = new QVLCTreeView( 0 );
-    view->setModel(model);
-    view->setIconSize( QSize(20,20) );
+    model = new PLModel( p_playlist, p_intf, p_root, -1, this );
+
+    QVBoxLayout *layout = new QVBoxLayout();
+    layout->setSpacing( 0 ); layout->setMargin( 0 );
+
+    /* Create and configure the QTreeView */
+    view = new QVLCTreeView;
+    view->setModel( model );
+    view->setIconSize( QSize( 20, 20 ) );
     view->setAlternatingRowColors( true );
-    view->header()->resizeSection( 0, 300 );
+    view->setAnimated( true );
+    view->setSelectionBehavior( QAbstractItemView::SelectRows );
+    view->setSelectionMode( QAbstractItemView::ExtendedSelection );
+    view->setDragEnabled( true );
+    view->setAcceptDrops( true );
+    view->setDropIndicatorShown( true );
+    view->header()->setSortIndicator( -1 , Qt::AscendingOrder );
+    view->setUniformRowHeights( true );
+    view->setSortingEnabled( true );
+
+
+    getSettings()->beginGroup("Playlist");
+    if( getSettings()->contains( "headerState" ) )
+    {
+        view->header()->restoreState(
+                getSettings()->value( "headerState" ).toByteArray() );
+    }
+    else
+    {
+        /* Configure the size of the header */
+        view->header()->resizeSection( 0, 200 );
+        view->header()->resizeSection( 1, 80 );
+    }
     view->header()->setSortIndicatorShown( true );
     view->header()->setClickable( true );
-    view->setSelectionMode( QAbstractItemView::ExtendedSelection );
+    view->header()->setContextMenuPolicy( Qt::CustomContextMenu );
+    getSettings()->endGroup();
 
-    connect( view, SIGNAL( activated( const QModelIndex& ) ), model,
-             SLOT( activateItem( const QModelIndex& ) ) );
+    /* Connections for the TreeView */
+    CONNECT( view, activated( const QModelIndex& ) ,
+             model,activateItem( const QModelIndex& ) );
+    CONNECT( view, rightClicked( QModelIndex , QPoint ),
+             this, doPopup( QModelIndex, QPoint ) );
+    CONNECT( view->header(), customContextMenuRequested( const QPoint & ),
+             this, popupSelectColumn( QPoint ) );
+    CONNECT( model, currentChanged( const QModelIndex& ),
+             this, handleExpansion( const QModelIndex& ) );
+    CONNECT( model, columnsChanged( int ),
+            this, checkSortingIndicator( int ) );
 
-    connect( view, SIGNAL( rightClicked( QModelIndex , QPoint ) ),
-             this, SLOT( doPopup( QModelIndex, QPoint ) ) );
+    currentRootId = -1;
+    CONNECT( parent, rootChanged( int ), this, setCurrentRootId( int ) );
 
-    connect( model,
-             SIGNAL( dataChanged( const QModelIndex&, const QModelIndex& ) ),
-             this, SLOT( handleExpansion( const QModelIndex& ) ) );
+    /* Buttons configuration */
+    QHBoxLayout *buttons = new QHBoxLayout;
 
-    QVBoxLayout *layout = new QVBoxLayout();
-    layout->setSpacing( 0 ); layout->setMargin( 0 );
+    /* Add item to the playlist button */
+    addButton = new QPushButton;
+    addButton->setIcon( QIcon( ":/buttons/playlist/playlist_add" ) );
+    addButton->setMaximumWidth( 30 );
+    BUTTONACT( addButton, popupAdd() );
+    buttons->addWidget( addButton );
 
-    QHBoxLayout *buttons = new QHBoxLayout();
+    /* Random 2-state button */
+    randomButton = new QPushButton( this );
+    randomButton->setIcon( QIcon( ":/buttons/playlist/shuffle_on" ));
+    randomButton->setToolTip( qtr( I_PL_RANDOM ));
+    randomButton->setCheckable( true );
+    randomButton->setChecked( model->hasRandom() );
+    BUTTONACT( randomButton, toggleRandom() );
+    buttons->addWidget( randomButton );
 
-    repeatButton = new QPushButton( 0 ); buttons->addWidget( repeatButton );
-    if( model->hasRepeat() ) repeatButton->setText( qtr( "Repeat One" ) );
-    else if( model->hasLoop() ) repeatButton->setText( qtr( "Repeat All" ) );
-    else repeatButton->setText( qtr( "No Repeat" ) );
-    connect( repeatButton, SIGNAL( clicked() ), this, SLOT( toggleRepeat() ));
+    /* Repeat 3-state button */
+    repeatButton = new QPushButton( this );
+    repeatButton->setToolTip( qtr( "Click to toggle between loop one, loop all" ) );
+    repeatButton->setCheckable( true );
+
+    if( model->hasRepeat() )
+    {
+        repeatButton->setIcon( QIcon( ":/buttons/playlist/repeat_one" ) );
+        repeatButton->setChecked( true );
+    }
+    else if( model->hasLoop() )
+    {
+        repeatButton->setIcon( QIcon( ":/buttons/playlist/repeat_all" ) );
+        repeatButton->setChecked( true );
+    }
+    else
+    {
+        repeatButton->setIcon( QIcon( ":/buttons/playlist/repeat_one" ) );
+        repeatButton->setChecked( false );
+    }
+    BUTTONACT( repeatButton, toggleRepeat() );
+    buttons->addWidget( repeatButton );
 
-    randomButton = new QPushButton( 0 ); buttons->addWidget( randomButton );
-    if( model->hasRandom() ) randomButton->setText( qtr( "Random" ) );
-    else randomButton->setText( qtr( "No random" ) );
-    connect( randomButton, SIGNAL( clicked() ), this, SLOT( toggleRandom() ));
+    /* Goto */
+    gotoPlayingButton = new QPushButton;
+    BUTTON_SET_ACT_I( gotoPlayingButton, "", buttons/playlist/jump_to,
+            qtr( "Show the current item" ), gotoPlayingItem() );
+    buttons->addWidget( gotoPlayingButton );
 
-    QSpacerItem *spacer = new QSpacerItem( 10, 20 );buttons->addItem( spacer );
+    /* A Spacer and the search possibilities */
+    QSpacerItem *spacer = new QSpacerItem( 10, 20 );
+    buttons->addItem( spacer );
 
-    QLabel *filter = new QLabel( qfu( "&Search:" ) + " " );
+    QLabel *filter = new QLabel( qtr(I_PL_SEARCH) + " " );
     buttons->addWidget( filter );
-    searchLine = new  ClickLineEdit( qfu( "Playlist filter" ), 0 );
-    connect( searchLine, SIGNAL( textChanged(QString) ),
-             this, SLOT( search(QString)) );
-    buttons->addWidget( searchLine ); filter->setBuddy( searchLine );
 
-    QPushButton *clear = new QPushButton( qfu( "CL") );
-    buttons->addWidget( clear );
-    connect( clear, SIGNAL( clicked() ), this, SLOT( clearFilter() ) );
+    SearchLineEdit *search = new SearchLineEdit( this );
+    buttons->addWidget( search );
+    filter->setBuddy( search );
+    CONNECT( search, textChanged( const QString& ), this, search( const QString& ) );
 
+    /* Finish the layout */
     layout->addWidget( view );
     layout->addLayout( buttons );
 //    layout->addWidget( bar );
     setLayout( layout );
 }
 
+/* Function to toggle between the Repeat states */
 void StandardPLPanel::toggleRepeat()
 {
     if( model->hasRepeat() )
     {
         model->setRepeat( false ); model->setLoop( true );
-        repeatButton->setText( qtr( "Repeat All" ) );
+        repeatButton->setIcon( QIcon( ":/buttons/playlist/repeat_all" ) );
+        repeatButton->setChecked( true );
     }
     else if( model->hasLoop() )
     {
         model->setRepeat( false ) ; model->setLoop( false );
-        repeatButton->setText( qtr( "No Repeat" ) );
+        repeatButton->setChecked( false );
+        repeatButton->setIcon( QIcon( ":/buttons/playlist/repeat_one" ) );
     }
     else
     {
-        model->setRepeat( true );
-        repeatButton->setText( qtr( "Repeat One" ) );
+        model->setRepeat( true ); model->setLoop( false );
+        repeatButton->setChecked( true );
+        repeatButton->setIcon( QIcon( ":/buttons/playlist/repeat_one" ) );
     }
 }
 
+/* Function to toggle between the Random states */
 void StandardPLPanel::toggleRandom()
 {
     bool prev = model->hasRandom();
     model->setRandom( !prev );
-    randomButton->setText( prev ? qtr( "No Random" ) : qtr( "Random" ) );
 }
 
-void StandardPLPanel::handleExpansion( const QModelIndex &index )
+void StandardPLPanel::gotoPlayingItem()
+{
+    view->scrollTo( view->currentIndex() );
+}
+
+void StandardPLPanel::handleExpansion( const QModelIndex& index )
+{
+    view->scrollTo( index );
+}
+
+void StandardPLPanel::setCurrentRootId( int _new )
 {
-    QModelIndex parent;
-    if( model->isCurrent( index ) )
+    currentRootId = _new;
+    if( currentRootId == THEPL->p_local_category->i_id ||
+        currentRootId == THEPL->p_local_onelevel->i_id  )
+    {
+        addButton->setEnabled( true );
+        addButton->setToolTip( qtr(I_PL_ADDPL) );
+    }
+    else if( ( THEPL->p_ml_category &&
+                        currentRootId == THEPL->p_ml_category->i_id ) ||
+             ( THEPL->p_ml_onelevel &&
+                        currentRootId == THEPL->p_ml_onelevel->i_id ) )
+    {
+        addButton->setEnabled( true );
+        addButton->setToolTip( qtr(I_PL_ADDML) );
+    }
+    else
+        addButton->setEnabled( false );
+}
+
+/* PopupAdd Menu for the Add Menu */
+void StandardPLPanel::popupAdd()
+{
+    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() ) );
+    }
+
+    popup.exec( QCursor::pos() - addButton->mapFromGlobal( QCursor::pos() )
+                        + QPoint( 0, addButton->height() ) );
+}
+
+/* Set sortingindicator to -1 if it's on column thats removed,
+ * else check that it's still showing on correct column
+ */
+void StandardPLPanel::checkSortingIndicator( int meta )
+{
+    int index=0;
+
+    if( view->header()->isSortIndicatorShown() == false )
+        return;
+
+    int sortIndex = view->header()->sortIndicatorSection();
+    if( sortIndex < 0 || sortIndex > view->header()->count() || meta == 0 )
+        return;
+
+    int _meta = meta;
+
+    while( _meta )
     {
-        parent = index;
-        while( parent.isValid() )
+        if( _meta & model->shownFlags() )
+            index++;
+        _meta >>= 1;
+    }
+
+    /* Adding column */
+    if( model->shownFlags() & meta )
+    {
+        /* If column is added before sortIndex, move it one to right*/
+        if( sortIndex >= index )
+        {
+            sortIndex += 1;
+        }
+    } else {
+        /* Column removed */
+        if( sortIndex == index )
         {
-            view->setExpanded( parent, true );
-            parent = model->parent( parent );
+            sortIndex = -1;
+        } else if( sortIndex > index )
+        {
+            /* Move indicator left one step*/
+            sortIndex -= 1;
         }
     }
+    view->header()->setSortIndicator( sortIndex  ,
+                view->header()->sortIndicatorOrder() );
 }
 
-void StandardPLPanel::clearFilter()
+void StandardPLPanel::popupSelectColumn( QPoint pos )
 {
-    searchLine->setText( "" );
+    ContextUpdateMapper = new QSignalMapper(this);
+
+    QMenu selectColMenu;
+
+    int i_column = 1;
+    for( i_column = 1; i_column != COLUMN_END; i_column<<=1 )
+    {
+        QAction* option = selectColMenu.addAction(
+            qfu( psz_column_title( i_column ) ) );
+        option->setCheckable( true );
+        option->setChecked( model->shownFlags() & i_column );
+        ContextUpdateMapper->setMapping( option, i_column );
+        CONNECT( option, triggered(), ContextUpdateMapper, map() );
+    }
+
+    CONNECT( ContextUpdateMapper, mapped( int ),  model, viewchanged( int ) );
+
+    selectColMenu.exec( QCursor::pos() );
 }
 
-void StandardPLPanel::search( QString searchText )
+/* Search in the playlist */
+void StandardPLPanel::search( const QString& searchText )
 {
     model->search( searchText );
 }
 
 void StandardPLPanel::doPopup( QModelIndex index, QPoint point )
 {
-    assert( index.isValid() );
+    if( !index.isValid() ) return;
     QItemSelectionModel *selection = view->selectionModel();
     QModelIndexList list = selection->selectedIndexes();
     model->popup( index, point, list );
 }
 
+/* Set the root of the new Playlist */
+/* This activated by the selector selection */
 void StandardPLPanel::setRoot( int i_root_id )
 {
+    QPL_LOCK;
     playlist_item_t *p_item = playlist_ItemGetById( THEPL, i_root_id );
     assert( p_item );
     p_item = playlist_GetPreferredNode( THEPL, p_item );
     assert( p_item );
+    QPL_UNLOCK;
+
     model->rebuild( p_item );
 }
 
+void StandardPLPanel::removeItem( int i_id )
+{
+    model->removeItem( i_id );
+}
+
+/* Delete and Suppr key remove the selection
+   FilterKey function and code function */
 void StandardPLPanel::keyPressEvent( QKeyEvent *e )
 {
     switch( e->key() )
@@ -184,4 +382,10 @@ void StandardPLPanel::deleteSelection()
 }
 
 StandardPLPanel::~StandardPLPanel()
-{}
+{
+    getSettings()->beginGroup("Playlist");
+    getSettings()->setValue( "headerState", view->header()->saveState() );
+    getSettings()->endGroup();
+}
+
+