6 files changed, 47 insertions, 4 deletions
diff --git a/Swift/QtUI/QtAddBookmarkWindow.cpp b/Swift/QtUI/QtAddBookmarkWindow.cpp
index 675ea03..230f2ed 100644
--- a/Swift/QtUI/QtAddBookmarkWindow.cpp
+++ b/Swift/QtUI/QtAddBookmarkWindow.cpp
@@ -1,24 +1,28 @@
 /*
- * Copyright (c) 2010 Kevin Smith
+ * Copyright (c) 2010-2014 Kevin Smith
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
 #include "QtAddBookmarkWindow.h"
 
 #include <qdebug.h>
 
 namespace Swift {
 QtAddBookmarkWindow::QtAddBookmarkWindow(UIEventStream* eventStream) : eventStream_(eventStream) {
 
 }
 
+QtAddBookmarkWindow::QtAddBookmarkWindow(UIEventStream* eventStream, const MUCBookmark& bookmark) : eventStream_(eventStream) {
+	createFormFromBookmark(bookmark);
+}
+
 bool QtAddBookmarkWindow::commit() {
 	boost::optional<MUCBookmark> bookmark = createBookmarkFromForm();
 	if (bookmark) {
 		eventStream_->send(boost::shared_ptr<UIEvent>(new AddMUCBookmarkUIEvent(*bookmark)));
 		return true;
 	}
 	else {
 		return false;
 	}
diff --git a/Swift/QtUI/QtAddBookmarkWindow.h b/Swift/QtUI/QtAddBookmarkWindow.h
index f026cc3..c0dc214 100644
--- a/Swift/QtUI/QtAddBookmarkWindow.h
+++ b/Swift/QtUI/QtAddBookmarkWindow.h
@@ -1,23 +1,24 @@
 /*
- * Copyright (c) 2010 Kevin Smith
+ * Copyright (c) 2010-2014 Kevin Smith
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
 #pragma once
 
 #include "QtBookmarkDetailWindow.h"
 
 #include "Swift/Controllers/UIEvents/UIEventStream.h"
 #include "Swift/Controllers/UIEvents/AddMUCBookmarkUIEvent.h"
 
 namespace Swift {
 	class QtAddBookmarkWindow : public QtBookmarkDetailWindow {
 		Q_OBJECT
 		public:
 			QtAddBookmarkWindow(UIEventStream* eventStream);
+			QtAddBookmarkWindow(UIEventStream* eventStream, const MUCBookmark& bookmark);
 			bool commit();
 		private:
 			UIEventStream* eventStream_;
 	};
 }
diff --git a/Swift/QtUI/QtBookmarkDetailWindow.cpp b/Swift/QtUI/QtBookmarkDetailWindow.cpp
index ae84b4b..3e501f2 100644
--- a/Swift/QtUI/QtBookmarkDetailWindow.cpp
+++ b/Swift/QtUI/QtBookmarkDetailWindow.cpp
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2010 Kevin Smith
+ * Copyright (c) 2010-2014 Kevin Smith
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
 #include "QtBookmarkDetailWindow.h"
 #include "QtSwiftUtil.h"
 #include <QMessageBox>
 
 namespace Swift {
@@ -43,10 +43,34 @@ boost::optional<MUCBookmark> QtBookmarkDetailWindow::createBookmarkFromForm() {
 	if (!nick.empty()) {
 		bookmark.setNick(nick);
 	}
 	if (!password.empty()) {
 		bookmark.setPassword(password);
 	}
 	return bookmark;
 }
 
+void QtBookmarkDetailWindow::createFormFromBookmark(const MUCBookmark& bookmark) {
+	if (bookmark.getRoom().isValid()) {
+		room_->setText(P2QSTRING(bookmark.getRoom().toString()));
+	}
+
+	if (!bookmark.getName().empty()) {
+		name_->setText(P2QSTRING(bookmark.getName()));
+	}
+
+	if (bookmark.getNick()) {
+		nick_->setText(P2QSTRING((*bookmark.getNick())));
+	}
+
+	if (bookmark.getPassword()) {
+		password_->setText(P2QSTRING((*bookmark.getPassword())));
+	}
+
+	if (bookmark.getAutojoin()) {
+		autojoin_->setCheckState(Qt::Checked);
+	} else {
+		autojoin_->setCheckState(Qt::Unchecked);
+	}
+}
+
 }
diff --git a/Swift/QtUI/QtBookmarkDetailWindow.h b/Swift/QtUI/QtBookmarkDetailWindow.h
index fd2b7b4..b223719 100644
--- a/Swift/QtUI/QtBookmarkDetailWindow.h
+++ b/Swift/QtUI/QtBookmarkDetailWindow.h
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2010 Kevin Smith
+ * Copyright (c) 2010-2014 Kevin Smith
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
 #pragma once
 
 #include "ui_QtBookmarkDetailWindow.h"
 
 #include <boost/optional.hpp>
@@ -16,14 +16,17 @@
 
 namespace Swift {
 	class QtBookmarkDetailWindow : public QDialog, protected Ui::QtBookmarkDetailWindow {
 		Q_OBJECT
 		public:
 			QtBookmarkDetailWindow(QWidget* parent = NULL);
 			virtual bool commit() = 0;
 			boost::optional<MUCBookmark> createBookmarkFromForm();
 
+		protected:
+			void createFormFromBookmark(const MUCBookmark& bookmark);
+
 		public slots:
 			void accept();
 	};
 }
 
diff --git a/Swift/QtUI/QtChatWindow.cpp b/Swift/QtUI/QtChatWindow.cpp
index d3cce6d..f58c11b 100644
--- a/Swift/QtUI/QtChatWindow.cpp
+++ b/Swift/QtUI/QtChatWindow.cpp
@@ -40,18 +40,19 @@
 #include <Swift/Controllers/Roster/RosterItem.h>
 #include <Swift/Controllers/Settings/SettingsProvider.h>
 #include <Swift/Controllers/UIEvents/UIEventStream.h>
 #include <Swift/Controllers/UIEvents/SendFileUIEvent.h>
 #include <Swift/Controllers/UIEvents/JoinMUCUIEvent.h>
 
 #include <SwifTools/TabComplete.h>
 
 #include <Swift/QtUI/Roster/QtOccupantListWidget.h>
+#include <Swift/QtUI/QtAddBookmarkWindow.h>
 #include <Swift/QtUI/QtPlainChatView.h>
 #include <Swift/QtUI/QtSettingsProvider.h>
 #include <Swift/QtUI/QtScaledAvatarCache.h>
 #include <Swift/QtUI/QtTextEdit.h>
 #include <Swift/QtUI/QtUISettingConstants.h>
 #include <Swift/QtUI/QtUtilities.h>
 #include <Swift/QtUI/QtWebKitChatView.h>
 
 namespace Swift {
@@ -621,18 +622,20 @@ void QtChatWindow::handleActionButtonClicked() {
 				case ChatWindow::ChangeSubject: changeSubject = contextMenu.addAction(tr("Change subject…")); break;
 				case ChatWindow::Configure: configure = contextMenu.addAction(tr("Configure room…")); break;
 				case ChatWindow::Affiliations: affiliations = contextMenu.addAction(tr("Edit affiliations…")); break;
 				case ChatWindow::Destroy: destroy = contextMenu.addAction(tr("Destroy room")); break;
 				case ChatWindow::Invite: invite = contextMenu.addAction(tr("Invite person to this room…")); break;
 			}
 		}
 	}
 
+	QAction* bookmark = contextMenu.addAction(tr("Add boomark..."));
+
 	QAction* result = contextMenu.exec(QCursor::pos());
 	if (result == NULL) {
 		/* Skip processing. Note that otherwise, because the actions could be null they could match */
 	}
 	else if (result == changeSubject) {
 		bool ok;
 		QString subject = QInputDialog::getText(this, tr("Change room subject"), tr("New subject:"), QLineEdit::Normal, subject_->text(), &ok);
 		if (ok) {
 			onChangeSubjectRequest(Q2PSTRING(subject));
@@ -662,18 +665,20 @@ void QtChatWindow::handleActionButtonClicked() {
 	}
 	else if (result == invite) {
 		onInviteToChat(std::vector<JID>());
 	}
 	else if (result == block) {
 		onBlockUserRequest();
 	}
 	else if (result == unblock) {
 		onUnblockUserRequest();
+	} else if (result == bookmark) {
+		onBookmarkRequest();
 	}
 }
 
 void QtChatWindow::handleAffiliationEditorAccepted() {
 	onChangeAffiliationsRequest(affiliationEditor_->getChanges());
 }
 
 void QtChatWindow::setAffiliations(MUCOccupant::Affiliation affiliation, const std::vector<JID>& jids) {
 	if (!affiliationEditor_) return;
@@ -686,18 +691,23 @@ void QtChatWindow::setAvailableRoomActions(const std::vector<RoomAction>& action
 
 void QtChatWindow::setBlockingState(BlockingState state) {
 	blockingState_ = state;
 }
 
 void QtChatWindow::setCanInitiateImpromptuChats(bool supportsImpromptu) {
 	supportsImpromptuChat_ = supportsImpromptu;
 }
 
+void QtChatWindow::showBookmarkWindow(const MUCBookmark& bookmark) {
+	QtAddBookmarkWindow* window = new QtAddBookmarkWindow(eventStream_, bookmark);
+	window->show();
+}
+
 void QtChatWindow::showRoomConfigurationForm(Form::ref form) {
 	if (mucConfigurationWindow_) {
 		delete mucConfigurationWindow_.data();
 	}
 	mucConfigurationWindow_ = new QtMUCConfigurationWindow(form);
 	mucConfigurationWindow_->onFormComplete.connect(boost::bind(boost::ref(onConfigureRequest), _1));
 	mucConfigurationWindow_->onFormCancelled.connect(boost::bind(boost::ref(onConfigurationFormCancelled)));
 }
 
diff --git a/Swift/QtUI/QtChatWindow.h b/Swift/QtUI/QtChatWindow.h
index 5a4fe95..de7e45e 100644
--- a/Swift/QtUI/QtChatWindow.h
+++ b/Swift/QtUI/QtChatWindow.h
@@ -122,18 +122,19 @@ namespace Swift {
 			QByteArray getSplitterState();
 			virtual void setAvailableOccupantActions(const std::vector<OccupantAction>& actions);
 			void setSubject(const std::string& subject);
 			void showRoomConfigurationForm(Form::ref);
 			void addMUCInvitation(const std::string& senderName, const JID& jid, const std::string& reason, const std::string& password, bool direct = true, bool isImpromptu = false, bool isContinuation = false);
 			void setAffiliations(MUCOccupant::Affiliation, const std::vector<JID>&);
 			void setAvailableRoomActions(const std::vector<RoomAction>& actions);
 			void setBlockingState(BlockingState state);
 			virtual void setCanInitiateImpromptuChats(bool supportsImpromptu);
+			virtual void showBookmarkWindow(const MUCBookmark& bookmark);
 
 		public slots:
 			void handleChangeSplitterState(QByteArray state);
 			void handleFontResized(int fontSizeSteps);
 			void setAlert(const std::string& alertText, const std::string& buttonText = "");
 			void cancelAlert();
 			void setCorrectionEnabled(Tristate enabled);
 
 		signals: