/*****************************************************************************
* standardpanel.cpp : The "standard" playlist panel : just a treeview
****************************************************************************
- * Copyright (C) 2000-2009 VideoLAN
+ * Copyright © 2000-2010 VideoLAN
* $Id$
*
* Authors: Clément Stenac <zorglub@videolan.org>
- * JB Kempf <jb@videolan.org>
+ * Jean-Baptiste Kempf <jb@videolan.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
# include "config.h"
#endif
-#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 "components/playlist/vlc_model.hpp" /* VLCModel */
+#include "components/playlist/playlist_model.hpp" /* PLModel */
+#include "components/playlist/ml_model.hpp" /* MLModel */
+#include "components/playlist/views.hpp" /* 3 views */
+#include "components/playlist/selector.hpp" /* PLSelector */
+#include "menus.hpp" /* Popup */
+#include "input_manager.hpp" /* THEMIM */
+
+#include "sorting.h" /* Columns order */
+
+#include <vlc_services_discovery.h> /* SD_CMD_SEARCH */
-#include <QPushButton>
#include <QHeaderView>
-#include <QKeyEvent>
#include <QModelIndexList>
-#include <QLabel>
#include <QMenu>
-#include <QSignalMapper>
+#include <QKeyEvent>
#include <QWheelEvent>
-#include <QToolButton>
-#include <QFontMetrics>
-#include <QPainter>
+#include <QStackedLayout>
+#include <QSignalMapper>
+#include <QSettings>
#include <assert.h>
-#include "sorting.h"
-
StandardPLPanel::StandardPLPanel( PlaylistWidget *_parent,
intf_thread_t *_p_intf,
- playlist_t *p_playlist,
- playlist_item_t *p_root ):
- QWidget( _parent ), p_intf( _p_intf )
+ playlist_item_t *p_root,
+ PLSelector *_p_selector,
+ PLModel *_p_model,
+ MLModel *_p_plmodel)
+ : QWidget( _parent ),
+ model( _p_model ),
+ mlmodel( _p_plmodel),
+ p_intf( _p_intf ),
+ p_selector( _p_selector )
{
- layout = new QGridLayout( this );
- layout->setSpacing( 0 ); layout->setMargin( 0 );
+ viewStack = new QStackedLayout( this );
+ viewStack->setSpacing( 0 ); viewStack->setMargin( 0 );
setMinimumWidth( 300 );
- 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;
- QFont titleFont;
- titleFont.setPointSize( titleFont.pointSize() + 6 );
- titleFont.setFamily( "Verdana" );
- title->setFont( titleFont );
- layout->addWidget( title, 0, 0 );*/
-
- locationBar = new LocationBar( model );
- layout->addWidget( locationBar, 0, 0 );
+ iconView = NULL;
+ treeView = NULL;
+ listView = NULL;
+ picFlowView = NULL;
- /* A Spacer and the search possibilities */
- layout->setColumnStretch( 1, 10 );
-
- SearchLineEdit *search = new SearchLineEdit( this );
- search->setMaximumWidth( 300 );
- layout->addWidget( search, 0, 4 );
- CONNECT( search, textChanged( const QString& ),
- this, search( const QString& ) );
- layout->setColumnStretch( 4, 10 );
-
- /* Add item to the playlist button */
- addButton = new QToolButton;
- addButton->setIcon( QIcon( ":/buttons/playlist/playlist_add" ) );
- addButton->setMaximumWidth( 30 );
- BUTTONACT( addButton, popupAdd() );
- layout->addWidget( addButton, 0, 3 );
-
- /* Button to switch views */
- QToolButton *viewButton = new QToolButton( this );
- viewButton->setIcon( style()->standardIcon( QStyle::SP_FileDialogDetailedView ) );
- layout->addWidget( viewButton, 0, 2 );
-
- /* 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 );
+ currentRootIndexId = -1;
+ lastActivatedId = -1;
/* Saved Settings */
- getSettings()->beginGroup("Playlist");
-
- int i_viewMode = getSettings()->value( "view-mode", TREE_VIEW ).toInt();
- showView( i_viewMode );
+ int i_savedViewMode = getSettings()->value( "Playlist/view-mode", TREE_VIEW ).toInt();
+ showView( i_savedViewMode );
- getSettings()->endGroup();
-
- CONNECT( THEMIM, leafBecameParent( input_item_t *),
- this, browseInto( input_item_t * ) );
+ DCONNECT( THEMIM, leafBecameParent( int ),
+ this, browseInto( int ) );
- CONNECT( model, currentChanged( const QModelIndex& ),
+ CONNECT( model, currentIndexChanged( const QModelIndex& ),
this, handleExpansion( const QModelIndex& ) );
+ CONNECT( model, rootChanged(), this, browseInto() );
+
+ setRoot( p_root, false );
}
StandardPLPanel::~StandardPLPanel()
getSettings()->beginGroup("Playlist");
if( treeView )
getSettings()->setValue( "headerStateV2", treeView->header()->saveState() );
- getSettings()->setValue( "view-mode", ( currentView == iconView ) ? ICON_VIEW : TREE_VIEW );
+ getSettings()->setValue( "view-mode", currentViewIndex() );
getSettings()->endGroup();
}
void StandardPLPanel::handleExpansion( const QModelIndex& index )
{
assert( currentView );
+ if( currentRootIndexId != -1 && currentRootIndexId != model->itemId( index.parent() ) )
+ browseInto( index.parent() );
currentView->scrollTo( index );
}
-/* PopupAdd Menu for the Add Menu */
-void StandardPLPanel::popupAdd()
-{
- QMenu popup;
- 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_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() ) );
- popup.addAction( qtr(I_OP_ADVOP), THEDP, SLOT( MLAppendDialog() ) );
- }
-
- popup.exec( QCursor::pos() - addButton->mapFromGlobal( QCursor::pos() )
- + QPoint( 0, addButton->height() ) );
-}
-
void StandardPLPanel::popupPlView( const QPoint &point )
{
QModelIndex index = currentView->indexAt( point );
QPoint globalPoint = currentView->viewport()->mapToGlobal( point );
- if( !index.isValid() ){
+ QItemSelectionModel *selection = currentView->selectionModel();
+ QModelIndexList list = selection->selectedIndexes();
+
+ if( !model->popup( index, globalPoint, list ) )
QVLCMenu::PopupMenu( p_intf, true );
- }
- else
- {
- QItemSelectionModel *selection = currentView->selectionModel();
- QModelIndexList list = selection->selectedIndexes();
- model->popup( index, globalPoint, list );
- }
}
-void StandardPLPanel::popupSelectColumn( QPoint pos )
+void StandardPLPanel::popupSelectColumn( QPoint )
{
QMenu menu;
assert( treeView );
/* We do not offer the option to hide index 0 column, or
- * QTreeView will behave weird */
- int i, j;
- for( i = 1 << 1, j = 1; i < COLUMN_END; i <<= 1, j++ )
+ * QTreeView will behave weird */
+ for( int i = 1 << 1, j = 1; i < COLUMN_END; i <<= 1, j++ )
{
- QAction* option = menu.addAction(
- qfu( psz_column_title( i ) ) );
+ QAction* option = menu.addAction( qfu( psz_column_title( i ) ) );
option->setCheckable( true );
option->setChecked( !treeView->isColumnHidden( j ) );
selectColumnsSigMapper->setMapping( option, j );
/* Search in the playlist */
void StandardPLPanel::search( const QString& searchText )
{
- model->search( searchText );
+ int type;
+ QString name;
+ p_selector->getCurrentSelectedItem( &type, &name );
+ if( type != SD_TYPE )
+ {
+ bool flat = ( currentView == iconView ||
+ currentView == listView ||
+ currentView == picFlowView );
+ model->search( searchText,
+ flat ? currentView->rootIndex() : QModelIndex(),
+ !flat );
+ }
}
-/* Set the root of the new Playlist */
-/* This activated by the selector selection */
-void StandardPLPanel::setRoot( playlist_item_t *p_item )
+void StandardPLPanel::searchDelayed( const QString& searchText )
{
- QPL_LOCK;
- assert( p_item );
+ int type;
+ QString name;
+ p_selector->getCurrentSelectedItem( &type, &name );
- /* needed for popupAdd() */
- currentRootId = p_item->i_id;
-
- /* cosmetics, ..still need playlist locking.. */
- /*char *psz_title = input_item_GetName( p_item->p_input );
- title->setText( qfu(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_playing )
+ if( type == SD_TYPE )
{
- addButton->setEnabled( true );
- addButton->setToolTip( qtr(I_PL_ADDPL) );
+ if( !name.isEmpty() && !searchText.isEmpty() )
+ playlist_ServicesDiscoveryControl( THEPL, qtu( name ), SD_CMD_SEARCH,
+ qtu( searchText ) );
}
- else if( THEPL->p_media_library && p_item == THEPL->p_media_library )
+}
+
+/* Set the root of the new Playlist */
+/* This activated by the selector selection */
+void StandardPLPanel::setRoot( playlist_item_t *p_item, bool b )
+{
+#ifdef MEDIA_LIBRARY
+ if( b )
{
- addButton->setEnabled( true );
- addButton->setToolTip( qtr(I_PL_ADDML) );
+ msg_Dbg( p_intf, "Setting the SQL ML" );
+ currentView->setModel( mlmodel );
}
else
- addButton->setEnabled( false );
+#else
+ Q_UNUSED( b );
+#endif
+ {
+ msg_Dbg( p_intf, "Normal PL/ML or SD" );
+ if( currentView->model() != model )
+ currentView->setModel( model );
+ model->rebuild( p_item );
+ }
+}
+
+void StandardPLPanel::browseInto( const QModelIndex &index )
+{
+ if( currentView == iconView || currentView == listView || currentView == picFlowView )
+ {
+ currentRootIndexId = model->itemId( index );
+ currentView->setRootIndex( index );
+ }
+
+ emit viewChanged( index );
+}
+
+void StandardPLPanel::browseInto()
+{
+ browseInto( (currentRootIndexId != -1 && currentView != treeView) ?
+ model->index( currentRootIndexId, 0 ) :
+ QModelIndex() );
}
-void StandardPLPanel::removeItem( int i_id )
+void StandardPLPanel::wheelEvent( QWheelEvent *e )
{
- model->removeItem( i_id );
+ // Accept this event in order to prevent unwanted volume up/down changes
+ e->accept();
}
-/* Delete and Suppr key remove the selection
- FilterKey function and code function */
-void StandardPLPanel::keyPressEvent( QKeyEvent *e )
+bool StandardPLPanel::eventFilter ( QObject *, QEvent * event )
{
- switch( e->key() )
+ if (event->type() == QEvent::KeyPress)
{
- case Qt::Key_Back:
- case Qt::Key_Delete:
- deleteSelection();
- break;
+ QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
+ if( keyEvent->key() == Qt::Key_Delete ||
+ keyEvent->key() == Qt::Key_Backspace )
+ {
+ deleteSelection();
+ return true;
+ }
}
+ return false;
}
void StandardPLPanel::deleteSelection()
this, popupPlView( const QPoint & ) );
CONNECT( iconView, activated( const QModelIndex & ),
this, activate( const QModelIndex & ) );
- CONNECT( locationBar, invoked( const QModelIndex & ),
- iconView, setRootIndex( const QModelIndex & ) );
+ iconView->installEventFilter( this );
+ viewStack->addWidget( iconView );
+}
+
+void StandardPLPanel::createListView()
+{
+ listView = new PlListView( model, this );
+ listView->setContextMenuPolicy( Qt::CustomContextMenu );
+ CONNECT( listView, customContextMenuRequested( const QPoint & ),
+ this, popupPlView( const QPoint & ) );
+ CONNECT( listView, activated( const QModelIndex & ),
+ this, activate( const QModelIndex & ) );
+ listView->installEventFilter( this );
+ viewStack->addWidget( listView );
+}
- layout->addWidget( iconView, 1, 0, 1, -1 );
+void StandardPLPanel::createCoverView()
+{
+ picFlowView = new PicFlowView( model, this );
+ picFlowView->setContextMenuPolicy( Qt::CustomContextMenu );
+ CONNECT( picFlowView, customContextMenuRequested( const QPoint & ),
+ this, popupPlView( const QPoint & ) );
+ CONNECT( picFlowView, activated( const QModelIndex & ),
+ this, activate( const QModelIndex & ) );
+ viewStack->addWidget( picFlowView );
+ picFlowView->installEventFilter( this );
}
void StandardPLPanel::createTreeView()
{
/* Create and configure the QTreeView */
- treeView = new QTreeView;
+ treeView = new PlTreeView;
treeView->setIconSize( QSize( 20, 20 ) );
treeView->setAlternatingRowColors( true );
treeView->setAnimated( true );
treeView->setUniformRowHeights( true );
treeView->setSortingEnabled( true );
+ treeView->setAttribute( Qt::WA_MacShowFocusRect, false );
treeView->header()->setSortIndicator( -1 , Qt::AscendingOrder );
treeView->header()->setSortIndicatorShown( true );
treeView->header()->setClickable( true );
treeView->setContextMenuPolicy( Qt::CustomContextMenu );
/* setModel after setSortingEnabled(true), or the model will sort immediately! */
- treeView->setModel( model );
+
+ getSettings()->beginGroup("Playlist");
if( getSettings()->contains( "headerStateV2" ) )
{
}
}
+ getSettings()->endGroup();
+
/* Connections for the TreeView */
CONNECT( treeView, activated( const QModelIndex& ),
this, activate( const QModelIndex& ) );
this, popupSelectColumn( QPoint ) );
CONNECT( treeView, customContextMenuRequested( const QPoint & ),
this, popupPlView( const QPoint & ) );
+ treeView->installEventFilter( this );
/* SignalMapper for columns */
selectColumnsSigMapper = new QSignalMapper( this );
CONNECT( selectColumnsSigMapper, mapped( int ),
this, toggleColumnShown( int ) );
- /* Finish the layout */
- layout->addWidget( treeView, 1, 0, 1, -1 );
+ viewStack->addWidget( treeView );
+}
+
+void StandardPLPanel::changeModel( bool b_ml )
+{
+#ifdef MEDIA_LIBRARY
+ VLCModel *mod;
+ if( b_ml )
+ mod = mlmodel;
+ else
+ mod = model;
+ if( currentView->model() != mod )
+ currentView->setModel( mod );
+#else
+ Q_UNUSED( b_ml );
+ if( currentView->model() != model )
+ currentView->setModel( model );
+#endif
}
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:;
+ case LIST_VIEW:
+ {
+ if( listView == NULL )
+ createListView();
+ currentView = listView;
+ break;
+ }
+ case PICTUREFLOW_VIEW:
+ {
+ if( picFlowView == NULL )
+ createCoverView();
+ currentView = picFlowView;
+ break;
+ }
+ default:
+ case TREE_VIEW:
+ {
+ if( treeView == NULL )
+ createTreeView();
+ currentView = treeView;
+ break;
+ }
}
+
+ changeModel( false );
+
+ viewStack->setCurrentWidget( currentView );
+ browseInto();
+ gotoPlayingItem();
+}
+
+int StandardPLPanel::currentViewIndex() const
+{
+ if( currentView == treeView )
+ return TREE_VIEW;
+ else if( currentView == iconView )
+ return ICON_VIEW;
+ else if( currentView == listView )
+ return LIST_VIEW;
+ else
+ return PICTUREFLOW_VIEW;
}
void StandardPLPanel::cycleViews()
if( currentView == iconView )
showView( TREE_VIEW );
else if( currentView == treeView )
+ showView( LIST_VIEW );
+ else if( currentView == listView )
+#ifndef NDEBUG
+ showView( PICTUREFLOW_VIEW );
+ else if( currentView == picFlowView )
+#endif
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->model() == model )
{
- if( currentView == iconView ) {
- iconView->setRootIndex( index );
- //title->setText( index.data().toString() );
- locationBar->setIndex( index );
+ /* If we are not a leaf node */
+ if( !index.data( PLModel::IsLeafNodeRole ).toBool() )
+ {
+ if( currentView != treeView )
+ browseInto( index );
+ }
+ else
+ {
+ playlist_Lock( THEPL );
+ playlist_item_t *p_item = playlist_ItemGetById( THEPL, model->itemId( index ) );
+ p_item->i_flags |= PLAYLIST_SUBITEM_STOP_FLAG;
+ lastActivatedId = p_item->p_input->i_id;
+ playlist_Unlock( THEPL );
+ model->activateItem( 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 )
+void StandardPLPanel::browseInto( int i_id )
{
+ if( i_id != lastActivatedId ) return;
- 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 );
-
+ QModelIndex index = model->index( i_id, 0 );
playlist_Unlock( THEPL );
- if( currentView == iconView ) {
- iconView->setRootIndex( index );
- locationBar->setIndex( index );
- }
- else
+ if( currentView == treeView )
treeView->setExpanded( index, true );
+ else
+ browseInto( index );
- 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::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;
+ lastActivatedId = -1;
}
-
-#undef PADDING
projects / vlc / blobdiff