]> git.sesse.net Git - vlc/blobdiff - modules/gui/qt4/components/playlist/standardpanel.cpp
Qt: PLModel: move zoom value out of model
[vlc] / modules / gui / qt4 / components / playlist / standardpanel.cpp
index 4ceeaeba22a2fcd2182b4ef776b054136f543cef..879c827f55fdbdb194ded02d17e0a8da41ff2a59 100644 (file)
@@ -1,11 +1,11 @@
 /*****************************************************************************
  * 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 "dialogs_provider.hpp"                   /* THEDP */
+#include "dialogs/playlist.hpp"                   /* Playlist Dialog */
+#include "dialogs/mediainfo.hpp"                  /* MediaInfoDialog */
+
+#include <vlc_services_discovery.h>               /* SD_CMD_SEARCH */
+#include <vlc_intf_strings.h>                     /* POP_ */
+
+#define I_NEW_DIR \
+    I_DIR_OR_FOLDER( N_("Create Directory"), N_( "Create Folder" ) )
+#define I_NEW_DIR_NAME \
+    I_DIR_OR_FOLDER( N_( "Enter name for new directory:" ), \
+                     N_( "Enter name for new folder:" ) )
 
-#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 <QStylePainter>
+#include <QInputDialog>
+#include <QDesktopServices>
+#include <QUrl>
+#include <QFont>
 
 #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 )
-{
-    layout = new QGridLayout( this );
-    layout->setSpacing( 0 ); layout->setMargin( 0 );
+                                  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 )
+{
+    viewStack = new QStackedLayout( this );
+    viewStack->setSpacing( 0 ); viewStack->setMargin( 0 );
     setMinimumWidth( 300 );
 
-    iconView = NULL;
-    treeView = NULL;
-    listView = NULL;
+    iconView    = NULL;
+    treeView    = NULL;
+    listView    = NULL;
+    picFlowView = NULL;
 
-    model = new PLModel( p_playlist, p_intf, p_root, this );
-    currentRootId = -1;
-    currentRootIndexId = -1;
-    lastActivatedId = -1;
-
-    locationBar = new LocationBar( model );
-    locationBar->setSizePolicy( QSizePolicy::Ignored, QSizePolicy::Preferred );
-    layout->addWidget( locationBar, 0, 0 );
-    layout->setColumnStretch( 0, 5 );
-    CONNECT( locationBar, invoked( const QModelIndex & ),
-             this, browseInto( const QModelIndex & ) );
-
-    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( 2, 3 );
-
-    /* Button to switch views */
-    QToolButton *viewButton = new QToolButton( this );
-    viewButton->setIcon( style()->standardIcon( QStyle::SP_FileDialogDetailedView ) );
-    layout->addWidget( viewButton, 0, 1 );
-
-    /* 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 );
+    currentRootIndexId  = -1;
+    lastActivatedId     = -1;
 
     /* Saved Settings */
-    getSettings()->beginGroup("Playlist");
+    int i_savedViewMode = getSettings()->value( "Playlist/view-mode", TREE_VIEW ).toInt();
+    i_zoom = getSettings()->value( "Playlist/zoom", 0 ).toInt();
 
-    int i_viewMode = getSettings()->value( "view-mode", TREE_VIEW ).toInt();
-    showView( i_viewMode );
-
-    getSettings()->endGroup();
+    showView( i_savedViewMode );
 
-    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, handleRootChange() );
+    CONNECT( model, rootIndexChanged(), this, browseInto() );
+
+    setRootItem( p_root, false );
 }
 
 StandardPLPanel::~StandardPLPanel()
@@ -136,12 +108,8 @@ StandardPLPanel::~StandardPLPanel()
     getSettings()->beginGroup("Playlist");
     if( treeView )
         getSettings()->setValue( "headerStateV2", treeView->header()->saveState() );
-    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()->setValue( "view-mode", currentViewIndex() );
+    getSettings()->setValue( "zoom", i_zoom );
     getSettings()->endGroup();
 }
 
