Swiftdiff options
| author | Richard Maudsley <richard.maudsley@isode.com> | 2014-07-24 08:18:49 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2014-10-10 09:53:29 (GMT) |
| commit | c7cd9c8d239c1c5d604de8862625741754138771 (patch) | |
| tree | 06c6915ce14f84ae63f50f564a5b6021acf5c0a3 /Swift/QtUI/UserSearch/QtUserSearchWindow.h | |
| parent | 8921c929a190c3ae4d7a10e5e58c8e720a0121c3 (diff) | |
| download | swift-contrib-c7cd9c8d239c1c5d604de8862625741754138771.zip swift-contrib-c7cd9c8d239c1c5d604de8862625741754138771.tar.bz2 | |
Fix JID auto-complete item select not working when adding a contact.
Test-Information:
Confirm that clicking a suggested user fills the JID box on the "Add User" dialog. Confirm that JID suggestion functions normally in other places.
Change-Id: Ic1a5c30b95416fd46bc22a612793621e9501d770
Diffstat (limited to 'Swift/QtUI/UserSearch/QtUserSearchWindow.h')
| -rw-r--r-- | Swift/QtUI/UserSearch/QtUserSearchWindow.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Swift/QtUI/UserSearch/QtUserSearchWindow.h b/Swift/QtUI/UserSearch/QtUserSearchWindow.h index 0318b3d..255b8fe 100644 --- a/Swift/QtUI/UserSearch/QtUserSearchWindow.h +++ b/Swift/QtUI/UserSearch/QtUserSearchWindow.h @@ -47,55 +47,56 @@ namespace Swift { virtual void setJIDs(const std::vector<JID> &jids); virtual void setRoomJID(const JID &roomJID); virtual std::string getReason() const; virtual std::vector<JID> getJIDs() const; virtual void setCanStartImpromptuChats(bool supportsImpromptu); virtual void updateContacts(const std::vector<Contact::ref> &contacts); virtual void addContacts(const std::vector<Contact::ref>& contacts); virtual void setCanSupplyDescription(bool allowed); protected: virtual int nextId() const; private slots: void handleFirstPageRadioChange(); virtual void handleCurrentChanged(int); virtual void handleAccepted(); void handleContactSuggestionRequested(const QString& text); void addContact(); void handleAddViaSearch(); void handleListChanged(std::vector<Contact::ref> list); void handleJIDsAdded(std::vector<JID> jids); private: void setFirstPage(QString title = ""); void setSecondPage(); void setThirdPage(); private: void clearForm(); void setError(const QString& error); JID getServerToSearch(); void handleSearch(); JID getContactJID() const; Contact::ref getContact() const; void addSearchedJIDToList(const Contact::ref& contact); + void handleOnSearchedJIDSelected(const Contact::ref& contact); private: UIEventStream* eventStream_; UserSearchWindow::Type type_; QAbstractItemModel* model_; UserSearchDelegate* delegate_; QtUserSearchFirstPage* firstPage_; QtUserSearchFirstMultiJIDPage* firstMultiJIDPage_; QtUserSearchFieldsPage* fieldsPage_; QtUserSearchResultsPage* resultsPage_; QtUserSearchDetailsPage* detailsPage_; JID myServer_; JID roomJID_; int lastPage_; std::vector<Contact::ref> contactVector_; SettingsProvider* settings_; bool searchNext_; bool supportsImpromptu_; }; } |