Added a container dialog for stand-alone settingspages (SettingsPageDlg).

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

diff --git a/src/qtui/settingspages/identitiessettingspage.cpp b/src/qtui/settingspages/identitiessettingspage.cpp
index 1a2bfc1..9c677db 100644 (file)
--- a/src/qtui/settingspages/identitiessettingspage.cpp
+++ b/src/qtui/settingspages/identitiessettingspage.cpp
@@ -29,7 +29,7 @@ IdentitiesSettingsPage::IdentitiesSettingsPage(QWidget *parent)
   : SettingsPage(tr("General"), tr("Identities"), parent) {
 
   ui.setupUi(this);
-  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(identityCreated(IdentityId)), this, SLOT(clientIdentityCreated(IdentityId)));
@@ -120,7 +120,7 @@ void IdentitiesSettingsPage::save() {
   }
   changedIdentities.clear();
   deletedIdentities.clear();
-  changeState(false);
+  setChangedState(false);
   setEnabled(true);
 }
 
@@ -136,12 +136,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() {
@@ -363,7 +363,7 @@ 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);
@@ -375,7 +375,7 @@ void IdentitiesSettingsPage::on_addNick_clicked() {
 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();
@@ -387,7 +387,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());
   }
@@ -444,8 +444,8 @@ 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);
   numevents = toCreate.count() + toUpdate.count() + toRemove.count();
   rcvevents = 0;
@@ -466,6 +466,7 @@ SaveIdentitiesDlg::SaveIdentitiesDlg(QList<Identity *> tocreate, QList<Identity
         numevents--;
         continue;
       }
+      // FIXME this only checks for one changed item rather than all!
       connect(cid, SIGNAL(updatedRemotely()), this, SLOT(clientEvent()));
       Client::updateIdentity(*id);
     }
@@ -485,7 +486,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);
 
@@ -502,12 +503,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));
 }