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

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@11528 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Aug 30, 2009 · 50b4e2bcd83021829ffe13fd2912e4b6ed32985b · 50b4e2b
1 parent 81c44fd
commit 50b4e2bcd83021829ffe13fd2912e4b6ed32985b
Showing with 191 additions and 182 deletions.

+1 −12 src/app/qgisapp.cpp

+8 −1 src/app/qgsserversourceselect.cpp

+1 −1 src/app/qgsserversourceselect.h

+181 −168 src/ui/qgsserversourceselectbase.ui
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -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();
 }
 
 

diff --git a/src/app/qgsserversourceselect.cpp b/src/app/qgsserversourceselect.cpp
@@ -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() );
   }
 }
 

diff --git a/src/app/qgsserversourceselect.h b/src/app/qgsserversourceselect.h
@@ -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.