Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2014-10-29 14:02:39 (GMT) |
|---|---|---|
| committer | Swift Review <review@swift.im> | 2014-10-30 15:41:49 (GMT) |
| commit | 5cf50d46aed4d2dac333e5e3b3bc2f57f7a1b835 (patch) | |
| tree | 554e93a52e5c41e98b9e42e5d958819b87439b88 /Swift/QtUI/UserSearch/QtUserSearchFirstPage.cpp | |
| parent | 4041cc4dd4f0abc6641fed5890120efa691a27ca (diff) | |
| download | swift-5cf50d46aed4d2dac333e5e3b3bc2f57f7a1b835.zip swift-5cf50d46aed4d2dac333e5e3b3bc2f57f7a1b835.tar.bz2 | |
Prevent user from adding contacts twice to a roster.
This removes roster JIDs from the suggesting in the 'Add User'-dialog. In
addition, an indication is added when a manually entered JID is invalid or
already on the roster.
Test-Information:
Tested scenarios with recent JIDs and JIDs from the roster. Tested that 'Start
Chat'-dialog suggestions still work.
Change-Id: I1ff51637adb4224184b78a1af9090a04b1e18fff
Diffstat (limited to 'Swift/QtUI/UserSearch/QtUserSearchFirstPage.cpp')
| -rw-r--r-- | Swift/QtUI/UserSearch/QtUserSearchFirstPage.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Swift/QtUI/UserSearch/QtUserSearchFirstPage.cpp b/Swift/QtUI/UserSearch/QtUserSearchFirstPage.cpp index af53a26..f36ff2b 100644 --- a/Swift/QtUI/UserSearch/QtUserSearchFirstPage.cpp +++ b/Swift/QtUI/UserSearch/QtUserSearchFirstPage.cpp @@ -18,17 +18,22 @@ QtUserSearchFirstPage::QtUserSearchFirstPage(UserSearchWindow::Type type, const setSubTitle(QString(tr("%1. If you know their address you can enter it directly, or you can search for them.")).arg(type == UserSearchWindow::AddContact ? tr("Add another user to your contact list") : tr("Chat to another user"))); jid_ = new QtSuggestingJIDInput(this, settings); horizontalLayout_2->addWidget(jid_); + jidWarning_ = new QLabel(this); + jidWarning_->setPixmap(QPixmap(":icons/warn.png")); + jidWarning_->hide(); + horizontalLayout_2->addWidget(jidWarning_); setTabOrder(byJID_, jid_); setTabOrder(jid_, byLocalSearch_); setTabOrder(byLocalSearch_, byRemoteSearch_); connect(jid_, SIGNAL(textChanged(const QString&)), this, SLOT(emitCompletenessCheck())); + connect(jid_, SIGNAL(editingDone()), this, SLOT(emitCompletenessCheck())); connect(service_->lineEdit(), SIGNAL(textChanged(const QString&)), this, SLOT(emitCompletenessCheck())); } bool QtUserSearchFirstPage::isComplete() const { bool complete = false; if (byJID_->isChecked()) { - complete = JID(Q2PSTRING(jid_->text().trimmed())).isValid(); + complete = JID(Q2PSTRING(jid_->text().trimmed())).isValid() && jidWarning_->toolTip().isEmpty(); } else if (byLocalSearch_->isChecked()) { complete = true; } else if (byRemoteSearch_->isChecked()) { |