#include "components/playlist/standardpanel.hpp"
#include "components/playlist/icon_view.hpp"
#include "util/customwidgets.hpp"
+#include "menus.hpp"
#include <vlc_intf_strings.h>
#include <QMenu>
#include <QSignalMapper>
#include <QWheelEvent>
+#include <QToolButton>
+#include <QFontMetrics>
+#include <QPainter>
#include <assert.h>
layout->setSpacing( 0 ); layout->setMargin( 0 );
setMinimumWidth( 300 );
- model = new PLModel( p_playlist, p_intf, p_root, this );
- 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 );
layout->addWidget( search, 0, 4 );
CONNECT( search, textChanged( const QString& ),
this, search( const QString& ) );
- layout->setColumnStretch( 4, 2 );
+ 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 );
- QPushButton *viewButton = new QPushButton( this );
- viewButton->setIcon( QIcon( ":/buttons/playlist/playlist_add" ) );
+ /* Button to switch views */
+ QToolButton *viewButton = new QToolButton( this );
+ viewButton->setIcon( style()->standardIcon( QStyle::SP_FileDialogDetailedView ) );
layout->addWidget( viewButton, 0, 2 );
- BUTTONACT( viewButton, toggleView() );
+
+ /* 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();
- if( i_viewMode == ICON_VIEW )
- {
- createIconView();
- currentView = iconView;
- }
- else
- {
- createTreeView();
- currentView = treeView;
- }
+ showView( i_viewMode );
getSettings()->endGroup();
- last_activated_id = -1;
- CONNECT( THEMIM, inputChanged( input_thread_t * ),
- this, handleInputChange( input_thread_t * ) );
+ CONNECT( THEMIM, leafBecameParent( input_item_t *),
+ this, browseInto( input_item_t * ) );
+
+ CONNECT( model, currentChanged( const QModelIndex& ),
+ this, handleExpansion( const QModelIndex& ) );
}
StandardPLPanel::~StandardPLPanel()
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() ) );
{
QModelIndex index = currentView->indexAt( point );
QPoint globalPoint = currentView->viewport()->mapToGlobal( point );
- QItemSelectionModel *selection = currentView->selectionModel();
- QModelIndexList list = selection->selectedIndexes();
- model->popup( index, globalPoint, list );
+ 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 )
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) );
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 );
}
{
/* Create and configure the QTreeView */
treeView = new QTreeView;
- treeView->setModel( model );
treeView->setIconSize( QSize( 20, 20 ) );
treeView->setAlternatingRowColors( 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(
layout->addWidget( treeView, 1, 0, 1, -1 );
}
-void StandardPLPanel::toggleView()
+void StandardPLPanel::showView( int i_view )
{
- if( treeView && treeView->isVisible() )
+ 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();
- treeView->hide();
+ locationBar->setIndex( iconView->rootIndex() );
+ if( treeView ) treeView->hide();
iconView->show();
currentView = iconView;
+ iconViewAction->setChecked( true );
+ break;
}
- else
- {
- if( treeView == NULL )
- createTreeView();
-
- iconView->hide();
- treeView->show();
- currentView = treeView;
+ 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
void StandardPLPanel::activate( const QModelIndex &index )
{
- last_activated_id = model->itemId( index );
if( model->hasChildren( index ) )
{
if( currentView == iconView ) {
iconView->setRootIndex( index );
- title->setText( index.data().toString() );
+ //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::handleInputChange( input_thread_t *p_input_thread )
+void StandardPLPanel::browseInto( input_item_t *p_input )
{
- input_item_t *p_input_item = input_GetItem( p_input_thread );
- if( !p_input_item ) return;
- playlist_Lock( THEPL );
+ if( p_input->i_id != last_activated_id ) return;
- playlist_item_t *p_item = playlist_ItemGetByInput( THEPL, p_input_item );
+ playlist_Lock( THEPL );
- if( p_item && p_item->p_parent &&
- p_item->p_parent->i_id == last_activated_id )
+ playlist_item_t *p_item = playlist_ItemGetByInput( THEPL, p_input );
+ if( !p_item )
{
- QModelIndex index = model->index( p_item->p_parent->i_id, 0 );
- iconView->setRootIndex( index );
- title->setText( index.data().toString() );
- last_activated_id = p_item->i_id;
+ 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