Disable online only actions when offline.

Disabling action, menu items and drag 'n' drop which require an online connection when the user is offline. Test-Information: Checked by going offline and checking the relevant actions and menu items. Change-Id: Iacfa2c9f815d3b9bbad9ca4c2d0d04f95ce9a9e4
author: Tobias Markmann <tm@ayena.de> 2014-09-29 08:07:05 (GMT)
committer: Kevin Smith <git@kismith.co.uk> 2014-10-17 20:11:30 (GMT)
commit: 38b0cb785fea8eae5e48fae56440695fdfd10ee1 (patch)
tree: 78bb8ce9a6bcbc397805bcd433b96b3b23994f09
parent: 1722d220533a78e8b2acbcd571631960656e78f8 (diff)
download: swift-38b0cb785fea8eae5e48fae56440695fdfd10ee1.zip
swift-38b0cb785fea8eae5e48fae56440695fdfd10ee1.tar.bz2
13 files changed, 147 insertions, 41 deletions
diff --git a/Swift/Controllers/Chat/UnitTest/MockChatListWindow.h b/Swift/Controllers/Chat/UnitTest/MockChatListWindow.h
index 5fa264d..287c4b9 100644
--- a/Swift/Controllers/Chat/UnitTest/MockChatListWindow.h
+++ b/Swift/Controllers/Chat/UnitTest/MockChatListWindow.h
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2011 Kevin Smith
+ * Copyright (c) 2011-2014 Kevin Smith
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
 #pragma once
 
@@ -19,9 +19,10 @@ namespace Swift {
 			void addWhiteboardSession(const ChatListWindow::Chat& /*chat*/) {}
 			void removeWhiteboardSession(const JID& /*jid*/) {}
 			void setBookmarksEnabled(bool /*enabled*/) {}
 			void setRecents(const std::list<ChatListWindow::Chat>& /*recents*/) {}
 			void setUnreadCount(int /*unread*/) {}
 			void clearBookmarks() {}
+			void setOnline(bool /*isOnline*/) {}
 	};
 
 }
diff --git a/Swift/Controllers/UIInterfaces/ChatListWindow.h b/Swift/Controllers/UIInterfaces/ChatListWindow.h
index f7eb151..5a7b527 100644
--- a/Swift/Controllers/UIInterfaces/ChatListWindow.h
+++ b/Swift/Controllers/UIInterfaces/ChatListWindow.h
@@ -86,12 +86,13 @@ namespace Swift {
 			virtual void addWhiteboardSession(const ChatListWindow::Chat& chat) = 0;
 			virtual void removeWhiteboardSession(const JID& jid) = 0;
 			virtual void removeMUCBookmark(const MUCBookmark& bookmark) = 0;
 			virtual void setRecents(const std::list<Chat>& recents) = 0;
 			virtual void setUnreadCount(int unread) = 0;
 			virtual void clearBookmarks() = 0;
+			virtual void setOnline(bool isOnline) = 0;
 
 			boost::signal<void (const MUCBookmark&)> onMUCBookmarkActivated;
 			boost::signal<void (const Chat&)> onRecentActivated;
 			boost::signal<void (const JID&)> onWhiteboardActivated;
 			boost::signal<void ()> onClearRecentsRequested;
 	};
