Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2012-09-19 15:44:27 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2012-09-19 17:27:47 (GMT) |
| commit | 43e6f6cb4e1fe907df25f8acead2532afa284ad6 (patch) | |
| tree | ea8fa4484db24858cf6b3b8823245860925f480a /Swift | |
| parent | 3922b29d87df67657cc0a9a7f37290967cec725b (diff) | |
| download | swift-43e6f6cb4e1fe907df25f8acead2532afa284ad6.zip swift-43e6f6cb4e1fe907df25f8acead2532afa284ad6.tar.bz2 | |
Distinguish between wrapped and non-wrapped sender names in chat message theming.
Resolves: #1162
License: This patch is BSD-licensed, see http://www.opensource.org/licenses/bsd-license.php
Diffstat (limited to 'Swift')
| -rw-r--r-- | Swift/QtUI/ChatSnippet.h | 1 | ||||
| -rw-r--r-- | Swift/QtUI/MessageSnippet.cpp | 3 | ||||
| -rwxr-xr-x | Swift/resources/themes/Default/Incoming/Content.html | 2 | ||||
| -rwxr-xr-x | Swift/resources/themes/Default/Outgoing/Content.html | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/Swift/QtUI/ChatSnippet.h b/Swift/QtUI/ChatSnippet.h index 92a6837..78e0b88 100644 --- a/Swift/QtUI/ChatSnippet.h +++ b/Swift/QtUI/ChatSnippet.h @@ -31,6 +31,7 @@ namespace Swift { QString result(original); result.replace("%message%", "%message%"); result.replace("%sender%", "%sender%"); + result.replace("%wrapped_sender%", "%wrapped_sender%"); result.replace("%time%", "%%time%"); result.replace("%shortTime%", "%%shortTime%"); result.replace("%userIconPath%", "%userIconPath%"); diff --git a/Swift/QtUI/MessageSnippet.cpp b/Swift/QtUI/MessageSnippet.cpp index a10ee2c..47aa9f8 100644 --- a/Swift/QtUI/MessageSnippet.cpp +++ b/Swift/QtUI/MessageSnippet.cpp @@ -33,7 +33,8 @@ MessageSnippet::MessageSnippet(const QString& message, const QString& sender, co } content_.replace("%message%", wrapResizable("<span class='swift_message'>" + escape(message) + "</span><span class='swift_ack'></span><span class='swift_receipt'></span>")); - content_.replace("%sender%", wrapResizable(escape(sender))); + content_.replace("%wrapped_sender%", wrapResizable(escape(sender))); + content_.replace("%sender%", escape(sender)); content_.replace("%time%", wrapResizable("<span class='swift_time'>" + timeToEscapedString(time) + "</span>")); content_.replace("%userIconPath%", escape(iconURI)); content_ = "<div id='" + id + "'>" + content_ + "</div>"; diff --git a/Swift/resources/themes/Default/Incoming/Content.html b/Swift/resources/themes/Default/Incoming/Content.html index 2946716..eb5bdea 100755 --- a/Swift/resources/themes/Default/Incoming/Content.html +++ b/Swift/resources/themes/Default/Incoming/Content.html @@ -13,7 +13,7 @@ <tr> <td class="message"> %message% - <div class="timeStamp"><span class="name">%sender% @</span> %time%</div> + <div class="timeStamp"><span class="name">%wrapped_sender% @</span> %time%</div> <span id="insert"></span> </td> <td class="messageRight"></td> diff --git a/Swift/resources/themes/Default/Outgoing/Content.html b/Swift/resources/themes/Default/Outgoing/Content.html index beb57f0..f855f56 100755 --- a/Swift/resources/themes/Default/Outgoing/Content.html +++ b/Swift/resources/themes/Default/Outgoing/Content.html @@ -13,7 +13,7 @@ <tr> <td class="message"> %message% - <div class="timeStamp"><span class="name">%sender% @</span> %time%</div> + <div class="timeStamp"><span class="name">%wrapped_sender% @</span> %time%</div> <span id="insert"></span> </td> <td class="messageRight"></td> |