X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fcomponents%2Fplaylist%2Fstandardpanel.cpp;h=88a6573fac68b8852fb17c6eed97419baae1ca23;hb=b131df4e1d11b0bd8df9d51040825cb9fd033345;hp=8158ffa623d3dc886194c1cbd825c3dc1d545bb8;hpb=b0a8bf12b2515b995997156c1ecb00fce7a23db7;p=vlc

diff --git a/modules/gui/qt4/components/playlist/standardpanel.cpp b/modules/gui/qt4/components/playlist/standardpanel.cpp
index 8158ffa623..88a6573fac 100644
--- a/modules/gui/qt4/components/playlist/standardpanel.cpp
+++ b/modules/gui/qt4/components/playlist/standardpanel.cpp
@@ -1,10 +1,11 @@
 /*****************************************************************************
  * standardpanel.cpp : The "standard" playlist panel : just a treeview
  ****************************************************************************
- * Copyright (C) 2000-2005 the VideoLAN team
+ * Copyright (C) 2000-2009 VideoLAN
  * $Id$
  *
  * Authors: Clément Stenac <zorglub@videolan.org>
+ *          JB 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
@@ -25,235 +26,167 @@
 # include "config.h"
 #endif
 
-#include "qt4.hpp"
 #include "dialogs_provider.hpp"
 
 #include "components/playlist/playlist_model.hpp"
-#include "components/playlist/panels.hpp"
+#include "components/playlist/standardpanel.hpp"
+#include "components/playlist/icon_view.hpp"
+#include "components/playlist/selector.hpp"
 #include "util/customwidgets.hpp"
+#include "menus.hpp"
 
 #include <vlc_intf_strings.h>
 
 #include <QPushButton>
-#include <QHBoxLayout>
-#include <QVBoxLayout>
 #include <QHeaderView>
 #include <QKeyEvent>
 #include <QModelIndexList>
 #include <QLabel>
-#include <QSpacerItem>
 #include <QMenu>
-#include <QSignalMapper>
+#include <QWheelEvent>
+#include <QToolButton>
+#include <QFontMetrics>
+#include <QStackedLayout>
+
 #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 ):
-                                  PLPanel( _parent, _p_intf )
+                                  playlist_item_t *p_root,
+                                  PLSelector *_p_selector ):
+                                  QWidget( _parent ), p_intf( _p_intf ),
+                                  p_selector( _p_selector )
 {
-    model = new PLModel( p_playlist, p_intf, p_root, this );
-
-    QVBoxLayout *layout = new QVBoxLayout();
+    layout = new QGridLayout( this );
     layout->setSpacing( 0 ); layout->setMargin( 0 );
+    setMinimumWidth( 300 );
 
-    /* Create and configure the QTreeView */
-    view = new QVLCTreeView;
-    view->setModel( model );
-    view->setIconSize( QSize( 20, 20 ) );
-    view->setAlternatingRowColors( true );
-    view->setAnimated( true );
-    view->setSelectionBehavior( QAbstractItemView::SelectRows );
-    view->setSelectionMode( QAbstractItemView::ExtendedSelection );
-    view->setDragEnabled( true );
-    view->setAcceptDrops( true );
-    view->setDropIndicatorShown( true );
-    view->header()->setSortIndicator( -1 , Qt::AscendingOrder );
-    view->setUniformRowHeights( true );
-    view->setSortingEnabled( true );
-
+    iconView = NULL;
+    treeView = NULL;
+    listView = NULL;
+    viewStack = new QStackedLayout();
+    layout->addLayout( viewStack, 1, 0, 1, -1 );
 
-    getSettings()->beginGroup("Playlist");
-    if( getSettings()->contains( "headerStateV2" ) )
-    {
-        view->header()->restoreState(
-                getSettings()->value( "headerStateV2" ).toByteArray() );
-    }
-    else
+    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, textEdited( const QString& ),
+             this, search( const QString& ) );
+    CONNECT( searchEdit, editingFinished(),
+             this, searchDelayed() );
+    layout->setColumnStretch( 2, 3 );
+
+    /* Button to switch views */
+    QToolButton *viewButton = new QToolButton( this );
+    viewButton->setIcon( style()->standardIcon( QStyle::SP_FileDialogDetailedView ) );
+    viewButton->setToolTip( qtr("Change playlistview"));
+    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++ )
     {
-        int m, c;
-        for( m = 1, c = 0; m != COLUMN_END; m <<= 1, c++ )
-        {
-            view->setColumnHidden( c, !( m & COLUMN_DEFAULT ) );
-            if( m == COLUMN_TITLE ) view->header()->resizeSection( c, 200 );
-            else if( m == COLUMN_DURATION ) view->header()->resizeSection( c, 80 );
-        }
+        viewActions[i] = actionGroup->addAction( viewNames[i] );
+        viewActions[i]->setCheckable( true );
+        viewSelectionMapper->setMapping( viewActions[i], i );
+        CONNECT( viewActions[i], triggered(), viewSelectionMapper, map() );
     }