@@ -154,37 +122,159 @@ void StandardPLPanel::gotoPlayingItem()
 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()
-{
-    browseInto();
-}
-
 void StandardPLPanel::popupPlView( const QPoint &point )
 {
     QModelIndex index = currentView->indexAt( point );
     QPoint globalPoint = currentView->viewport()->mapToGlobal( point );
     QItemSelectionModel *selection = currentView->selectionModel();
-    QModelIndexList list = selection->selectedIndexes();
+    QModelIndexList list = selection->selectedRows();
+
+    if( !popup( index, globalPoint, list ) )
+        VLCMenuBar::PopupMenu( p_intf, true );
+}
+
+/*********** Popup *********/
+bool StandardPLPanel::popup( const QModelIndex & index, const QPoint &point, const QModelIndexList &selectionlist )
+{
+    VLCModel *model = qobject_cast<VLCModel*>(currentView->model());
+    QModelIndexList callerAsList;
+    callerAsList << ( index.isValid() ? index : QModelIndex() );
+    popupIndex = index; /* suitable for modal only */
+
+#define ADD_MENU_ENTRY( icon, title, act, data ) \
+    action = menu.addAction( icon, title ); \
+    container.action = act; \
+    container.indexes = data; \
+    action->setData( QVariant::fromValue( container ) )
+
+    /* */
+    QMenu menu;
+    QAction *action;
+    PLModel::actionsContainerType container;
+
+    /* Play/Stream/Info static actions */
+    if( index.isValid() )
+    {
+        ADD_MENU_ENTRY( QIcon( ":/menu/play" ), qtr(I_POP_PLAY),
+                        container.ACTION_PLAY, callerAsList );
+
+        menu.addAction( QIcon( ":/menu/stream" ), qtr(I_POP_STREAM),
+                        this, SLOT( popupStream() ) );
+
+        menu.addAction( QIcon(), qtr(I_POP_SAVE),
+                        this, SLOT( popupSave() ) );
+
+        menu.addAction( QIcon( ":/menu/info" ), qtr(I_POP_INFO),
+                        this, SLOT( popupInfoDialog() ) );
+
+        menu.addSeparator();
+
+        if( model->getURI( index ).startsWith( "file://" ) )
+            menu.addAction( QIcon( ":/type/folder-grey" ), qtr(I_POP_EXPLORE),
+                            this, SLOT( popupExplore() ) );
+    }
+
+    /* In PL or ML, allow to add a file/folder */
+    if( model->canEdit() )
+    {
+        QIcon addIcon( ":/buttons/playlist/playlist_add" );
+
+        if( model->isTree() )
+            menu.addAction( addIcon, qtr(I_POP_NEWFOLDER),
+                            this, SLOT( popupPromptAndCreateNode() ) );
+
+        menu.addSeparator();
+        if( model->isCurrentItem( model->rootIndex(), PLModel::IN_PLAYLIST ) )
+        {
+            menu.addAction( addIcon, qtr(I_PL_ADDF), THEDP, SLOT( simplePLAppendDialog()) );
+            menu.addAction( addIcon, qtr(I_PL_ADDDIR), THEDP, SLOT( PLAppendDir()) );
+            menu.addAction( addIcon, qtr(I_OP_ADVOP), THEDP, SLOT( PLAppendDialog()) );
+        }
+        else if( model->isCurrentItem( model->rootIndex(), PLModel::IN_MEDIALIBRARY ) )
+        {
+            menu.addAction( addIcon, qtr(I_PL_ADDF), THEDP, SLOT( simpleMLAppendDialog()) );
+            menu.addAction( addIcon, qtr(I_PL_ADDDIR), THEDP, SLOT( MLAppendDir() ) );
+            menu.addAction( addIcon, qtr(I_OP_ADVOP), THEDP, SLOT( MLAppendDialog() ) );
+        }
+    }
+
+    if( index.isValid() )
+    {
+        if( !model->isCurrentItem( model->rootIndex(), PLModel::IN_PLAYLIST ) )
+        {
+            ADD_MENU_ENTRY( QIcon(), qtr("Add to playlist"),
+                            container.ACTION_ADDTOPLAYLIST, selectionlist );
+        }
+    }
+
+    menu.addSeparator();
+
+    /* Item removal */
+    if( index.isValid() )
+    {
+        ADD_MENU_ENTRY( QIcon( ":/buttons/playlist/playlist_remove" ), qtr(I_POP_DEL),
+                        container.ACTION_REMOVE, selectionlist );
+    }
+
+    if( model->canEdit() ) {
+        menu.addAction( QIcon( ":/toolbar/clear" ), qtr("Clear playlist"),
+                        model, SLOT( clearPlaylist() ) );
+    }
+
+    menu.addSeparator();
+
+    /* Playlist sorting */
+    QMenu *sortingMenu = new QMenu( qtr( "Sort by" ) );
+    /* Choose what columns to show in sorting menu, not sure if this should be configurable*/
+    QList<int> sortingColumns;
+    sortingColumns << COLUMN_TITLE << COLUMN_ARTIST << COLUMN_ALBUM << COLUMN_TRACK_NUMBER << COLUMN_URI;
+    container.action = container.ACTION_SORT;
+    container.indexes = callerAsList;
+    foreach( int Column, sortingColumns )
+    {
+        action = sortingMenu->addAction( qfu( psz_column_title( Column ) ) + " " + qtr("Ascending") );
+        container.column = model->columnFromMeta(Column) + 1;
+        action->setData( QVariant::fromValue( container ) );
+
+        action = sortingMenu->addAction( qfu( psz_column_title( Column ) ) + " " + qtr("Descending") );
+        container.column = -1 * (model->columnFromMeta(Column)+1);
+        action->setData( QVariant::fromValue( container ) );
+    }
+    menu.addMenu( sortingMenu );
+
+    /* Zoom */
+    QMenu *zoomMenu = new QMenu( qtr( "Display size" ) );
+    zoomMenu->addAction( qtr( "Increase" ), this, SLOT( increaseZoom() ) );
+    zoomMenu->addAction( qtr( "Decrease" ), this, SLOT( decreaseZoom() ) );
+    menu.addMenu( zoomMenu );
 
-    if( !model->popup( index, globalPoint, list ) )
-        QVLCMenu::PopupMenu( p_intf, true );
+    CONNECT( &menu, triggered( QAction * ), model, actionSlot( QAction * ) );
+
+    /* Display and forward the result */
+    if( !menu.isEmpty() )
+    {
+        menu.exec( point ); return true;
+    }
+    else return false;
+
+#undef ADD_MENU_ENTRY
 }
 
