5 files changed, 16 insertions, 0 deletions
diff --git a/Swift/QtUI/Roster/QtOccupantListWidget.cpp b/Swift/QtUI/Roster/QtOccupantListWidget.cpp
index 0b3722c..1469300 100644
--- a/Swift/QtUI/Roster/QtOccupantListWidget.cpp
+++ b/Swift/QtUI/Roster/QtOccupantListWidget.cpp
@@ -51,18 +51,19 @@ void QtOccupantListWidget::contextMenuEvent(QContextMenuEvent* event) {
 			std::map<QAction*, ChatWindow::OccupantAction> actions;
 			foreach (ChatWindow::OccupantAction availableAction, availableOccupantActions_) {
 				QString text = "Error: missing string";
 				switch (availableAction) {
 					case ChatWindow::Kick: text = tr("Kick user"); break;
 					case ChatWindow::Ban: text = tr("Kick and ban user"); break;
 					case ChatWindow::MakeModerator: text = tr("Make moderator"); break;
 					case ChatWindow::MakeParticipant: text = tr("Make participant"); break;
 					case ChatWindow::MakeVisitor: text = tr("Remove voice"); break;
+					case ChatWindow::AddContact: text = tr("Add contact"); break;
 				}
 				QAction* action = contextMenu.addAction(text);
 				actions[action] = availableAction;
 			}
 			QAction* result = contextMenu.exec(event->globalPos());
 			if (result) {
 				onOccupantActionSelected(actions[result], contact);
 			}
 		}
diff --git a/Swift/QtUI/UserSearch/QtUserSearchDetailsPage.cpp b/Swift/QtUI/UserSearch/QtUserSearchDetailsPage.cpp
index da89a8d..f4189e7 100644
--- a/Swift/QtUI/UserSearch/QtUserSearchDetailsPage.cpp
+++ b/Swift/QtUI/UserSearch/QtUserSearchDetailsPage.cpp
@@ -30,18 +30,22 @@ QtUserSearchDetailsPage::~QtUserSearchDetailsPage() {
 
 void QtUserSearchDetailsPage::setJID(const JID& jid) {
 	contactJID = jid;
 }
 
 void QtUserSearchDetailsPage::setNameSuggestions(const std::vector<std::string>& nameSuggestions) {
 	editWidget->setNameSuggestions(nameSuggestions);
 }
 
+void QtUserSearchDetailsPage::setName(const std::string& name) {
+	editWidget->setName(name);
+}
+
 std::set<std::string> QtUserSearchDetailsPage::getSelectedGroups() {
 	return editWidget->getSelectedGroups();
 }
 
 std::string QtUserSearchDetailsPage::getName() {
 	return editWidget->getName();
 }
 
 void QtUserSearchDetailsPage::clear() {
diff --git a/Swift/QtUI/UserSearch/QtUserSearchDetailsPage.h b/Swift/QtUI/UserSearch/QtUserSearchDetailsPage.h
index 9409493..63fd241 100644
--- a/Swift/QtUI/UserSearch/QtUserSearchDetailsPage.h
+++ b/Swift/QtUI/UserSearch/QtUserSearchDetailsPage.h
@@ -21,18 +21,19 @@ namespace Swift {
 
 	class QtUserSearchDetailsPage : public QWizardPage {
 			Q_OBJECT
 		public:
 			QtUserSearchDetailsPage(const std::set<std::string>& availableGroups);
 			virtual ~QtUserSearchDetailsPage();
 
 			void setJID(const JID& jid);
 			void setNameSuggestions(const std::vector<std::string>& nameSuggestions);
+			void setName(const std::string& name);
 
 			std::set<std::string> getSelectedGroups();
 			std::string getName();
 
 			void clear();
 
 		signals:
 			void onUserTriggersFinish();
 
diff --git a/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp b/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp
index 949d65c..b8a44e5 100644
--- a/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp
+++ b/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp
@@ -230,18 +230,27 @@ void QtUserSearchWindow::setSearchFields(boost::shared_ptr<SearchPayload> fields
 	fieldsPage_->emitCompletenessCheck();
 }
 
 void QtUserSearchWindow::setNameSuggestions(const std::vector<std::string>& suggestions) {
 	if (detailsPage_) {
 		detailsPage_->setNameSuggestions(suggestions);
 	}
 }
 
+void QtUserSearchWindow::prepopulateJIDAndName(const JID& jid, const std::string& name) {
+	firstPage_->jid_->setText(P2QSTRING(jid.toBare().toString()));
+	detailsPage_->setJID(jid);
+	lastPage_ = 1;
+	restart();
+	next();
+	detailsPage_->setName(name);
+}
+
 void QtUserSearchWindow::setResults(const std::vector<UserSearchResult>& results) {
 	UserSearchModel *newModel = new UserSearchModel();
 	newModel->setResults(results);
 	resultsPage_->results_->setModel(newModel);
 	resultsPage_->results_->setItemDelegate(delegate_);
 	resultsPage_->results_->setHeaderHidden(true);
 	delete model_;
 	model_ = newModel;
 }
diff --git a/Swift/QtUI/UserSearch/QtUserSearchWindow.h b/Swift/QtUI/UserSearch/QtUserSearchWindow.h
index 9173ba9..32e851a 100644
--- a/Swift/QtUI/UserSearch/QtUserSearchWindow.h
+++ b/Swift/QtUI/UserSearch/QtUserSearchWindow.h
@@ -34,18 +34,19 @@ namespace Swift {
 			virtual void clear();
 			virtual void show();
 			virtual void setResults(const std::vector<UserSearchResult>& results);
 			virtual void setResultsForm(Form::ref results);
 			virtual void setSelectedService(const JID& jid);
 			virtual void setServerSupportsSearch(bool error);
 			virtual void setSearchError(bool error);
 			virtual void setSearchFields(boost::shared_ptr<SearchPayload> fields);
 			virtual void setNameSuggestions(const std::vector<std::string>& suggestions);
+			virtual void prepopulateJIDAndName(const JID& jid, const std::string& name);
 
 		protected:
 			virtual int nextId() const;
 		private slots:
 			void handleFirstPageRadioChange();
 			virtual void handleCurrentChanged(int);
 			virtual void handleAccepted();
 		private:
 			void clearForm();