remember browser last expanded item

blazek · blazek · commit abf00872c2f8 · 2014-11-06T19:09:18.000+01:00
diff --git a/src/app/qgsbrowserdockwidget.cpp b/src/app/qgsbrowserdockwidget.cpp
@@ -56,6 +56,7 @@ class QgsBrowserTreeView : public QTreeView
       setContextMenuPolicy( Qt::CustomContextMenu );
       setHeaderHidden( true );
       setDropIndicatorShown( true );
+
     }
 
     void dragEnterEvent( QDragEnterEvent* e )
@@ -287,6 +288,7 @@ QgsBrowserDockWidget::QgsBrowserDockWidget( QString name, QWidget * parent ) :
 
   connect( mBrowserView, SIGNAL( customContextMenuRequested( const QPoint & ) ), this, SLOT( showContextMenu( const QPoint & ) ) );
   connect( mBrowserView, SIGNAL( doubleClicked( const QModelIndex& ) ), this, SLOT( addLayerAtIndex( const QModelIndex& ) ) );
+  connect( mBrowserView, SIGNAL( expanded( const QModelIndex& ) ), this, SLOT( itemExpanded( const QModelIndex& ) ) );
 }
 
 void QgsBrowserDockWidget::showEvent( QShowEvent * e )
@@ -314,6 +316,15 @@ void QgsBrowserDockWidget::showEvent( QShowEvent * e )
       if ( item && item->type() == QgsDataItem::Favourites )
         mBrowserView->expand( index );
     }
+
+    // expand last expanded path from previous session
+    QSettings settings;
+    QString lastPath =  settings.value( "/BrowserWidget/lastExpanded" ).toString();
+    QgsDebugMsg( "lastPath = " + lastPath );
+    if ( !lastPath.isEmpty() )
+    {
+      expandPath( lastPath );
+    }
   }
 
   QDockWidget::showEvent( e );
@@ -678,3 +689,34 @@ void QgsBrowserDockWidget::setCaseSensitive( bool caseSensitive )
     return;
   mProxyModel->setCaseSensitive( caseSensitive );
 }
+
+void QgsBrowserDockWidget::itemExpanded( const QModelIndex& index )
+{
+  if ( !mModel || !mProxyModel )
+    return;
+  QSettings settings;
+  QModelIndex srcIndex = mProxyModel->mapToSource( index );
+  QgsDataItem *item = mModel->dataItem( srcIndex );
+  if ( !item )
+    return;
+
+  // TODO: save separately each type (FS, WMS)?
+  settings.setValue( "/BrowserWidget/lastExpanded", item->path() );
+  QgsDebugMsg( "last expanded: " + item->path() );
+}
+
+void QgsBrowserDockWidget::expandPath( QString path )
+{
+  QgsDebugMsg( "path = " + path );
+
+  if ( !mModel || !mProxyModel )
+    return;
+  QModelIndex srcIndex = mModel->findPath( path );
+  QModelIndex index = mProxyModel->mapFromSource( srcIndex );
+  QgsDebugMsg( QString( "srcIndex.isValid() = %1 index.isValid() = %2" ).arg( srcIndex.isValid() ).arg( index.isValid() ) );
+  if ( index.isValid() )
+  {
+    mBrowserView->expand( index );
+    mBrowserView->scrollTo( index, QAbstractItemView::PositionAtTop );
+  }
+}
diff --git a/src/app/qgsbrowserdockwidget.h b/src/app/qgsbrowserdockwidget.h
@@ -31,6 +31,7 @@ class APP_EXPORT QgsBrowserDockWidget : public QDockWidget, private Ui::QgsBrows
   public:
     explicit QgsBrowserDockWidget( QString name, QWidget *parent = 0 );
     void addFavouriteDirectory( QString favDir );
+    void expandPath( QString path );
 
   public slots:
     void addLayerAtIndex( const QModelIndex& index );
@@ -53,6 +54,8 @@ class APP_EXPORT QgsBrowserDockWidget : public QDockWidget, private Ui::QgsBrows
     void showProperties();
     void toggleFastScan();
 
+    void itemExpanded( const QModelIndex& index );
+
   protected:
     void refreshModel( const QModelIndex& index );
 
diff --git a/src/core/qgsbrowsermodel.cpp b/src/core/qgsbrowsermodel.cpp
@@ -296,13 +296,15 @@ QModelIndex QgsBrowserModel::findPath( QString path )
       if ( path.startsWith( item->path() ) )
       {
         // we have found a preceding item: stop searching on this level and go deeper
+        item->populate();
         foundChild = true;
         theIndex = idx;
         break;
       }
     }
   }
 
+  QgsDebugMsg( "path not found" );
   return QModelIndex(); // not found
 }
 

Original file line number	Diff line number	Diff line change
`@@ -296,13 +296,15 @@ QModelIndex QgsBrowserModel::findPath( QString path )`
`296`	`296`	`if ( path.startsWith( item->path() ) )`
`297`	`297`	`{`
`298`	`298`	`// we have found a preceding item: stop searching on this level and go deeper`
	`299`	`+ item->populate();`
`299`	`300`	`foundChild = true;`
`300`	`301`	`theIndex = idx;`
`301`	`302`	`break;`
`302`	`303`	`}`
`303`	`304`	`}`
`304`	`305`	`}`
`305`	`306`
	`307`	`+ QgsDebugMsg( "path not found" );`
`306`	`308`	`return QModelIndex(); // not found`
`307`	`309`	`}`
`308`	`310`