Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-02-26 14:34:03 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-02-26 14:34:03 (GMT) |
| commit | e4807335c4e38dc2f047d400641c65448854b062 (patch) | |
| tree | 1fa0dba9152e41b40e3c5794fd9ab993b9348230 /Swift/QtUI/UserSearch/QtUserSearchWindow.cpp | |
| parent | 3ea985154d59de3a3994c43d9b3dd36d089cfe2c (diff) | |
| download | swift-e4807335c4e38dc2f047d400641c65448854b062.zip swift-e4807335c4e38dc2f047d400641c65448854b062.tar.bz2 | |
Add "Edit details" section to Add User widget.
Resolves: #618
Diffstat (limited to 'Swift/QtUI/UserSearch/QtUserSearchWindow.cpp')
| -rw-r--r-- | Swift/QtUI/UserSearch/QtUserSearchWindow.cpp | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp b/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp index 2927c9b..2c1de3d 100644 --- a/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp +++ b/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp @@ -6,10 +6,10 @@ #include "Swift/QtUI/UserSearch/QtUserSearchWindow.h" -#include <qdebug.h> #include <QModelIndex> #include <QWizardPage> #include <QMovie> +#include <boost/smart_ptr/make_shared.hpp> #include "Swift/Controllers/UIEvents/UIEventStream.h" #include "Swift/Controllers/UIEvents/RequestChatUIEvent.h" @@ -20,10 +20,11 @@ #include "QtUserSearchFirstPage.h" #include "QtUserSearchFieldsPage.h" #include "QtUserSearchResultsPage.h" +#include "QtUserSearchDetailsPage.h" namespace Swift { -QtUserSearchWindow::QtUserSearchWindow(UIEventStream* eventStream, UserSearchWindow::Type type) : eventStream_(eventStream), type_(type) { +QtUserSearchWindow::QtUserSearchWindow(UIEventStream* eventStream, UserSearchWindow::Type type, const std::set<std::string>& groups) : eventStream_(eventStream), type_(type) { setupUi(this); #ifndef Q_WS_MAC setWindowIcon(QIcon(":/logo-icon-16.png")); @@ -56,8 +57,16 @@ QtUserSearchWindow::QtUserSearchWindow(UIEventStream* eventStream, UserSearchWin #ifdef SWIFT_PLATFORM_MACOSX resultsPage_->results_->setAlternatingRowColors(true); #endif + if (type == AddContact) { + connect(resultsPage_, SIGNAL(onUserTriggersContinue()), this, SLOT(next())); + } + else { + connect(resultsPage_, SIGNAL(onUserTriggersContinue()), this, SLOT(accept())); + } setPage(3, resultsPage_); - connect(resultsPage_, SIGNAL(onUserTriggersFinish()), this, SLOT(accept())); + + detailsPage_ = new QtUserSearchDetailsPage(groups); + setPage(4, detailsPage_); connect(this, SIGNAL(currentIdChanged(int)), this, SLOT(handleCurrentChanged(int))); connect(this, SIGNAL(accepted()), this, SLOT(handleAccepted())); @@ -79,6 +88,9 @@ void QtUserSearchWindow::handleCurrentChanged(int page) { else if (page == 3 && lastPage_ == 2) { handleSearch(); } + else if (page == 4) { + detailsPage_->clear(); + } lastPage_ = page; } @@ -97,10 +109,9 @@ void QtUserSearchWindow::handleAccepted() { else { jid = JID(Q2PSTRING(firstPage_->jid_->text())); } + if (type_ == AddContact) { - /* FIXME: allow specifying a nick */ - boost::shared_ptr<UIEvent> event(new AddContactUIEvent(jid, jid.toString())); - eventStream_->send(event); + eventStream_->send(boost::make_shared<AddContactUIEvent>(jid, detailsPage_->getName(), detailsPage_->getSelectedGroups())); } else { boost::shared_ptr<UIEvent> event(new RequestChatUIEvent(jid)); @@ -110,9 +121,9 @@ void QtUserSearchWindow::handleAccepted() { int QtUserSearchWindow::nextId() const { switch (currentId()) { - case 1: return firstPage_->byJID_->isChecked() ? -1 : 2; + case 1: return firstPage_->byJID_->isChecked() ? (type_ == AddContact ? 4 : -1) : 2; case 2: return 3; - case 3: return 4; + case 3: return type_ == AddContact ? 4 : -1; case 4: return -1; default: return -1; } |