Skip to content
Permalink
Browse files

don't close wms layer dialog after addition and allow naming of layers

git-svn-id: http://svn.osgeo.org/qgis/trunk@11528 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef
jef committed Aug 30, 2009
1 parent 2e88599 commit 2ab57028c19f51344cd5fbf649057d24ca9f3cc3
Showing with 191 additions and 182 deletions.
  1. +1 −12 src/app/qgisapp.cpp
  2. +8 −1 src/app/qgsserversourceselect.cpp
  3. +1 −1 src/app/qgsserversourceselect.h
  4. +181 −168 src/ui/qgsserversourceselectbase.ui
@@ -2778,18 +2778,7 @@ void QgisApp::addWmsLayer()
QgsDebugMsg( "about to addRasterLayer" );

QgsServerSourceSelect *wmss = new QgsServerSourceSelect( this );

if ( wmss->exec() )
{

addRasterLayer( wmss->connectionInfo(),
/*wmss->connName()*/wmss->selectedLayers().join( "/" ),
"wms",
wmss->selectedLayers(),
wmss->selectedStylesForSelectedLayers(),
wmss->selectedImageEncoding(),
wmss->selectedCrs() );
}
wmss->exec();
}


@@ -439,7 +439,14 @@ void QgsServerSourceSelect::on_btnAdd_clicked()
}
else
{
accept();
QgisApp::instance()->addRasterLayer(
connectionInfo(),
leLayerName->text().isEmpty() ? selectedLayers().join( "/" ) : leLayerName->text(),
"wms",
selectedLayers(),
selectedStylesForSelectedLayers(),
selectedImageEncoding(),
selectedCrs() );
}
}

@@ -102,7 +102,7 @@ class QgsServerSourceSelect : public QDialog, private Ui::QgsServerSourceSelectB
*/
void on_btnConnect_clicked();

//! Determines the layers the user selected and closes the dialog
//! Determines the layers the user selected
void on_btnAdd_clicked();

//! Opens the Spatial Reference System dialog.

0 comments on commit 2ab5702

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