Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2012-06-14 21:28:58 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2012-06-15 07:44:48 (GMT) |
| commit | 5a1bdf2f6a4842176be5938f8db5cb9d151aceb5 (patch) | |
| tree | 338090bf71a0a5836ac1210e8433694479567d50 /Swift/QtUI/QtChatWindow.h | |
| parent | b4a24233debf8ee7e5005aa787ff48c52abe7df6 (diff) | |
| download | swift-contrib-5a1bdf2f6a4842176be5938f8db5cb9d151aceb5.zip swift-contrib-5a1bdf2f6a4842176be5938f8db5cb9d151aceb5.tar.bz2 | |
Preliminary emoticon work.
Parsing and toggling support for emoticons. No emoticons are included so this won't do anything yet.
Diffstat (limited to 'Swift/QtUI/QtChatWindow.h')
| -rw-r--r-- | Swift/QtUI/QtChatWindow.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Swift/QtUI/QtChatWindow.h b/Swift/QtUI/QtChatWindow.h index ff26c9c..5081681 100644 --- a/Swift/QtUI/QtChatWindow.h +++ b/Swift/QtUI/QtChatWindow.h @@ -17,6 +17,7 @@ #include <map> #include <QPointer> #include <QTextCursor> +#include <QMap> class QTextEdit; class QLineEdit; @@ -46,7 +47,7 @@ namespace Swift { static const QString ButtonMUCInvite; public: - QtChatWindow(const QString &contact, QtChatTheme* theme, UIEventStream* eventStream, SettingsProvider* settings); + QtChatWindow(const QString &contact, QtChatTheme* theme, UIEventStream* eventStream, SettingsProvider* settings, QMap<QString, QString> emoticons); ~QtChatWindow(); std::string addMessage(const std::string &message, const std::string &senderName, bool senderIsSelf, boost::shared_ptr<SecurityLabel> label, const std::string& avatarPath, const boost::posix_time::ptime& time); std::string addAction(const std::string &message, const std::string &senderName, bool senderIsSelf, boost::shared_ptr<SecurityLabel> label, const std::string& avatarPath, const boost::posix_time::ptime& time); @@ -147,6 +148,7 @@ namespace Swift { void tabComplete(); void beginCorrection(); void cancelCorrection(); + void handleSettingChanged(const std::string& setting); std::string addMessage(const std::string &message, const std::string &senderName, bool senderIsSelf, boost::shared_ptr<SecurityLabel> label, const std::string& avatarPath, const QString& style, const boost::posix_time::ptime& time); void replaceMessage(const std::string& message, const std::string& id, const boost::posix_time::ptime& time, const QString& style); void handleOccupantSelectionChanged(RosterItem* item); @@ -189,5 +191,7 @@ namespace Swift { int idCounter_; SettingsProvider* settings_; std::vector<ChatWindow::RoomAction> availableRoomActions_; + QMap<QString, QString> emoticons_; + bool showEmoticons_; }; } |