-    view->header()->setSortIndicatorShown( true );
-    view->header()->setClickable( true );
-    view->header()->setContextMenuPolicy( Qt::CustomContextMenu );
-    getSettings()->endGroup();
 
-    /* Connections for the TreeView */
-    CONNECT( view, activated( const QModelIndex& ) ,
-             model,activateItem( const QModelIndex& ) );
-    CONNECT( view, rightClicked( QModelIndex , QPoint ),
-             this, doPopup( QModelIndex, QPoint ) );
-    CONNECT( view->header(), customContextMenuRequested( const QPoint & ),
-             this, popupSelectColumn( QPoint ) );
-    CONNECT( model, currentChanged( const QModelIndex& ),
-             this, handleExpansion( const QModelIndex& ) );
+    BUTTONACT( viewButton, cycleViews() );
+    QMenu *viewMenu = new QMenu( this );
+    viewMenu->addActions( actionGroup->actions() );
 
-    currentRootId = -1;
+    viewButton->setMenu( viewMenu );
 
-    /* Buttons configuration */
-    QHBoxLayout *buttons = new QHBoxLayout;
-
-    /* Add item to the playlist button */
-    addButton = new QPushButton;
-    addButton->setIcon( QIcon( ":/buttons/playlist/playlist_add" ) );
-    addButton->setMaximumWidth( 30 );
-    BUTTONACT( addButton, popupAdd() );
-    buttons->addWidget( addButton );
-
-    /* Random 2-state button */
-    randomButton = new QPushButton( this );
-    randomButton->setIcon( QIcon( ":/buttons/playlist/shuffle_on" ));
-    randomButton->setToolTip( qtr( I_PL_RANDOM ));
-    randomButton->setCheckable( true );
-    randomButton->setChecked( model->hasRandom() );
-    BUTTONACT( randomButton, toggleRandom() );
-    buttons->addWidget( randomButton );
-
-    /* Repeat 3-state button */
-    repeatButton = new QPushButton( this );
-    repeatButton->setToolTip( qtr( "Click to toggle between loop one, loop all" ) );
-    repeatButton->setCheckable( true );
-
-    if( model->hasRepeat() )
-    {
-        repeatButton->setIcon( QIcon( ":/buttons/playlist/repeat_one" ) );
-        repeatButton->setChecked( true );
-    }
-    else if( model->hasLoop() )
-    {
-        repeatButton->setIcon( QIcon( ":/buttons/playlist/repeat_all" ) );
-        repeatButton->setChecked( true );
-    }
-    else
-    {
-        repeatButton->setIcon( QIcon( ":/buttons/playlist/repeat_one" ) );
-        repeatButton->setChecked( false );
-    }
-    BUTTONACT( repeatButton, toggleRepeat() );
-    buttons->addWidget( repeatButton );
-
-    /* Goto */
-    gotoPlayingButton = new QPushButton;
-    BUTTON_SET_ACT_I( gotoPlayingButton, "", buttons/playlist/jump_to,
-            qtr( "Show the current item" ), gotoPlayingItem() );
-    buttons->addWidget( gotoPlayingButton );
-
-    /* A Spacer and the search possibilities */
-    QSpacerItem *spacer = new QSpacerItem( 10, 20 );
-    buttons->addItem( spacer );
-
-    QLabel *filter = new QLabel( qtr(I_PL_SEARCH) + " " );
-    buttons->addWidget( filter );
-
-    SearchLineEdit *search = new SearchLineEdit( this );
-    buttons->addWidget( search );
-    filter->setBuddy( search );
-    CONNECT( search, textChanged( const QString& ), this, search( const QString& ) );
-
-    /* Title label */
-    title = new QLabel;
-    QFont titleFont;
-    titleFont.setPointSize( titleFont.pointSize() + 6 );
-    titleFont.setFamily( "Verdana" );
-    title->setFont( titleFont );
+    /* Saved Settings */
+    getSettings()->beginGroup("Playlist");
 
