Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-03-25 16:13:53 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2016-03-29 07:36:36 (GMT) |
| commit | c26314684cd4e6140e5ea882285c2076505bd53d (patch) | |
| tree | 9d31b6bfaced4a01aff8069096e2c9bb28efad43 /Swift/resources/themes/Default/Incoming | |
| parent | daf513a6567100322d3c51733ea0c449ca6adb1b (diff) | |
| download | swift-c26314684cd4e6140e5ea882285c2076505bd53d.zip swift-c26314684cd4e6140e5ea882285c2076505bd53d.tar.bz2 | |
Replace chat view theme with one based on the new design
This also removes the old chat theme resources and some code
in QtWebKitChatView that was required for compatibility to
Adium-style themes.
The new code uses a CSS style in the header to change the
font size and does not iterate the whole DOM tree itself
anymore.
Added new resources for failed and successful asks.
Test-Information:
Tested MUCs, PMs, message correction and file-transfers with
the new chat theme.
Change-Id: If922a972c658189444e60a7b00e5e5e96661620d
Diffstat (limited to 'Swift/resources/themes/Default/Incoming')
| -rw-r--r--[-rwxr-xr-x] | Swift/resources/themes/Default/Incoming/Content.html | 46 | ||||
| -rwxr-xr-x | Swift/resources/themes/Default/Incoming/Context.html | 30 | ||||
| -rw-r--r--[-rwxr-xr-x] | Swift/resources/themes/Default/Incoming/NextContent.html | 25 | ||||
| -rwxr-xr-x | Swift/resources/themes/Default/Incoming/NextContext.html | 7 | ||||
| -rw-r--r-- | Swift/resources/themes/Default/Incoming/buddy_icon.png | bin | 12047 -> 0 bytes |
5 files changed, 33 insertions, 75 deletions
diff --git a/Swift/resources/themes/Default/Incoming/Content.html b/Swift/resources/themes/Default/Incoming/Content.html index dc5f8b2..05c9796 100755..100644 --- a/Swift/resources/themes/Default/Incoming/Content.html +++ b/Swift/resources/themes/Default/Incoming/Content.html @@ -1,30 +1,18 @@ -<div class="chatItem incomingItem"> - <table width="100%"> - <tr> - <td valign="top"> - <img src="%userIconPath%" class="avatar" title="%sender%" ondragstart="return false" /> - <div class="myBubble"> - <div class="indicator"></div> - <table class="tableBubble" cellspacing="0" cellpadding="0"> - <tr> - <td class="tl"></td> - <td class="tr"></td> - </tr> - <tr> - <td class="message" style="direction: %direction%"> - %message% - <div class="timeStamp"><span class="name">%wrapped_sender% @</span> %time%</div> - <span id="insert"></span> - </td> - <td class="messageRight"></td> - </tr> - <tr> - <td class="bl"></td> - <td class="br"></td> - </tr> - </table> - </div> - </td> - </tr> - </table> +<!--OTHERS MESSAGE--> +<div class="message" id="%id%"> + <div class="user"> + <div class="time"> + <p>%time%</p> + <span class="swift_ack"></span> + <span class="swift_receipt"></span> + </div> + <div class="otheravatar"> + <img src="%userIconPath%"/> + </div> + <div class="otherright"></div> + </div> + <div class="text"> + <p class="otherusername">%wrapped_sender%</p> + <div class="message-content">%message%</div> + </div> </div> diff --git a/Swift/resources/themes/Default/Incoming/Context.html b/Swift/resources/themes/Default/Incoming/Context.html deleted file mode 100755 index 1f0c528..0000000 --- a/Swift/resources/themes/Default/Incoming/Context.html +++ /dev/null @@ -1,30 +0,0 @@ -<div class="chatItem incomingItem"> - <table width="100%"> - <tr> - <td valign="top"> - <img src="%userIconPath%" class="avatar" ondragstart="return false" /> - <div class="myBubble"> - <div class="indicator"></div> - <table class="tableBubble" cellspacing="0" cellpadding="0"> - <tr> - <td class="tl"></td> - <td class="tr"></td> - </tr> - <tr> - <td class="message" style="direction: %direction%"> - %message% - <div class="timeStamp"><span class="name">%sender% @</span> %time%</div> - <span id="insert"></span> - </td> - <td class="messageRight"></td> - </tr> - <tr> - <td class="bl"></td> - <td class="br"></td> - </tr> - </table> - </div> - </td> - </tr> - </table> -</div> diff --git a/Swift/resources/themes/Default/Incoming/NextContent.html b/Swift/resources/themes/Default/Incoming/NextContent.html index aff669b..af5ec2b 100755..100644 --- a/Swift/resources/themes/Default/Incoming/NextContent.html +++ b/Swift/resources/themes/Default/Incoming/NextContent.html @@ -1,10 +1,17 @@ -<div> - <div class="followUp"></div> - <div style="direction: %direction%"> - - %message% - <div class="timeStamp">%time%</div> - </div> - <span id="insert"></span> +<!--OTHERS MESSAGE ADDITIONAL--> +<div class="message additional" id="%id%"> + <div class="user"> + <div class="time-additional"> + <p>%time%</p> + <span class="swift_ack"></span> + <span class="swift_receipt"></span> + </div> + <div class="systemavatar"> + <img/> + </div> + <div class="systemright"></div> + </div> + <div class="text"> + <div class="message-content">%message%</div> + </div> </div> - diff --git a/Swift/resources/themes/Default/Incoming/NextContext.html b/Swift/resources/themes/Default/Incoming/NextContext.html deleted file mode 100755 index c0a8846..0000000 --- a/Swift/resources/themes/Default/Incoming/NextContext.html +++ /dev/null @@ -1,7 +0,0 @@ - <div class="followUp"></div> - <div style="direction: %direction%"> - - %message% - <div class="timeStamp">%time%</div> - </div><span id="insert"></span> - diff --git a/Swift/resources/themes/Default/Incoming/buddy_icon.png b/Swift/resources/themes/Default/Incoming/buddy_icon.png Binary files differdeleted file mode 100644 index 0757aaa..0000000 --- a/Swift/resources/themes/Default/Incoming/buddy_icon.png +++ /dev/null |
