Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Merge pull request #4737 from boundlessgeo/browser-sync
[bugfix] Sync the browser connections when changed from the select dialogs
- Loading branch information
Showing
with
662 additions
and 304 deletions.
- +4 −0 python/core/qgsbrowsermodel.sip
- +9 −0 python/core/qgsdataitem.sip
- +1 −1 python/gui/gui_auto.sip
- +109 −0 python/gui/qgsabstractdatasourcewidget.sip
- +5 −1 python/gui/qgsbrowserdockwidget.sip
- +10 −11 python/gui/qgsowssourceselect.sip
- +7 −2 src/app/qgisapp.cpp
- +6 −0 src/app/qgisapp.h
- +8 −0 src/core/qgsbrowsermodel.cpp
- +3 −0 src/core/qgsbrowsermodel.h
- +6 −0 src/core/qgsdataitem.cpp
- +8 −0 src/core/qgsdataitem.h
- +4 −3 src/gui/CMakeLists.txt
- +42 −0 src/gui/qgsabstractdatasourcewidget.cpp
- +102 −0 src/gui/qgsabstractdatasourcewidget.h
- +8 −2 src/gui/qgsbrowserdockwidget.cpp
- +3 −1 src/gui/qgsbrowserdockwidget.h
- +1 −1 src/gui/qgsbrowserdockwidget_p.h
- +38 −34 src/gui/qgsdatasourcemanagerdialog.cpp
- +21 −12 src/gui/qgsdatasourcemanagerdialog.h
- +8 −4 src/gui/qgsowssourceselect.cpp
- +8 −13 src/gui/qgsowssourceselect.h
- +4 −0 src/providers/arcgisrest/CMakeLists.txt
- +1 −1 src/providers/arcgisrest/qgsafsdataitems.cpp
- +1 −1 src/providers/arcgisrest/qgsafssourceselect.cpp
- +2 −2 src/providers/arcgisrest/qgsafssourceselect.h
- +4 −4 src/providers/arcgisrest/qgsamsdataitems.cpp
- +1 −1 src/providers/arcgisrest/qgsamssourceselect.cpp
- +2 −7 src/providers/arcgisrest/qgsamssourceselect.h
- +58 −52 src/{gui/qgssourceselectdialog.cpp → providers/arcgisrest/qgsarcgisservicesourceselect.cpp}
- +26 −16 src/{gui/qgssourceselectdialog.h → providers/arcgisrest/qgsarcgisservicesourceselect.h}
- +3 −3 src/providers/db2/qgsdb2dataitems.cpp
- +9 −5 src/providers/db2/qgsdb2sourceselect.cpp
- +5 −9 src/providers/db2/qgsdb2sourceselect.h
- +4 −4 src/providers/delimitedtext/qgsdelimitedtextsourceselect.cpp
- +3 −3 src/providers/delimitedtext/qgsdelimitedtextsourceselect.h
- +3 −3 src/providers/mssql/qgsmssqldataitems.cpp
- +9 −5 src/providers/mssql/qgsmssqlsourceselect.cpp
- +7 −8 src/providers/mssql/qgsmssqlsourceselect.h
- +3 −3 src/providers/oracle/qgsoracledataitems.cpp
- +2 −3 src/providers/oracle/qgsoraclesourceselect.cpp
- +3 −6 src/providers/oracle/qgsoraclesourceselect.h
- +3 −3 src/providers/ows/qgsowsdataitems.cpp
- +9 −5 src/providers/postgres/qgspgsourceselect.cpp
- +4 −6 src/providers/postgres/qgspgsourceselect.h
- +8 −3 src/providers/postgres/qgspostgresdataitems.cpp
- +2 −2 src/providers/spatialite/qgsspatialitedataitems.cpp
- +8 −4 src/providers/spatialite/qgsspatialitesourceselect.cpp
- +6 −9 src/providers/spatialite/qgsspatialitesourceselect.h
- +9 −4 src/providers/virtual/qgsvirtuallayersourceselect.cpp
- +7 −3 src/providers/virtual/qgsvirtuallayersourceselect.h
- +3 −3 src/providers/wcs/qgswcsdataitems.cpp
- +3 −3 src/providers/wfs/qgswfsdataitems.cpp
- +9 −5 src/providers/wfs/qgswfssourceselect.cpp
- +8 −8 src/providers/wfs/qgswfssourceselect.h
- +3 −9 src/providers/wms/qgswmsdataitems.cpp
- +1 −1 src/providers/wms/qgswmsdataitems.h
- +11 −4 src/providers/wms/qgswmssourceselect.cpp
- +5 −9 src/providers/wms/qgswmssourceselect.h
- +2 −2 src/ui/{qgssourceselectdialogbase.ui → qgsarcgisservicesourceselectbase.ui}
@@ -0,0 +1,109 @@ | ||
/************************************************************************ | ||
* This file has been generated automatically from * | ||
* * | ||
* src/gui/qgsabstractdatasourcewidget.h * | ||
* * | ||
* Do not edit manually ! Edit header and run scripts/sipify.pl again * | ||
************************************************************************/ | ||
|
||
|
||
|
||
|
||
|
||
|
||
class QgsAbstractDataSourceWidget : QDialog | ||
{ | ||
%Docstring | ||
Abstract base Data Source Widget to create connections and add layers | ||
This class provides common functionality and the interface for all | ||
source select dialogs used by data providers to configure data sources | ||
and add layers. | ||
.. versionadded:: 3.0 | ||
%End | ||
|
||
%TypeHeaderCode | ||
#include "qgsabstractdatasourcewidget.h" | ||
%End | ||
public: | ||
|
||
~QgsAbstractDataSourceWidget( ); | ||
%Docstring | ||
Destructor | ||
%End | ||
|
||
void setMapCanvas( const QgsMapCanvas *mapCanvas ); | ||
%Docstring | ||
Store a pointer to the map canvas to retrieve extent and CRS | ||
Used to select an appropriate CRS and possibly to retrieve data only in the current extent | ||
%End | ||
|
||
|
||
public slots: | ||
|
||
virtual void refresh( ); | ||
%Docstring | ||
Triggered when the provider's connections need to be refreshed | ||
The default implementation does nothing | ||
%End | ||
|
||
signals: | ||
|
||
void connectionsChanged(); | ||
%Docstring | ||
Emitted when the provider's connections have changed | ||
This signal is normally forwarded the app and used to refresh browser items | ||
%End | ||
|
||
void addDatabaseLayers( const QStringList &paths, const QString &providerKey ); | ||
%Docstring | ||
Emitted when a DB layer has been selected for addition | ||
%End | ||
|
||
void addRasterLayer( const QString &rasterLayerPath, const QString &baseName, const QString &providerKey ); | ||
%Docstring | ||
Emitted when a raster layer has been selected for addition | ||
%End | ||
|
||
void addVectorLayer( const QString &uri, const QString &layerName ); | ||
%Docstring | ||
Emitted when a vector layer has been selected for addition | ||
%End | ||
|
||
void progress( int, int ); | ||
%Docstring | ||
Emitted when a progress dialog is shown by the provider dialog | ||
%End | ||
|
||
void progressMessage( QString message ); | ||
%Docstring | ||
Emitted when a progress dialog is shown by the provider dialog | ||
%End | ||
|
||
protected: | ||
|
||
QgsAbstractDataSourceWidget( QWidget *parent /TransferThis/ = 0, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::None ); | ||
%Docstring | ||
Constructor | ||
%End | ||
|
||
QgsProviderRegistry::WidgetMode widgetMode( ) const; | ||
%Docstring | ||
Return the widget mode | ||
:rtype: QgsProviderRegistry.WidgetMode | ||
%End | ||
|
||
const QgsMapCanvas *mapCanvas( ) const; | ||
%Docstring | ||
Return the map canvas (can be null) | ||
:rtype: QgsMapCanvas | ||
%End | ||
|
||
}; | ||
|
||
/************************************************************************ | ||
* This file has been generated automatically from * | ||
* * | ||
* src/gui/qgsabstractdatasourcewidget.h * | ||
* * | ||
* Do not edit manually ! Edit header and run scripts/sipify.pl again * | ||
************************************************************************/ |
Oops, something went wrong.