Fix for renaming of wms/wfs connections in dialog

mhugent · mhugent · commit d5bdd2b1a7af · 2008-04-16T15:41:24.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8354 c8812cc2-4d05-0410-92ff-de0c093fc19c
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()

Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ void QgsServerSourceSelect::on_btnEdit_clicked()`
`159`	`159`
`160`	`160`	`if (nc->exec())`
`161`	`161`	`{`
`162`		`- nc->saveConnection();`
	`162`	`+ populateConnectionList();`
`163`	`163`	`}`
`164`	`164`	`}`
`165`	`165`
Original file line number	Diff line number	Diff line change
`@@ -246,9 +246,8 @@ void QgsWFSSourceSelect::modifyEntryOfServerList()`
`246`	`246`
`247`	`247`	`if (nc.exec())`
`248`	`248`	`{`
`249`		`- nc.saveConnection();`
	`249`	`+ populateConnectionList();`
`250`	`250`	`}`
`251`		`- populateConnectionList();`
`252`	`251`	`}`
`253`	`252`
`254`	`253`	`void QgsWFSSourceSelect::deleteEntryOfServerList()`