X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fcomponents%2Fplaylist%2Fstandardpanel.cpp;h=bf81375978f5676fefe9c9d848ee7560f14433df;hb=05d736eac9cb11e55fca0552ff4150cb48004ed8;hp=4ce86172d0f46d03797c0ec4b72ba620dda55e1c;hpb=a99d1a2c2a3bcfdcc4ec38b68fd9b35bdf78f5c4;p=vlc

diff --git a/modules/gui/qt4/components/playlist/standardpanel.cpp b/modules/gui/qt4/components/playlist/standardpanel.cpp
index 4ce86172d0..bf81375978 100644
--- a/modules/gui/qt4/components/playlist/standardpanel.cpp
+++ b/modules/gui/qt4/components/playlist/standardpanel.cpp
@@ -52,6 +52,10 @@
 
 #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,
@@ -64,44 +68,32 @@ StandardPLPanel::StandardPLPanel( PlaylistWidget *_parent,
 
     iconView = NULL;
     treeView = NULL;
+    listView = 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 );*/
+    currentRootIndexId = -1;
+    lastActivatedId = -1;
 
     locationBar = new LocationBar( model );
+    locationBar->setSizePolicy( QSizePolicy::Ignored, QSizePolicy::Preferred );
     layout->addWidget( locationBar, 0, 0 );
-    CONNECT( model, rootChanged(), locationBar, setRootIndex() );
-
-    /* A Spacer and the search possibilities */
-    layout->setColumnStretch( 1, 10 );
+    layout->setColumnStretch( 0, 5 );
+    CONNECT( locationBar, invoked( const QModelIndex & ),
+             this, browseInto( const QModelIndex & ) );
 
-    SearchLineEdit *search = new SearchLineEdit( this );
-    search->setMaximumWidth( 300 );
-    layout->addWidget( search, 0, 4 );
-    CONNECT( search, textChanged( const QString& ),
+    searchEdit = new SearchLineEdit( this );
+    searchEdit->setMaximumWidth( 250 );
+    searchEdit->setMinimumWidth( 80 );
+    layout->addWidget( searchEdit, 0, 2 );
+    CONNECT( searchEdit, 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 );
+    layout->setColumnStretch( 2, 3 );
 
     /* Button to switch views */
     QToolButton *viewButton = new QToolButton( this );
     viewButton->setIcon( style()->standardIcon( QStyle::SP_FileDialogDetailedView ) );
-    layout->addWidget( viewButton, 0, 2 );
+    layout->addWidget( viewButton, 0, 1 );
 
     /* View selection menu */
     viewSelectionMapper = new QSignalMapper( this );
@@ -109,15 +101,13 @@ StandardPLPanel::StandardPLPanel( PlaylistWidget *_parent,
 
     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() );
+    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 );
@@ -146,7 +136,12 @@ StandardPLPanel::~StandardPLPanel()
     getSettings()->beginGroup("Playlist");
     if( treeView )
         getSettings()->setValue( "headerStateV2", treeView->header()->saveState() );
-    getSettings()->setValue( "view-mode", ( currentView == iconView ) ? ICON_VIEW : TREE_VIEW );
+    if( currentView == treeView )
+        getSettings()->setValue( "view-mode", TREE_VIEW );
+    else if( currentView == listView )
+        getSettings()->setValue( "view-mode", LIST_VIEW );
+    else if( currentView == iconView )
+        getSettings()->setValue( "view-mode", ICON_VIEW );
     getSettings()->endGroup();
 }
 
@@ -164,63 +159,18 @@ void StandardPLPanel::handleExpansion( const QModelIndex& index )
 
 void StandardPLPanel::handleRootChange()
 {
-    /* needed for popupAdd() */
-    PLItem *root = model->getItem( QModelIndex() );
-    currentRootId = root->id();
-
-    locationBar->setIndex( QModelIndex() );
-
-    /* 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() ) );
+    browseInto();
 }
 
 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 )
@@ -251,7 +201,10 @@ void StandardPLPanel::toggleColumnShown( int i )
 /* Search in the playlist */
 void StandardPLPanel::search( const QString& searchText )
 {
-    model->search( searchText );
+    bool flat = currentView == iconView || currentView == listView;
+    model->search( searchText,
+                   flat ? currentView->rootIndex() : QModelIndex(),
+                   !flat );
 }
 
 /* Set the root of the new Playlist */
@@ -261,22 +214,45 @@ void StandardPLPanel::setRoot( playlist_item_t *p_item )
     model->rebuild( p_item );
 }
 
-void StandardPLPanel::removeItem( int i_id )
+void StandardPLPanel::browseInto( const QModelIndex &index )
 {
-    model->removeItem( i_id );
+    if( currentView == iconView || currentView == listView )
+    {
+        currentRootIndexId = model->itemId( index );;
+        currentView->setRootIndex( index );
+    }
+
+    locationBar->setIndex( index );
+    model->search( QString(), index, false );
+    searchEdit->clear();
 }
 
