Networks can now be removed even when they're connected.

[quassel.git] / src / qtui / settingspages / networkssettingspage.cpp

diff --git a/src/qtui/settingspages/networkssettingspage.cpp b/src/qtui/settingspages/networkssettingspage.cpp
index 5170826..ff58261 100644 (file)
--- a/src/qtui/settingspages/networkssettingspage.cpp
+++ b/src/qtui/settingspages/networkssettingspage.cpp
@@ -37,7 +37,7 @@ NetworksSettingsPage::NetworksSettingsPage(QWidget *parent) : SettingsPage(tr("G
   disconnectedIcon = QIcon(":/22x22/actions/network-disconnect");
 
   currentId = 0;
-  setEnabled(false);  // need a core connection!
+  setEnabled(Client::isConnected());  // need a core connection!
   setWidgetStates();
   connect(Client::instance(), SIGNAL(coreConnectionStateChanged(bool)), this, SLOT(coreConnectionStateChanged(bool)));
   connect(Client::instance(), SIGNAL(networkCreated(NetworkId)), this, SLOT(clientNetworkAdded(NetworkId)));
@@ -178,7 +178,7 @@ void NetworksSettingsPage::setWidgetStates() {
 }
 
 void NetworksSettingsPage::setItemState(NetworkId id, QListWidgetItem *item) {
-  if(!item) item = networkItem(id);
+  if(!item && !(item = networkItem(id))) return;
   const Network *net = Client::network(id);
   if(!net || net->isInitialized()) item->setFlags(item->flags() | Qt::ItemIsEnabled);
   else item->setFlags(item->flags() & ~Qt::ItemIsEnabled);
@@ -190,19 +190,22 @@ void NetworksSettingsPage::setItemState(NetworkId id, QListWidgetItem *item) {
     item->setIcon(disconnectedIcon);
   }
   if(net) {
+    bool select = false;
     // check if we already have another net of this name in the list, and replace it
     QList<QListWidgetItem *> items = ui.networkList->findItems(net->networkName(), Qt::MatchExactly);
     if(items.count()) {
       foreach(QListWidgetItem *i, items) {
         NetworkId oldid = i->data(Qt::UserRole).value<NetworkId>();
         if(oldid > 0) continue;  // only locally created nets should be replaced
-        if(oldid == currentId) item->setSelected(true);
-        delete ui.networkList->takeItem(ui.networkList->row(i));
+        if(oldid == currentId) select = true;
+        int row = ui.networkList->row(i);
+        if(row >= 0) delete ui.networkList->takeItem(row);
         networkInfos.remove(oldid);
         break;
       }
     }
     item->setText(net->networkName());
+    if(select) item->setSelected(true);
   }
 }
 
@@ -391,7 +394,7 @@ void NetworksSettingsPage::on_networkList_itemSelectionChanged() {
 void NetworksSettingsPage::on_addNetwork_clicked() {
   QStringList existing;
   for(int i = 0; i < ui.networkList->count(); i++) existing << ui.networkList->item(i)->text();
-  NetworkEditDlgNew dlg(QString(), existing, this);
+  NetworkEditDlg dlg(QString(), existing, this);
   if(dlg.exec() == QDialog::Accepted) {
     NetworkId id;
     for(id = 1; id <= networkInfos.count(); id++) {
@@ -414,8 +417,7 @@ void NetworksSettingsPage::on_deleteNetwork_clicked() {
   if(ui.networkList->selectedItems().count()) {
     NetworkId netid = ui.networkList->selectedItems()[0]->data(Qt::UserRole).value<NetworkId>();
     int ret = QMessageBox::question(this, tr("Delete Network?"),
-                                    tr("Do you really want to delete the network \"%1\" and all related settings, including the backlog?"
-                                       "<br><br><em>NOTE: Backlog deletion hasn't actually been implemented yet.</em>").arg(networkInfos[netid].networkName),
+                                    tr("Do you really want to delete the network \"%1\" and all related settings, including the backlog?").arg(networkInfos[netid].networkName),
                                     QMessageBox::Yes|QMessageBox::No, QMessageBox::No);
     if(ret == QMessageBox::Yes) {
       currentId = 0;
@@ -433,7 +435,7 @@ void NetworksSettingsPage::on_renameNetwork_clicked() {
   QString old = ui.networkList->selectedItems()[0]->text();
   QStringList existing;
   for(int i = 0; i < ui.networkList->count(); i++) existing << ui.networkList->item(i)->text();
-  NetworkEditDlgNew dlg(old, existing, this);
+  NetworkEditDlg dlg(old, existing, this);
   if(dlg.exec() == QDialog::Accepted) {
     ui.networkList->selectedItems()[0]->setText(dlg.networkName());
     NetworkId netid = ui.networkList->selectedItems()[0]->data(Qt::UserRole).value<NetworkId>();
@@ -459,7 +461,7 @@ void NetworksSettingsPage::on_serverList_itemSelectionChanged() {
 
 void NetworksSettingsPage::on_addServer_clicked() {
   if(currentId == 0) return;
-  ServerEditDlgNew dlg(QVariantMap(), this);
+  ServerEditDlg dlg(QVariantMap(), this);
   if(dlg.exec() == QDialog::Accepted) {
     networkInfos[currentId].serverList.append(dlg.serverData());
     displayNetwork(currentId);
@@ -472,7 +474,7 @@ void NetworksSettingsPage::on_addServer_clicked() {
 void NetworksSettingsPage::on_editServer_clicked() {
   if(currentId == 0) return;
   int cur = ui.serverList->currentRow();
-  ServerEditDlgNew dlg(networkInfos[currentId].serverList[cur], this);
+  ServerEditDlg dlg(networkInfos[currentId].serverList[cur], this);
   if(dlg.exec() == QDialog::Accepted) {
     networkInfos[currentId].serverList[cur] = dlg.serverData();
     displayNetwork(currentId);
@@ -512,7 +514,7 @@ void NetworksSettingsPage::on_downServer_clicked() {
  * NetworkEditDlg
  *************************************************************************/
 
-NetworkEditDlgNew::NetworkEditDlgNew(const QString &old, const QStringList &exist, QWidget *parent) : QDialog(parent), existing(exist) {
+NetworkEditDlg::NetworkEditDlg(const QString &old, const QStringList &exist, QWidget *parent) : QDialog(parent), existing(exist) {
   ui.setupUi(this);
 
   if(old.isEmpty()) {
@@ -522,12 +524,12 @@ NetworkEditDlgNew::NetworkEditDlgNew(const QString &old, const QStringList &exis
   } else ui.networkEdit->setText(old);
 }
 
-QString NetworkEditDlgNew::networkName() const {
+QString NetworkEditDlg::networkName() const {
   return ui.networkEdit->text();
 
 }
 
-void NetworkEditDlgNew::on_networkEdit_textChanged(const QString &text) {
+void NetworkEditDlg::on_networkEdit_textChanged(const QString &text) {
   ui.buttonBox->button(QDialogButtonBox::Ok)->setDisabled(text.isEmpty() || existing.contains(text));
 }
 
@@ -536,7 +538,7 @@ void NetworkEditDlgNew::on_networkEdit_textChanged(const QString &text) {
  * ServerEditDlg
  *************************************************************************/
 
-ServerEditDlgNew::ServerEditDlgNew(const QVariant &_serverData, QWidget *parent) : QDialog(parent) {
+ServerEditDlg::ServerEditDlg(const QVariant &_serverData, QWidget *parent) : QDialog(parent) {
   ui.setupUi(this);
   QVariantMap serverData = _serverData.toMap();
   if(serverData.count()) {
@@ -545,12 +547,12 @@ ServerEditDlgNew::ServerEditDlgNew(const QVariant &_serverData, QWidget *parent)
     ui.password->setText(serverData["Password"].toString());
     ui.useSSL->setChecked(serverData["UseSSL"].toBool());
   } else {
-    ui.port->setValue(Global::defaultPort);
+    ui.port->setValue(6667);
   }
   on_host_textChanged();
 }
 
-QVariant ServerEditDlgNew::serverData() const {
+QVariant ServerEditDlg::serverData() const {
   QVariantMap _serverData;
   _serverData["Host"] = ui.host->text();
   _serverData["Port"] = ui.port->value();
@@ -559,7 +561,7 @@ QVariant ServerEditDlgNew::serverData() const {
   return _serverData;
 }
 
-void ServerEditDlgNew::on_host_textChanged() {
+void ServerEditDlg::on_host_textChanged() {
   ui.buttonBox->button(QDialogButtonBox::Ok)->setDisabled(ui.host->text().isEmpty());
 }