X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsimplenetworkeditor.cpp;h=1591e75fd23a7e24b01fd761d25d99c33ef2410c;hp=a185e62b580b3e1f4beefded5d7263492c842565;hb=f04db2cb802b1296ca739c823495930c71d3b4ab;hpb=da86ee7178494e6e5404887ddac98d5e107cc747

diff --git a/src/qtui/simplenetworkeditor.cpp b/src/qtui/simplenetworkeditor.cpp
index a185e62b..1591e75f 100644
--- a/src/qtui/simplenetworkeditor.cpp
+++ b/src/qtui/simplenetworkeditor.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-2013 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,7 +15,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #include "simplenetworkeditor.h"
@@ -25,109 +25,132 @@
 #include "networkssettingspage.h"
 
 SimpleNetworkEditor::SimpleNetworkEditor(QWidget *parent)
-  : QWidget(parent)
+    : QWidget(parent)
 {
-  ui.setupUi(this);
+    ui.setupUi(this);
 
-  ui.addServer->setIcon(SmallIcon("list-add"));
-  ui.deleteServer->setIcon(SmallIcon("edit-delete"));
-  ui.editServer->setIcon(SmallIcon("configure"));
-  ui.upServer->setIcon(SmallIcon("go-up"));
-  ui.downServer->setIcon(SmallIcon("go-down"));
+    ui.addServer->setIcon(SmallIcon("list-add"));
+    ui.deleteServer->setIcon(SmallIcon("edit-delete"));
+    ui.editServer->setIcon(SmallIcon("configure"));
+    ui.upServer->setIcon(SmallIcon("go-up"));
+    ui.downServer->setIcon(SmallIcon("go-down"));
 
-  connect(ui.networkNameEdit, SIGNAL(textEdited(const QString &)), this, SIGNAL(widgetHasChanged()));
-  connect(ui.channelList, SIGNAL(textChanged()), this, SIGNAL(widgetHasChanged()));
+    connect(ui.networkNameEdit, SIGNAL(textEdited(const QString &)), this, SIGNAL(widgetHasChanged()));
+    connect(ui.channelList, SIGNAL(textChanged()), this, SIGNAL(widgetHasChanged()));
 }
 