-/* Delete and Suppr key remove the selection
-   FilterKey function and code function */
-void StandardPLPanel::keyPressEvent( QKeyEvent *e )
+void StandardPLPanel::browseInto( )
 {
-    switch( e->key() )
+    browseInto( currentRootIndexId != -1 && currentView != treeView ?
+                model->index( currentRootIndexId, 0 ) :
+                QModelIndex() );
+}
+
+void StandardPLPanel::wheelEvent( QWheelEvent *e )
+{
+    // Accept this event in order to prevent unwanted volume up/down changes
+    e->accept();
+}
+
+bool StandardPLPanel::eventFilter ( QObject * watched, QEvent * event )
+{
+    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()
@@ -294,12 +270,23 @@ void StandardPLPanel::createIconView()
              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 );
     layout->addWidget( iconView, 1, 0, 1, -1 );
 }
 
+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 );
+    layout->addWidget( listView, 1, 0, 1, -1 );
+}
+
+
 void StandardPLPanel::createTreeView()
 {
     /* Create and configure the QTreeView */
@@ -347,6 +334,7 @@ void StandardPLPanel::createTreeView()
              this, popupSelectColumn( QPoint ) );
     CONNECT( treeView, customContextMenuRequested( const QPoint & ),
              this, popupPlView( const QPoint & ) );
+    treeView->installEventFilter( this );
 
     /* SignalMapper for columns */
     selectColumnsSigMapper = new QSignalMapper( this );
@@ -365,11 +353,11 @@ void StandardPLPanel::showView( int i_view )
     {
         if( treeView == NULL )
             createTreeView();
-        locationBar->setIndex( treeView->rootIndex() );
         if( iconView ) iconView->hide();
+        if( listView ) listView->hide();
         treeView->show();
         currentView = treeView;
-        treeViewAction->setChecked( true );
+        viewActions[i_view]->setChecked( true );
         break;
     }
     case ICON_VIEW:
@@ -377,15 +365,30 @@ void StandardPLPanel::showView( int i_view )
         if( iconView == NULL )
             createIconView();
 
-        locationBar->setIndex( iconView->rootIndex() );
         if( treeView ) treeView->hide();
+        if( listView ) listView->hide();
         iconView->show();
         currentView = iconView;
-        iconViewAction->setChecked( true );
+        viewActions[i_view]->setChecked( true );
         break;
     }
-    default:;
+    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;
     }
+
+    browseInto();
+    gotoPlayingItem();
 }
 
 void StandardPLPanel::cycleViews()
@@ -393,33 +396,26 @@ void StandardPLPanel::cycleViews()
     if( currentView == iconView )
         showView( TREE_VIEW );
     else if( currentView == treeView )
+        showView( LIST_VIEW );
+    else if( currentView == listView )
         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 );
-        }
+        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;
-        last_activated_id = p_item->p_input->i_id;//model->getItem( index )->inputItem()->i_id;
+        lastActivatedId = p_item->p_input->i_id;
         playlist_Unlock( THEPL );
         model->activateItem( index );
     }
@@ -428,7 +424,7 @@ void StandardPLPanel::activate( const QModelIndex &index )
 void StandardPLPanel::browseInto( input_item_t *p_input )
 {
 
-    if( p_input->i_id != last_activated_id ) return;
+    if( p_input->i_id != lastActivatedId ) return;
 
     playlist_Lock( THEPL );
 
@@ -443,14 +439,12 @@ void StandardPLPanel::browseInto( input_item_t *p_input )
 
     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;
+    lastActivatedId = -1;
 
 
 }
@@ -473,6 +467,7 @@ void LocationBar::setIndex( const QModelIndex &index )
     buttons.clear();
     QModelIndex i = index;
     bool bold = true;
+    box->addStretch();
     while( true )
     {
         PLItem *item = model->getItem( i );
@@ -481,8 +476,8 @@ void LocationBar::setIndex( const QModelIndex &index )
         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 );
+        btn->setSizePolicy( QSizePolicy::Maximum, QSizePolicy::Fixed );
+        box->insertWidget( 0, btn );
         buttons.append( btn );
 
         mapper->setMapping( btn, item->id() );
@@ -503,7 +498,6 @@ void LocationBar::setRootIndex()
 void LocationBar::invoke( int i_id )
 {
     QModelIndex index = model->index( i_id, 0 );
-    setIndex( index );
     emit invoked ( index );
 }
 
@@ -522,11 +516,7 @@ 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() )
@@ -534,9 +524,14 @@ void LocationButton::paintEvent ( QPaintEvent * event )
 
     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() ) );
+    QRect rect = option.rect.adjusted( b_arrow ? 15 + margin : margin, 0, -margin, 0 );
+
+    QString str( text() );
+    /* This check is absurd, but either it is not done properly inside elidedText(),
+       or boundingRect() is wrong */
+    if( rect.width() < fontMetrics().boundingRect( text() ).width() )
+        str = fontMetrics().elidedText( text(), Qt::ElideRight, rect.width() );
+    p.drawText( rect, Qt::AlignVCenter | Qt::AlignLeft, str );
 
     if( b_arrow )
     {
@@ -550,7 +545,9 @@ 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 ) );
+    /* Add two pixels to width: font metrics are buggy, if you pass text through elidation
+       with exactly the width of its bounding rect, sometimes it still elides */
+    s.setWidth( s.width() + ( 2 * frameWidth ) + ( 2 * PADDING ) + ( b_arrow ? 15 : 0 ) + 2 );
     s.setHeight( QPushButton::sizeHint().height() );
     return s;
 }