images/images.qrc

@@ -345,14 +345,14 @@
         <file>themes/gis/plugins/quick_print.png</file>
         <file>themes/gis/plugins/scale_bar.png</file>
         <file>themes/gis/plugins/spit.png</file>
-        <file>themes/gis/plugins/wfs.png</file>
         <file>splash/splash.png</file>
         <file>north_arrows/default.png</file>
         <file>themes/default/locked.png</file>
         <file>themes/default/unlocked.png</file>
         <file>themes/default/plugins/copyright_label.png</file>
         <file>themes/default/plugins/north_arrow.png</file>
         <file>themes/default/plugins/scale_bar.png</file>
+        <file>themes/default/mActionAddWfsLayer.png</file>
     </qresource>
     <qresource prefix="/images/tips">
         <file alias="symbol_levels.png">qgis_tips/symbol_levels.png</file>

src/app/qgisapp.cpp

@@ -836,6 +836,7 @@ void QgisApp::createActions()
   connect( mActionAddPgLayer, SIGNAL( triggered() ), this, SLOT( addDatabaseLayer() ) );
   connect( mActionAddSpatiaLiteLayer, SIGNAL( triggered() ), this, SLOT( addSpatiaLiteLayer() ) );
   connect( mActionAddWmsLayer, SIGNAL( triggered() ), this, SLOT( addWmsLayer() ) );
+  connect( mActionAddWfsLayer, SIGNAL( triggered() ), this, SLOT( addWfsLayer() ) );
   connect( mActionOpenTable, SIGNAL( triggered() ), this, SLOT( attributeTable() ) );
   connect( mActionToggleEditing, SIGNAL( triggered() ), this, SLOT( toggleEditing() ) );
   connect( mActionSaveEdits, SIGNAL( triggered() ), this, SLOT( saveEdits() ) );
@@ -1468,6 +1469,7 @@ void QgisApp::setTheme( QString theThemeName )
   mActionNewBookmark->setIcon( getThemeIcon( "/mActionNewBookmark.png" ) );
   mActionCustomProjection->setIcon( getThemeIcon( "/mActionCustomProjection.png" ) );
   mActionAddWmsLayer->setIcon( getThemeIcon( "/mActionAddWmsLayer.png" ) );
+  mActionAddWfsLayer->setIcon( getThemeIcon( "/mActionAddWfsLayer.png" ) );
   mActionAddToOverview->setIcon( getThemeIcon( "/mActionInOverview.png" ) );
   mActionAnnotation->setIcon( getThemeIcon( "/mActionAnnotation.png" ) );
   mActionFormAnnotation->setIcon( getThemeIcon( "/mActionFormAnnotation.png" ) );
@@ -2427,6 +2429,36 @@ void QgisApp::addWmsLayer()
   delete wmss;
 }
 
+void QgisApp::addWfsLayer()
+{
+  if ( mMapCanvas && mMapCanvas->isDrawing() )
+  {
+    return;
+  }
+  // Fudge for now
+  QgsDebugMsg( "about to addWfsLayer" );
+
+  // TODO: QDialog for now, switch to QWidget in future
+  QDialog *wfss = dynamic_cast<QDialog*>( QgsProviderRegistry::instance()->selectWidget( QString( "WFS" ), this ) );
+  if ( !wfss )
+  {
+    QMessageBox::warning( this, tr( "WFS" ), tr( "Cannot get WFS select dialog from provider." ) );
+    return;
+  }
+  connect( wfss , SIGNAL( addWfsLayer( QString, QString ) ),
+           this , SLOT( addWfsLayer( QString, QString ) ) );
+
+  wfss->exec();
+  delete wfss;
+}
+
+void QgisApp::addWfsLayer( QString uri, QString typeName )
+{
+  // TODO: this should be eventually moved to a more reasonable place
+  addVectorLayer( uri, typeName, "WFS" );
+}
+
+
 void QgisApp::fileExit()
 {
   if ( mMapCanvas && mMapCanvas->isDrawing() )

src/app/qgisapp.h

@@ -260,6 +260,7 @@ class QgisApp : public QMainWindow, private Ui::MainWindow
     QAction *actionAddPgLayer() { return mActionAddPgLayer; }
     QAction *actionAddSpatiaLiteLayer() { return mActionAddSpatiaLiteLayer; };
     QAction *actionAddWmsLayer() { return mActionAddWmsLayer; }
+    QAction *actionAddWfsLayer() { return mActionAddWfsLayer; }
     QAction *actionOpenTable() { return mActionOpenTable; }
     QAction *actionToggleEditing() { return mActionToggleEditing; }
     QAction *actionSaveEdits() { return mActionSaveEdits; }
@@ -435,6 +436,8 @@ class QgisApp : public QMainWindow, private Ui::MainWindow
                                     QString const & format,
                                     QString const & crs );
 
+    void addWfsLayer( QString uri, QString typeName );
+
     void versionReplyFinished();
 
   protected:
@@ -689,6 +692,8 @@ class QgisApp : public QMainWindow, private Ui::MainWindow
     void fileExit();
     //! Add a WMS layer to the map
     void addWmsLayer();
+    //! Add a WFS layer to the map
+    void addWfsLayer();
     //! Set map tool to Zoom out
     void zoomOut();
     //! Set map tool to Zoom in