-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 );
@@ -193,6 +283,63 @@ void StandardPLPanel::popupSelectColumn( QPoint pos )
     menu.exec( QCursor::pos() );
 }
 
+void StandardPLPanel::popupPromptAndCreateNode()
+{
+    bool ok;
+    QString name = QInputDialog::getText( PlaylistDialog::getInstance( p_intf ),
+        qtr( I_NEW_DIR ), qtr( I_NEW_DIR_NAME ),
+        QLineEdit::Normal, QString(), &ok);
+    if ( !ok ) return;
+    qobject_cast<VLCModel *>(currentView->model())->createNode( popupIndex, name );
+}
+
+void StandardPLPanel::popupInfoDialog()
+{
+    if( popupIndex.isValid() )
+    {
+        VLCModel *model = qobject_cast<VLCModel *>(currentView->model());
+        input_item_t* p_input = model->getInputItem( popupIndex );
+        MediaInfoDialog *mid = new MediaInfoDialog( p_intf, p_input );
+        mid->setParent( PlaylistDialog::getInstance( p_intf ),
+                        Qt::Dialog );
+        mid->show();
+    }
+}
+
+void StandardPLPanel::popupExplore()
+{
+    VLCModel *model = qobject_cast<VLCModel *>(currentView->model());
+    QString uri = model->getURI( popupIndex );
+    char *path = NULL;
+
+    if( ! uri.isEmpty() )
+        path = make_path( uri.toAscii().constData() );
+
+    if( path == NULL )
+        return;
+
+    QDesktopServices::openUrl(
+                QUrl::fromLocalFile( QFileInfo( qfu( path ) ).absolutePath() ) );
+
+    free( path );
+}
+
+void StandardPLPanel::popupStream()
+{
+    VLCModel *model = qobject_cast<VLCModel *>(currentView->model());
+    QString uri = model->getURI( popupIndex );
+    if ( ! uri.isEmpty() )
+        THEDP->streamingDialog( NULL, uri, false );
+}
+
+void StandardPLPanel::popupSave()
+{
+    VLCModel *model = qobject_cast<VLCModel *>(currentView->model());
+    QString uri = model->getURI( popupIndex );
+    if ( ! uri.isEmpty() )
+        THEDP->streamingDialog( NULL, uri );
+}
+
 void StandardPLPanel::toggleColumnShown( int i )
 {
     treeView->setColumnHidden( i, !treeView->isColumnHidden( i ) );
@@ -201,37 +348,86 @@ void StandardPLPanel::toggleColumnShown( int i )
 /* 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;
+    bool can_search;
+    p_selector->getCurrentItemInfos( &type, &can_search, &name );
+
+    if( type != SD_TYPE || !can_search )
+    {
+        bool flat = ( currentView == iconView ||
+                      currentView == listView ||
+                      currentView == picFlowView );
+        model->search( searchText,
+                       flat ? currentView->rootIndex() : QModelIndex(),
+                       !flat );
+    }
+}
+
+void StandardPLPanel::searchDelayed( const QString& searchText )
+{
+    int type;
+    QString name;
+    bool can_search;
+    p_selector->getCurrentItemInfos( &type, &can_search, &name );
+
+    if( type == SD_TYPE && can_search )
+    {
+        if( !name.isEmpty() && !searchText.isEmpty() )
+            playlist_ServicesDiscoveryControl( THEPL, qtu( name ), SD_CMD_SEARCH,
+                                              qtu( searchText ) );
+    }
 }
 
 /* Set the root of the new Playlist */
 /* This activated by the selector selection */
-void StandardPLPanel::setRoot( playlist_item_t *p_item )
+void StandardPLPanel::setRootItem( playlist_item_t *p_item, bool b )
 {
-    model->rebuild( p_item );
+#ifdef MEDIA_LIBRARY
+    if( b )
+    {
+        msg_Dbg( p_intf, "Setting the SQL ML" );
+        currentView->setModel( mlmodel );
+    }
+    else
+#else
+    Q_UNUSED( b );
+#endif
+    {
+        if( currentView->model() != model )
+            currentView->setModel( model );
+        model->rebuild( p_item );
+    }
 }
 
 void StandardPLPanel::browseInto( const QModelIndex &index )
 {
-    if( currentView == iconView || currentView == listView )
+    if( currentView == iconView || currentView == listView || currentView == picFlowView )
     {
-        currentRootIndexId = model->itemId( index );;
+
         currentView->setRootIndex( index );
+
+        /* When going toward root in LocationBar, scroll to the item
+           that was previously as root */
+        QModelIndex newIndex = model->index(currentRootIndexId,0);
+        while( newIndex.isValid() && (newIndex.parent() != index) )
+            newIndex = newIndex.parent();
+        if( newIndex.isValid() )
+            currentView->scrollTo( newIndex );
+
+        /* Store new rootindexid*/
+        currentRootIndexId = model->itemId( index );
+        model->ensureArtRequested( index );
     }
 
-    locationBar->setIndex( index );
-    model->search( QString(), index, false );
-    searchEdit->clear();
+    emit viewChanged( index );
 }
 
-void StandardPLPanel::browseInto( )
+void StandardPLPanel::browseInto()
 {
-    browseInto( currentRootIndexId != -1 && currentView != treeView ?
-                model->index( currentRootIndexId, 0 ) :
-                QModelIndex() );
+    browseInto( (currentRootIndexId != -1 && currentView != treeView) ?
+                 model->index( currentRootIndexId, 0 ) :
+                 QModelIndex() );
 }
 
 void StandardPLPanel::wheelEvent( QWheelEvent *e )
@@ -240,7 +436,7 @@ void StandardPLPanel::wheelEvent( QWheelEvent *e )
     e->accept();
 }
 
