From e7ea063f2d5e448d10111d14539c7b19b34243a6 Mon Sep 17 00:00:00 2001 From: Tobias Markmann Date: Fri, 21 Oct 2016 14:46:37 +0200 Subject: 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 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 = ""; break; case ChatWindow::ReceiptRequested: - xml = ""; + xml = ""; break; case ChatWindow::ReceiptFailed: xml = ""; 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 @@ ../resources/icons/stop.png ../resources/icons/delivery-success.svg ../resources/icons/delivery-failure.svg + ../resources/icons/delivery-warning.svg diff --git a/Swift/resources/icons/delivery-failure.svg b/Swift/resources/icons/delivery-failure.svg index f0eeb46..c1a0c08 100644 --- a/Swift/resources/icons/delivery-failure.svg +++ b/Swift/resources/icons/delivery-failure.svg @@ -1,118 +1,14 @@ - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - + + + + + + + + + + + - diff --git a/Swift/resources/icons/delivery-success.svg b/Swift/resources/icons/delivery-success.svg index c37db99..faf6ae1 100644 --- a/Swift/resources/icons/delivery-success.svg +++ b/Swift/resources/icons/delivery-success.svg @@ -1,107 +1,11 @@ - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - + + + + + + + + + diff --git a/Swift/resources/icons/delivery-warning.svg b/Swift/resources/icons/delivery-warning.svg new file mode 100644 index 0000000..940552e --- /dev/null +++ b/Swift/resources/icons/delivery-warning.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + -- cgit v0.10.2-6-g49f6