diff options
-rw-r--r-- | Swift/QtUI/QtWebKitChatView.cpp | 4 | ||||
-rw-r--r-- | Swift/QtUI/Swift.qrc | 4 | ||||
-rwxr-xr-x | Swift/resources/icons/delivery-failure.png | bin | 439 -> 0 bytes | |||
-rw-r--r-- | Swift/resources/icons/delivery-failure.svg | 118 | ||||
-rw-r--r-- | Swift/resources/icons/delivery-success.svg | 107 | ||||
-rwxr-xr-x | Swift/resources/icons/delivery-successful.png | bin | 447 -> 0 bytes | |||
-rw-r--r-- | Swift/resources/themes/Default/main.css | 5 |
7 files changed, 234 insertions, 4 deletions
diff --git a/Swift/QtUI/QtWebKitChatView.cpp b/Swift/QtUI/QtWebKitChatView.cpp index f8ced92..c3320d8 100644 --- a/Swift/QtUI/QtWebKitChatView.cpp +++ b/Swift/QtUI/QtWebKitChatView.cpp @@ -954,13 +954,13 @@ void QtWebKitChatView::setMessageReceiptState(const std::string& id, ChatWindow: QString xml; switch (state) { case ChatWindow::ReceiptReceived: - xml = "<img src='qrc:/icons/delivery-successful.png' title='" + tr("The receipt for this message has been received.") + "'/>"; + 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.") + "'/>"; break; case ChatWindow::ReceiptFailed: - xml = "<img src='qrc:/icons/delivery-failure.png' title='" + tr("Failed to transmit message to the receipient(s).") + "'/>"; + xml = "<img src='qrc:/icons/delivery-failure.svg' title='" + tr("Failed to transmit message to the receipient(s).") + "'/>"; } setReceiptXML(P2QSTRING(id), xml); } diff --git a/Swift/QtUI/Swift.qrc b/Swift/QtUI/Swift.qrc index 4c8fd55..6865d8e 100644 --- a/Swift/QtUI/Swift.qrc +++ b/Swift/QtUI/Swift.qrc @@ -44,7 +44,7 @@ <file alias="icons/star-unchecked.png">../resources/icons/star-unchecked2.png</file> <file alias="icons/zzz.png">../resources/icons/zzz.png</file> <file alias="icons/stop.png">../resources/icons/stop.png</file> - <file alias="icons/delivery-successful.png">../resources/icons/delivery-successful.png</file> - <file alias="icons/delivery-failure.png">../resources/icons/delivery-failure.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> </qresource> </RCC> diff --git a/Swift/resources/icons/delivery-failure.png b/Swift/resources/icons/delivery-failure.png Binary files differdeleted file mode 100755 index fb59276..0000000 --- a/Swift/resources/icons/delivery-failure.png +++ /dev/null diff --git a/Swift/resources/icons/delivery-failure.svg b/Swift/resources/icons/delivery-failure.svg new file mode 100644 index 0000000..f0eeb46 --- /dev/null +++ b/Swift/resources/icons/delivery-failure.svg @@ -0,0 +1,118 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="500" + height="500" + viewBox="0 0 132.29166 132.29167" + id="svg2" + version="1.1" + inkscape:version="0.91+devel+osxmenu r12922" + enable-background="new" + sodipodi:docname="delivery-failure.svg"> + <defs + id="defs4"> + <marker + inkscape:stockid="Arrow1Lstart" + orient="auto" + refY="0.0" + refX="0.0" + id="Arrow1Lstart" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path4240" + d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " + style="fill-rule:evenodd;stroke:#ffffff;stroke-width:1pt;stroke-opacity:1;fill:#ffffff;fill-opacity:1" + transform="scale(0.8) translate(12.5,0)" /> + </marker> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="1.6379971" + inkscape:cx="231.07446" + inkscape:cy="250.30518" + inkscape:document-units="mm" + inkscape:current-layer="layer1" + showgrid="false" + units="px" + showguides="false" + inkscape:guide-bbox="true" + inkscape:snap-to-guides="true" + inkscape:snap-grids="true" + inkscape:window-width="1680" + inkscape:window-height="1001" + inkscape:window-x="0" + inkscape:window-y="23" + inkscape:window-maximized="0"> + <inkscape:grid + type="xygrid" + id="grid4978" + spacingx="8.8194442" + dotted="false" + spacingy="8.8194435" /> + </sodipodi:namedview> + <metadata + id="metadata7"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title /> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(0,-164.70832)"> + <image + y="164.70833" + x="0" + id="image4230" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAYAAABWdVznAAAABHNCSVQICAgIfAhkiAAAAAlwSFlz AAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAE8SURB VCiRldLPK8NxHMfx5/s7W323KZvt4oIoEafdOFgOLvQt5YIU4WZ/AsKfMEdX/8D8ujGrCTWF4sJc /EjK0Wn2cpgJjfI+vt+PPu/erz4miUqZpQ8XZ4U8kyUAZCoYlkn1rqxDBZok1vLLTeJtAyxJzVLW 8E3M9y09OGD2Nwaw5IcxX+Pg4hxY6jfa4DZSKpcoq9xyctd/7wh5v+GoG2e0Z4bhznEMQ8hzqge6 /hBe1yQRNwZAxI0x0j2F6w9x83KFECZL1FVfa4120BxpJx6eZv96k2TbMMFAmIPiNhePJ59bHZkK AJdPp+Rudwn6wwx1jhEK1JMr7nD+BctUcAzLVBtnD0fs32whRK64y9nj8fessIxJWDq/sPc11mgw zsvr848IlE31rQ44IBm+CVC2OqqFP4zsv1/jHWTgiOVi5zoNAAAAAElFTkSuQmCC " + preserveAspectRatio="none" + height="132.29167" + width="132.29167" + style="display:none;opacity:1;image-rendering:optimizeSpeed" + inkscape:label="image4230" /> + <circle + style="display:inline;opacity:1;fill:#e06666;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" + id="path4233" + cx="66.145836" + cy="230.85417" + r="65.603951" /> + <g + id="g4154" + transform="translate(-2.5844572,2.5844633)"> + <path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path4982" + d="M 37.84152,259.15846 99.619061,197.38092" + style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:12.32540321;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + <path + style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:12.32540321;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 99.619061,259.15846 37.84152,197.38092" + id="path4152" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + </g> + </g> +</svg> diff --git a/Swift/resources/icons/delivery-success.svg b/Swift/resources/icons/delivery-success.svg new file mode 100644 index 0000000..c37db99 --- /dev/null +++ b/Swift/resources/icons/delivery-success.svg @@ -0,0 +1,107 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="500" + height="500" + viewBox="0 0 132.29166 132.29167" + id="svg2" + version="1.1" + inkscape:version="0.91+devel+osxmenu r12922" + enable-background="new" + sodipodi:docname="delivery-success.svg"> + <defs + id="defs4"> + <marker + inkscape:stockid="Arrow1Lstart" + orient="auto" + refY="0.0" + refX="0.0" + id="Arrow1Lstart" + style="overflow:visible" + inkscape:isstock="true"> + <path + id="path4240" + d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " + style="fill-rule:evenodd;stroke:#ffffff;stroke-width:1pt;stroke-opacity:1;fill:#ffffff;fill-opacity:1" + transform="scale(0.8) translate(12.5,0)" /> + </marker> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="1.6379971" + inkscape:cx="228.3272" + inkscape:cy="79.364707" + inkscape:document-units="mm" + inkscape:current-layer="layer1" + showgrid="false" + units="px" + showguides="false" + inkscape:guide-bbox="true" + inkscape:snap-to-guides="true" + inkscape:snap-grids="true" + inkscape:window-width="1680" + inkscape:window-height="1001" + inkscape:window-x="0" + inkscape:window-y="23" + inkscape:window-maximized="0"> + <inkscape:grid + type="xygrid" + id="grid4978" + spacingx="8.8194442" + dotted="false" + spacingy="8.8194435" /> + </sodipodi:namedview> + <metadata + id="metadata7"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title /> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(0,-164.70832)"> + <image + y="164.70833" + x="0" + id="image4230" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAYAAABWdVznAAAABHNCSVQICAgIfAhkiAAAAAlwSFlz AAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAE8SURB VCiRldLPK8NxHMfx5/s7W323KZvt4oIoEafdOFgOLvQt5YIU4WZ/AsKfMEdX/8D8ujGrCTWF4sJc /EjK0Wn2cpgJjfI+vt+PPu/erz4miUqZpQ8XZ4U8kyUAZCoYlkn1rqxDBZok1vLLTeJtAyxJzVLW 8E3M9y09OGD2Nwaw5IcxX+Pg4hxY6jfa4DZSKpcoq9xyctd/7wh5v+GoG2e0Z4bhznEMQ8hzqge6 /hBe1yQRNwZAxI0x0j2F6w9x83KFECZL1FVfa4120BxpJx6eZv96k2TbMMFAmIPiNhePJ59bHZkK AJdPp+Rudwn6wwx1jhEK1JMr7nD+BctUcAzLVBtnD0fs32whRK64y9nj8fessIxJWDq/sPc11mgw zsvr848IlE31rQ44IBm+CVC2OqqFP4zsv1/jHWTgiOVi5zoNAAAAAElFTkSuQmCC " + preserveAspectRatio="none" + height="132.29167" + width="132.29167" + style="display:none;opacity:1;image-rendering:optimizeSpeed" + inkscape:label="image4230" /> + <circle + style="display:inline;opacity:1;fill:#92c47e;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" + id="path4233" + cx="66.145836" + cy="230.85417" + r="65.603951" /> + <path + style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:13.22916698;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 30.868059,226.44444 26.458333,26.45833 44.097218,-44.09722" + id="path4982" + inkscape:connector-curvature="0" /> + </g> +</svg> diff --git a/Swift/resources/icons/delivery-successful.png b/Swift/resources/icons/delivery-successful.png Binary files differdeleted file mode 100755 index b8ad992..0000000 --- a/Swift/resources/icons/delivery-successful.png +++ /dev/null diff --git a/Swift/resources/themes/Default/main.css b/Swift/resources/themes/Default/main.css index 05e7a04..d759ced 100644 --- a/Swift/resources/themes/Default/main.css +++ b/Swift/resources/themes/Default/main.css @@ -253,3 +253,8 @@ body { color: #aaa; font-style: italic; } + +/* receipt */ +span.swift_receipt > img { + height: 12px; +} |