reload browser if mapset changed

git-svn-id: http://svn.osgeo.org/qgis/trunk@5199 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Apr 6, 2006 · ec14441 · ec14441
1 parent 3271d3c
commit ec14441
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 7 deletions.
diff --git a/src/plugins/grass/qgsgrassbrowser.cpp b/src/plugins/grass/qgsgrassbrowser.cpp
@@ -537,3 +537,7 @@ void QgsGrassBrowser::currentChanged(const QModelIndex & current, const QModelIn
     #endif
 }
 
+void QgsGrassBrowser::setLocation( const QString &gisbase, const QString &location )
+{
+    mModel->setLocation(gisbase, location);
+}
diff --git a/src/plugins/grass/qgsgrassbrowser.h b/src/plugins/grass/qgsgrassbrowser.h
@@ -62,6 +62,9 @@ public slots:
     // Write region 
     void writeRegion ( struct Cell_head *window );
 
+    // Set Location
+    void setLocation ( const QString &gisbase, const QString &location );
+
     // Refresh model
     void refresh();
 

diff --git a/src/plugins/grass/qgsgrassmodel.cpp b/src/plugins/grass/qgsgrassmodel.cpp
@@ -913,8 +913,12 @@ QString QgsGrassModel::uri ( const QModelIndex &index ) const
 
 void QgsGrassModel::setLocation( const QString &gisbase, const QString &location ) 
 { 
+    removeItems(mRoot, QStringList());
     mGisbase = gisbase;
     mLocation = location;
+    mRoot->mGisbase = gisbase;
+    mRoot->mLocation = location;
+    refreshItem(mRoot);
 }
 
 QVariant QgsGrassModel::headerData(int section, 

diff --git a/src/plugins/grass/qgsgrassplugin.cpp b/src/plugins/grass/qgsgrassplugin.cpp
@@ -239,8 +239,6 @@ void QgsGrassPlugin::initGui()
 
 void QgsGrassPlugin::mapsetChanged ()
 {
-    if ( mTools ) mTools->closeTools();
-
     if ( !QgsGrass::activeMode() )  {
         mOpenToolsAction->setEnabled(false);
 	mRegionAction->setEnabled(false);
@@ -274,7 +272,6 @@ void QgsGrassPlugin::mapsetChanged ()
             mTools->mapsetChanged();
         }    
     }
-
 }
 
 void QgsGrassPlugin::saveMapset()

diff --git a/src/plugins/grass/qgsgrasstools.cpp b/src/plugins/grass/qgsgrasstools.cpp
@@ -159,10 +159,10 @@ QgsGrassTools::QgsGrassTools ( QgisApp *qgisApp, QgisIface *iface,
     // Add map browser 
     // Warning: if browser is on the first page modules are 
     // displayed over the browser
-    QgsGrassBrowser *browser = new QgsGrassBrowser ( mIface, this );
-    mTabWidget->addTab( browser, "Browser" );
+    mBrowser = new QgsGrassBrowser ( mIface, this );
+    mTabWidget->addTab( mBrowser, "Browser" );
 
-    connect( browser, SIGNAL(regionChanged()), 
+    connect( mBrowser, SIGNAL(regionChanged()), 
 		         this, SLOT(emitRegionChanged()) );
 }
 
@@ -385,7 +385,8 @@ void QgsGrassTools::mapsetChanged()
                 + "/" + QgsGrass::getDefaultMapset();
     setCaption(title);
 
-    // TODO: Close opened tools (tabs) ?
+    closeTools();
+    mBrowser->setLocation( QgsGrass::getDefaultGisdbase(), QgsGrass::getDefaultLocation() );
 }
 
 QgsGrassTools::~QgsGrassTools()

diff --git a/src/plugins/grass/qgsgrasstools.h b/src/plugins/grass/qgsgrasstools.h
@@ -30,6 +30,7 @@ class QDomElement;
 #include "qgisiface.h"
 
 class QgsGrassProvider;
+class QgsGrassBrowser;
 #include <QDialog>
 #include <QTabBar>
 class QSize;
@@ -115,6 +116,9 @@ public slots:
     //! QGIS directory
     QString mAppDir;
 
+    //! Browser
+    QgsGrassBrowser *mBrowser;
+
     QgsGrassToolsTabWidget *mTabWidget;
     Q3ListView *mModulesListView;
 };
-Original file line number
+Diff line change
@@ Expand Up @@
         #endif
     }
+    void QgsGrassBrowser::setLocation( const QString &gisbase, const QString &location )
+    {
+        mModel->setLocation(gisbase, location);
+    }