summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2016-10-21 12:46:37 (GMT)
committerTobias Markmann <tm@ayena.de>2016-10-21 12:46:37 (GMT)
commite7ea063f2d5e448d10111d14539c7b19b34243a6 (patch)
treec8b1c05c04bd35bded7b05a94ac36723a88b0d57 /Swift/QtUI
parent37c12b839fa3dc7ebe77b7b337e92440e8135058 (diff)
downloadswift-e7ea063f2d5e448d10111d14539c7b19b34243a6.zip
swift-e7ea063f2d5e448d10111d14539c7b19b34243a6.tar.bz2
Add delivery-warning SVG icon with a matching style
The delviery-warning.svg matches the style of delivery-failure.svg and delivery-success.svg. It is a yellowish circle with a white border and a white exclamation mark in it. Test-Information: Build and checked the new icon is shown when a message receipt is requested but no receipt is received. Tested on macOS 10.12 with Qt 5.7.0 and QtWebKit TP4. Change-Id: Ie715993eabd8f853ea0a6983645d7d89259f61a7
Diffstat (limited to 'Swift/QtUI')
-rw-r--r--Swift/QtUI/QtWebKitChatView.cpp2
-rw-r--r--Swift/QtUI/Swift.qrc1
2 files changed, 2 insertions, 1 deletions
diff --git a/Swift/QtUI/QtWebKitChatView.cpp b/Swift/QtUI/QtWebKitChatView.cpp
index 414f098..c0ce3dc 100644
--- a/Swift/QtUI/QtWebKitChatView.cpp
+++ b/Swift/QtUI/QtWebKitChatView.cpp
@@ -962,7 +962,7 @@ void QtWebKitChatView::setMessageReceiptState(const std::string& id, ChatWindow:
xml = "<img src='qrc:/icons/delivery-success.svg' title='" + tr("The receipt for this message has been received.") + "'/>";
break;
case ChatWindow::ReceiptRequested:
- xml = "<img src='qrc:/icons/warn.png' title='" + tr("The receipt for this message has not yet been received. The recipient(s) might not have received this message.") + "'/>";
+ xml = "<img src='qrc:/icons/delivery-warning.svg' title='" + tr("The receipt for this message has not yet been received. The recipient(s) might not have received this message.") + "'/>";
break;
case ChatWindow::ReceiptFailed:
xml = "<img src='qrc:/icons/delivery-failure.svg' title='" + tr("Failed to transmit message to the receipient(s).") + "'/>";
diff --git a/Swift/QtUI/Swift.qrc b/Swift/QtUI/Swift.qrc
index 6865d8e..cfb0fec 100644
--- a/Swift/QtUI/Swift.qrc
+++ b/Swift/QtUI/Swift.qrc
@@ -46,5 +46,6 @@
<file alias="icons/stop.png">../resources/icons/stop.png</file>
<file alias="icons/delivery-success.svg">../resources/icons/delivery-success.svg</file>
<file alias="icons/delivery-failure.svg">../resources/icons/delivery-failure.svg</file>
+ <file alias="icons/delivery-warning.svg">../resources/icons/delivery-warning.svg</file>
</qresource>
</RCC>