3 files changed, 37 insertions, 22 deletions
diff --git a/Swift/QtUI/QtAddBookmarkWindow.cpp b/Swift/QtUI/QtAddBookmarkWindow.cpp
index a272aa2..3596657 100644
--- a/Swift/QtUI/QtAddBookmarkWindow.cpp
+++ b/Swift/QtUI/QtAddBookmarkWindow.cpp
@@ -1,23 +1,22 @@
 /*
- * Copyright (c) 2010-2014 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include "QtAddBookmarkWindow.h"
 
-#include <qdebug.h>
-
 namespace Swift {
 QtAddBookmarkWindow::QtAddBookmarkWindow(UIEventStream* eventStream) : eventStream_(eventStream) {
-
+	setWindowTitle(tr("Add Bookmark Details"));
 }
 
 QtAddBookmarkWindow::QtAddBookmarkWindow(UIEventStream* eventStream, const MUCBookmark& bookmark) : eventStream_(eventStream) {
 	createFormFromBookmark(bookmark);
+	setWindowTitle(tr("Add Bookmark Details"));
 }
 
 bool QtAddBookmarkWindow::commit() {
 	boost::optional<MUCBookmark> bookmark = createBookmarkFromForm();
 	if (bookmark) {
 		eventStream_->send(boost::shared_ptr<UIEvent>(new AddMUCBookmarkUIEvent(*bookmark)));
diff --git a/Swift/QtUI/QtChatWindow.cpp b/Swift/QtUI/QtChatWindow.cpp
index f25c033..b1b9f83 100644
--- a/Swift/QtUI/QtChatWindow.cpp
+++ b/Swift/QtUI/QtChatWindow.cpp
@@ -7,13 +7,12 @@
 #include <Swift/QtUI/QtChatWindow.h>
 
 #include <boost/cstdint.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/smart_ptr/make_shared.hpp>
 
-#include <qdebug.h>
 #include <QApplication>
 #include <QBoxLayout>
 #include <QCloseEvent>
 #include <QComboBox>
 #include <QCursor>
 #include <QFileDialog>
@@ -31,39 +30,41 @@
 #include <QString>
 #include <QTextDocument>
 #include <QTextEdit>
 #include <QTime>
 #include <QToolButton>
 #include <QUrl>
-#include <QMimeData>
+
+#include <qdebug.h>
 
 #include <Swiften/Base/Log.h>
 
 #include <Swift/Controllers/Roster/ContactRosterItem.h>
 #include <Swift/Controllers/Roster/Roster.h>
 #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 <Swift/Controllers/UIEvents/SendFileUIEvent.h>
+#include <Swift/Controllers/UIEvents/UIEventStream.h>
 
 #include <SwifTools/TabComplete.h>
 
-#include <Swift/QtUI/Roster/QtOccupantListWidget.h>
 #include <Swift/QtUI/QtAddBookmarkWindow.h>
+#include <Swift/QtUI/QtEditBookmarkWindow.h>
 #include <Swift/QtUI/QtPlainChatView.h>
-#include <Swift/QtUI/QtSettingsProvider.h>
 #include <Swift/QtUI/QtScaledAvatarCache.h>
+#include <Swift/QtUI/QtSettingsProvider.h>
 #include <Swift/QtUI/QtTextEdit.h>
 #include <Swift/QtUI/QtUISettingConstants.h>
 #include <Swift/QtUI/QtUtilities.h>
 #include <Swift/QtUI/QtWebKitChatView.h>
+#include <Swift/QtUI/Roster/QtOccupantListWidget.h>
 
 namespace Swift {
 
-QtChatWindow::QtChatWindow(const QString& contact, QtChatTheme* theme, UIEventStream* eventStream, SettingsProvider* settings, const std::map<std::string, std::string>& emoticons) : QtTabbable(), id_(Q2PSTRING(contact)), contact_(contact), nextAlertId_(0), eventStream_(eventStream), blockingState_(BlockingUnsupported), isMUC_(false), supportsImpromptuChat_(false) {
+QtChatWindow::QtChatWindow(const QString& contact, QtChatTheme* theme, UIEventStream* eventStream, SettingsProvider* settings, const std::map<std::string, std::string>& emoticons) : QtTabbable(), id_(Q2PSTRING(contact)), contact_(contact), nextAlertId_(0), eventStream_(eventStream), blockingState_(BlockingUnsupported), isMUC_(false), supportsImpromptuChat_(false), roomBookmarkState_(RoomNotBookmarked) {
 	settings_ = settings;
 	unreadCount_ = 0;
 	isOnline_ = true;
 	completer_ = NULL;
 	affiliationEditor_ = NULL;
 	theme_ = theme;
@@ -521,15 +522,12 @@ void QtChatWindow::updateTitleWithUnreadCount() {
 	else {
 		setWindowTitle(contact_);
 	}
 	emit titleUpdated();
 }
 
-
-
-
 void QtChatWindow::flash() {
 	emit requestFlash();
 }
 
 int QtChatWindow::getCount() {
 	return unreadCount_;
@@ -722,14 +720,22 @@ void QtChatWindow::handleActionButtonClicked() {
 					invite->setEnabled(isOnline_);
 					break;
 			}
 		}
 	}
 
-	QAction* bookmark = contextMenu.addAction(tr("Add bookmark..."));
-	bookmark->setEnabled(isOnline_);
+	QAction* bookmark = NULL;
+	if (isMUC_) {
+		if (roomBookmarkState_ == RoomNotBookmarked) {
+			bookmark = contextMenu.addAction(tr("Bookmark this room..."));
+		}
+		else {
+			bookmark = contextMenu.addAction(tr("Edit bookmark..."));
+		}
+		bookmark->setEnabled(isOnline_);
+	}
 
 	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) {
@@ -794,14 +800,20 @@ void QtChatWindow::setBlockingState(BlockingState state) {
 
 void QtChatWindow::setCanInitiateImpromptuChats(bool supportsImpromptu) {
 	supportsImpromptuChat_ = supportsImpromptu;
 }
 
 void QtChatWindow::showBookmarkWindow(const MUCBookmark& bookmark) {
-	QtAddBookmarkWindow* window = new QtAddBookmarkWindow(eventStream_, bookmark);
-	window->show();
+	if (roomBookmarkState_ == RoomNotBookmarked) {
+		QtAddBookmarkWindow* window = new QtAddBookmarkWindow(eventStream_, bookmark);
+		window->show();
+	}
+	else {
+		QtEditBookmarkWindow* window = new QtEditBookmarkWindow(eventStream_, bookmark);
+		window->show();
+	}
 }
 
 std::string QtChatWindow::getID() const {
 	return id_;
 }
 
@@ -876,13 +888,12 @@ void QtChatWindow::setFileTransferProgress(std::string id, const int percentageD
 }
 
 void QtChatWindow::setFileTransferStatus(std::string id, const FileTransferState state, const std::string& msg) {
 	messageLog_->setFileTransferStatus(id, state, msg);
 }
 
-
 std::string QtChatWindow::addWhiteboardRequest(bool senderIsSelf) {
 	handleAppendedToLog();
 	return messageLog_->addWhiteboardRequest(contact_, senderIsSelf);
 }
 
 void QtChatWindow::setWhiteboardSessionStatus(std::string id, const ChatWindow::WhiteboardSessionState state) {
@@ -898,7 +909,11 @@ void QtChatWindow::setAckState(const std::string& id, AckState state) {
 }
 
 void QtChatWindow::setMessageReceiptState(const std::string& id, ChatWindow::ReceiptState state) {
 	messageLog_->setMessageReceiptState(id, state);
 }
 
+void QtChatWindow::setBookmarkState(RoomBookmarkState bookmarkState) {
+	roomBookmarkState_ = bookmarkState;
+}
+
 }
diff --git a/Swift/QtUI/QtChatWindow.h b/Swift/QtUI/QtChatWindow.h
index 5c6fa2a..06c6064 100644
--- a/Swift/QtUI/QtChatWindow.h
+++ b/Swift/QtUI/QtChatWindow.h
@@ -11,24 +11,23 @@
 #include <QMap>
 #include <QMenu>
 #include <QPointer>
 #include <QString>
 #include <QTextCursor>
 
-#include <SwifTools/LastLineTracker.h>
-
 #include <Swift/Controllers/UIInterfaces/ChatWindow.h>
 
+#include <SwifTools/LastLineTracker.h>
+
 #include <Swift/QtUI/ChatSnippet.h>
 #include <Swift/QtUI/QtAffiliationEditor.h>
 #include <Swift/QtUI/QtEmoticonsGrid.h>
 #include <Swift/QtUI/QtMUCConfigurationWindow.h>
 #include <Swift/QtUI/QtSwiftUtil.h>
 #include <Swift/QtUI/QtTabbable.h>
 
-
 class QTextEdit;
 class QLineEdit;
 class QComboBox;
 class QLabel;
 class QSplitter;
 class QPushButton;
@@ -130,12 +129,13 @@ namespace Swift {
 			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);
+			virtual void setBookmarkState(RoomBookmarkState bookmarkState);
 			virtual std::string getID() const;
 
 		public slots:
 			void handleChangeSplitterState(QByteArray state);
 			void handleFontResized(int fontSizeSteps);
 			AlertID addAlert(const std::string& alertText);
@@ -222,9 +222,10 @@ namespace Swift {
 			QPalette defaultLabelsPalette_;
 			LabelModel* labelModel_;
 			BlockingState blockingState_;
 			bool impromptu_;
 			bool isMUC_;
 			bool supportsImpromptuChat_;
+			RoomBookmarkState roomBookmarkState_;
 			QMenu* emoticonsMenu_;
 	};
 }