diff --git a/Swift/QtUI/ChatList/QtChatListWindow.cpp b/Swift/QtUI/ChatList/QtChatListWindow.cpp
index 8e75f34..ea65dd6 100644
--- a/Swift/QtUI/ChatList/QtChatListWindow.cpp
+++ b/Swift/QtUI/ChatList/QtChatListWindow.cpp
@@ -26,13 +26,13 @@
 #include <Swift/QtUI/QtAddBookmarkWindow.h>
 #include <Swift/QtUI/QtEditBookmarkWindow.h>
 #include <Swift/QtUI/QtUISettingConstants.h>
 
 namespace Swift {
 
-QtChatListWindow::QtChatListWindow(UIEventStream *uiEventStream, SettingsProvider* settings, QWidget* parent) : QTreeView(parent) {
+QtChatListWindow::QtChatListWindow(UIEventStream *uiEventStream, SettingsProvider* settings, QWidget* parent) : QTreeView(parent), isOnline_(false) {
 	eventStream_ = uiEventStream;
 	settings_ = settings;
 	bookmarksEnabled_ = false;
 	model_ = new ChatListModel();
 	setModel(model_);
 	delegate_ = new ChatListDelegate(settings_->getSetting(QtUISettingConstants::COMPACT_ROSTER));
@@ -83,20 +83,20 @@ void QtChatListWindow::handleClicked(const QModelIndex& index) {
 		setExpanded(index, !isExpanded(index));
 	}
 }
 
 void QtChatListWindow::setupContextMenus() {
 	mucMenu_ = new QMenu();
-	mucMenu_->addAction(tr("Add New Bookmark"), this, SLOT(handleAddBookmark()));
-	mucMenu_->addAction(tr("Edit Bookmark"), this, SLOT(handleEditBookmark()));
-	mucMenu_->addAction(tr("Remove Bookmark"), this, SLOT(handleRemoveBookmark()));
+	onlineOnlyActions_ << mucMenu_->addAction(tr("Add New Bookmark"), this, SLOT(handleAddBookmark()));
+	onlineOnlyActions_ << mucMenu_->addAction(tr("Edit Bookmark"), this, SLOT(handleEditBookmark()));
+	onlineOnlyActions_ << mucMenu_->addAction(tr("Remove Bookmark"), this, SLOT(handleRemoveBookmark()));
 	mucRecentsMenu_ = new QMenu();
-	mucRecentsMenu_->addAction(tr("Add to Bookmarks"), this, SLOT(handleAddBookmarkFromRecents()));
+	onlineOnlyActions_ << mucRecentsMenu_->addAction(tr("Add to Bookmarks"), this, SLOT(handleAddBookmarkFromRecents()));
 	mucRecentsMenu_->addAction(tr("Clear recents"), this, SLOT(handleClearRecentsRequested()));
 	emptyMenu_ = new QMenu();
-	emptyMenu_->addAction(tr("Add New Bookmark"), this, SLOT(handleAddBookmark()));
+	onlineOnlyActions_ << emptyMenu_->addAction(tr("Add New Bookmark"), this, SLOT(handleAddBookmark()));
 }
 
 void QtChatListWindow::handleItemActivated(const QModelIndex& index) {
 	ChatListItem* item = model_->getItemForIndex(index);
 	if (ChatListMUCItem* mucItem = dynamic_cast<ChatListMUCItem*>(item)) {
 		if (bookmarksEnabled_) {
@@ -140,12 +140,16 @@ void QtChatListWindow::setRecents(const std::list<ChatListWindow::Chat>& recents
 }
 
 void QtChatListWindow::setUnreadCount(int unread) {
 	emit onCountUpdated(unread);
 }
 
+void QtChatListWindow::setOnline(bool isOnline) {
+	isOnline_ = isOnline;
+}
+
 void QtChatListWindow::handleRemoveBookmark() {
 	ChatListMUCItem* mucItem = dynamic_cast<ChatListMUCItem*>(contextMenuItem_);
 	if (!mucItem) return;
 	eventStream_->send(boost::shared_ptr<UIEvent>(new RemoveMUCBookmarkUIEvent(mucItem->getBookmark())));
 }
 
@@ -179,12 +183,17 @@ void QtChatListWindow::dragEnterEvent(QDragEnterEvent *event) {
 }
 
 void QtChatListWindow::contextMenuEvent(QContextMenuEvent* event) {
 	QModelIndex index = indexAt(event->pos());
 	ChatListItem* baseItem = index.isValid() ? static_cast<ChatListItem*>(index.internalPointer()) : NULL;
 	contextMenuItem_ = baseItem;
+
+	foreach(QAction* action, onlineOnlyActions_) {
+		action->setEnabled(isOnline_);
+	}
+
 	if (!baseItem) {
 		emptyMenu_->exec(QCursor::pos());
 		return;
 	}
 
 	ChatListMUCItem* mucItem = dynamic_cast<ChatListMUCItem*>(baseItem);
diff --git a/Swift/QtUI/ChatList/QtChatListWindow.h b/Swift/QtUI/ChatList/QtChatListWindow.h
index 1cba3a4..823e6dc 100644
--- a/Swift/QtUI/ChatList/QtChatListWindow.h
+++ b/Swift/QtUI/ChatList/QtChatListWindow.h
@@ -25,12 +25,13 @@ namespace Swift {
 			void addWhiteboardSession(const ChatListWindow::Chat& chat);
 			void removeWhiteboardSession(const JID& jid);
 			void setBookmarksEnabled(bool enabled);
 			void setRecents(const std::list<ChatListWindow::Chat>& recents);
 			void setUnreadCount(int unread);
 			void clearBookmarks();
+			virtual void setOnline(bool isOnline);
 
 		signals:
 			void onCountUpdated(int count);
 		private slots:
 			void handleItemActivated(const QModelIndex&);
 			void handleAddBookmark();
@@ -53,9 +54,11 @@ namespace Swift {
 			ChatListDelegate* delegate_;
 			QMenu* mucMenu_;
 			QMenu* emptyMenu_;
 			QMenu* mucRecentsMenu_;
 			ChatListItem* contextMenuItem_;
 			SettingsProvider* settings_;
+			QList<QAction*> onlineOnlyActions_;
+			bool isOnline_;
 	};
 
 }
diff --git a/Swift/QtUI/QtChatWindow.cpp b/Swift/QtUI/QtChatWindow.cpp
index ed79dcc..68104b4 100644
--- a/Swift/QtUI/QtChatWindow.cpp
+++ b/Swift/QtUI/QtChatWindow.cpp
@@ -256,28 +256,33 @@ void QtChatWindow::handleKeyPressEvent(QKeyEvent* event) {
 	}
 	event->accept();
 
 	int key = event->key();
 	if (key == Qt::Key_Tab) {
 		tabComplete();
-	} else if ((key == Qt::Key_Up) && input_->toPlainText().isEmpty() && !(lastSentMessage_.isEmpty())) {
+	}
+	else if ((key == Qt::Key_Up) && input_->toPlainText().isEmpty() && !(lastSentMessage_.isEmpty())) {
 		beginCorrection();
-	} else if (key == Qt::Key_Down && isCorrection_ && input_->textCursor().atBlockEnd()) {
+	}
+	else if (key == Qt::Key_Down && isCorrection_ && input_->textCursor().atBlockEnd()) {
 		cancelCorrection();
-	} else if (key == Qt::Key_Down || key == Qt::Key_Up) {
+	}
+	else if (key == Qt::Key_Down || key == Qt::Key_Up) {
 		/* Drop */
-	} else {
+	}
+	else {
 		messageLog_->handleKeyPressEvent(event);
 	}
 }
 
 void QtChatWindow::beginCorrection() {
 	boost::optional<AlertID> newCorrectingAlert;
 	if (correctionEnabled_ == ChatWindow::Maybe) {
 		newCorrectingAlert = addAlert(Q2PSTRING(tr("This chat may not support message correction. If you send a correction anyway, it may appear as a duplicate message")));
-	} else if (correctionEnabled_ == ChatWindow::No) {
+	}
+	else if (correctionEnabled_ == ChatWindow::No) {
 		newCorrectingAlert = addAlert(Q2PSTRING(tr("This chat does not support message correction.  If you send a correction anyway, it will appear as a duplicate message")));
 	}
 
 	if (newCorrectingAlert) {
 		if (correctingAlert_) {
 			removeAlert(*correctingAlert_);
@@ -327,13 +332,14 @@ void QtChatWindow::tabComplete() {
 		return;
 	}
 
 	QTextCursor cursor;
 	if (tabCompleteCursor_.hasSelection()) {
 		cursor = tabCompleteCursor_;
-	} else {
+	}
+	else {
 		cursor = input_->textCursor();
 		while(cursor.movePosition(QTextCursor::Left, QTextCursor::KeepAnchor) && cursor.document()->characterAt(cursor.position() - 1) != ' ') { }
 	}
 	QString root = cursor.selectedText();
 	if (root.isEmpty()) {
 		return;
@@ -403,13 +409,14 @@ void QtChatWindow::setSecurityLabelsError() {
 }
 
 void QtChatWindow::setSecurityLabelsEnabled(bool enabled) {
 	if (enabled) {
 		labelsWidget_->setEnabled(true);
 		labelsWidget_->show();
-	} else {
+	}
+	else {
 		labelsWidget_->hide();
 	}
 }
 
 void QtChatWindow::setCorrectionEnabled(Tristate enabled) {
 	correctionEnabled_ = enabled;
@@ -495,13 +502,14 @@ void QtChatWindow::setName(const std::string& name) {
 	updateTitleWithUnreadCount();
 }
 
 void QtChatWindow::updateTitleWithUnreadCount() {
 	if (isWindow()) {
 		setWindowTitle(unreadCount_ > 0 ? QString("(%1) %2").arg(unreadCount_).arg(contact_) : contact_);
-	} else {
+	}
+	else {
 		setWindowTitle(contact_);
 	}
 	emit titleUpdated();
 }
 
 
@@ -531,13 +539,14 @@ void QtChatWindow::returnPressed() {
 void QtChatWindow::handleInputChanged() {
 	if (inputClearing_) {
 		return;
 	}
 	if (input_->toPlainText().isEmpty()) {
 		onUserCancelsTyping();
-	} else {
+	}
+	else {
 		onUserTyping();
 	}
 }
 
 void QtChatWindow::handleCursorPositionChanged() {
 	if (tabCompletion_) {
@@ -571,35 +580,40 @@ void QtChatWindow::resizeEvent(QResizeEvent*) {
 
 void QtChatWindow::moveEvent(QMoveEvent*) {
 	emit geometryChanged();
 }
 
 void QtChatWindow::dragEnterEvent(QDragEnterEvent *event) {
-	if (event->mimeData()->hasUrls() && event->mimeData()->urls().size() == 1) {
-		// TODO: check whether contact actually supports file transfer
-		if (!isMUC_) {
-			event->acceptProposedAction();
+	if (inputEnabled_) {
+		if (event->mimeData()->hasUrls() && event->mimeData()->urls().size() == 1) {
+			// TODO: check whether contact actually supports file transfer
+			if (!isMUC_) {
+				event->acceptProposedAction();
+			}
 		}
-	} else if (event->mimeData()->hasFormat("application/vnd.swift.contact-jid-list")) {
-		if (isMUC_ || supportsImpromptuChat_) {
-			event->acceptProposedAction();
+		else if (event->mimeData()->hasFormat("application/vnd.swift.contact-jid-list")) {
+			if (isMUC_ || supportsImpromptuChat_) {
+				event->acceptProposedAction();
+			}
 		}
 	}
 }
 
 void QtChatWindow::dropEvent(QDropEvent *event) {
 	if (fileTransferEnabled_ == ChatWindow::Yes && event->mimeData()->hasUrls()) {
 		if (event->mimeData()->urls().size() == 1) {
 			onSendFileRequest(Q2PSTRING(event->mimeData()->urls().at(0).toLocalFile()));
-		} else {
+		}
+		else {
 			std::string messageText(Q2PSTRING(tr("Sending of multiple files at once isn't supported at this time.")));
 			ChatMessage message;
 			message.append(boost::make_shared<ChatTextMessagePart>(messageText));
 			addSystemMessage(message, DefaultDirection);
 		}
-	} else if (event->mimeData()->hasFormat("application/vnd.swift.contact-jid-list")) {
+	}
+	else if (event->mimeData()->hasFormat("application/vnd.swift.contact-jid-list")) {
 		QByteArray dataBytes = event->mimeData()->data("application/vnd.swift.contact-jid-list");
 		QDataStream dataStream(&dataBytes, QIODevice::ReadOnly);
 		std::vector<JID> invites;
 		while (!dataStream.atEnd()) {
 			QString jidString;
 			dataStream >> jidString;
@@ -631,21 +645,26 @@ void QtChatWindow::handleActionButtonClicked() {
 	QAction* block = NULL;
 	QAction* unblock = NULL;
 
 	if (availableRoomActions_.empty()) {
 		if (blockingState_ == IsBlocked) {
 			unblock = contextMenu.addAction(tr("Unblock"));
-		} else if (blockingState_ == IsUnblocked) {
+			unblock->setEnabled(inputEnabled_);
+		}
+		else if (blockingState_ == IsUnblocked) {
 			block = contextMenu.addAction(tr("Block"));
+			block->setEnabled(inputEnabled_);
 		}
 
 		if (supportsImpromptuChat_) {
 			invite = contextMenu.addAction(tr("Invite person to this chat…"));
+			invite->setEnabled(inputEnabled_);
 		}
 
-	} else {
+	}
+	else {
 		foreach(ChatWindow::RoomAction availableAction, availableRoomActions_)
 		{
 			if (impromptu_) {
 				// hide options we don't need in impromptu chats
 				if (availableAction == ChatWindow::ChangeSubject ||
 					availableAction == ChatWindow::Configure ||
@@ -653,22 +672,38 @@ void QtChatWindow::handleActionButtonClicked() {
 					availableAction == ChatWindow::Destroy) {
 					continue;
 				}
 			}
 			switch(availableAction)
 			{
-				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;
+				case ChatWindow::ChangeSubject:
+					changeSubject = contextMenu.addAction(tr("Change subject…"));
+					changeSubject->setEnabled(inputEnabled_);
+					break;
+				case ChatWindow::Configure:
+					configure = contextMenu.addAction(tr("Configure room…"));
+					configure->setEnabled(inputEnabled_);
+					break;
+				case ChatWindow::Affiliations:
+					affiliations = contextMenu.addAction(tr("Edit affiliations…"));
+					affiliations->setEnabled(inputEnabled_);
+					break;
+				case ChatWindow::Destroy:
+					destroy = contextMenu.addAction(tr("Destroy room"));
+					destroy->setEnabled(inputEnabled_);
+					break;
+				case ChatWindow::Invite:
+					invite = contextMenu.addAction(tr("Invite person to this room…"));
+					invite->setEnabled(inputEnabled_);
+					break;
 			}
 		}
 	}
 
 	QAction* bookmark = contextMenu.addAction(tr("Add boomark..."));
+	bookmark->setEnabled(inputEnabled_);
 
 	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) {
@@ -705,13 +740,14 @@ void QtChatWindow::handleActionButtonClicked() {
 	}
 	else if (result == block) {
 		onBlockUserRequest();
 	}
 	else if (result == unblock) {
 		onUnblockUserRequest();
-	} else if (result == bookmark) {
+	}
+	else if (result == bookmark) {
 		onBookmarkRequest();
 	}
 }
 
 void QtChatWindow::handleAffiliationEditorAccepted() {
 	onChangeAffiliationsRequest(affiliationEditor_->getChanges());
diff --git a/Swift/QtUI/QtMainWindow.cpp b/Swift/QtUI/QtMainWindow.cpp
index 1db8c77..52b6bcc 100644
--- a/Swift/QtUI/QtMainWindow.cpp
+++ b/Swift/QtUI/QtMainWindow.cpp
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2010-2011 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 <Swift/QtUI/QtMainWindow.h>
 
@@ -147,42 +147,49 @@ QtMainWindow::QtMainWindow(SettingsProvider* settings, UIEventStream* uiEventStr
 
 	QMenu* actionsMenu = new QMenu(tr("&Actions"), this);
 	menus_.push_back(actionsMenu);
 	QAction* editProfileAction = new QAction(tr("Edit &Profile…"), this);
 	connect(editProfileAction, SIGNAL(triggered()), SLOT(handleEditProfileAction()));
 	actionsMenu->addAction(editProfileAction);
+	onlineOnlyActions_ << editProfileAction;
 	QAction* joinMUCAction = new QAction(tr("Enter &Room…"), this);
 	connect(joinMUCAction, SIGNAL(triggered()), SLOT(handleJoinMUCAction()));
 	actionsMenu->addAction(joinMUCAction);
+	onlineOnlyActions_ << joinMUCAction;
 #ifdef SWIFT_EXPERIMENTAL_HISTORY
 	QAction* viewLogsAction = new QAction(tr("&View History…"), this);
 	connect(viewLogsAction, SIGNAL(triggered()), SLOT(handleViewLogsAction()));
 	actionsMenu->addAction(viewLogsAction);
 #endif
 	openBlockingListEditor_ = new QAction(tr("Edit &Blocking List…"), this);
 	connect(openBlockingListEditor_, SIGNAL(triggered()), SLOT(handleEditBlockingList()));
 	actionsMenu->addAction(openBlockingListEditor_);
+	onlineOnlyActions_ << openBlockingListEditor_;
 	openBlockingListEditor_->setVisible(false);
 	addUserAction_ = new QAction(tr("&Add Contact…"), this);
 	addUserAction_->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_D));
 	addUserAction_->setShortcutContext(Qt::ApplicationShortcut);
 	connect(addUserAction_, SIGNAL(triggered(bool)), this, SLOT(handleAddUserActionTriggered(bool)));
 	actionsMenu->addAction(addUserAction_);
+	onlineOnlyActions_ << addUserAction_;
 	editUserAction_ = new QAction(tr("&Edit Selected Contact…"), this);
 	connect(editUserAction_, SIGNAL(triggered(bool)), treeWidget_, SLOT(handleEditUserActionTriggered(bool)));
 	actionsMenu->addAction(editUserAction_);
+	onlineOnlyActions_ << editUserAction_;
 	editUserAction_->setEnabled(false);
 	chatUserAction_ = new QAction(tr("Start &Chat…"), this);
 	chatUserAction_->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_N));
 	chatUserAction_->setShortcutContext(Qt::ApplicationShortcut);
 	connect(chatUserAction_, SIGNAL(triggered(bool)), this, SLOT(handleChatUserActionTriggered(bool)));
 	actionsMenu->addAction(chatUserAction_);
+	onlineOnlyActions_ << chatUserAction_;
 	if (enableAdHocCommandOnJID) {
 		otherAdHocAction_ = new QAction(tr("Run Other Command"), this);
 		connect(otherAdHocAction_, SIGNAL(triggered()), this, SLOT(handleOtherAdHocActionTriggered()));
 		actionsMenu->addAction(otherAdHocAction_);
+		onlineOnlyActions_ << otherAdHocAction_;
 	}
 	serverAdHocMenu_ = new QMenu(tr("Run Server Command"), this);
 	actionsMenu->addMenu(serverAdHocMenu_);
 	actionsMenu->addSeparator();
 	QAction* signOutAction = new QAction(tr("&Sign Out"), this);
 	connect(signOutAction, SIGNAL(triggered()), SLOT(handleSignOutAction()));
@@ -193,13 +200,13 @@ QtMainWindow::QtMainWindow(SettingsProvider* settings, UIEventStream* uiEventStr
 	toggleRequestDeliveryReceipts_->setChecked(settings_->getSetting(SettingConstants::REQUEST_DELIVERYRECEIPTS));
 	connect(toggleRequestDeliveryReceipts_, SIGNAL(toggled(bool)), SLOT(handleToggleRequestDeliveryReceipts(bool)));
 
 	QList< QAction* > generalMenuActions = loginMenus_.generalMenu->actions();
 	loginMenus_.generalMenu->insertAction(generalMenuActions.at(generalMenuActions.count()-2),toggleRequestDeliveryReceipts_);
 
-	treeWidget_->onSomethingSelectedChanged.connect(boost::bind(&QAction::setEnabled, editUserAction_, _1));
+	treeWidget_->onSomethingSelectedChanged.connect(boost::bind(&QtMainWindow::handleSomethingSelectedChanged, this, _1));
 
 	setAvailableAdHocCommands(std::vector<DiscoItems::Item>());
 	QAction* adHocAction = new QAction(tr("Collecting commands..."), this);
 	adHocAction->setEnabled(false);
 	serverAdHocMenu_->addAction(adHocAction);
 	serverAdHocCommandActions_.append(adHocAction);
@@ -224,12 +231,17 @@ void QtMainWindow::handleShowCertificateInfo() {
 }
 
 void QtMainWindow::handleEditBlockingList() {
 	uiEventStream_->send(boost::make_shared<RequestBlockListDialogUIEvent>());
 }
 
+void QtMainWindow::handleSomethingSelectedChanged(bool itemSelected) {
+	bool isOnline = addUserAction_->isEnabled();
+	editUserAction_->setEnabled(isOnline && itemSelected);
+}
+
 QtEventWindow* QtMainWindow::getEventWindow() {
 	return eventWindow_;
 }
 
 QtChatListWindow* QtMainWindow::getChatListWindow() {
 	return chatListWindow_;
@@ -345,12 +357,19 @@ void QtMainWindow::setMyAvatarPath(const std::string& path) {
 void QtMainWindow::setMyStatusText(const std::string& status) {
 	meView_->setStatusText(P2QSTRING(status));
 }
 
 void QtMainWindow::setMyStatusType(StatusShow::Type type) {
 	meView_->setStatusType(type);
+	const bool online = (type != StatusShow::None);
+	treeWidget_->setOnline(online);
+	chatListWindow_->setOnline(online);
+	foreach (QAction *action, onlineOnlyActions_) {
+		action->setEnabled(online);
+	}
+	serverAdHocMenu_->setEnabled(online);
 }
 
 void QtMainWindow::setMyContactRosterItem(boost::shared_ptr<ContactRosterItem> contact) {
 	meView_->setContactRosterItem(contact);
 }
 
diff --git a/Swift/QtUI/QtMainWindow.h b/Swift/QtUI/QtMainWindow.h
index 84fab15..ea92c79 100644
--- a/Swift/QtUI/QtMainWindow.h
+++ b/Swift/QtUI/QtMainWindow.h
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2010-2011 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
 
@@ -75,12 +75,13 @@ namespace Swift {
 			void handleChatCountUpdated(int count);
 			void handleEditProfileRequest();
 			void handleTabChanged(int index);
 			void handleToggleRequestDeliveryReceipts(bool enabled);
 			void handleShowCertificateInfo();
 			void handleEditBlockingList();
+			void handleSomethingSelectedChanged(bool itemSelected);
 
 		private:
 			SettingsProvider* settings_;
 			QtLoginWindow::QtMenus loginMenus_;
 			std::vector<QMenu*> menus_;
 			QtRosterWidget* treeWidget_;
@@ -101,8 +102,9 @@ namespace Swift {
 			QWidget* eventsTabWidget_;
 			QtEventWindow* eventWindow_;
 			QtChatListWindow* chatListWindow_;
 			UIEventStream* uiEventStream_;
 			std::vector<DiscoItems::Item> serverAdHocCommands_;
 			QList<QAction*> serverAdHocCommandActions_;
+			QList<QAction*> onlineOnlyActions_;
 	};
 }
diff --git a/Swift/QtUI/QtNameWidget.cpp b/Swift/QtUI/QtNameWidget.cpp
index 08e32f5..c172caa 100644
--- a/Swift/QtUI/QtNameWidget.cpp
+++ b/Swift/QtUI/QtNameWidget.cpp
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2010-2012 Remko Tronçon
+ * Copyright (c) 2010-2014 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
 #include "QtNameWidget.h"
 
@@ -14,13 +14,13 @@
 #include <Swift/QtUI/QtElidingLabel.h>
 #include <Swift/QtUI/QtSettingsProvider.h>
 #include <Swift/QtUI/QtUISettingConstants.h>
 
 namespace Swift {
 
-QtNameWidget::QtNameWidget(SettingsProvider* settings, QWidget *parent) : QWidget(parent), settings(settings) {
+QtNameWidget::QtNameWidget(SettingsProvider* settings, QWidget *parent) : QWidget(parent), settings(settings), isOnline_(false) {
 	QHBoxLayout* mainLayout = new QHBoxLayout(this);
 	mainLayout->setSpacing(0);
 	mainLayout->setContentsMargins(0,0,0,0);
 
 	mode = settings->getSetting(QtUISettingConstants::SHOW_NICK_IN_ROSTER_HEADER) ? ShowNick : ShowJID;
 
@@ -38,12 +38,16 @@ void QtNameWidget::setNick(const QString& nick) {
 
 void QtNameWidget::setJID(const QString& jid) {
 	this->jid = jid;
 	updateText();
 }
 
+void QtNameWidget::setOnline(const bool isOnline) {
+	isOnline_ = isOnline;
+}
+
 void QtNameWidget::mousePressEvent(QMouseEvent* event) {
 	QMenu menu;
 	bool hasNick = !nick.isEmpty();
 
 	QAction* showAsNick = new QAction(hasNick ? tr("Show Nickname") : tr("(No Nickname Set)"), this);
 	showAsNick->setCheckable(true);
@@ -59,12 +63,13 @@ void QtNameWidget::mousePressEvent(QMouseEvent* event) {
 		showAsJID->setChecked(true);
 	}
 	menu.addAction(showAsJID);
 
 	QAction* editProfile = new QAction(tr("Edit Profile"), this);
 	menu.addAction(editProfile);
+	editProfile->setEnabled(isOnline_);
 
 	QAction* result = menu.exec(event->globalPos());
 	if (result == showAsJID) {
 		mode = ShowJID;
 	}
 	else if (result == showAsNick) {
diff --git a/Swift/QtUI/QtNameWidget.h b/Swift/QtUI/QtNameWidget.h
index 3225879..460cc9a 100644
--- a/Swift/QtUI/QtNameWidget.h
+++ b/Swift/QtUI/QtNameWidget.h
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2014 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
 #pragma once
 
@@ -17,12 +17,13 @@ namespace Swift {
 
 		public:
 			QtNameWidget(SettingsProvider* settings, QWidget *parent);
 
 			void setNick(const QString& text);
 			void setJID(const QString& jid);
+			void setOnline(const bool isOnline);
 
 		signals:
 			void onChangeNickRequest();
 
 		private:
 			void updateText();
@@ -36,9 +37,10 @@ namespace Swift {
 
 			SettingsProvider* settings;
 			Mode mode;
 			QtElidingLabel* textLabel;
 			QString jid;
 			QString nick;
+			bool isOnline_;
 	};
 }
 
diff --git a/Swift/QtUI/QtRosterHeader.cpp b/Swift/QtUI/QtRosterHeader.cpp
index 69a0ef6..d5029ad 100644
--- a/Swift/QtUI/QtRosterHeader.cpp
+++ b/Swift/QtUI/QtRosterHeader.cpp
@@ -79,12 +79,20 @@ void QtRosterHeader::handleChangeStatusRequest(StatusShow::Type type, const QStr
 void QtRosterHeader::setStatusText(const QString& statusMessage) {
 	statusWidget_->setStatusText(statusMessage);
 }
 
 void QtRosterHeader::setStatusType(StatusShow::Type type) {
 	statusWidget_->setStatusType(type);
+	if (type == StatusShow::None) {
+		nameWidget_->setOnline(false);
+		disconnect(avatarLabel_, SIGNAL(clicked()), this, SIGNAL(onEditProfileRequest()));
+	}
+	else {
+		nameWidget_->setOnline(true);
+		connect(avatarLabel_, SIGNAL(clicked()), this, SIGNAL(onEditProfileRequest()), Qt::UniqueConnection);
+	}
 }
 
 void QtRosterHeader::setConnecting() {
 	statusWidget_->setConnecting();
 }
 
diff --git a/Swift/QtUI/Roster/QtRosterWidget.cpp b/Swift/QtUI/Roster/QtRosterWidget.cpp
index 4a3c9f3..8c296e5 100644
--- a/Swift/QtUI/Roster/QtRosterWidget.cpp
+++ b/Swift/QtUI/Roster/QtRosterWidget.cpp
@@ -57,39 +57,44 @@ void QtRosterWidget::contextMenuEvent(QContextMenuEvent* event) {
 		return;
 	}
 	RosterItem* item = static_cast<RosterItem*>(index.internalPointer());
 	QMenu contextMenu;
 	if (ContactRosterItem* contact = dynamic_cast<ContactRosterItem*>(item)) {
 		QAction* editContact = contextMenu.addAction(tr("Edit…"));
+		editContact->setEnabled(isOnline());
 		QAction* removeContact = contextMenu.addAction(tr("Remove"));
+		removeContact->setEnabled(isOnline());
 		QAction* showProfileForContact = contextMenu.addAction(tr("Show Profile"));
 
 		QAction* unblockContact = NULL;
 		if (contact->blockState() == ContactRosterItem::IsBlocked ||
 			contact->blockState() == ContactRosterItem::IsDomainBlocked) {
 			unblockContact = contextMenu.addAction(tr("Unblock"));
+			unblockContact->setEnabled(isOnline());
 		}
 
 		QAction* blockContact = NULL;
 		if (contact->blockState() == ContactRosterItem::IsUnblocked) {
 			blockContact = contextMenu.addAction(tr("Block"));
+			blockContact->setEnabled(isOnline());
 		}
 
 #ifdef SWIFT_EXPERIMENTAL_FT
 		QAction* sendFile = NULL;
 		if (contact->supportsFeature(ContactRosterItem::FileTransferFeature)) {
 			sendFile = contextMenu.addAction(tr("Send File"));
+			sendFile->setEnabled(isOnline());
 		}
 #endif
 #ifdef SWIFT_EXPERIMENTAL_WB
 		QAction* startWhiteboardChat = NULL;
 		if (contact->supportsFeature(ContactRosterItem::WhiteboardFeature)) {
 			startWhiteboardChat = contextMenu.addAction(tr("Start Whiteboard Chat"));
+			startWhiteboardChat->setEnabled(isOnline());
 		}
 #endif
-
 		QAction* result = contextMenu.exec(event->globalPos());
 		if (result == editContact) {
 			eventStream_->send(boost::make_shared<RequestContactEditorUIEvent>(contact->getJID()));
 		}
 		else if (result == removeContact) {
 			if (QtContactEditWindow::confirmContactDeletion(contact->getJID())) {
@@ -132,12 +137,15 @@ void QtRosterWidget::contextMenuEvent(QContextMenuEvent* event) {
 	}
 	else if (GroupRosterItem* group = dynamic_cast<GroupRosterItem*>(item)) {
 		QAction* renameGroupAction = contextMenu.addAction(tr("Rename"));
 		if (P2QSTRING(group->getDisplayName()) == tr("Contacts")) {
 			renameGroupAction->setEnabled(false);
 		}
+		else {
+			renameGroupAction->setEnabled(isOnline());
+		}
 		QAction* result = contextMenu.exec(event->globalPos());
 		if (result == renameGroupAction) {
 			renameGroup(group);
 		}
 	}
 }
diff --git a/Swift/QtUI/Roster/QtTreeWidget.cpp b/Swift/QtUI/Roster/QtTreeWidget.cpp
index 5333260..f296088 100644
--- a/Swift/QtUI/Roster/QtTreeWidget.cpp
+++ b/Swift/QtUI/Roster/QtTreeWidget.cpp
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2010-2012 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 <Swift/QtUI/Roster/QtTreeWidget.h>
 
@@ -249,7 +249,15 @@ JID QtTreeWidget::selectedJID() const {
 	if (list.size() != 1) {
 		return JID();
 	}
 	return jidFromIndex(list[0]);
 }
 
+void QtTreeWidget::setOnline(bool isOnline) {
+	isOnline_ = isOnline;
+}
+
+bool QtTreeWidget::isOnline() const {
+	return isOnline_;
+}
+
 }
diff --git a/Swift/QtUI/Roster/QtTreeWidget.h b/Swift/QtUI/Roster/QtTreeWidget.h
index cf2f73e..12d34f5 100644
--- a/Swift/QtUI/Roster/QtTreeWidget.h
+++ b/Swift/QtUI/Roster/QtTreeWidget.h
@@ -33,12 +33,14 @@ class QtTreeWidget : public QTreeView {
 		void setRosterModel(Roster* roster);
 		Roster* getRoster() {return roster_;}
 		void refreshTooltip();
 		void setMessageTarget(MessageTarget messageTarget);
 		JID jidFromIndex(const QModelIndex& index) const;
 		JID selectedJID() const;
+		void setOnline(bool isOnline);
+
 	public:
 		boost::signal<void (RosterItem*)> onSomethingSelectedChanged;
 
 	private slots:
 		void handleItemActivated(const QModelIndex&);
 		void handleModelItemExpanded(const QModelIndex&, bool expanded);
@@ -51,12 +53,13 @@ class QtTreeWidget : public QTreeView {
 	protected:
 		void dragEnterEvent(QDragEnterEvent* event);
 		void dropEvent(QDropEvent* event);
 		void dragMoveEvent(QDragMoveEvent* event);
 		bool event(QEvent* event);
 		QModelIndexList getSelectedIndexes() const;
+		bool isOnline() const;
 
 	private:
 		void drawBranches(QPainter*, const QRect&, const QModelIndex&) const;
 
 	protected slots:
 		virtual void currentChanged(const QModelIndex& current, const QModelIndex& previous);
@@ -68,9 +71,10 @@ class QtTreeWidget : public QTreeView {
 		Roster* roster_;
 		RosterDelegate* delegate_;
 		QtTreeWidgetItem* treeRoot_;
 		SettingsProvider* settings_;
 		bool tooltipShown_;
 		MessageTarget messageTarget_;
+		bool isOnline_;
 };
 
 }
author	Tobias Markmann <tm@ayena.de>	2014-09-29 08:07:05 (GMT)
committer	Kevin Smith <git@kismith.co.uk>	2014-10-17 20:11:30 (GMT)
commit	38b0cb785fea8eae5e48fae56440695fdfd10ee1 (patch)
tree	78bb8ce9a6bcbc397805bcd433b96b3b23994f09
parent	1722d220533a78e8b2acbcd571631960656e78f8 (diff)
download	swift-38b0cb785fea8eae5e48fae56440695fdfd10ee1.zip swift-38b0cb785fea8eae5e48fae56440695fdfd10ee1.tar.bz2