-bool StandardPLPanel::eventFilter ( QObject * watched, QEvent * event )
+bool StandardPLPanel::eventFilter ( QObject *obj, QEvent * event )
 {
     if (event->type() == QEvent::KeyPress)
     {
@@ -252,6 +448,32 @@ bool StandardPLPanel::eventFilter ( QObject * watched, QEvent * event )
             return true;
         }
     }
+    else if ( event->type() == QEvent::Paint )
+    {/* Warn! Don't filter events from anything else than views ! */
+        if ( model->rowCount() == 0 && p_selector->getCurrentItemCategory() == PL_ITEM_TYPE )
+        {
+            QWidget *viewport = qobject_cast<QWidget *>( obj );
+            QStylePainter painter( viewport );
+            QPixmap dropzone(":/dropzone");
+            QRect rect = viewport->geometry();
+            QSize size = rect.size() / 2 - dropzone.size() / 2;
+            rect.adjust( 0, size.height(), 0 , 0 );
+            painter.drawItemPixmap( rect, Qt::AlignHCenter, dropzone );
+            /* now select the zone just below the drop zone and let Qt center
+               the text by itself */
+            rect.adjust( 0, dropzone.size().height() + 10, 0, 0 );
+            rect.setRight( viewport->geometry().width() );
+            rect.setLeft( 0 );
+            painter.drawItemText( rect,
+                                  Qt::AlignHCenter,
+                                  palette(),
+                                  true,
+                                  qtr("Playlist is currently empty.\n"
+                                      "Drop a file here or select a "
+                                      "media source from the left."),
+                                  QPalette::Text );
+        }
+    }
     return false;
 }
 