-void SimpleNetworkEditor::setWidgetStates() {
-  if(ui.serverList->selectedItems().count()) {
-    ui.editServer->setEnabled(true);
-    ui.deleteServer->setEnabled(true);
-    ui.upServer->setEnabled(ui.serverList->currentRow() > 0);
-    ui.downServer->setEnabled(ui.serverList->currentRow() < ui.serverList->count() - 1);
-  } else {
-    ui.editServer->setEnabled(false);
-    ui.deleteServer->setEnabled(false);
-    ui.upServer->setEnabled(false);
-    ui.downServer->setEnabled(false);
-  }
+
+void SimpleNetworkEditor::setWidgetStates()
+{
+    if (ui.serverList->selectedItems().count()) {
+        ui.editServer->setEnabled(true);
+        ui.deleteServer->setEnabled(true);
+        ui.upServer->setEnabled(ui.serverList->currentRow() > 0);
+        ui.downServer->setEnabled(ui.serverList->currentRow() < ui.serverList->count() - 1);
+    }
+    else {
+        ui.editServer->setEnabled(false);
+        ui.deleteServer->setEnabled(false);
+        ui.upServer->setEnabled(false);
+        ui.downServer->setEnabled(false);
+    }
 }
 
-void SimpleNetworkEditor::displayNetworkInfo(const NetworkInfo &networkInfo) {
-  _networkInfo = networkInfo;
 
-  ui.serverList->clear();
-  foreach(Network::Server server, _networkInfo.serverList) {
-    QListWidgetItem *item = new QListWidgetItem(QString("%1:%2").arg(server.host).arg(server.port));
-    if(server.useSsl)
-      item->setIcon(SmallIcon("document-encrypt"));
-    ui.serverList->addItem(item);
-  }
+void SimpleNetworkEditor::displayNetworkInfo(const NetworkInfo &networkInfo)
+{
+    _networkInfo = networkInfo;
+
+    ui.serverList->clear();
+    foreach(Network::Server server, _networkInfo.serverList) {
+        QListWidgetItem *item = new QListWidgetItem(QString("%1:%2").arg(server.host).arg(server.port));
+        if (server.useSsl)
+            item->setIcon(SmallIcon("document-encrypt"));
+        ui.serverList->addItem(item);
+    }
+
+    ui.networkNameEdit->setText(_networkInfo.networkName);
+    setWidgetStates();
+}
+
+
+void SimpleNetworkEditor::saveToNetworkInfo(NetworkInfo &networkInfo)
+{
+    _networkInfo.networkName = ui.networkNameEdit->text();
+    networkInfo = _networkInfo;
+}
+
 
-  ui.networkNameEdit->setText(_networkInfo.networkName);
-  setWidgetStates();
+QStringList SimpleNetworkEditor::defaultChannels() const
+{
+    return ui.channelList->toPlainText().split("\n",  QString::SkipEmptyParts);
 }
 
-void SimpleNetworkEditor::saveToNetworkInfo(NetworkInfo &networkInfo) {
-  _networkInfo.networkName = ui.networkNameEdit->text();
-  networkInfo = _networkInfo;
+
+void SimpleNetworkEditor::setDefaultChannels(const QStringList &channels)
+{
+    ui.channelList->setPlainText(channels.join("\n"));
 }
 
-QStringList SimpleNetworkEditor::defaultChannels() const {
-  return ui.channelList->toPlainText().split("\n",  QString::SkipEmptyParts);
+
+void SimpleNetworkEditor::on_serverList_itemSelectionChanged()
+{
+    setWidgetStates();
 }
 
-void SimpleNetworkEditor::setDefaultChannels(const QStringList &channels) {
-  ui.channelList->setPlainText(channels.join("\n"));
+
+void SimpleNetworkEditor::on_addServer_clicked()
+{
+    ServerEditDlg dlg(Network::Server(), this);
+    if (dlg.exec() == QDialog::Accepted) {
+        _networkInfo.serverList.append(dlg.serverData());
+        displayNetworkInfo(_networkInfo);
+        ui.serverList->setCurrentRow(ui.serverList->count() - 1);
+        emit widgetHasChanged();
+    }
 }
 
-void SimpleNetworkEditor::on_serverList_itemSelectionChanged() {
-  setWidgetStates();
+
+void SimpleNetworkEditor::on_editServer_clicked()
+{
+    int cur = ui.serverList->currentRow();
+    ServerEditDlg dlg(_networkInfo.serverList[cur], this);
+    if (dlg.exec() == QDialog::Accepted) {
+        _networkInfo.serverList[cur] = dlg.serverData();
+        displayNetworkInfo(_networkInfo);
+        ui.serverList->setCurrentRow(cur);
+        emit widgetHasChanged();
+    }
 }
 
-void SimpleNetworkEditor::on_addServer_clicked() {
-  ServerEditDlg dlg(Network::Server(), this);
-  if(dlg.exec() == QDialog::Accepted) {
-    _networkInfo.serverList.append(dlg.serverData());
+
+void SimpleNetworkEditor::on_deleteServer_clicked()
+{
+    int cur = ui.serverList->currentRow();
+    _networkInfo.serverList.removeAt(cur);
     displayNetworkInfo(_networkInfo);
-    ui.serverList->setCurrentRow(ui.serverList->count() - 1);
+    ui.serverList->setCurrentRow(qMin(cur, ui.serverList->count() - 1));
     emit widgetHasChanged();
-  }
 }
 
-void SimpleNetworkEditor::on_editServer_clicked() {
-  int cur = ui.serverList->currentRow();
-  ServerEditDlg dlg(_networkInfo.serverList[cur], this);
-  if(dlg.exec() == QDialog::Accepted) {
-    _networkInfo.serverList[cur] = dlg.serverData();
+
+void SimpleNetworkEditor::on_upServer_clicked()
+{
+    int cur = ui.serverList->currentRow();
+    Network::Server server = _networkInfo.serverList.takeAt(cur);
+    _networkInfo.serverList.insert(cur - 1, server);
     displayNetworkInfo(_networkInfo);
-    ui.serverList->setCurrentRow(cur);
+    ui.serverList->setCurrentRow(cur - 1);
     emit widgetHasChanged();
-  }
-}
-
-void SimpleNetworkEditor::on_deleteServer_clicked() {
-  int cur = ui.serverList->currentRow();
-  _networkInfo.serverList.removeAt(cur);
-  displayNetworkInfo(_networkInfo);
-  ui.serverList->setCurrentRow(qMin(cur, ui.serverList->count() - 1));
-  emit widgetHasChanged();
 }
 
-void SimpleNetworkEditor::on_upServer_clicked() {
-  int cur = ui.serverList->currentRow();
-  Network::Server server = _networkInfo.serverList.takeAt(cur);
-  _networkInfo.serverList.insert(cur - 1, server);
-  displayNetworkInfo(_networkInfo);
-  ui.serverList->setCurrentRow(cur - 1);
-  emit widgetHasChanged();
-}
 
-void SimpleNetworkEditor::on_downServer_clicked() {
-  int cur = ui.serverList->currentRow();
-  Network::Server server = _networkInfo.serverList.takeAt(cur);
-  _networkInfo.serverList.insert(cur + 1, server);
-  displayNetworkInfo(_networkInfo);
-  ui.serverList->setCurrentRow(cur + 1);
-  emit widgetHasChanged();
+void SimpleNetworkEditor::on_downServer_clicked()
+{
+    int cur = ui.serverList->currentRow();
+    Network::Server server = _networkInfo.serverList.takeAt(cur);
+    _networkInfo.serverList.insert(cur + 1, server);
+    displayNetworkInfo(_networkInfo);
+    ui.serverList->setCurrentRow(cur + 1);
+    emit widgetHasChanged();
 }