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/QtUI/QtChatWindow.h | |
| 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/QtUI/QtChatWindow.h')
| -rw-r--r-- | Swift/QtUI/QtChatWindow.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Swift/QtUI/QtChatWindow.h b/Swift/QtUI/QtChatWindow.h index bf37557..a73782a 100644 --- a/Swift/QtUI/QtChatWindow.h +++ b/Swift/QtUI/QtChatWindow.h @@ -107,7 +107,7 @@ namespace Swift { void setSecurityLabelsError(); SecurityLabelsCatalog::Item getSelectedSecurityLabel(); void setName(const std::string& name); - void setInputEnabled(bool enabled); + void setOnline(bool online); QtTabbable::AlertType getWidgetAlertState(); void setContactChatState(ChatState::ChatStateType state); void setRosterModel(Roster* roster); @@ -203,7 +203,7 @@ namespace Swift { bool inputClearing_; bool tabCompletion_; UIEventStream* eventStream_; - bool inputEnabled_; + bool isOnline_; QSplitter *logRosterSplitter_; Tristate correctionEnabled_; Tristate fileTransferEnabled_; |