@@ -271,7 +493,8 @@ void StandardPLPanel::createIconView()
     CONNECT( iconView, activated( const QModelIndex & ),
              this, activate( const QModelIndex & ) );
     iconView->installEventFilter( this );
-    layout->addWidget( iconView, 1, 0, 1, -1 );
+    iconView->viewport()->installEventFilter( this );
+    viewStack->addWidget( iconView );
 }
 
 void StandardPLPanel::createListView()
@@ -283,20 +506,33 @@ void StandardPLPanel::createListView()
     CONNECT( listView, activated( const QModelIndex & ),
              this, activate( const QModelIndex & ) );
     listView->installEventFilter( this );
-    layout->addWidget( listView, 1, 0, 1, -1 );
+    listView->viewport()->installEventFilter( this );
+    viewStack->addWidget( listView );
 }
 
+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 );
@@ -310,24 +546,6 @@ void StandardPLPanel::createTreeView()
     treeView->setContextMenuPolicy( Qt::CustomContextMenu );
 
     /* setModel after setSortingEnabled(true), or the model will sort immediately! */
-    treeView->setModel( model );
-
-    getSettings()->beginGroup("Playlist");
-    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 );
-        }
-    }
-    getSettings()->endGroup();
 
     /* Connections for the TreeView */
     CONNECT( treeView, activated( const QModelIndex& ),
@@ -337,62 +555,133 @@ void StandardPLPanel::createTreeView()
     CONNECT( treeView, customContextMenuRequested( const QPoint & ),
              this, popupPlView( const QPoint & ) );
     treeView->installEventFilter( this );
+    treeView->viewport()->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::updateZoom( int i )
+{
+    if ( i < 4 - QApplication::font().pointSize() ) return;
+    i_zoom = i;
+#define A_ZOOM( view ) \
+    if ( view ) \
+    qobject_cast<AbstractPlViewItemDelegate*>( view->itemDelegate() )->setZoom( i_zoom )
+    /* Can't iterate as picflow & tree aren't using custom delegate */
+    A_ZOOM( iconView );
+    A_ZOOM( listView );
+#undef A_ZOOM
+    currentView->reset();
+}
+
+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 )
 {
+    bool b_treeViewCreated = false;
+
     switch( i_view )
     {
-    case TREE_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;
+    case PICTUREFLOW_VIEW:
+    {
+        if( picFlowView == NULL )
+            createCoverView();
+        currentView = picFlowView;
+        break;
+    }
+    default:
+    case TREE_VIEW:
+    {
+        if( treeView == NULL )
+        {
+            createTreeView();
+            b_treeViewCreated = true;
+        }
+        currentView = treeView;
+        break;
+    }
     }
 
+    changeModel( false );
+
+    /* Restoring the header Columns must come after changeModel */
+    if( b_treeViewCreated )
+    {
+        assert( treeView );
+        if( getSettings()->contains( "Playlist/headerStateV2" ) )
+        {
+            treeView->header()->restoreState(getSettings()
+                    ->value( "Playlist/headerStateV2" ).toByteArray() );
+            /* if there is allready stuff in playlist, we don't sort it and we reset
+               sorting */
+            if( model->rowCount() )
+            {
+                treeView->header()->setSortIndicator( -1 , Qt::AscendingOrder );
+            }
+        }
+        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 );
+            }
+        }
+    }
+
+    updateZoom( i_zoom );
+    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 )
@@ -400,6 +689,10 @@ void StandardPLPanel::cycleViews()
     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 );