-    /* Finish the layout */
-    layout->addWidget( title );
-    layout->addWidget( view );
-    layout->addLayout( buttons );
-//    layout->addWidget( bar );
-    setLayout( layout );
+    int i_viewMode = getSettings()->value( "view-mode", TREE_VIEW ).toInt();
 
-    selectColumnsSigMapper = new QSignalMapper( this );
-    CONNECT( selectColumnsSigMapper, mapped( int ), this, toggleColumnShown( int ) );
-}
+    getSettings()->endGroup();
 
-/* Function to toggle between the Repeat states */
-void StandardPLPanel::toggleRepeat()
-{
-    if( model->hasRepeat() )
-    {
-        model->setRepeat( false ); model->setLoop( true );
-        repeatButton->setIcon( QIcon( ":/buttons/playlist/repeat_all" ) );
-        repeatButton->setChecked( true );
-    }
-    else if( model->hasLoop() )
-    {
-        model->setRepeat( false ) ; model->setLoop( false );
-        repeatButton->setChecked( false );
-        repeatButton->setIcon( QIcon( ":/buttons/playlist/repeat_one" ) );
-    }
-    else
-    {
-        model->setRepeat( true ); model->setLoop( false );
-        repeatButton->setChecked( true );
-        repeatButton->setIcon( QIcon( ":/buttons/playlist/repeat_one" ) );
-    }
+    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() );
 }
 
-/* Function to toggle between the Random states */
-void StandardPLPanel::toggleRandom()
+StandardPLPanel::~StandardPLPanel()
 {
-    bool prev = model->hasRandom();
-    model->setRandom( !prev );
+    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()->endGroup();
 }
 
+/* Unused anymore, but might be useful, like in right-click menu */
 void StandardPLPanel::gotoPlayingItem()
 {
-    view->scrollTo( model->currentIndex() );
+    currentView->scrollTo( model->currentIndex() );
 }
 
 void StandardPLPanel::handleExpansion( const QModelIndex& index )
 {
-    view->scrollTo( 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()
+void StandardPLPanel::handleRootChange()
 {
-    QMenu popup;
-    if( currentRootId == THEPL->p_local_category->i_id ||
-        currentRootId == THEPL->p_local_onelevel->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 ) )
-    {
-        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() ) );
-    }
+    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();
 
-    popup.exec( QCursor::pos() - addButton->mapFromGlobal( QCursor::pos() )
-                        + QPoint( 0, addButton->height() ) );
+    if( !model->popup( index, globalPoint, list ) )
+        QVLCMenu::PopupMenu( p_intf, true );
 }
 
 void StandardPLPanel::popupSelectColumn( QPoint pos )
 {
     QMenu menu;
+    assert( treeView );
 
     /* We do not offer the option to hide index 0 column, or
     * QTreeView will behave weird */
@@ -263,7 +196,7 @@ void StandardPLPanel::popupSelectColumn( QPoint pos )
         QAction* option = menu.addAction(
             qfu( psz_column_title( i ) ) );
         option->setCheckable( true );
-        option->setChecked( !view->isColumnHidden( j ) );
+        option->setChecked( !treeView->isColumnHidden( j ) );
         selectColumnsSigMapper->setMapping( option, j );
         CONNECT( option, triggered(), selectColumnsSigMapper, map() );
     }
@@ -272,91 +205,267 @@ void StandardPLPanel::popupSelectColumn( QPoint pos )
 
 void StandardPLPanel::toggleColumnShown( int i )
 {
-    view->setColumnHidden( i, !view->isColumnHidden( i ) );
+    treeView->setColumnHidden( i, !treeView->isColumnHidden( i ) );
 }
 
 /* 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;
+        model->search( searchText,
+                       flat ? currentView->rootIndex() : QModelIndex(),
+                       !flat );
+    }
 }
 
-void StandardPLPanel::doPopup( QModelIndex index, QPoint point )
+void StandardPLPanel::searchDelayed()
 {
-    QItemSelectionModel *selection = view->selectionModel();
-    QModelIndexList list = selection->selectedIndexes();
-    model->popup( index, point, list );
+    int type;
+    QString name;
+    p_selector->getCurrentSelectedItem( &type, &name );
+
+    if( type == SD_TYPE )
+    {
+        if( !name.isEmpty() )
+            playlist_QueryServicesDiscovery( THEPL, qtu(name), qtu(searchEdit->text() ) );
+    }
 }
 
 /* Set the root of the new Playlist */
 /* This activated by the selector selection */
 void StandardPLPanel::setRoot( playlist_item_t *p_item )
 {
-    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 );
-    title->setText( qfu(psz_title) );
-    free( psz_title );
-
-    QPL_UNLOCK;
-
-    /* do THE job */
     model->rebuild( p_item );
