#include "qt4.hpp"
#include "dialogs_provider.hpp"
+
#include "components/playlist/playlist_model.hpp"
#include "components/playlist/panels.hpp"
#include "util/customwidgets.hpp"
#include <vlc_intf_strings.h>
-#include <QTreeView>
#include <QPushButton>
#include <QHBoxLayout>
#include <QVBoxLayout>
#include <QHeaderView>
#include <QKeyEvent>
#include <QModelIndexList>
-#include <QToolBar>
#include <QLabel>
#include <QSpacerItem>
#include <QMenu>
#include <QSignalMapper>
-
#include <assert.h>
#include "sorting.h"
layout->setSpacing( 0 ); layout->setMargin( 0 );
/* Create and configure the QTreeView */
- view = new QVLCTreeView( 0 );
- view->setSortingEnabled( true );
- view->sortByColumn( 0 , Qt::AscendingOrder );
+ view = new QVLCTreeView;
view->setModel( model );
view->setIconSize( QSize( 20, 20 ) );
view->setAlternatingRowColors( true );
view->setAnimated( true );
+ view->setSelectionBehavior( QAbstractItemView::SelectRows );
view->setSelectionMode( QAbstractItemView::ExtendedSelection );
view->setDragEnabled( true );
view->setAcceptDrops( true );
view->setDropIndicatorShown( true );
- view->setAutoScroll( true );
+ view->header()->setSortIndicator( -1 , Qt::AscendingOrder );
+ view->setUniformRowHeights( true );
+ view->setSortingEnabled( true );
getSettings()->beginGroup("Playlist");
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 ) );
+ CONNECT( model, currentChanged( const QModelIndex& ),
+ this, handleExpansion( const QModelIndex& ) );
+ CONNECT( model, columnsChanged( int ),
+ this, checkSortingIndicator( int ) );
currentRootId = -1;
CONNECT( parent, rootChanged( int ), this, setCurrentRootId( int ) );
/* Add item to the playlist button */
addButton = new QPushButton;
- addButton->setIcon( QIcon( ":/playlist_add" ) );
+ addButton->setIcon( QIcon( ":/buttons/playlist/playlist_add" ) );
addButton->setMaximumWidth( 30 );
BUTTONACT( addButton, popupAdd() );
buttons->addWidget( addButton );
/* Random 2-state button */
randomButton = new QPushButton( this );
- if( model->hasRandom() )
- {
- randomButton->setIcon( QIcon( ":/shuffle_on" ));
- randomButton->setToolTip( qtr( I_PL_RANDOM ));
- }
- else
- {
- randomButton->setIcon( QIcon( ":/shuffle_off" ) );
- randomButton->setToolTip( qtr( I_PL_NORANDOM ));
- }
+ 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 );
/* 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( ":/repeat_one" ) );
- repeatButton->setToolTip( qtr( I_PL_REPEAT ));
+ repeatButton->setIcon( QIcon( ":/buttons/playlist/repeat_one" ) );
+ repeatButton->setChecked( true );
}
else if( model->hasLoop() )
{
- repeatButton->setIcon( QIcon( ":/repeat_all" ) );
- repeatButton->setToolTip( qtr( I_PL_LOOP ));
+ repeatButton->setIcon( QIcon( ":/buttons/playlist/repeat_all" ) );
+ repeatButton->setChecked( true );
}
else
{
- repeatButton->setIcon( QIcon( ":/repeat_off" ) );
- repeatButton->setToolTip( qtr( I_PL_NOREPEAT ));
+ repeatButton->setIcon( QIcon( ":/buttons/playlist/repeat_one" ) );
+ repeatButton->setChecked( false );
}
BUTTONACT( repeatButton, toggleRepeat() );
buttons->addWidget( repeatButton );
/* Goto */
gotoPlayingButton = new QPushButton;
- BUTTON_SET_ACT_I( gotoPlayingButton, "", jump_to,
+ BUTTON_SET_ACT_I( gotoPlayingButton, "", buttons/playlist/jump_to,
qtr( "Show the current item" ), gotoPlayingItem() );
buttons->addWidget( gotoPlayingButton );
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;
- clear->setMaximumWidth( 30 );
- BUTTON_SET_ACT_I( clear, "", clear, qtr( "Clear" ), clearFilter() );
- buttons->addWidget( clear );
+ 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 );
if( model->hasRepeat() )
{
model->setRepeat( false ); model->setLoop( true );
- repeatButton->setIcon( QIcon( ":/repeat_all" ) );
- repeatButton->setToolTip( qtr( I_PL_LOOP ));
+ repeatButton->setIcon( QIcon( ":/buttons/playlist/repeat_all" ) );
+ repeatButton->setChecked( true );
}
else if( model->hasLoop() )
{
model->setRepeat( false ) ; model->setLoop( false );
- repeatButton->setIcon( QIcon( ":/repeat_off" ) );
- repeatButton->setToolTip( qtr( I_PL_NOREPEAT ));
+ repeatButton->setChecked( false );
+ repeatButton->setIcon( QIcon( ":/buttons/playlist/repeat_one" ) );
}
else
{
- model->setRepeat( true );
- repeatButton->setIcon( QIcon( ":/repeat_one" ) );
- repeatButton->setToolTip( qtr( I_PL_REPEAT ));
+ model->setRepeat( true ); model->setLoop( false );
+ repeatButton->setChecked( true );
+ repeatButton->setIcon( QIcon( ":/buttons/playlist/repeat_one" ) );
}
}
{
bool prev = model->hasRandom();
model->setRandom( !prev );
- randomButton->setIcon( prev ?
- QIcon( ":/shuffle_off" ) :
- QIcon( ":/shuffle_on" ) );
- randomButton->setToolTip( prev ? qtr( I_PL_NORANDOM ) : qtr(I_PL_RANDOM ) );
}
void StandardPLPanel::gotoPlayingItem()
view->scrollTo( view->currentIndex() );
}
-void StandardPLPanel::handleExpansion( const QModelIndex &index )
+void StandardPLPanel::handleExpansion( const QModelIndex& index )
{
- if( model->isCurrent( index ) )
- view->scrollTo( index, QAbstractItemView::EnsureVisible );
+ view->scrollTo( index );
}
void StandardPLPanel::setCurrentRootId( int _new )
if( currentRootId == THEPL->p_local_category->i_id ||
currentRootId == THEPL->p_local_onelevel->i_id )
{
- popup.addAction( qtr(I_PL_ADDF), THEDP, SLOT(PLAppendDialog()) );
+ 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( MLAppendDialog() ) );
+ 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 )
+ {
+ 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 )
+ {
+ sortIndex = -1;
+ } else if( sortIndex > index )
+ {
+ /* Move indicator left one step*/
+ sortIndex -= 1;
+ }
+ }
+ view->header()->setSortIndicator( sortIndex ,
+ view->header()->sortIndicatorOrder() );
+}
+
void StandardPLPanel::popupSelectColumn( QPoint pos )
{
ContextUpdateMapper = new QSignalMapper(this);
QMenu selectColMenu;
- CONNECT( ContextUpdateMapper, mapped( int ), model, viewchanged( int ) );
-
int i_column = 1;
for( i_column = 1; i_column != COLUMN_END; i_column<<=1 )
{
CONNECT( option, triggered(), ContextUpdateMapper, map() );
}
- selectColMenu.exec( QCursor::pos() );
-}
+ CONNECT( ContextUpdateMapper, mapped( int ), model, viewchanged( int ) );
-/* ClearFilter LineEdit */
-void StandardPLPanel::clearFilter()
-{
- searchLine->setText( "" );
+ selectColMenu.exec( QCursor::pos() );
}
/* Search in the playlist */
-void StandardPLPanel::search( QString searchText )
+void StandardPLPanel::search( const QString& searchText )
{
model->search( searchText );
}
void StandardPLPanel::setRoot( int i_root_id )
{
QPL_LOCK;
- playlist_item_t *p_item = playlist_ItemGetById( THEPL, i_root_id,
- pl_Locked );
+ playlist_item_t *p_item = playlist_ItemGetById( THEPL, i_root_id );
assert( p_item );
p_item = playlist_GetPreferredNode( THEPL, p_item );
assert( p_item );
projects / vlc / blobdiff