Changeset 1476 in ntrip

Timestamp:

Jan 17, 2009, 4:39:28 PM (16 years ago)

Author:

mervart

Message:

* empty log message *

File:

• trunk/BNC/bnctabledlg.cpp (modified) (7 diffs)

trunk/BNC/bnctabledlg.cpp

@@ -56 +56 @@
   QVBoxLayout* mainLayout = new QVBoxLayout(this);
 
-  QSettings settings;
   int ww = QFontMetrics(font()).width('w');
 
@@ -75 +74 @@
   connect(_casterHostComboBox, SIGNAL(currentIndexChanged(const QString&)),
           this, SLOT(slotCasterHostChanged(const QString&)));
-  QStringList casterHostList = settings.value("casterHostList").toStringList();
-  for (int ii = 0; ii < casterHostList.count(); ii++) {
-    QString item = casterHostList[ii];
-    if (item.indexOf("http://") != 0) {
-      item = "http://" + item;
-    }
-    QUrl url(item);
+  QSettings settings;
+  QStringList casterUrlList = settings.value("casterUrlList").toStringList();
+  for (int ii = 0; ii < casterUrlList.count(); ii++) {
+    QUrl url(casterUrlList[ii]);
     _casterHostComboBox->addItem(url.host());
   }
@@ -294 +290 @@
 void bncTableDlg::accept() {
 
+  QUrl url;
+  url.setHost(_casterHostComboBox->currentText());
+  url.setPort(_casterPortLineEdit->text().toInt());
+  url.setUserName(_casterUserLineEdit->text());
+  url.setPassword(_casterPasswordLineEdit->text());
+
   QSettings settings;
   settings.setValue("casterHost", _casterHostComboBox->currentText());
   settings.setValue("ntripVersion", _ntripVersionComboBox->currentText());
+  QStringList casterUrlList = settings.value("casterUrlList").toStringList();
+  casterUrlList << url.toString();
+  settings.setValue("casterUrlList", casterUrlList);
+  settings.sync();
 
   QStringList* mountPoints = new QStringList;
@@ -310 +316 @@
       format.replace(" ", "_");
       if (_table->isItemSelected(item)) {
-        QUrl url;
-        url.setUserName(QUrl::toPercentEncoding(_casterUserLineEdit->text()));
-        url.setPassword(QUrl::toPercentEncoding(_casterPasswordLineEdit->text()));
-        url.setHost(_casterHostComboBox->currentText());
-        url.setPort(_casterPortLineEdit->text().toInt());
         url.setPath(item->text());
-
         mountPoints->push_back(url.toString() + " " + format + " " + latitude 
                         + " " + longitude + " " + nmea + " " + ntripVersion);
@@ -513 +513 @@
 ////////////////////////////////////////////////////////////////////////////
 void bncCasterTableDlg:: slotWhatsThisCasterTable() {
-QWhatsThis::enterWhatsThisMode();
+  QWhatsThis::enterWhatsThisMode();
 }
 
@@ -550 +550 @@
   _casterPortLineEdit->setText(newCasterPort);
 
+  QUrl url;
+  url.setScheme("http");
+  url.setHost(newCasterHost);
+  url.setPort(newCasterPort.toInt());
+
   QSettings settings;
-  QStringList casterHostList = settings.value("casterHostList").toStringList();
-  casterHostList << QString("http://" + newCasterHost + ":" + newCasterPort);
-  settings.setValue("casterHostList", casterHostList);
+  QStringList casterUrlList = settings.value("casterUrlList").toStringList();
+  casterUrlList << url.toString();
+  settings.setValue("casterUrlList", casterUrlList);
   settings.sync();
 }
@@ -561 +566 @@
 void bncTableDlg::slotCasterHostChanged(const QString& newHost) {
   QSettings settings;
-  QStringList casterHostList = settings.value("casterHostList").toStringList();
-  for (int ii = 0; ii < casterHostList.count(); ii++) {
-    QString item = casterHostList[ii];
-    if (item.indexOf("http://") != 0) {
-      item = "http://" + item;
-    }
-    QUrl url(item);
+  QStringList casterUrlList = settings.value("casterUrlList").toStringList();
+  for (int ii = 0; ii < casterUrlList.count(); ii++) {
+    QUrl url(casterUrlList[ii]);
     if (url.host() == newHost) {
       _casterUserLineEdit->setText(url.userName());