src/app/qgsbrowserdockwidget.cpp

@@ -4,13 +4,15 @@
 #include <QTreeView>
 #include <QMenu>
 #include <QSettings>
+#include <QToolButton>
 
 #include "qgsbrowsermodel.h"
 #include "qgsdataitem.h"
 #include "qgslogger.h"
 #include "qgsmaplayerregistry.h"
 #include "qgsrasterlayer.h"
 #include "qgsvectorlayer.h"
+#include "qgisapp.h"
 
 #include <QDragEnterEvent>
 /**
@@ -52,7 +54,22 @@ QgsBrowserDockWidget::QgsBrowserDockWidget( QWidget * parent ) :
   setWindowTitle( tr( "Browser" ) );
 
   mBrowserView = new QgsBrowserTreeView( this );
-  setWidget( mBrowserView );
+
+  mRefreshButton = new QToolButton( this );
+  mRefreshButton->setIcon( QgisApp::instance()->getThemeIcon( "mActionDraw.png" ) );
+  mRefreshButton->setText( tr( "Refresh" ) );
+  mRefreshButton->setAutoRaise( true );
+  connect( mRefreshButton, SIGNAL( clicked() ), this, SLOT( refresh() ) );
+
+  QVBoxLayout* layout = new QVBoxLayout( this );
+  layout->setContentsMargins( 0, 0, 0, 0 );
+  layout->setSpacing( 0 );
+  layout->addWidget( mRefreshButton );
+  layout->addWidget( mBrowserView );
+
+  QWidget* innerWidget = new QWidget( this );
+  innerWidget->setLayout( layout );
+  setWidget( innerWidget );
 
   connect( mBrowserView, SIGNAL( customContextMenuRequested( const QPoint & ) ), this, SLOT( showContextMenu( const QPoint & ) ) );
   //connect( mBrowserView, SIGNAL( clicked( const QModelIndex& ) ), this, SLOT( itemClicked( const QModelIndex& ) ) );
@@ -170,6 +187,15 @@ void QgsBrowserDockWidget::showContextMenu( const QPoint & pt )
     }
   }
 
+  QList<QAction*> actions = item->actions();
+  if ( !actions.isEmpty() )
+  {
+    if ( !menu->actions().isEmpty() )
+      menu->addSeparator();
+    // add action to the menu
+    menu->addActions( actions );
+  }
+
   if ( menu->actions().count() == 0 )
   {
     delete menu;
@@ -216,3 +242,36 @@ void QgsBrowserDockWidget::removeFavourite()
   // reload the browser model so that the favourite directory is not shown anymore
   mModel->reload();
 }
+
+void QgsBrowserDockWidget::refresh()
+{
+  refreshModel( QModelIndex() );
+}
+
+void QgsBrowserDockWidget::refreshModel( const QModelIndex& index )
+{
+  QgsDebugMsg( "Entered" );
+  if ( index.isValid() )
+  {
+    QgsDataItem *item = mModel->dataItem( index );
+    if ( item )
+    {
+      QgsDebugMsg( "path = " + item->path() );
+    }
+    else
+    {
+      QgsDebugMsg( "invalid item" );
+    }
+  }
+
+  mModel->refresh( index );
+
+  for ( int i = 0 ; i < mModel->rowCount( index ); i++ )
+  {
+    QModelIndex idx = mModel->index( i, 0, index );
+    if ( mBrowserView->isExpanded( idx ) )
+    {
+      refreshModel( idx );
+    }
+  }
+}

src/app/qgsbrowserdockwidget.h

@@ -6,6 +6,7 @@
 class QgsBrowserModel;
 class QModelIndex;
 class QTreeView;
+class QToolButton;
 
 class QgsBrowserDockWidget : public QDockWidget
 {
@@ -22,11 +23,16 @@ class QgsBrowserDockWidget : public QDockWidget
     void addFavourite();
     void removeFavourite();
 
+    void refresh();
+
   protected:
 
+    void refreshModel( const QModelIndex& index );
+
     void showEvent( QShowEvent * event );
 
     QTreeView* mBrowserView;
+    QToolButton* mRefreshButton;
     QgsBrowserModel* mModel;
 };
 

src/core/qgsdataitem.h

@@ -76,6 +76,9 @@ class CORE_EXPORT QgsDataItem : public QObject
 
     virtual QWidget * paramWidget() { return 0; }
 
+    // list of actions provided by this item - usually used for popup menu on right-click
+    virtual QList<QAction*> actions() { return QList<QAction*>(); }
+
     //
 
     enum Capability

src/gui/qgsprojectionselector.cpp

@@ -828,7 +828,8 @@ void QgsProjectionSelector::coordinateSystemSelected( QTreeWidgetItem * theItem
   else
   {
     // Not an CRS - remove the highlight so the user doesn't get too confused
-    theItem->setSelected( false );
+    if ( theItem )
+      theItem->setSelected( false );
     teProjection->setText( "" );
   }
 }

src/plugins/CMakeLists.txt

@@ -26,7 +26,6 @@ ENDIF (POSTGRES_FOUND)
 
 IF (EXPAT_FOUND)
   ADD_SUBDIRECTORY(gps_importer)
-  ADD_SUBDIRECTORY(wfs)
 ENDIF (EXPAT_FOUND)
 
 IF (GSL_FOUND)