Include project home in browser toplevel browser (implement #6955)

jef-n · jef-n · commit 73dc9b19be9e · 2013-01-07T20:26:40.000+01:00
[API] add QgsProject::homePath()
[API] make QgsBrowserModel::reload() a public slot
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -3330,11 +3330,12 @@ bool QgisApp::addProject( QString projectFile )
 
   if ( ! QgsProject::instance()->read( projectFile ) )
   {
+    QApplication::restoreOverrideCursor();
+
     QMessageBox::critical( this,
                            tr( "Unable to open project" ),
                            QgsProject::instance()->error() );
 
-    QApplication::restoreOverrideCursor();
 
     mMapCanvas->freeze( false );
     mMapCanvas->refresh();
diff --git a/src/app/qgsbrowserdockwidget.cpp b/src/app/qgsbrowserdockwidget.cpp
@@ -28,6 +28,7 @@
 #include "qgsrasterlayer.h"
 #include "qgsvectorlayer.h"
 #include "qgisapp.h"
+#include "qgsproject.h"
 
 // browser layer properties dialog
 #include "qgsapplication.h"
@@ -285,6 +286,10 @@ void QgsBrowserDockWidget::showEvent( QShowEvent * e )
       if ( item && item->type() == QgsDataItem::Favourites )
         mBrowserView->expand( index );
     }
+
+    connect( QgsProject::instance(), SIGNAL( readProject( const QDomDocument & ) ), mModel, SLOT( reload() ) );
+    connect( QgsProject::instance(), SIGNAL( writeProject( QDomDocument & ) ), mModel, SLOT( reload() ) );
+    connect( QgisApp::instance(), SIGNAL( newProject() ), mModel, SLOT( reload() ) );
   }
 
   QDockWidget::showEvent( e );
diff --git a/src/core/qgsbrowsermodel.cpp b/src/core/qgsbrowsermodel.cpp
@@ -24,6 +24,7 @@
 #include "qgsproviderregistry.h"
 
 #include "qgsbrowsermodel.h"
+#include "qgsproject.h"
 
 #include <QSettings>
 
@@ -40,8 +41,18 @@ QgsBrowserModel::~QgsBrowserModel()
 
 void QgsBrowserModel::addRootItems()
 {
-  // give the home directory a prominent first place
-  QgsDirectoryItem *item = new QgsDirectoryItem( NULL, tr( "Home" ), QDir::homePath() );
+  QgsDirectoryItem *item;
+
+  QString home = QgsProject::instance()->homePath();
+
+  if( !home.isNull() )
+  {
+    item = new QgsDirectoryItem( NULL, tr( "Project home" ), home );
+    mRootItems << item;
+  }
+
+  // give the home directory a prominent second place
+  item = new QgsDirectoryItem( NULL, tr( "Home" ), QDir::homePath() );
   QStyle *style = QApplication::style();
   QIcon homeIcon( style->standardPixmap( QStyle::SP_DirHomeIcon ) );
   item->setIcon( homeIcon );
diff --git a/src/core/qgsbrowsermodel.h b/src/core/qgsbrowsermodel.h
@@ -75,9 +75,6 @@ class CORE_EXPORT QgsBrowserModel : public QAbstractItemModel
 
     bool hasChildren( const QModelIndex &parent = QModelIndex() ) const;
 
-    // Reload the whole model
-    void reload();
-
     // Refresh item specified by path
     void refresh( QString path );
 
@@ -93,6 +90,8 @@ class CORE_EXPORT QgsBrowserModel : public QAbstractItemModel
     void fetchMore( const QModelIndex & parent );
 
   public slots:
+    // Reload the whole model
+    void reload();
 
     void beginInsertItems( QgsDataItem *parent, int first, int last );
     void endInsertItems();
diff --git a/src/core/qgsproject.cpp b/src/core/qgsproject.cpp
@@ -1368,11 +1368,11 @@ QString QgsProject::readPath( QString src ) const
     // That means that it was saved with an earlier version of "relative path support",
     // where the source file had to exist and only the project directory was stripped
     // from the filename.
-    QFileInfo pfi( fileName() );
-    if ( !pfi.exists() )
+    QString home = homePath();
+    if( home.isNull() )
       return src;
 
-    QFileInfo fi( pfi.canonicalPath() + "/" + src );
+    QFileInfo fi( home + "/" + src );
 
     if ( !fi.exists() )
     {
@@ -1763,4 +1763,11 @@ void QgsProjectBadLayerDefaultHandler::handleBadLayers( QList<QDomNode> /*layers
   // just ignore any bad layers
 }
 
+QString QgsProject::homePath() const
+{
+  QFileInfo pfi( fileName() );
+  if ( !pfi.exists() )
+    return QString::null;
 
+  return pfi.canonicalPath();
+}
diff --git a/src/core/qgsproject.h b/src/core/qgsproject.h
@@ -310,6 +310,11 @@ class CORE_EXPORT QgsProject : public QObject
         @note added in version 1.9*/
     bool topologicalEditing() const;
 
+    /** Return project's home path
+	@return home path of project (or QString::null if not set)
+        @note added in version 2.0 */
+    QString homePath() const;
+
   protected:
 
     /** Set error message from read/write operation
diff --git a/src/providers/wms/qgswmssourceselect.cpp b/src/providers/wms/qgswmssourceselect.cpp
@@ -58,8 +58,8 @@ QgsWMSSourceSelect::QgsWMSSourceSelect( QWidget * parent, Qt::WFlags fl, bool ma
     : QDialog( parent, fl )
     , mManagerMode( managerMode )
     , mEmbeddedMode( embeddedMode )
-    , mCurrentTileset( 0 )
     , mDefaultCRS( GEO_EPSG_CRS_AUTHID )
+    , mCurrentTileset( 0 )
 {
   setupUi( this );
 

Original file line number	Diff line number	Diff line change
`@@ -58,8 +58,8 @@ QgsWMSSourceSelect::QgsWMSSourceSelect( QWidget * parent, Qt::WFlags fl, bool ma`
`58`	`58`	`: QDialog( parent, fl )`
`59`	`59`	`, mManagerMode( managerMode )`
`60`	`60`	`, mEmbeddedMode( embeddedMode )`
`61`		`- , mCurrentTileset( 0 )`
`62`	`61`	`, mDefaultCRS( GEO_EPSG_CRS_AUTHID )`
	`62`	`+ , mCurrentTileset( 0 )`
`63`	`63`	`{`
`64`	`64`	`setupUi( this );`
`65`	`65`