Skip to content
Permalink
Browse files

Rollback all geonode specific changes to QgsDataSourceManagerDialog

  • Loading branch information
nyalldawson committed Sep 5, 2017
1 parent 33b1380 commit a03e1eeeaa4c0d5436d52a2c98eec3da4a8209cd
Showing with 0 additions and 23 deletions.
  1. +0 −19 src/gui/qgsdatasourcemanagerdialog.cpp
  2. +0 −4 src/gui/qgsdatasourcemanagerdialog.h
@@ -27,7 +27,6 @@
#include "qgsmapcanvas.h"
#include "qgsmessagelog.h"
#include "qgsgui.h"
//#include "qgsgeonodesourceselect.h"

QgsDataSourceManagerDialog::QgsDataSourceManagerDialog( QgsBrowserModel *browserModel, QWidget *parent, QgsMapCanvas *canvas, Qt::WindowFlags fl ) :
QgsOptionsDialogBase( QStringLiteral( "Data Source Manager" ), parent, fl ),
@@ -72,15 +71,6 @@ QgsDataSourceManagerDialog::QgsDataSourceManagerDialog( QgsBrowserModel *browser
addProviderDialog( dlg, provider->providerKey(), provider->text(), provider->icon( ), provider->toolTip( ) );
}

/*
QDialog *geonodeDialog = new QgsGeoNodeSourceSelect( this, Qt::Widget, QgsProviderRegistry::WidgetMode::Embedded );
QDialog *dlg = addDialog( geonodeDialog, QStringLiteral( "geonode" ), tr( "GeoNode" ), QStringLiteral( "/mActionAddGeonodeLayer.svg" ) );
if ( dlg )
{
connect( dlg, SIGNAL( addRasterLayer( QString, QString, QString ) ), this, SLOT( rasterLayerAdded( QString, QString, QString ) ) );
connect( dlg, SIGNAL( addWfsLayer( QString, QString, QString ) ), this, SLOT( vectorLayerAdded( QString, QString, QString ) ) );
}*/
}

QgsDataSourceManagerDialog::~QgsDataSourceManagerDialog()
@@ -131,15 +121,6 @@ void QgsDataSourceManagerDialog::vectorLayersAdded( const QStringList &layerQStr
emit addVectorLayers( layerQStringList, enc, dataSourceType );
}

QDialog *QgsDataSourceManagerDialog::addDialog( QDialog *dialog, QString const key, QString const name, QString const icon, QString title )
{
mPageNames.append( key );
ui->mOptionsStackedWidget->addWidget( dialog );
QListWidgetItem *layerItem = new QListWidgetItem( name, ui->mOptionsListWidget );
layerItem->setToolTip( title.isEmpty() ? tr( "Add %1 layer" ).arg( name ) : title );
layerItem->setIcon( QgsApplication::getThemeIcon( icon ) );
return dialog;
}

void QgsDataSourceManagerDialog::addProviderDialog( QgsAbstractDataSourceWidget *dlg, const QString &providerKey, const QString &providerName, const QIcon &icon, const QString &toolTip )
{
@@ -116,10 +116,6 @@ class GUI_EXPORT QgsDataSourceManagerDialog : public QgsOptionsDialogBase, priva
void providerDialogsRefreshRequested();

private:
//! Add a provider dialog
QDialog *addDialog( QDialog *dialog, QString const key, QString const name, QString const icon, QString title = QString() );


void addProviderDialog( QgsAbstractDataSourceWidget *dlg, const QString &providerKey, const QString &providerName, const QIcon &icon, QString toolTip = QString() );
void makeConnections( QgsAbstractDataSourceWidget *dlg, const QString &providerKey );
Ui::QgsDataSourceManagerDialog *ui;

0 comments on commit a03e1ee

Please sign in to comment.
You can’t perform that action at this time.