@@ -407,241 +700,36 @@ void StandardPLPanel::cycleViews()
 
 void StandardPLPanel::activate( const QModelIndex &index )
 {
-    if( model->hasChildren( 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;
-        lastActivatedId = p_item->p_input->i_id;
-        playlist_Unlock( THEPL );
-        model->activateItem( index );
-    }
-}
-
-void StandardPLPanel::browseInto( input_item_t *p_input )
-{
-
-    if( p_input->i_id != lastActivatedId ) 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 == treeView )
-        treeView->setExpanded( index, true );
-    else
-        browseInto( index );
-
-    lastActivatedId = -1;
-
-
-}
-
-LocationBar::LocationBar( PLModel *m )
-{
-    model = m;
-    mapper = new QSignalMapper( this );
-    CONNECT( mapper, mapped( int ), this, invoke( int ) );
-
-    btnMore = new LocationButton( "...", false, true, this );
-    menuMore = new QMenu( this );
-    btnMore->setMenu( menuMore );
-}
-
-void LocationBar::setIndex( const QModelIndex &index )
-{
-    qDeleteAll( buttons );
-    buttons.clear();
-    qDeleteAll( actions );
-    actions.clear();
-
-    QModelIndex i = index;
-    bool first = 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, first, !first, this );
-        btn->setSizePolicy( QSizePolicy::Maximum, QSizePolicy::Fixed );
-        buttons.append( btn );
-
-        QAction *action = new QAction( text, this );
-        actions.append( action );
-        CONNECT( btn, clicked(), action, trigger() );
-
-        mapper->setMapping( action, item->id() );
-        CONNECT( action, triggered(), mapper, map() );
-
-        first = false;
-
-        if( i.isValid() ) i = i.parent();
-        else break;
-    }
-
-    QString prefix;
-    for( int a = actions.count() - 1; a >= 0 ; a-- )
-    {
-        actions[a]->setText( prefix + actions[a]->text() );
-        prefix += QString("  ");
-    }
-
-    if( isVisible() ) layOut( size() );
-}
-
-void LocationBar::setRootIndex()
-{
-    setIndex( QModelIndex() );
-}
-
-void LocationBar::invoke( int i_id )
-{
-    QModelIndex index = model->index( i_id, 0 );
-    emit invoked ( index );
-}
-
-void LocationBar::layOut( const QSize& size )
-{
-    menuMore->clear();
-
-    int count = buttons.count();
-    QList<int> widths;
-    int totalWidth = 0;
-    for( int i = 0; i < count; i++ )
+    if( currentView->model() == model )
     {
-        int w = buttons[i]->sizeHint().width();
-        if( i == 0 || totalWidth + w <= size.width() )
+        /* If we are not a leaf node */
+        if( !index.data( PLModel::IsLeafNodeRole ).toBool() )
         {
-            totalWidth += w;
-            widths.append( w );
-        }
-        if( totalWidth > size.width() ) break;
-    }
-
-    int x = 0;
-    int shown = widths.count();
-    if( shown < count )
-    {
-        QSize sz = btnMore->sizeHint();
-        btnMore->setGeometry( 0, 0, sz.width(), size.height() );
-        btnMore->show();
-        x = sz.width();
-        totalWidth += x;
-    }
-    else
-    {
-        btnMore->hide();
-    }
-    shown--;
-    for( int i = count - 1; i >= 0; i-- )
-    {
-        if( i > shown )
-        {
-            menuMore->addAction( actions[i] );
-            buttons[i]->hide();
-        }
-        else if( i > 0 && totalWidth > size.width() )
-        {
-            menuMore->addAction( actions[i] );
-            buttons[i]->hide();
-            totalWidth -= widths[i];
+            if( currentView != treeView )
+                browseInto( index );
         }
         else
         {
-            buttons[i]->setGeometry( x, 0,
-                                    qMin( widths[i], size.width() - x ),
-                                    size.height() );
-            buttons[i]->show();
-            totalWidth -= widths[i];
-            x += widths[i];
+            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 );
         }
     }
 }
 