+}
 
-    /* enable/disable adding */
-    if( p_item == THEPL->p_local_category ||
-        p_item == THEPL->p_local_onelevel )
-    {
-        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 ) )
+void StandardPLPanel::browseInto( const QModelIndex &index )
+{
+    if( currentView == iconView || currentView == listView )
     {
-        addButton->setEnabled( true );
-        addButton->setToolTip( qtr(I_PL_ADDML) );
+        currentRootIndexId = model->itemId( index );
+        currentView->setRootIndex( index );
     }
-    else
-        addButton->setEnabled( false );
+
+    locationBar->setIndex( index );
+    searchEdit->clear();
+}
+
+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 * watched, 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()
 {
-    QItemSelectionModel *selection = view->selectionModel();
+    QItemSelectionModel *selection = currentView->selectionModel();
     QModelIndexList list = selection->selectedIndexes();
     model->doDelete( list );
 }
 
-StandardPLPanel::~StandardPLPanel()
+void StandardPLPanel::createIconView()
 {
+    iconView = new PlIconView( model, this );
+    iconView->setContextMenuPolicy( Qt::CustomContextMenu );
+    CONNECT( iconView, customContextMenuRequested( const QPoint & ),
+             this, popupPlView( const QPoint & ) );
+    CONNECT( iconView, activated( const QModelIndex & ),
+             this, activate( 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 );
+}
+
+
+void StandardPLPanel::createTreeView()
+{
+    /* Create and configure the QTreeView */
+    treeView = new PlTreeView;
+
+    treeView->setIconSize( QSize( 20, 20 ) );
+    treeView->setAlternatingRowColors( true );
+    treeView->setAnimated( true );
+    treeView->setUniformRowHeights( true );
+    treeView->setSortingEnabled( true );
+    treeView->header()->setSortIndicator( -1 , Qt::AscendingOrder );
+    treeView->header()->setSortIndicatorShown( true );
+    treeView->header()->setClickable( true );
+    treeView->header()->setContextMenuPolicy( Qt::CustomContextMenu );
+
+    treeView->setSelectionBehavior( QAbstractItemView::SelectRows );
+    treeView->setSelectionMode( QAbstractItemView::ExtendedSelection );
+    treeView->setDragEnabled( true );
+    treeView->setAcceptDrops( true );
+    treeView->setDropIndicatorShown( true );
+    treeView->setContextMenuPolicy( Qt::CustomContextMenu );
+
+    /* setModel after setSortingEnabled(true), or the model will sort immediately! */
+    treeView->setModel( model );
+
     getSettings()->beginGroup("Playlist");
-    getSettings()->setValue( "headerStateV2", view->header()->saveState() );
+
+    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& ),
+             this, activate( const QModelIndex& ) );
+    CONNECT( treeView->header(), customContextMenuRequested( const QPoint & ),
+             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 */
+    viewStack->addWidget( treeView );
+}
+
+void StandardPLPanel::showView( int i_view )
+{
+    switch( i_view )
+    {
+    case TREE_VIEW:
+    {
+        if( treeView == NULL )
+            createTreeView();
+        currentView = treeView;
+        break;
+    }
+    case ICON_VIEW:
+    {
+        if( iconView == NULL )
+            createIconView();
+        currentView = iconView;
+        break;
+    }
+    case LIST_VIEW:
+    {
+        if( listView == NULL )
+            createListView();
+        currentView = listView;
+        break;
+    }
+    default: return;
+    }
+
+    viewStack->setCurrentWidget( currentView );
+    viewActions[i_view]->setChecked( true );
+    browseInto();
+    gotoPlayingItem();
+}
+
+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::activate( const QModelIndex &index )
+{
+    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 );
+    }
+}
+
+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;
+
+
 }