Swiftdiff options
4 files changed, 10 insertions, 1 deletions
diff --git a/Swift/QtUI/UserSearch/QtSuggestingJIDInput.cpp b/Swift/QtUI/UserSearch/QtSuggestingJIDInput.cpp index a4a4610..9b96627 100644 --- a/Swift/QtUI/UserSearch/QtSuggestingJIDInput.cpp +++ b/Swift/QtUI/UserSearch/QtSuggestingJIDInput.cpp @@ -93,2 +93,7 @@ void QtSuggestingJIDInput::setSuggestions(const std::vector<Contact::ref>& sugge +void QtSuggestingJIDInput::clear() { + setText(""); + currentContact_.reset(); +} + void QtSuggestingJIDInput::keyPressEvent(QKeyEvent* event) { @@ -140,3 +145,2 @@ void QtSuggestingJIDInput::handleClicked(const QModelIndex& index) { currentContact_ = contactListModel_->getContact(index.row()); - setText(""); onUserSelected(currentContact_->jid); diff --git a/Swift/QtUI/UserSearch/QtSuggestingJIDInput.h b/Swift/QtUI/UserSearch/QtSuggestingJIDInput.h index 25e7d42..71cd87d 100644 --- a/Swift/QtUI/UserSearch/QtSuggestingJIDInput.h +++ b/Swift/QtUI/UserSearch/QtSuggestingJIDInput.h @@ -35,2 +35,4 @@ class QtSuggestingJIDInput : public QLineEdit { + void clear(); + boost::signal<void (const JID&)> onUserSelected; diff --git a/Swift/QtUI/UserSearch/QtUserSearchFirstMultiJIDPage.cpp b/Swift/QtUI/UserSearch/QtUserSearchFirstMultiJIDPage.cpp index 8ea49c4..2c34aa6 100644 --- a/Swift/QtUI/UserSearch/QtUserSearchFirstMultiJIDPage.cpp +++ b/Swift/QtUI/UserSearch/QtUserSearchFirstMultiJIDPage.cpp @@ -60,2 +60,3 @@ bool QtUserSearchFirstMultiJIDPage::isComplete() const { void QtUserSearchFirstMultiJIDPage::reset() { + jid_->clear(); reason_->clear(); diff --git a/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp b/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp index 260ccfe..ca84759 100644 --- a/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp +++ b/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp @@ -160,2 +160,3 @@ void QtUserSearchWindow::addContact() { contactVector_.push_back(firstMultiJIDPage_->jid_->getContact()); + firstMultiJIDPage_->jid_->clear(); } @@ -275,2 +276,3 @@ void QtUserSearchWindow::addSearchedJIDToList(const JID& jid) { handleJIDsAdded(jids); + firstMultiJIDPage_->jid_->clear(); } |