: 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)));
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);
}
changedIdentities.clear();
deletedIdentities.clear();
- changeState(false);
+ setChangedState(false);
setEnabled(true);
}
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() {
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();
//ui.identityList->setEditable(false);
displayIdentity(0);
} else {
- IdentityId id = ui.identityList->itemData(index).value<IdentityId>();
+ IdentityId id = ui.identityList->itemData(index).toInt();
if(identities.contains(id)) displayIdentity(identities[id]);
ui.deleteIdentity->setEnabled(id != 1); // default identity cannot be deleted
ui.renameIdentity->setEnabled(id != 1); // ...or renamed
// 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
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();
}
}
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();
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());
}
IdentityId CreateIdentityDlg::duplicateId() const {
if(!ui.duplicateIdentity->isChecked()) return 0;
if(ui.identityList->currentIndex() >= 0) {
- return ui.identityList->itemData(ui.identityList->currentIndex()).value<IdentityId>();
+ return ui.identityList->itemData(ui.identityList->currentIndex()).toInt();
}
return 0;
}
/*********************************************************************************************/
-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;
numevents--;
continue;
}
+ // FIXME this only checks for one changed item rather than all!
connect(cid, SIGNAL(updatedRemotely()), this, SLOT(clientEvent()));
Client::updateIdentity(*id);
}
/*************************************************************************************************/
-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);
} 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));
}