X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fcomponents%2Fplaylist%2Fstandardpanel.cpp;h=aa57a9c920c13dd318148e5623f9489b5eeb1295;hb=e61cd9b76b9c39ca09c41f95bd3fc7dce9a49585;hp=cde0a792ed0667c501527ddce97dd6700278bc5d;hpb=a94647f04b28484b49f16ce252523b38343b6b58;p=vlc diff --git a/modules/gui/qt4/components/playlist/standardpanel.cpp b/modules/gui/qt4/components/playlist/standardpanel.cpp index cde0a792ed..aa57a9c920 100644 --- a/modules/gui/qt4/components/playlist/standardpanel.cpp +++ b/modules/gui/qt4/components/playlist/standardpanel.cpp @@ -20,10 +20,13 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif #include "qt4.hpp" #include "dialogs_provider.hpp" -#include "playlist_model.hpp" +#include "components/playlist/playlist_model.hpp" #include "components/playlist/panels.hpp" #include "util/customwidgets.hpp" @@ -40,118 +43,174 @@ #include #include #include +#include #include -StandardPLPanel::StandardPLPanel( BasePlaylistWidget *_parent, +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_intf, p_root, -1, this ); + + QVBoxLayout *layout = new QVBoxLayout(); + layout->setSpacing( 0 ); layout->setMargin( 0 ); + + /* Create and configure the QTreeView */ view = new QVLCTreeView( 0 ); view->setModel(model); - view->setIconSize( QSize(20,20) ); + view->setIconSize( QSize( 20, 20 ) ); view->setAlternatingRowColors( true ); - view->header()->resizeSection( 0, 230 ); - view->header()->resizeSection( 1, 170 ); + view->setAnimated( true ); + view->setSortingEnabled( true ); + view->setSelectionMode( QAbstractItemView::ExtendedSelection ); + view->setDragEnabled( true ); + view->setAcceptDrops( true ); + view->setDropIndicatorShown( true ); + view->setAutoScroll( true ); + + /* 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->header()->setContextMenuPolicy( Qt::CustomContextMenu ); - view->setSelectionMode( QAbstractItemView::ExtendedSelection ); - view->setDragEnabled(true); - view->setAcceptDrops(true); - view->setDropIndicatorShown(true); - + /* Connections for the TreeView */ CONNECT( view, activated( const QModelIndex& ) , model,activateItem( const QModelIndex& ) ); CONNECT( view, rightClicked( QModelIndex , QPoint ), this, doPopup( QModelIndex, QPoint ) ); CONNECT( model, dataChanged( const QModelIndex&, const QModelIndex& ), this, handleExpansion( const QModelIndex& ) ); + CONNECT( view->header(), customContextMenuRequested( const QPoint & ), + this, popupSelectColumn( QPoint ) ); currentRootId = -1; - CONNECT( parent, rootChanged(int), this, setCurrentRootId( int ) ); - - QVBoxLayout *layout = new QVBoxLayout(); - layout->setSpacing( 0 ); layout->setMargin( 0 ); + CONNECT( parent, rootChanged( int ), this, setCurrentRootId( int ) ); - QHBoxLayout *buttons = new QHBoxLayout(); + /* Buttons configuration */ + QHBoxLayout *buttons = new QHBoxLayout; - addButton = new QPushButton( "+", this ); - addButton->setMaximumWidth( 25 ); - BUTTONACT( addButton, add() ); + /* Add item to the playlist button */ + addButton = new QPushButton; + addButton->setIcon( QIcon( ":/pixmaps/playlist_add.png" ) ); + addButton->setMaximumWidth( 30 ); + BUTTONACT( addButton, popupAdd() ); buttons->addWidget( addButton ); - repeatButton = new QPushButton( 0 ); buttons->addWidget( repeatButton ); - if( model->hasRepeat() ) repeatButton->setText( qtr( "R1" ) ); - else if( model->hasLoop() ) repeatButton->setText( qtr( "RA" ) ); - else repeatButton->setText( qtr( "NR" ) ); + /* Random 2-state button */ + randomButton = new QPushButton( this ); + if( model->hasRandom() ) + { + randomButton->setIcon( QIcon( ":/pixmaps/playlist_shuffle_on.png" )); + randomButton->setToolTip( qtr( I_PL_RANDOM )); + } + else + { + randomButton->setIcon( QIcon( ":/pixmaps/playlist_shuffle_off.png" ) ); + randomButton->setToolTip( qtr( I_PL_NORANDOM )); + } + BUTTONACT( randomButton, toggleRandom() ); + buttons->addWidget( randomButton ); + + /* Repeat 3-state button */ + repeatButton = new QPushButton( this ); + if( model->hasRepeat() ) + { + repeatButton->setIcon( QIcon( ":/pixmaps/playlist_repeat_one.png" ) ); + repeatButton->setToolTip( qtr( I_PL_REPEAT )); + } + else if( model->hasLoop() ) + { + repeatButton->setIcon( QIcon( ":/pixmaps/playlist_repeat_all.png" ) ); + repeatButton->setToolTip( qtr( I_PL_LOOP )); + } + else + { + repeatButton->setIcon( QIcon( ":/pixmaps/playlist_repeat_off.png" ) ); + repeatButton->setToolTip( qtr( I_PL_NOREPEAT )); + } BUTTONACT( repeatButton, toggleRepeat() ); + buttons->addWidget( repeatButton ); - randomButton = new QPushButton( 0 ); buttons->addWidget( randomButton ); - if( model->hasRandom() ) randomButton->setText( qtr( " RND" ) ); - else randomButton->setText( qtr( "NRND" ) ); - BUTTONACT( randomButton, toggleRandom() ); + /* Goto */ + gotoPlayingButton = new QPushButton( "X" , this ); + gotoPlayingButton->setToolTip( qtr( "Show the current item" )); + BUTTONACT( gotoPlayingButton, 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( qtr(I_PL_SEARCH) + " " ); buttons->addWidget( filter ); + searchLine = new ClickLineEdit( qtr(I_PL_FILTER), 0 ); + searchLine->setMinimumWidth( 80 ); CONNECT( searchLine, textChanged(QString), this, search(QString)); buttons->addWidget( searchLine ); filter->setBuddy( searchLine ); - QPushButton *clear = new QPushButton( qfu( "CL") ); + QPushButton *clear = new QPushButton; + clear->setText( qfu( "CL") ); clear->setMaximumWidth( 30 ); - buttons->addWidget( clear ); + clear->setToolTip( qtr( "Clear" )); BUTTONACT( clear, clearFilter() ); + buttons->addWidget( clear ); + /* 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(I_PL_LOOP) ); + repeatButton->setIcon( QIcon( ":/pixmaps/playlist_repeat_all.png" ) ); + repeatButton->setToolTip( qtr( I_PL_LOOP )); } else if( model->hasLoop() ) { model->setRepeat( false ) ; model->setLoop( false ); - repeatButton->setText( qtr(I_PL_NOREPEAT) ); + repeatButton->setIcon( QIcon( ":/pixmaps/playlist_repeat_off.png" ) ); + repeatButton->setToolTip( qtr( I_PL_NOREPEAT )); } else { model->setRepeat( true ); - repeatButton->setText( qtr(I_PL_REPEAT) ); + repeatButton->setIcon( QIcon( ":/pixmaps/playlist_repeat_one.png" ) ); + repeatButton->setToolTip( qtr( I_PL_REPEAT )); } } +/* Function to toggle between the Random states */ void StandardPLPanel::toggleRandom() { bool prev = model->hasRandom(); model->setRandom( !prev ); - randomButton->setText( prev ? qtr(I_PL_NORANDOM) : qtr(I_PL_RANDOM) ); + randomButton->setIcon( prev ? + QIcon( ":/pixmaps/playlist_shuffle_off.png" ) : + QIcon( ":/pixmaps/playlist_shuffle_on.png" ) ); + randomButton->setToolTip( prev ? qtr( I_PL_NORANDOM ) : qtr(I_PL_RANDOM ) ); +} + +void StandardPLPanel::gotoPlayingItem() +{ + view->scrollTo( view->currentIndex() ); } void StandardPLPanel::handleExpansion( const QModelIndex &index ) { - QModelIndex parent; if( model->isCurrent( index ) ) - { - parent = index; - while( parent.isValid() ) - { - view->setExpanded( parent, true ); - parent = model->parent( parent ); - } - } + view->scrollTo( index, QAbstractItemView::EnsureVisible ); } void StandardPLPanel::setCurrentRootId( int _new ) @@ -163,8 +222,10 @@ void StandardPLPanel::setCurrentRootId( int _new ) addButton->setEnabled( true ); addButton->setToolTip( qtr(I_PL_ADDPL) ); } - else if( currentRootId == THEPL->p_ml_category->i_id || - currentRootId == THEPL->p_ml_onelevel->i_id ) + 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) ); @@ -173,31 +234,67 @@ void StandardPLPanel::setCurrentRootId( int _new ) addButton->setEnabled( false ); } -void StandardPLPanel::add() +/* PopupAdd Menu for the Add Menu */ +void StandardPLPanel::popupAdd() { - QMenu *popup = new QMenu(); + 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_ADVADD), THEDP, SLOT(PLAppendDialog()) ); - popup->addAction( qtr(I_PL_ADDDIR), THEDP, SLOT( PLAppendDir()) ); + popup.addAction( qtr(I_PL_ADDF), THEDP, SLOT(simplePLAppendDialog())); + popup.addAction( qtr(I_PL_ADVADD), THEDP, SLOT(PLAppendDialog()) ); + popup.addAction( qtr(I_PL_ADDDIR), THEDP, SLOT( PLAppendDir()) ); } - else if( currentRootId == THEPL->p_ml_category->i_id || - currentRootId == THEPL->p_ml_onelevel->i_id ) + 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_ADVADD), THEDP, SLOT( MLAppendDialog() ) ); - popup->addAction( qtr(I_PL_ADDDIR), THEDP, SLOT( MLAppendDir() ) ); + popup.addAction( qtr(I_PL_ADDF), THEDP, SLOT(simpleMLAppendDialog())); + popup.addAction( qtr(I_PL_ADVADD), THEDP, SLOT( MLAppendDialog() ) ); + popup.addAction( qtr(I_PL_ADDDIR), THEDP, SLOT( MLAppendDir() ) ); } - popup->popup( QCursor::pos() ); + popup.exec( QCursor::pos() - addButton->mapFromGlobal( QCursor::pos() ) + + QPoint( 0, addButton->height() ) ); +} + +void StandardPLPanel::popupSelectColumn( QPoint pos ) +{ + ContextUpdateMapper = new QSignalMapper(this); + + QMenu selectColMenu; + +#define ADD_META_ACTION( meta ) { \ + QAction* option = selectColMenu.addAction( qfu(VLC_META_##meta) ); \ + option->setCheckable( true ); \ + option->setChecked( model->shownFlags() & VLC_META_ENGINE_##meta ); \ + ContextUpdateMapper->setMapping( option, VLC_META_ENGINE_##meta ); \ + CONNECT( option, triggered(), ContextUpdateMapper, map() ); \ +} + + CONNECT( ContextUpdateMapper, mapped( int ), model, viewchanged( int ) ); + + ADD_META_ACTION( TITLE ); + ADD_META_ACTION( DURATION ); + ADD_META_ACTION( ARTIST ); + ADD_META_ACTION( GENRE ); + ADD_META_ACTION( COLLECTION ); + ADD_META_ACTION( SEQ_NUM ); + ADD_META_ACTION( DESCRIPTION ); + ADD_META_ACTION( RATING ); + +#undef ADD_META_ACTION + + selectColMenu.exec( QCursor::pos() ); } +/* ClearFilter LineEdit */ void StandardPLPanel::clearFilter() { searchLine->setText( "" ); } +/* Search in the playlist */ void StandardPLPanel::search( QString searchText ) { model->search( searchText ); @@ -211,6 +308,8 @@ void StandardPLPanel::doPopup( QModelIndex index, QPoint point ) 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 ) { playlist_item_t *p_item = playlist_ItemGetById( THEPL, i_root_id, @@ -226,6 +325,8 @@ 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() )