-void LocationBar::resizeEvent ( QResizeEvent * event )
+void StandardPLPanel::browseInto( int i_id )
 {
-    layOut( event->size() );
-}
+    if( i_id != lastActivatedId ) return;
 
-QSize LocationBar::sizeHint() const
-{
-    return btnMore->sizeHint();
-}
-
-LocationButton::LocationButton( const QString &text, bool bold,
-                                bool arrow, QWidget * parent )
-  : b_arrow( arrow ), QPushButton( parent )
-{
-    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() )
-    {
-        p.save();
-        p.setRenderHint( QPainter::Antialiasing, true );
-        QColor c = palette().color( QPalette::Highlight );
-        p.setPen( c );
-        p.setBrush( c.lighter( 150 ) );
-        p.setOpacity( 0.2 );
-        p.drawRoundedRect( option.rect.adjusted( 0, 2, 0, -2 ), 5, 5 );
-        p.restore();
-    }
-
-    QRect r = option.rect.adjusted( PADDING, 0, -PADDING - (b_arrow ? 10 : 0), 0 );
-
-    QString str( text() );
-    /* This check is absurd, but either it is not done properly inside elidedText(),
-       or boundingRect() is wrong */
-    if( r.width() < fontMetrics().boundingRect( text() ).width() )
-        str = fontMetrics().elidedText( text(), Qt::ElideRight, r.width() );
-    p.drawText( r, Qt::AlignVCenter | Qt::AlignLeft, str );
+    QModelIndex index = model->index( i_id, 0 );
 
-    if( b_arrow )
-    {
-        option.rect.setWidth( 10 );
-        option.rect.moveRight( rect().right() );
-        style()->drawPrimitive( QStyle::PE_IndicatorArrowRight, &option, &p );
-    }
-}
+    if( currentView == treeView )
+        treeView->setExpanded( index, true );
+    else
+        browseInto( index );
 
-QSize LocationButton::sizeHint() const
-{
-    QSize s( fontMetrics().boundingRect( text() ).size() );
-    /* 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 * PADDING ) + ( b_arrow ? 10 : 0 ) + 2 );
-    s.setHeight( s.height() + 2 * PADDING );
-    return s;
+    lastActivatedId = -1;
 }
-
-#undef PADDING