# include "config.h"
#endif
-#include "qt4.hpp"
#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 "menus.hpp"
#include <vlc_intf_strings.h>
#include <QLabel>
#include <QMenu>
#include <QSignalMapper>
+#include <QWheelEvent>
+#include <QToolButton>
+#include <QFontMetrics>
+#include <QPainter>
#include <assert.h>
playlist_item_t *p_root ):
QWidget( _parent ), p_intf( _p_intf )
{
- QGridLayout *layout = new QGridLayout( this );
+ layout = new QGridLayout( this );
layout->setSpacing( 0 ); layout->setMargin( 0 );
setMinimumWidth( 300 );
- model = new PLModel( p_playlist, p_intf, p_root, this );
-
- /* Create and configure the QTreeView */
- view = new QVLCTreeView;
- view->setModel( model );
-
- view->setIconSize( QSize( 20, 20 ) );
- view->setAlternatingRowColors( true );
- view->setAnimated( true );
- view->setUniformRowHeights( true );
- view->setSortingEnabled( true );
- view->header()->setSortIndicator( -1 , Qt::AscendingOrder );
- view->header()->setSortIndicatorShown( true );
- view->header()->setClickable( true );
- view->header()->setContextMenuPolicy( Qt::CustomContextMenu );
-
- view->setSelectionBehavior( QAbstractItemView::SelectRows );
- view->setSelectionMode( QAbstractItemView::ExtendedSelection );
- view->setDragEnabled( true );
- view->setAcceptDrops( true );
- view->setDropIndicatorShown( true );
-
- /* Saved Settings */
- getSettings()->beginGroup("Playlist");
- if( getSettings()->contains( "headerStateV2" ) )
- {
- view->header()->restoreState(
- getSettings()->value( "headerStateV2" ).toByteArray() );
- }
- else
- {
- for( int m = 1, c = 0; m != COLUMN_END; m <<= 1, c++ )
- {
- view->setColumnHidden( c, !( m & COLUMN_DEFAULT ) );
- if( m == COLUMN_TITLE ) view->header()->resizeSection( c, 200 );
- else if( m == COLUMN_DURATION ) view->header()->resizeSection( c, 80 );
- }
- }
- getSettings()->endGroup();
-
- /* 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& ) );
+ iconView = NULL;
+ treeView = NULL;
+ model = new PLModel( p_playlist, p_intf, p_root, this );
currentRootId = -1;
+ last_activated_id = -1;
/* Title label */
- title = new QLabel;
+ /*title = new QLabel;
QFont titleFont;
titleFont.setPointSize( titleFont.pointSize() + 6 );
titleFont.setFamily( "Verdana" );
title->setFont( titleFont );
- layout->addWidget( title, 0, 0 );
+ layout->addWidget( title, 0, 0 );*/
+
+ locationBar = new LocationBar( model );
+ layout->addWidget( locationBar, 0, 0 );
+ CONNECT( model, rootChanged(), locationBar, setRootIndex() );
/* A Spacer and the search possibilities */
layout->setColumnStretch( 1, 10 );
SearchLineEdit *search = new SearchLineEdit( this );
- search->setMaximumWidth( 200 );
+ search->setMaximumWidth( 300 );
layout->addWidget( search, 0, 4 );
CONNECT( search, textChanged( const QString& ),
this, search( const QString& ) );
- layout->setColumnStretch( 4, 1 );
+ layout->setColumnStretch( 4, 10 );
/* Add item to the playlist button */
- addButton = new QPushButton;
+ addButton = new QToolButton;
addButton->setIcon( QIcon( ":/buttons/playlist/playlist_add" ) );
addButton->setMaximumWidth( 30 );
BUTTONACT( addButton, popupAdd() );
layout->addWidget( addButton, 0, 3 );
- /* Finish the layout */
- layout->addWidget( view, 1, 0, 1, -1 );
+ /* Button to switch views */
+ QToolButton *viewButton = new QToolButton( this );
+ viewButton->setIcon( style()->standardIcon( QStyle::SP_FileDialogDetailedView ) );
+ layout->addWidget( viewButton, 0, 2 );
- selectColumnsSigMapper = new QSignalMapper( this );
- CONNECT( selectColumnsSigMapper, mapped( int ),
- this, toggleColumnShown( int ) );
+ /* View selection menu */
+ viewSelectionMapper = new QSignalMapper( this );
+ CONNECT( viewSelectionMapper, mapped( int ), this, showView( int ) );
+
+ QActionGroup *actionGroup = new QActionGroup( this );
+
+ treeViewAction = actionGroup->addAction( "Detailed view" );
+ treeViewAction->setCheckable( true );
+ viewSelectionMapper->setMapping( treeViewAction, TREE_VIEW );
+ CONNECT( treeViewAction, triggered(), viewSelectionMapper, map() );
+
+ iconViewAction = actionGroup->addAction( "Icon view" );
+ iconViewAction->setCheckable( true );
+ viewSelectionMapper->setMapping( iconViewAction, ICON_VIEW );
+ CONNECT( iconViewAction, triggered(), viewSelectionMapper, map() );
+
+ BUTTONACT( viewButton, cycleViews() );
+ QMenu *viewMenu = new QMenu( this );
+ viewMenu->addActions( actionGroup->actions() );
+
+ viewButton->setMenu( viewMenu );
+
+ /* Saved Settings */
+ getSettings()->beginGroup("Playlist");
+
+ int i_viewMode = getSettings()->value( "view-mode", TREE_VIEW ).toInt();
+ showView( i_viewMode );
+
+ getSettings()->endGroup();
+
+ CONNECT( THEMIM, leafBecameParent( input_item_t *),
+ this, browseInto( input_item_t * ) );
+
+ CONNECT( model, currentChanged( const QModelIndex& ),
+ this, handleExpansion( const QModelIndex& ) );
}
StandardPLPanel::~StandardPLPanel()
{
getSettings()->beginGroup("Playlist");
- getSettings()->setValue( "headerStateV2", view->header()->saveState() );
+ if( treeView )
+ getSettings()->setValue( "headerStateV2", treeView->header()->saveState() );
+ getSettings()->setValue( "view-mode", ( currentView == iconView ) ? ICON_VIEW : TREE_VIEW );
getSettings()->endGroup();
}
/* Unused anymore, but might be useful, like in right-click menu */
void StandardPLPanel::gotoPlayingItem()
{
- view->scrollTo( model->currentIndex() );
+ currentView->scrollTo( model->currentIndex() );
}
void StandardPLPanel::handleExpansion( const QModelIndex& index )
{
- view->scrollTo( index );
+ assert( currentView );
+ currentView->scrollTo( index );
}
/* 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 )
+ if( currentRootId == THEPL->p_playing->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 ) )
+ else if( THEPL->p_media_library &&
+ currentRootId == THEPL->p_media_library->i_id )
{
popup.addAction( qtr(I_PL_ADDF), THEDP, SLOT( simpleMLAppendDialog()) );
popup.addAction( qtr(I_PL_ADDDIR), THEDP, SLOT( MLAppendDir() ) );
+ QPoint( 0, addButton->height() ) );
}
+void StandardPLPanel::popupPlView( const QPoint &point )
+{
+ QModelIndex index = currentView->indexAt( point );
+ QPoint globalPoint = currentView->viewport()->mapToGlobal( point );
+ if( !index.isValid() ){
+ QVLCMenu::PopupMenu( p_intf, true );
+ }
+ else
+ {
+ QItemSelectionModel *selection = currentView->selectionModel();
+ QModelIndexList list = selection->selectedIndexes();
+ model->popup( index, globalPoint, list );
+ }
+}
+
void StandardPLPanel::popupSelectColumn( QPoint pos )
{
QMenu menu;
+ assert( treeView );
/* We do not offer the option to hide index 0 column, or
* QTreeView will behave weird */
QAction* option = menu.addAction(
qfu( psz_column_title( i ) ) );
option->setCheckable( true );
- option->setChecked( !view->isColumnHidden( j ) );
+ option->setChecked( !treeView->isColumnHidden( j ) );
selectColumnsSigMapper->setMapping( option, j );
CONNECT( option, triggered(), selectColumnsSigMapper, map() );
}
void StandardPLPanel::toggleColumnShown( int i )
{
- view->setColumnHidden( i, !view->isColumnHidden( i ) );
+ treeView->setColumnHidden( i, !treeView->isColumnHidden( i ) );
}
/* Search in the playlist */
model->search( searchText );
}
-void StandardPLPanel::doPopup( QModelIndex index, QPoint point )
-{
- 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( 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 );
+ /*char *psz_title = input_item_GetName( p_item->p_input );
title->setText( qfu(psz_title) );
- free( psz_title );
+ free( psz_title );*/
QPL_UNLOCK;
/* do THE job */
model->rebuild( p_item );
+ locationBar->setIndex( QModelIndex() );
+
/* enable/disable adding */
- if( p_item == THEPL->p_local_category ||
- p_item == THEPL->p_local_onelevel )
+ if( p_item == THEPL->p_playing )
{
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 ) )
+ else if( THEPL->p_media_library && p_item == THEPL->p_media_library )
{
addButton->setEnabled( true );
addButton->setToolTip( qtr(I_PL_ADDML) );
void StandardPLPanel::deleteSelection()
{
- QItemSelectionModel *selection = view->selectionModel();
+ QItemSelectionModel *selection = currentView->selectionModel();
QModelIndexList list = selection->selectedIndexes();
model->doDelete( list );
}
+void StandardPLPanel::createIconView()
+{
+ iconView = new PlIconView( model, this );
+ iconView->setContextMenuPolicy( Qt::CustomContextMenu );
+ CONNECT( iconView, customContextMenuRequested( const QPoint & ),
+ this, popupPlView( const QPoint & ) );
+ CONNECT( iconView, activated( const QModelIndex & ),
+ this, activate( const QModelIndex & ) );
+ CONNECT( locationBar, invoked( const QModelIndex & ),
+ iconView, setRootIndex( const QModelIndex & ) );
+
+ layout->addWidget( iconView, 1, 0, 1, -1 );
+}
+
+void StandardPLPanel::createTreeView()
+{
+ /* Create and configure the QTreeView */
+ treeView = new QTreeView;
+
+ treeView->setIconSize( QSize( 20, 20 ) );
+ treeView->setAlternatingRowColors( true );
+ treeView->setAnimated( true );
+ treeView->setUniformRowHeights( true );
+ treeView->setSortingEnabled( true );
+ treeView->header()->setSortIndicator( -1 , Qt::AscendingOrder );
+ treeView->header()->setSortIndicatorShown( true );
+ treeView->header()->setClickable( true );
+ treeView->header()->setContextMenuPolicy( Qt::CustomContextMenu );
+
+ treeView->setSelectionBehavior( QAbstractItemView::SelectRows );
+ treeView->setSelectionMode( QAbstractItemView::ExtendedSelection );
+ treeView->setDragEnabled( true );
+ treeView->setAcceptDrops( true );
+ treeView->setDropIndicatorShown( true );
+ treeView->setContextMenuPolicy( Qt::CustomContextMenu );
+
+ /* setModel after setSortingEnabled(true), or the model will sort immediately! */
+ treeView->setModel( model );
+
+ if( getSettings()->contains( "headerStateV2" ) )
+ {
+ treeView->header()->restoreState(
+ getSettings()->value( "headerStateV2" ).toByteArray() );
+ }
+ else
+ {
+ for( int m = 1, c = 0; m != COLUMN_END; m <<= 1, c++ )
+ {
+ 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 );
+ }
+ }
+
+ /* Connections for the TreeView */
+ CONNECT( treeView, activated( const QModelIndex& ),
+ this, activate( const QModelIndex& ) );
+ CONNECT( treeView->header(), customContextMenuRequested( const QPoint & ),
+ this, popupSelectColumn( QPoint ) );
+ CONNECT( treeView, customContextMenuRequested( const QPoint & ),
+ this, popupPlView( const QPoint & ) );
+
+ /* SignalMapper for columns */
+ selectColumnsSigMapper = new QSignalMapper( this );
+ CONNECT( selectColumnsSigMapper, mapped( int ),
+ this, toggleColumnShown( int ) );
+
+ /* Finish the layout */
+ layout->addWidget( treeView, 1, 0, 1, -1 );
+}
+
+void StandardPLPanel::showView( int i_view )
+{
+ switch( i_view )
+ {
+ case TREE_VIEW:
+ {
+ if( treeView == NULL )
+ createTreeView();
+ locationBar->setIndex( treeView->rootIndex() );
+ if( iconView ) iconView->hide();
+ treeView->show();
+ currentView = treeView;
+ treeViewAction->setChecked( true );
+ break;
+ }
+ case ICON_VIEW:
+ {
+ if( iconView == NULL )
+ createIconView();
+
+ locationBar->setIndex( iconView->rootIndex() );
+ if( treeView ) treeView->hide();
+ iconView->show();
+ currentView = iconView;
+ iconViewAction->setChecked( true );
+ break;
+ }
+ default:;
+ }
+}
+
+void StandardPLPanel::cycleViews()
+{
+ if( currentView == iconView )
+ showView( TREE_VIEW );
+ else if( currentView == treeView )
+ showView( ICON_VIEW );
+ else
+ assert( 0 );
+}
+
+void StandardPLPanel::wheelEvent( QWheelEvent *e )
+{
+ // Accept this event in order to prevent unwanted volume up/down changes
+ e->accept();
+}
+
+void StandardPLPanel::activate( const QModelIndex &index )
+{
+ if( model->hasChildren( index ) )
+ {
+ if( currentView == iconView ) {
+ iconView->setRootIndex( index );
+ //title->setText( index.data().toString() );
+ locationBar->setIndex( index );
+ }
+ }
+ else
+ {
+ playlist_Lock( THEPL );
+ playlist_item_t *p_item = playlist_ItemGetById( THEPL, model->itemId( index ) );
+ p_item->i_flags |= PLAYLIST_SUBITEM_STOP_FLAG;
+ last_activated_id = p_item->p_input->i_id;//model->getItem( index )->inputItem()->i_id;
+ playlist_Unlock( THEPL );
+ model->activateItem( index );
+ }
+}
+
+void StandardPLPanel::browseInto( input_item_t *p_input )
+{
+
+ if( p_input->i_id != last_activated_id ) 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 == iconView ) {
+ iconView->setRootIndex( index );
+ locationBar->setIndex( index );
+ }
+ else
+ treeView->setExpanded( index, true );
+
+ last_activated_id = -1;
+
+
+}
+
+LocationBar::LocationBar( PLModel *m )
+{
+ model = m;
+ mapper = new QSignalMapper( this );
+ CONNECT( mapper, mapped( int ), this, invoke( int ) );
+
+ box = new QHBoxLayout;
+ box->setSpacing( 0 );
+ box->setContentsMargins( 0, 0, 0, 0 );
+ setLayout( box );
+}
+
+void LocationBar::setIndex( const QModelIndex &index )
+{
+ qDeleteAll( buttons );
+ buttons.clear();
+ QModelIndex i = index;
+ bool bold = true;
+ while( true )
+ {
+ PLItem *item = model->getItem( i );
+
+ char *fb_name = input_item_GetTitleFbName( item->inputItem() );
+ QString text = qfu(fb_name);
+ free(fb_name);
+ QAbstractButton *btn = new LocationButton( text, bold, i.isValid() );
+ if( bold ) btn->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred );
+ box->insertWidget( 0, btn, bold ? 1 : 0 );
+ buttons.append( btn );
+
+ mapper->setMapping( btn, item->id() );
+ CONNECT( btn, clicked( ), mapper, map( ) );
+
+ bold = false;
+
+ if( i.isValid() ) i = i.parent();
+ else break;
+ }
+}
+
+void LocationBar::setRootIndex()
+{
+ setIndex( QModelIndex() );
+}
+
+void LocationBar::invoke( int i_id )
+{
+ QModelIndex index = model->index( i_id, 0 );
+ setIndex( index );
+ emit invoked ( index );
+}
+
+LocationButton::LocationButton( const QString &text, bool bold, bool arrow )
+ : b_arrow( arrow )
+{
+ QFont font;
+ font.setBold( bold );
+ setFont( font );
+ setText( text );
+}
+
+#define PADDING 4
+
+void LocationButton::paintEvent ( QPaintEvent * event )
+{
+ QStyleOptionButton option;
+ option.initFrom( this );
+ //option.rect = rect();
+ //option.features = QStyleOptionButton::Flat;
+ option.state |= QStyle::State_Enabled;
+ //option.state |= isChecked() ? QStyle::State_On : QStyle::State_Off;
+ //if( isDown() ) option.state |= QStyle::State_Sunken;
+ QPainter p( this );
+
+ if( underMouse() )
+ style()->drawControl( QStyle::CE_PushButtonBevel, &option, &p );
+
+ int margin = style()->pixelMetric(QStyle::PM_DefaultFrameWidth,0,this) + PADDING;
+
+ QRect rect = option.rect.adjusted( b_arrow ? 15 + margin : margin, 0, margin * -1, 0 );
+ p.drawText( rect, Qt::AlignVCenter,
+ fontMetrics().elidedText( text(), Qt::ElideRight, rect.width() ) );
+
+ if( b_arrow )
+ {
+ option.rect.setX( margin );
+ option.rect.setWidth( 8 );
+ style()->drawPrimitive( QStyle::PE_IndicatorArrowRight, &option, &p );
+ }
+}
+
+QSize LocationButton::sizeHint() const
+{
+ int frameWidth = style()->pixelMetric(QStyle::PM_DefaultFrameWidth,0,this);
+ QSize s( fontMetrics().boundingRect( text() ).size() );
+ s.setWidth( s.width() + ( 2 * frameWidth ) + ( 2 * PADDING ) + ( b_arrow ? 15 : 0 ) );
+ s.setHeight( QPushButton::sizeHint().height() );
+ return s;
+}
+
+#undef PADDING
projects / vlc / blobdiff