Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2014-10-31 14:45:27 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2014-10-31 14:45:49 (GMT) |
| commit | b2c12f79f9c0c05a1dc9f9603d6d2aa258647391 (patch) | |
| tree | bbf0eba7a9457334ae4a0d8f6113155bcca68423 /Swift/Controllers/Chat | |
| parent | 0ae300e79f0a72abb42aafd2bc5b85e37fd26557 (diff) | |
| download | swift-b2c12f79f9c0c05a1dc9f9603d6d2aa258647391.zip swift-b2c12f79f9c0c05a1dc9f9603d6d2aa258647391.tar.bz2 | |
Enable unblocking contacts from cog menu.
Renamed ChatWindow::setInputEnabled to ChatWindow::setOnline. Moved some input
return key disabling logic into QtChatWindow.
Test-Information:
Tested in Swift, blocking a contact and unblokcing it from cog menu. Return still
does not do anything on blocked contacts or when offline.
Change-Id: I42faffb8618598fcc7c0bd44148902ea7028258e
Diffstat (limited to 'Swift/Controllers/Chat')
| -rw-r--r-- | Swift/Controllers/Chat/ChatController.cpp | 2 | ||||
| -rw-r--r-- | Swift/Controllers/Chat/ChatControllerBase.cpp | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/Swift/Controllers/Chat/ChatController.cpp b/Swift/Controllers/Chat/ChatController.cpp index 0b34681..146a6b4 100644 --- a/Swift/Controllers/Chat/ChatController.cpp +++ b/Swift/Controllers/Chat/ChatController.cpp @@ -273,7 +273,6 @@ void ChatController::handleBlockingStateChanged() { if (!blockedContactAlert_) { blockedContactAlert_ = chatWindow_->addAlert(QT_TRANSLATE_NOOP("", "You've currently blocked this contact. To continue your conversation you have to unblock the contact first.")); } - chatWindow_->setInputEnabled(false); chatWindow_->setBlockingState(ChatWindow::IsBlocked); // disconnect typing events to prevent chat state notifciations to blocked contacts @@ -284,7 +283,6 @@ void ChatController::handleBlockingStateChanged() { chatWindow_->removeAlert(*blockedContactAlert_); blockedContactAlert_.reset(); } - chatWindow_->setInputEnabled(true); chatWindow_->setBlockingState(ChatWindow::IsUnblocked); chatWindow_->onUserTyping.connect(boost::bind(&ChatStateNotifier::setUserIsTyping, chatStateNotifier_)); diff --git a/Swift/Controllers/Chat/ChatControllerBase.cpp b/Swift/Controllers/Chat/ChatControllerBase.cpp index 2c2540c..d1ff91a 100644 --- a/Swift/Controllers/Chat/ChatControllerBase.cpp +++ b/Swift/Controllers/Chat/ChatControllerBase.cpp @@ -100,7 +100,7 @@ void ChatControllerBase::handleDayChangeTick() { } void ChatControllerBase::setEnabled(bool enabled) { - chatWindow_->setInputEnabled(enabled); + chatWindow_->setOnline(enabled); } void ChatControllerBase::setOnline(bool online) { |