X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fidentitiessettingspage.cpp;h=a5ec4f940214d95068cac872d8e13fbe68eb52c2;hp=83b120661f927e84195f1f1d6af55bb3cb5cc3b9;hb=f429bd6dfbea50ad4690875f1466a920f7a3b509;hpb=9a6a8478bdd8c7c5bb4ff1fa3de9510863d65a97

diff --git a/src/qtui/settingspages/identitiessettingspage.cpp b/src/qtui/settingspages/identitiessettingspage.cpp
index 83b12066..a5ec4f94 100644
--- a/src/qtui/settingspages/identitiessettingspage.cpp
+++ b/src/qtui/settingspages/identitiessettingspage.cpp
@@ -24,12 +24,22 @@
 #include "identitiessettingspage.h"
 
 #include "client.h"
+#include "iconloader.h"
 
 IdentitiesSettingsPage::IdentitiesSettingsPage(QWidget *parent)
   : SettingsPage(tr("General"), tr("Identities"), parent) {
 
   ui.setupUi(this);
-  setEnabled(false);  // need a core connection!
+  ui.renameIdentity->setIcon(BarIcon("edit-rename"));
+  ui.addIdentity->setIcon(BarIcon("list-add-user"));
+  ui.deleteIdentity->setIcon(BarIcon("list-remove-user"));
+  ui.addNick->setIcon(SmallIcon("list-add"));
+  ui.deleteNick->setIcon(SmallIcon("edit-delete"));
+  ui.renameNick->setIcon(SmallIcon("edit-rename"));
+  ui.nickUp->setIcon(SmallIcon("go-up"));
+  ui.nickDown->setIcon(SmallIcon("go-down"));
+
+  setEnabled(Client::isConnected());  // need a core connection!
   setWidgetStates();
   connect(Client::instance(), SIGNAL(coreConnectionStateChanged(bool)), this, SLOT(coreConnectionStateChanged(bool)));
   connect(Client::instance(), SIGNAL(identityCreated(IdentityId)), this, SLOT(clientIdentityCreated(IdentityId)));
@@ -45,14 +55,13 @@ IdentitiesSettingsPage::IdentitiesSettingsPage(QWidget *parent)
   connect(ui.awayNickEnabled, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
   connect(ui.awayReason, SIGNAL(textEdited(const QString &)), this, SLOT(widgetHasChanged()));
   connect(ui.awayReasonEnabled, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
-  connect(ui.returnMessage, SIGNAL(textEdited(const QString &)), this, SLOT(widgetHasChanged()));
-  connect(ui.returnMessageEnabled, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
   connect(ui.autoAwayEnabled, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
   connect(ui.autoAwayTime, SIGNAL(valueChanged(int)), this, SLOT(widgetHasChanged()));
   connect(ui.autoAwayReason, SIGNAL(textEdited(const QString &)), this, SLOT(widgetHasChanged()));
   connect(ui.autoAwayReasonEnabled, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
-  connect(ui.autoReturnMessage, SIGNAL(textEdited(const QString &)), this, SLOT(widgetHasChanged()));
-  connect(ui.autoReturnMessageEnabled, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
+  connect(ui.detachAwayEnabled, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
+  connect(ui.detachAwayReason, SIGNAL(textEdited(const QString &)), this, SLOT(widgetHasChanged()));
+  connect(ui.detachAwayReasonEnabled, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
   connect(ui.ident, SIGNAL(textEdited(const QString &)), this, SLOT(widgetHasChanged()));
   connect(ui.kickReason, SIGNAL(textEdited(const QString &)), this, SLOT(widgetHasChanged()));
   connect(ui.partReason, SIGNAL(textEdited(const QString &)), this, SLOT(widgetHasChanged()));
@@ -78,6 +87,8 @@ void IdentitiesSettingsPage::setWidgetStates() {
   }
   ui.deleteNick->setEnabled(ui.nicknameList->count() > 1);
 
+  // FIXME this is until stuff has been implemented
+  ui.detachAwayEnabled->setEnabled(false);
 }
 
 void IdentitiesSettingsPage::coreConnectionStateChanged(bool state) {
@@ -101,7 +112,7 @@ void IdentitiesSettingsPage::save() {
       Identity *temp = *i;
       i = identities.erase(i);
       toCreate.append(temp);
-      ui.identityList->removeItem(ui.identityList->findData(temp->id()));
+      ui.identityList->removeItem(ui.identityList->findData(temp->id().toInt()));
     } else {
       if(**i != *Client::identity((*i)->id())) {
         toUpdate.append(*i);
@@ -120,7 +131,7 @@ void IdentitiesSettingsPage::save() {
   }
   changedIdentities.clear();
   deletedIdentities.clear();
-  changeState(false);
+  setChangedState(false);
   setEnabled(true);
 }
 
@@ -136,12 +147,12 @@ void IdentitiesSettingsPage::load() {
   foreach(IdentityId id, Client::identityIds()) {
     clientIdentityCreated(id);
   }
-  changeState(false);
+  setChangedState(false);
 }
 
 void IdentitiesSettingsPage::widgetHasChanged() {
   bool changed = testHasChanged();
-  if(changed != hasChanged()) changeState(changed);
+  if(changed != hasChanged()) setChangedState(changed);
 }
 
 bool IdentitiesSettingsPage::testHasChanged() {
@@ -214,31 +225,31 @@ void IdentitiesSettingsPage::insertIdentity(Identity *identity) {
   identities[id] = identity;
   if(id == 1) {
     // default identity is always the first one!
-    ui.identityList->insertItem(0, identity->identityName(), id);
+    ui.identityList->insertItem(0, identity->identityName(), id.toInt());
   } else {
     QString name = identity->identityName();
     for(int j = 0; j < ui.identityList->count(); j++) {
       if((j>0 || ui.identityList->itemData(0).toInt() != 1) && name.localeAwareCompare(ui.identityList->itemText(j)) < 0) {
-        ui.identityList->insertItem(j, name, id);
+        ui.identityList->insertItem(j, name, id.toInt());
         widgetHasChanged();
         return;
       }
     }
     // append
-    ui.identityList->insertItem(ui.identityList->count(), name, id);
+    ui.identityList->insertItem(ui.identityList->count(), name, id.toInt());
     widgetHasChanged();
   }
 }
 
 void IdentitiesSettingsPage::renameIdentity(IdentityId id, const QString &newName) {
   Identity *identity = identities[id];
-  ui.identityList->setItemText(ui.identityList->findData(identity->id()), newName);
+  ui.identityList->setItemText(ui.identityList->findData(identity->id().toInt()), newName);
   identity->setIdentityName(newName);
 }
 
 void IdentitiesSettingsPage::removeIdentity(Identity *id) {
   identities.remove(id->id());
-  ui.identityList->removeItem(ui.identityList->findData(id->id()));
+  ui.identityList->removeItem(ui.identityList->findData(id->id().toInt()));
   changedIdentities.removeAll(id->id());
   if(currentId == id->id()) currentId = 0;
   id->deleteLater();
@@ -274,14 +285,13 @@ void IdentitiesSettingsPage::displayIdentity(Identity *id, bool dontsave) {
     ui.awayNickEnabled->setChecked(id->awayNickEnabled());
     ui.awayReason->setText(id->awayReason());
     ui.awayReasonEnabled->setChecked(id->awayReasonEnabled());
-    ui.returnMessage->setText(id->returnMessage());
-    ui.returnMessageEnabled->setChecked(id->returnMessageEnabled());
     ui.autoAwayEnabled->setChecked(id->autoAwayEnabled());
     ui.autoAwayTime->setValue(id->autoAwayTime());
     ui.autoAwayReason->setText(id->autoAwayReason());
     ui.autoAwayReasonEnabled->setChecked(id->autoAwayReasonEnabled());
-    ui.autoReturnMessage->setText(id->autoReturnMessage());
-    ui.autoReturnMessageEnabled->setChecked(id->autoReturnMessageEnabled());
+    ui.detachAwayEnabled->setChecked(id->detachAwayEnabled());
+    ui.detachAwayReason->setText(id->detachAwayReason());
+    ui.detachAwayReasonEnabled->setChecked(id->detachAwayReasonEnabled());
     ui.ident->setText(id->ident());
     ui.kickReason->setText(id->kickReason());
     ui.partReason->setText(id->partReason());
@@ -300,14 +310,13 @@ void IdentitiesSettingsPage::saveToIdentity(Identity *id) {
   id->setAwayNickEnabled(ui.awayNickEnabled->isChecked());
   id->setAwayReason(ui.awayReason->text());
   id->setAwayReasonEnabled(ui.awayReasonEnabled->isChecked());
-  id->setReturnMessage(ui.returnMessage->text());
-  id->setReturnMessageEnabled(ui.returnMessageEnabled->isChecked());
   id->setAutoAwayEnabled(ui.autoAwayEnabled->isChecked());
   id->setAutoAwayTime(ui.autoAwayTime->value());
   id->setAutoAwayReason(ui.autoAwayReason->text());
   id->setAutoAwayReasonEnabled(ui.autoAwayReasonEnabled->isChecked());
-  id->setAutoReturnMessage(ui.autoReturnMessage->text());
-  id->setAutoReturnMessageEnabled(ui.autoReturnMessageEnabled->isChecked());
+  id->setDetachAwayEnabled(ui.detachAwayEnabled->isChecked());
+  id->setDetachAwayReason(ui.detachAwayReason->text());
+  id->setDetachAwayReasonEnabled(ui.detachAwayReasonEnabled->isChecked());
   id->setIdent(ui.ident->text());
   id->setKickReason(ui.kickReason->text());
   id->setPartReason(ui.partReason->text());
@@ -320,9 +329,9 @@ void IdentitiesSettingsPage::on_addIdentity_clicked() {
     // find a free (negative) ID
     IdentityId id;
     for(id = 1; id <= identities.count(); id++) {
-      if(!identities.keys().contains(-id)) break;
+      if(!identities.keys().contains(-id.toInt())) break;
     }
-    id *= -1;
+    id = -id.toInt();
     Identity *newId = new Identity(id, this);
     if(dlg.duplicateId() != 0) {
       // duplicate
@@ -332,7 +341,7 @@ void IdentitiesSettingsPage::on_addIdentity_clicked() {
     newId->setIdentityName(dlg.identityName());
     identities[id] = newId;
     insertIdentity(newId);
-    ui.identityList->setCurrentIndex(ui.identityList->findData(id));
+    ui.identityList->setCurrentIndex(ui.identityList->findData(id.toInt()));
     widgetHasChanged();
   }
 }
@@ -363,18 +372,19 @@ void IdentitiesSettingsPage::on_renameIdentity_clicked() {
 void IdentitiesSettingsPage::on_addNick_clicked() {
   QStringList existing;
   for(int i = 0; i < ui.nicknameList->count(); i++) existing << ui.nicknameList->item(i)->text();
-  NickEditDlgNew dlg(QString(), existing, this);
+  NickEditDlg dlg(QString(), existing, this);
   if(dlg.exec() == QDialog::Accepted) {
     ui.nicknameList->addItem(dlg.nick());
     ui.nicknameList->setCurrentRow(ui.nicknameList->count()-1);
     setWidgetStates();
+    widgetHasChanged();
   }
 }
 
 void IdentitiesSettingsPage::on_deleteNick_clicked() {
   // no confirmation, since a nickname is really nothing hard to recreate
   if(ui.nicknameList->selectedItems().count()) {
-    delete ui.nicknameList->selectedItems()[0];
+    delete ui.nicknameList->takeItem(ui.nicknameList->row(ui.nicknameList->selectedItems()[0]));
     ui.nicknameList->setCurrentRow(qMin(ui.nicknameList->currentRow()+1, ui.nicknameList->count()-1));
     setWidgetStates();
     widgetHasChanged();
@@ -386,7 +396,7 @@ void IdentitiesSettingsPage::on_renameNick_clicked() {
   QString old = ui.nicknameList->selectedItems()[0]->text();
   QStringList existing;
   for(int i = 0; i < ui.nicknameList->count(); i++) existing << ui.nicknameList->item(i)->text();
-  NickEditDlgNew dlg(old, existing, this);
+  NickEditDlg dlg(old, existing, this);
   if(dlg.exec() == QDialog::Accepted) {
     ui.nicknameList->selectedItems()[0]->setText(dlg.nick());
   }
@@ -443,9 +453,11 @@ void CreateIdentityDlg::on_identityName_textChanged(const QString &text) {
 
 /*********************************************************************************************/
 
-SaveIdentitiesDlg::SaveIdentitiesDlg(QList<Identity *> tocreate, QList<Identity *> toupdate, QList<IdentityId> toremove, QWidget *parent)
-  : QDialog(parent), toCreate(tocreate), toUpdate(toupdate), toRemove(toremove) {
+SaveIdentitiesDlg::SaveIdentitiesDlg(const QList<Identity *> &toCreate, const QList<Identity *> &toUpdate, const QList<IdentityId> &toRemove, QWidget *parent)
+  : QDialog(parent) { //, toCreate(tocreate), toUpdate(toupdate), toRemove(toremove) {
   ui.setupUi(this);
+  ui.abort->setIcon(SmallIcon("dialog-cancel"));
+
   numevents = toCreate.count() + toUpdate.count() + toRemove.count();
   rcvevents = 0;
   if(numevents) {
@@ -466,7 +478,7 @@ SaveIdentitiesDlg::SaveIdentitiesDlg(QList<Identity *> tocreate, QList<Identity
         continue;
       }
       connect(cid, SIGNAL(updatedRemotely()), this, SLOT(clientEvent()));
-      Client::updateIdentity(*id);
+      Client::updateIdentity(id->id(), id->toVariantMap());
     }
     foreach(IdentityId id, toRemove) {
       Client::removeIdentity(id);
@@ -484,7 +496,7 @@ void SaveIdentitiesDlg::clientEvent() {
 
 /*************************************************************************************************/
 
-NickEditDlgNew::NickEditDlgNew(const QString &old, const QStringList &exist, QWidget *parent)
+NickEditDlg::NickEditDlg(const QString &old, const QStringList &exist, QWidget *parent)
   : QDialog(parent), oldNick(old), existing(exist) {
   ui.setupUi(this);
 
@@ -501,12 +513,12 @@ NickEditDlgNew::NickEditDlgNew(const QString &old, const QStringList &exist, QWi
   } else ui.nickEdit->setText(old);
 }
 
-QString NickEditDlgNew::nick() const {
+QString NickEditDlg::nick() const {
   return ui.nickEdit->text();
 
 }
 
-void NickEditDlgNew::on_nickEdit_textChanged(const QString &text) {
+void NickEditDlg::on_nickEdit_textChanged(const QString &text) {
   ui.buttonBox->button(QDialogButtonBox::Ok)->setDisabled(text.isEmpty() || existing.contains(text));
 }