Fix for renaming of wms/wfs connections in dialog

git-svn-id: http://svn.osgeo.org/qgis/trunk@8354 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Apr 16, 2008 · 44b97a3 · 44b97a3
1 parent ed93065
commit 44b97a3
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/src/app/qgsnewhttpconnection.cpp b/src/app/qgsnewhttpconnection.cpp
@@ -19,7 +19,7 @@
 #include "qgscontexthelp.h"
 #include <QSettings>
 
-QgsNewHttpConnection::QgsNewHttpConnection(QWidget *parent, const QString& baseKey, const QString& connName, Qt::WFlags fl): QDialog(parent, fl), mBaseKey(baseKey)
+QgsNewHttpConnection::QgsNewHttpConnection(QWidget *parent, const QString& baseKey, const QString& connName, Qt::WFlags fl): QDialog(parent, fl), mBaseKey(baseKey), mOriginalConnName(connName)
 {
   setupUi(this);
   connect(btnCancel, SIGNAL(clicked()), this, SLOT(reject()));
@@ -58,6 +58,12 @@ void QgsNewHttpConnection::saveConnection()
 {
   QSettings settings; 
   QString key = mBaseKey + txtName->text();
+
+  //delete original entry first
+  if(!mOriginalConnName.isNull() && mOriginalConnName != key)
+    {
+      settings.remove(mBaseKey + mOriginalConnName);
+    }
   settings.writeEntry(key + "/url", txtUrl->text().trimmed());
   settings.writeEntry(key + "/proxyhost", txtProxyHost->text().trimmed());
   settings.writeEntry(key + "/proxyport", txtProxyPort->text().trimmed());

diff --git a/src/app/qgsnewhttpconnection.h b/src/app/qgsnewhttpconnection.h
@@ -40,6 +40,7 @@ class QgsNewHttpConnection : public QDialog, private Ui::QgsNewHttpConnectionBas
     void on_btnHelp_clicked();
  private:
     QString mBaseKey;
+    QString mOriginalConnName; //store initial name to delete entry in case of rename
     static const int context_id = 308026563;
 };
 

diff --git a/src/app/qgsserversourceselect.cpp b/src/app/qgsserversourceselect.cpp
@@ -159,7 +159,7 @@ void QgsServerSourceSelect::on_btnEdit_clicked()
 
   if (nc->exec())
   {
-    nc->saveConnection();
+    populateConnectionList();
   }
 }
 

diff --git a/src/plugins/wfs/qgswfssourceselect.cpp b/src/plugins/wfs/qgswfssourceselect.cpp
@@ -246,9 +246,8 @@ void QgsWFSSourceSelect::modifyEntryOfServerList()
 
   if (nc.exec())
   {
-    nc.saveConnection();
+    populateConnectionList();
   }
-  populateConnectionList();
 }
 
 void QgsWFSSourceSelect::deleteEntryOfServerList()