X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fidentitiessettingspage.cpp;h=9c677db9b4d58ccfb85a00108ee949aad112540d;hb=c0bbc724cda7acf652d9d2ce80605ebb53c4a2ff;hp=c84c33ab73fb7b98fe439be6e1df2da36a822134;hpb=6623fd2d46dadd0168e4e28d1db6944c26c2a773;p=quassel.git diff --git a/src/qtui/settingspages/identitiessettingspage.cpp b/src/qtui/settingspages/identitiessettingspage.cpp index c84c33ab..9c677db9 100644 --- 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))); @@ -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); @@ -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()); } @@ -486,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); @@ -503,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)); }