From 81f523a483fc6201af695ab57aff7155f8005562 Mon Sep 17 00:00:00 2001
From: Etienne Tourigny <etourigny.dev@gmail.com>
Date: Tue, 20 Nov 2012 15:55:37 -0200
Subject: [PATCH] browser: fix mModel vs. mProxyModel index

---
 src/app/qgsbrowserdockwidget.cpp | 49 +++++++++++---------------------
 src/app/qgsbrowserdockwidget.h   |  3 +-
 2 files changed, 18 insertions(+), 34 deletions(-)

diff --git a/src/app/qgsbrowserdockwidget.cpp b/src/app/qgsbrowserdockwidget.cpp
index 86a750af906..8c2978de0bd 100644
--- a/src/app/qgsbrowserdockwidget.cpp
+++ b/src/app/qgsbrowserdockwidget.cpp
@@ -269,18 +269,9 @@ void QgsBrowserDockWidget::showEvent( QShowEvent * e )
   {
     mModel = new QgsBrowserModel( mBrowserView );
 
-    bool useFilter = true;
-    if ( useFilter ) // enable proxy model
-    {
-      // mBrowserView->setModel( mModel );
-      mProxyModel = new QgsBrowserTreeFilterProxyModel( this );
-      mProxyModel->setBrowserModel( mModel );
-      mBrowserView->setModel( mProxyModel );
-    }
-    else
-    {
-      mBrowserView->setModel( mModel );
-    }
+    mProxyModel = new QgsBrowserTreeFilterProxyModel( this );
+    mProxyModel->setBrowserModel( mModel );
+    mBrowserView->setModel( mProxyModel );
     // provide a horizontal scroll bar instead of using ellipse (...) for longer items
     mBrowserView->setTextElideMode( Qt::ElideNone );
     mBrowserView->header()->setResizeMode( 0, QHeaderView::ResizeToContents );
@@ -301,8 +292,8 @@ void QgsBrowserDockWidget::showEvent( QShowEvent * e )
 
 void QgsBrowserDockWidget::showContextMenu( const QPoint & pt )
 {
-  QModelIndex idx = mBrowserView->indexAt( pt );
-  QgsDataItem* item = dataItem( idx );
+  QModelIndex index = mProxyModel->mapToSource( mBrowserView->indexAt( pt ) );
+  QgsDataItem* item = mModel->dataItem( index );
   if ( !item )
     return;
 
@@ -358,7 +349,8 @@ void QgsBrowserDockWidget::showContextMenu( const QPoint & pt )
 
 void QgsBrowserDockWidget::addFavourite()
 {
-  QgsDataItem* item = dataItem( mBrowserView->currentIndex() );
+  QModelIndex index = mProxyModel->mapToSource( mBrowserView->currentIndex() );
+  QgsDataItem* item = mModel->dataItem( index );
   if ( !item )
     return;
 
@@ -390,7 +382,8 @@ void QgsBrowserDockWidget::addFavouriteDirectory( QString favDir )
 
 void QgsBrowserDockWidget::removeFavourite()
 {
-  QgsDataItem* item = dataItem( mBrowserView->currentIndex() );
+  QModelIndex index = mProxyModel->mapToSource( mBrowserView->currentIndex() );
+  QgsDataItem* item = mModel->dataItem( index );
 
   if ( !item )
     return;
@@ -420,7 +413,7 @@ void QgsBrowserDockWidget::refreshModel( const QModelIndex& index )
   QgsDebugMsg( "Entered" );
   if ( index.isValid() )
   {
-    QgsDataItem *item = dataItem( index );
+    QgsDataItem *item = mModel->dataItem( index );
     if ( item )
     {
       QgsDebugMsg( "path = " + item->path() );
@@ -436,7 +429,8 @@ void QgsBrowserDockWidget::refreshModel( const QModelIndex& index )
   for ( int i = 0 ; i < mModel->rowCount( index ); i++ )
   {
     QModelIndex idx = mModel->index( i, 0, index );
-    if ( mBrowserView->isExpanded( idx ) || !mModel->hasChildren( idx ) )
+    QModelIndex proxyIdx = mProxyModel->mapFromSource( idx );
+    if ( mBrowserView->isExpanded( proxyIdx ) || !mModel->hasChildren( proxyIdx ) )
     {
       refreshModel( idx );
     }
@@ -468,7 +462,7 @@ void QgsBrowserDockWidget::addLayer( QgsLayerItem *layerItem )
 
 void QgsBrowserDockWidget::addLayerAtIndex( const QModelIndex& index )
 {
-  QgsDataItem *item = dataItem( index );
+  QgsDataItem *item = mModel->dataItem( mProxyModel->mapToSource( index ) );
 
   if ( item != NULL && item->type() == QgsDataItem::Layer )
   {
@@ -498,8 +492,7 @@ void QgsBrowserDockWidget::addSelectedLayers()
   // add items in reverse order so they are in correct order in the layers dock
   for ( int i = list.size() - 1; i >= 0; i-- )
   {
-    QModelIndex index = list[i];
-    QgsDataItem *item = dataItem( index );
+    QgsDataItem *item = mModel->dataItem( mProxyModel->mapToSource( list[i] ) );
     if ( item && item->type() == QgsDataItem::Layer )
     {
       QgsLayerItem *layerItem = qobject_cast<QgsLayerItem*>( item );
@@ -513,9 +506,8 @@ void QgsBrowserDockWidget::addSelectedLayers()
 
 void QgsBrowserDockWidget::showProperties( )
 {
-  QgsDebugMsg( "Entered" );
-  QModelIndex index = mBrowserView->currentIndex();
-  QgsDataItem* item = dataItem( index );
+  QModelIndex index = mProxyModel->mapToSource( mBrowserView->currentIndex() );
+  QgsDataItem* item = mModel->dataItem( index );
   if ( ! item )
     return;
 
@@ -635,12 +627,3 @@ void QgsBrowserDockWidget::setFilterSyntax( QAction * action )
     return;
   mProxyModel->setFilterSyntax(( QRegExp::PatternSyntax ) action->data().toInt() );
 }
-
-QgsDataItem* QgsBrowserDockWidget::dataItem( const QModelIndex& index )
-{
-  if ( ! mProxyModel )
-    return mModel->dataItem( index );
-  else
-    return mModel->dataItem( mProxyModel->mapToSource( index ) );
-}
-
diff --git a/src/app/qgsbrowserdockwidget.h b/src/app/qgsbrowserdockwidget.h
index 925fbd46d8b..eaaae83e57d 100644
--- a/src/app/qgsbrowserdockwidget.h
+++ b/src/app/qgsbrowserdockwidget.h
@@ -61,7 +61,8 @@ class QgsBrowserDockWidget : public QDockWidget, private Ui::QgsBrowserDockWidge
 
     void addLayer( QgsLayerItem *layerItem );
 
-    QgsDataItem* dataItem( const QModelIndex& index );
+    // removed dataItem(), call mModel->dataItem directly (to avoid passing index from the wrong model)
+
     QgsBrowserTreeView* mBrowserView;
     QgsBrowserModel* mModel;
     QgsBrowserTreeFilterProxyModel* mProxyModel;