X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fnetworkssettingspage.cpp;h=9d5433791a70675ad0f90fa186af4e84f8bcbc32;hp=230263028130d90d32e582dab81f3a39c279bb9d;hb=6c19be8efa70b6fb76d2c43aa96ab5c908e039e3;hpb=710edfe368ed1db79cc274164523d14afc1b2c9d

diff --git a/src/qtui/settingspages/networkssettingspage.cpp b/src/qtui/settingspages/networkssettingspage.cpp
index 23026302..9d543379 100644
--- a/src/qtui/settingspages/networkssettingspage.cpp
+++ b/src/qtui/settingspages/networkssettingspage.cpp
@@ -521,29 +521,17 @@ void NetworksSettingsPage::on_addNetwork_clicked() {
   for(int i = 0; i < ui.networkList->count(); i++) existing << ui.networkList->item(i)->text();
   NetworkAddDlg dlg(existing, this);
   if(dlg.exec() == QDialog::Accepted) {
+    NetworkInfo info = dlg.networkInfo();
+    if(info.networkName.isEmpty())
+      return;  // sanity check
+
     NetworkId id;
     for(id = 1; id <= networkInfos.count(); id++) {
       widgetHasChanged();
       if(!networkInfos.keys().contains(-id.toInt())) break;
     }
     id = -id.toInt();
-
-    NetworkInfo info = dlg.networkInfo();
-    if(info.networkName.isEmpty())
-      return;  // sanity check
     info.networkId = id;
-    info.identity = 1;
-
-    // defaults
-    info.useRandomServer = false;
-    info.useAutoReconnect = true;
-    info.autoReconnectInterval = 60;
-    info.autoReconnectRetries = 20;
-    info.unlimitedReconnectRetries = false;
-    info.useAutoIdentify = false;
-    info.autoIdentifyService = "NickServ";
-    info.rejoinChannels = true;
-
     networkInfos[id] = info;
     QListWidgetItem *item = insertNetwork(info);
     ui.networkList->setCurrentItem(item);
@@ -663,20 +651,12 @@ NetworkAddDlg::NetworkAddDlg(const QStringList &exist, QWidget *parent) : QDialo
   ui.useSSL->setIcon(SmallIcon("document-encrypt"));
 
   // read preset networks
-  networksFilePath = findDataFilePath("networks.ini");
-  if(!networksFilePath.isEmpty()) {
-    QSettings s(networksFilePath, QSettings::IniFormat);
-    QStringList networks = s.childGroups();
-    foreach(QString s, existing)
-      networks.removeAll(s);
-    if(!networks.isEmpty()) {
-      QMap<QString, QString> sorted;
-      foreach(QString net, networks)
-        sorted[net.toLower()] = net;
-      ui.presetList->addItems(sorted.values());
-    }
-  }
-  if(!ui.presetList->count()) {
+  QStringList networks = Network::presetNetworks();
+  foreach(QString s, existing)
+    networks.removeAll(s);
+  if(networks.count())
+    ui.presetList->addItems(networks);
+  else {
     ui.useManual->setChecked(true);
     ui.usePreset->setEnabled(false);
   }
@@ -686,34 +666,13 @@ NetworkAddDlg::NetworkAddDlg(const QStringList &exist, QWidget *parent) : QDialo
 }
 
 NetworkInfo NetworkAddDlg::networkInfo() const {
-  NetworkInfo info;
-
   if(ui.useManual->isChecked()) {
+    NetworkInfo info;
     info.networkName = ui.networkName->text().trimmed();
     info.serverList << Network::Server(ui.serverAddress->text().trimmed(), ui.port->value(), ui.serverPassword->text(), ui.useSSL->isChecked());
-  } else {
-    info.networkName = ui.presetList->currentText();
-    QSettings s(networksFilePath, QSettings::IniFormat);
-    s.beginGroup(info.networkName);
-    foreach(QString server, s.value("Servers").toStringList()) {
-      bool ssl = false;
-      QStringList splitserver = server.split(':', QString::SkipEmptyParts);
-      if(splitserver.count() != 2) {
-        qWarning() << "Invalid server entry in networks.conf:" << server;
-        continue;
-      }
-      if(splitserver[1].at(0) == '+')
-        ssl = true;
-      uint port = splitserver[1].toUInt();
-      if(!port) {
-        qWarning() << "Invalid port entry in networks.conf:" << server;
-        continue;
-      }
-      info.serverList << Network::Server(splitserver[0].trimmed(), port, QString(), ssl);
-    }
-  }
-
-  return info;
+    return info;
+  } else
+    return Network::networkInfoFromPreset(ui.presetList->currentText());
 }
 
 void NetworkAddDlg::setButtonStates() {