X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fcomponents%2Fplaylist%2Fstandardpanel.cpp;h=6bea1c92d463ddce4de2d39cd19d51119b5430d5;hb=494ace96d068ee8e4b6b689da0ae469c0c0e4fe3;hp=360315e080414dd9817d979427f9f24d48054f44;hpb=6eabc8bc8bfa467fa57ea95de1c3f4dde58eded1;p=vlc diff --git a/modules/gui/qt4/components/playlist/standardpanel.cpp b/modules/gui/qt4/components/playlist/standardpanel.cpp index 360315e080..6bea1c92d4 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,9 +43,12 @@ #include #include #include +#include #include +#include "sorting.h" + StandardPLPanel::StandardPLPanel( PlaylistWidget *_parent, intf_thread_t *_p_intf, playlist_t *p_playlist, @@ -50,121 +56,164 @@ StandardPLPanel::StandardPLPanel( PlaylistWidget *_parent, 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->setSortingEnabled( true ); + view->sortByColumn( 0 , Qt::AscendingOrder ); + view->setModel( model ); + view->setIconSize( QSize( 20, 20 ) ); view->setAlternatingRowColors( true ); - view->setAnimated( true ); - view->setSortingEnabled( true ); + view->setAnimated( true ); view->setSelectionMode( QAbstractItemView::ExtendedSelection ); view->setDragEnabled( true ); view->setAcceptDrops( true ); view->setDropIndicatorShown( true ); view->setAutoScroll( true ); - - view->header()->resizeSection( 0, 230 ); - view->header()->resizeSection( 1, 170 ); + + /* 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->header()->setContextMenuPolicy( Qt::CustomContextMenu ); + + /* 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 & ), + 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 ) ); /* Buttons configuration */ - QHBoxLayout *buttons = new QHBoxLayout(); - - addButton = new QPushButton( "+", this ); - addButton->setMaximumWidth( 25 ); - BUTTONACT( addButton, add() ); + QHBoxLayout *buttons = new QHBoxLayout; + + /* 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( this ); - if( model->hasRepeat() ) repeatButton->setText( qtr( I_PL_REPEAT ) ); - else if( model->hasLoop() ) repeatButton->setText( qtr( I_PL_LOOP ) ); - else repeatButton->setText( qtr( I_PL_NOREPEAT ) ); + /* 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( this ); - randomButton->setText( model->hasRandom() ? qtr( I_PL_RANDOM ) - : qtr( I_PL_NORANDOM) ); - BUTTONACT( randomButton, toggleRandom() ); - buttons->addWidget( randomButton ); + /* Goto */ + gotoPlayingButton = new QPushButton( "X" , this ); + gotoPlayingButton->setToolTip( qtr( "Show the current item" )); + BUTTONACT( gotoPlayingButton, gotoPlayingItem() ); + buttons->addWidget( gotoPlayingButton ); + /* 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 ); + 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 ) ) - { view->scrollTo( index, QAbstractItemView::EnsureVisible ); - parent = index; - while( parent.isValid() ) - { - view->setExpanded( parent, true ); - parent = model->parent( parent ); - } - } } void StandardPLPanel::setCurrentRootId( int _new ) @@ -176,8 +225,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) ); @@ -186,7 +237,8 @@ void StandardPLPanel::setCurrentRootId( int _new ) addButton->setEnabled( false ); } -void StandardPLPanel::add() +/* PopupAdd Menu for the Add Menu */ +void StandardPLPanel::popupAdd() { QMenu popup; if( currentRootId == THEPL->p_local_category->i_id || @@ -196,50 +248,56 @@ void StandardPLPanel::add() 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.exec( QCursor::pos() ); + popup.exec( QCursor::pos() - addButton->mapFromGlobal( QCursor::pos() ) + + QPoint( 0, addButton->height() ) ); } -void StandardPLPanel::popupSelectColumn( QPoint ) -{ +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() ); \ - } +#define ADD_META_ACTION( meta ) { \ + QAction* option = selectColMenu.addAction( qfu( psz_column_title( meta ) ) ); \ + option->setCheckable( true ); \ + option->setChecked( model->shownFlags() & meta ); \ + ContextUpdateMapper->setMapping( option, meta ); \ + CONNECT( option, triggered(), ContextUpdateMapper, map() ); \ +} + CONNECT( ContextUpdateMapper, mapped( int ), model, viewchanged( int ) ); - ADD_META_ACTION( TITLE ); - ADD_META_ACTION( ARTIST ); - ADD_META_ACTION( DURATION ); - ADD_META_ACTION( COLLECTION ); - ADD_META_ACTION( GENRE ); - ADD_META_ACTION( SEQ_NUM ); - ADD_META_ACTION( RATING ); - ADD_META_ACTION( DESCRIPTION ); + ADD_META_ACTION( COLUMN_NUMBER ); + ADD_META_ACTION( COLUMN_TITLE ); + ADD_META_ACTION( COLUMN_DURATION ); + ADD_META_ACTION( COLUMN_ARTIST ); + ADD_META_ACTION( COLUMN_GENRE ); + ADD_META_ACTION( COLUMN_ALBUM ); + ADD_META_ACTION( COLUMN_TRACK_NUMBER ); + ADD_META_ACTION( COLUMN_DESCRIPTION ); #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 ); @@ -253,13 +311,18 @@ 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 ) { + QPL_LOCK; playlist_item_t *p_item = playlist_ItemGetById( THEPL, i_root_id, - VLC_TRUE ); + pl_Locked ); assert( p_item ); p_item = playlist_GetPreferredNode( THEPL, p_item ); assert( p_item ); + QPL_UNLOCK; + model->rebuild( p_item ); } @@ -268,6 +331,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() )