# 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/playlist_model.hpp" /* PLModel */
+#include "components/playlist/views.hpp" /* 3 views */
+#include "components/playlist/selector.hpp" /* PLSelector */
+#include "menus.hpp" /* Popup */
+#include "input_manager.hpp" /* THEMIM */
+
+#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"
-static const QString viewNames[] = { qtr( "Detailed View" ),
- qtr( "Icon View" ),
- qtr( "List View" ) };
-
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
+ ):
+ QWidget( _parent ), p_intf( _p_intf ),
+ p_selector( _p_selector )
{
- layout = new QGridLayout( this );
+ QGridLayout *layout = new QGridLayout( this );
layout->setSpacing( 0 ); layout->setMargin( 0 );
setMinimumWidth( 300 );
iconView = NULL;
treeView = NULL;
listView = NULL;
+ viewStack = new QStackedLayout();
+ layout->addLayout( viewStack, 1, 0, 1, -1 );
- model = new PLModel( p_playlist, p_intf, p_root, this );
+ model = _p_model;
currentRootId = -1;
currentRootIndexId = -1;
lastActivatedId = -1;
- locationBar = new LocationBar( model );
- locationBar->setSizePolicy( QSizePolicy::Maximum, QSizePolicy::Preferred );
- layout->addWidget( locationBar, 0, 1 );
- layout->setColumnStretch( 1, 100 );
- CONNECT( locationBar, invoked( const QModelIndex & ),
- this, browseInto( const QModelIndex & ) );
-
- layout->setColumnStretch( 2, 1 );
-
- searchEdit = new SearchLineEdit( this );
- searchEdit->setMaximumWidth( 250 );
- searchEdit->setMinimumWidth( 80 );
- layout->addWidget( searchEdit, 0, 3 );
- CONNECT( searchEdit, textChanged( const QString& ),
- this, search( const QString& ) );
- layout->setColumnStretch( 3, 50 );
-
- /* 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, 0 );
-
- /* Button to switch views */
- QToolButton *viewButton = new QToolButton( this );
- viewButton->setIcon( style()->standardIcon( QStyle::SP_FileDialogDetailedView ) );
- layout->addWidget( viewButton, 0, 4 );
-
- /* View selection menu */
- viewSelectionMapper = new QSignalMapper( this );
- CONNECT( viewSelectionMapper, mapped( int ), this, showView( int ) );
-
- QActionGroup *actionGroup = new QActionGroup( this );
-
- for( int i = 0; i < VIEW_COUNT; i++ )
- {
- viewActions[i] = actionGroup->addAction( viewNames[i] );
- viewActions[i]->setCheckable( true );
- viewSelectionMapper->setMapping( viewActions[i], i );
- CONNECT( viewActions[i], 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 * ) );
+ showView( i_viewMode );
+
+ DCONNECT( THEMIM, leafBecameParent( input_item_t *),
+ this, browseInto( input_item_t * ) );
CONNECT( model, currentChanged( const QModelIndex& ),
this, handleExpansion( const QModelIndex& ) );
CONNECT( model, rootChanged(), this, handleRootChange() );
+
+ setRoot( p_root );
}
StandardPLPanel::~StandardPLPanel()
void StandardPLPanel::handleExpansion( const QModelIndex& index )
{
assert( currentView );
+ if( currentRootIndexId != -1 && currentRootIndexId != model->itemId( index.parent() ) )
+ browseInto( index.parent() );
currentView->scrollTo( index );
}
void StandardPLPanel::handleRootChange()
{
- /* needed for popupAdd() */
- PLItem *root = model->getItem( QModelIndex() );
- currentRootId = root->id();
-
browseInto();
-
- /* enable/disable adding */
- if( currentRootId == THEPL->p_playing->i_id )
- {
- addButton->setEnabled( true );
- addButton->setToolTip( qtr(I_PL_ADDPL) );
- }
- else if( THEPL->p_media_library &&
- currentRootId == THEPL->p_media_library->i_id )
- {
- addButton->setEnabled( true );
- addButton->setToolTip( qtr(I_PL_ADDML) );
- }
- else
- addButton->setEnabled( false );
-}
-
-/* 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 )
/* Search in the playlist */
void StandardPLPanel::search( const QString& searchText )
{
- bool flat = currentView == iconView || currentView == listView;
- model->search( searchText,
- flat ? currentView->rootIndex() : QModelIndex(),
- !flat );
+ int type;
+ QString name;
+ p_selector->getCurrentSelectedItem( &type, &name );
+ if( type != SD_TYPE )
+ {
+ bool flat = currentView == iconView || currentView == listView;
+ model->search( searchText,
+ flat ? currentView->rootIndex() : QModelIndex(),
+ !flat );
+ }
+}
+
+void StandardPLPanel::searchDelayed( const QString& searchText )
+{
+ int type;
+ QString name;
+ p_selector->getCurrentSelectedItem( &type, &name );
+
+ if( type == SD_TYPE )
+ {
+ if( !name.isEmpty() && !searchText.isEmpty() )
+ playlist_ServicesDiscoveryControl( THEPL, qtu( name ), SD_CMD_SEARCH, qtu( searchText ) );
+ }
}
/* Set the root of the new Playlist */
{
if( currentView == iconView || currentView == listView )
{
- currentRootIndexId = model->itemId( index );;
+ currentRootIndexId = model->itemId( index );
currentView->setRootIndex( index );
}
- locationBar->setIndex( index );
- model->search( QString(), index, false );
- searchEdit->clear();
+ emit viewChanged( index );
}
void StandardPLPanel::browseInto( )
{
QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
if( keyEvent->key() == Qt::Key_Delete ||
- keyEvent->key() == Qt::Key_Back )
+ keyEvent->key() == Qt::Key_Backspace )
{
deleteSelection();
return true;
CONNECT( iconView, activated( const QModelIndex & ),
this, activate( const QModelIndex & ) );
iconView->installEventFilter( this );
- layout->addWidget( iconView, 1, 0, 1, -1 );
+ viewStack->addWidget( iconView );
}
void StandardPLPanel::createListView()
CONNECT( listView, activated( const QModelIndex & ),
this, activate( const QModelIndex & ) );
listView->installEventFilter( this );
- layout->addWidget( listView, 1, 0, 1, -1 );
+ viewStack->addWidget( listView );
}
void StandardPLPanel::createTreeView()
{
/* Create and configure the QTreeView */
- treeView = new QTreeView;
+ treeView = new PlTreeView;
treeView->setIconSize( QSize( 20, 20 ) );
treeView->setAlternatingRowColors( true );
/* setModel after setSortingEnabled(true), or the model will sort immediately! */
treeView->setModel( model );
+ getSettings()->beginGroup("Playlist");
+
if( getSettings()->contains( "headerStateV2" ) )
{
treeView->header()->restoreState(
}
}
+ getSettings()->endGroup();
+
/* Connections for the TreeView */
CONNECT( treeView, activated( const QModelIndex& ),
this, activate( const QModelIndex& ) );
this, toggleColumnShown( int ) );
/* Finish the layout */
- layout->addWidget( treeView, 1, 0, 1, -1 );
+ viewStack->addWidget( treeView );
}
void StandardPLPanel::showView( int i_view )
{
if( treeView == NULL )
createTreeView();
- if( iconView ) iconView->hide();
- if( listView ) listView->hide();
- treeView->show();
currentView = treeView;
- viewActions[i_view]->setChecked( true );
break;
}
case ICON_VIEW:
{
if( iconView == NULL )
createIconView();
-
- if( treeView ) treeView->hide();
- if( listView ) listView->hide();
- iconView->show();
currentView = iconView;
- viewActions[i_view]->setChecked( true );
break;
}
case LIST_VIEW:
{
if( listView == NULL )
createListView();
-
- if( treeView ) treeView->hide();
- if( iconView ) iconView->hide();
- listView->show();
currentView = listView;
- viewActions[i_view]->setChecked( true );
break;
}
default: return;
}
+ viewStack->setCurrentWidget( currentView );
+ //viewActions[i_view]->setChecked( true );
browseInto();
+ gotoPlayingItem();
}
void StandardPLPanel::cycleViews()
void StandardPLPanel::activate( const QModelIndex &index )
{
- if( model->hasChildren( index ) )
+ if( !index.data( PLModel::IsLeafNodeRole ).toBool() )
{
if( currentView != treeView )
browseInto( index );
lastActivatedId = -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() );
- btn->setSizePolicy( QSizePolicy::Maximum, QSizePolicy::Fixed );
- 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 );
- 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.state |= QStyle::State_Enabled;
- 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