From 1d585538641dbc9f87b4a883769500c46b6598ae Mon Sep 17 00:00:00 2001
From: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Date: Mon, 30 Aug 2021 21:30:22 +0200
Subject: [PATCH] profile: replace bookmark event icon PNG by SVG

This looks much better on print-outs. The remaining event icons
still need to be converted to SVG.

SVG created by Lubomir I. Ivanov <neolit123@gmail.com> and
made compatible with the Qt SVG renderer by BS.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
---
 icons/flag.png                     | Bin 1444 -> 0 bytes
 icons/flag.svg                     |  83 +++++++++++++++++++++++++++++
 profile-widget/divepixmapcache.cpp |   3 +-
 subsurface.qrc                     |   2 +-
 4 files changed, 86 insertions(+), 2 deletions(-)
 delete mode 100644 icons/flag.png
 create mode 100644 icons/flag.svg

diff --git a/icons/flag.png b/icons/flag.png
deleted file mode 100644
index 8a468cd66f4ecd821d5f863fe6e99e5f6c3719a7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1444
zcmV;V1zY-wP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00004XF*Lt006O%
z3;baP0000WV@Og>004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00006
zVoOIv0RI600RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_00jt1L_t(Y$F-GPOw(r=
z#-IP8CuqS|)RuyXRYWOr5+f)mD)GV~Gc%i8oVvM-CEMK9vP|Q`;!NDK4Yw@1Y%yq*
z%sE7H7jr5i;IXy^<RHbi(ozIzOG~Avf7}1Jt2qf^oSRSbUVUGl-}mNy^L!K`1XHQ8
zrhfi~v9Z&cLB4Sb6FF0~uCNUS1rhv9QPTl#96q*lT$*qc{!mOoB2nM4sVR5Kf_g<p
zZZq=p&Cd&9r#s-<b(Ovdq08UdMSJ<EKxe#Ge(7w(>WbxS9%bg3n-y!z&p<100uXp6
zfe<penwpeXw!G%ttyB}oPv=Q=C`29^ZRF7WHDsS!$=7Q)1kY@K&wb~>5q+e`zLyZP
zln_Eq<;7H0RZXUL4Q|q3xUwyLuY=-!G!_(<Lb_0ejO-Ewj?_}r$N=kck4WqTR;9(z
zzRacT*b+C+l}N`UVtBYw%$E6{IRi)a`4e>q_ixJ|8HW=-$alYwwcqUlLNN^1T}9(t
z>yZpKq>#Y{KYUp#(5Z8|#P}JbGv{iC#3^abE}7(FFe<n;xr0B<3HMrV9_(*znUN0>
z<nW^9ekX+48mJd%B0fDC9Ib%4wGJvIAQfWFae4rA7c*uXkq-O4D!Y9!%P}xq<_h_e
z=}FJ`_7yvOj43h%5kd%Z2(V<-hMU#jz}G(rMkYq~M>`?Vl%WS!00P8OLMYfo%nor-
z8ck3(>17I|F&$mq;z@v@wWq>sy2Hq625vS6H%(&^m4x}1o6-K`aUehtH%ozazf@xs
zfDL{`X$d%5h+rHAN<t$EA!zLb(K*c>^%DVyf0OpNb!`}TTad^K;TMSTK#~YQBS!|6
zj{YzA;$HnF06=nnHcD&i(TfLg^8^B3iZB62*)Y7qAZVI5YazTg0q~e*bB!%`(+3bk
zfD1qvBVcF|Tmlh-ln`>r(7g96xH|d(hDKK9dL&owMh7tgJPTD+23eQ}LkZw!!dI7)
z4*vwe<sthf)sC(7ijBK41{QA4gz)2s2uA|&QXG<m3JC0tFn;?pcux=_xeP1!e~1ur
zVdXuLlQ^VAMNr2ipeg##32VA=;fjPTjr!KUimly=k3#{c%~t4k*cXrYb|Y%O0Wkmt
zr2<13JcI+wkDi5Q$14B>be%Ydi`zG26_W)84N$R=BgO~wGRUCo$(q(4uPwh~)NPxk
z&3JXoXCItP<!0O$f*BTQ=0!wV1rjb^6(6*DK`@9gVz8b+4fVQ>h)+w#%z3HcMmSiE
z4G@cx5aS~aTHanep@X93Wi?~|KxR+(?V_i{5avj3(4bpsHnx{|oQ}mF&Y2dw-=EN_
zYlIRxs5GC2Qj-pUdoNDC{Vsy-w~;1EeZ3-JJ^chwTwE-Pa%^Xekdp>O>lE1m08pUS
zT=>x5S?uVuthI%F>RT35$|Bip!S?UJfLNA@zF!+qTlM)!)NaZ>;P($b3A@6)($d2G
z5-u-qRnC;*H@VWtIC=Bt$-0{APd>hD)m?XUV=hA6W8~WYuTMRFmm-8<S;6W<G{_q|
zL(81!&H1OaY_z|3W5nZGLkD@ytc0XJ&@MXp_aR$WR>lIPoG0YO3z!3dUNJ9I-)m|7
zp|9;mc}&7y+N}NbpCK0Jtjr<|-9;!A==Cke7lceJ8Z5OHfW=^FZTr8?0e~ii+D-^L
yN2dFn|8oa`kp}hq%P<E3nxd%dgyDx@7T_-&5t2Lrp7LP;0000<MNUMnLSTY$Lxq6=

diff --git a/icons/flag.svg b/icons/flag.svg
new file mode 100644
index 000000000..b5dd856f7
--- /dev/null
+++ b/icons/flag.svg
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   xml:space="preserve"
+   width="32px"
+   height="32px"
+   style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd"
+   viewBox="0 0 32 32"
+   version="1.1"
+   id="svg30"><metadata
+   id="metadata34"><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></dc:title></cc:Work></rdf:RDF></metadata>
+ <defs
+   id="defs14">
+  <style
+   type="text/css"
+   id="style2">
+   <![CDATA[
+    .str0 {stroke:#1F1A17;stroke-width:1.24967}
+    .str1 {stroke:#1F1A17;stroke-width:2.36232}
+    .fil2 {fill:none}
+    .fil1 {fill:white}
+    .fil0 {fill:url(#id1)}
+   ]]>
+  </style>
+   <clipPath
+   id="id0">
+    <path
+   d="M9.28983 6.40661l21.0341 5.69556 -3.28245 12.1211 -21.0341 -5.69556 3.28245 -12.1211z"
+   id="path1" />
+   </clipPath>
+  <linearGradient
+   id="id1"
+   gradientUnits="userSpaceOnUse"
+   x1="4.85575"
+   y1="28.2014"
+   x2="31.6208"
+   y2="1.43629">
+   <stop
+   offset="0"
+   style="stop-color:#542729"
+   id="s1" />
+   <stop
+   offset="0.25098"
+   style="stop-color:#A91414"
+   id="s2" />
+   <stop
+   offset="1"
+   style="stop-color:red"
+   id="s3" />
+  </linearGradient>
+ <linearGradient
+   xlink:href="#id1"
+   id="linearGradient870"
+   gradientUnits="userSpaceOnUse"
+   x1="4.85575"
+   y1="28.2014"
+   x2="31.6208"
+   y2="1.43629" />
+   </defs>
+ <path
+   id="p1"
+   style="fill:url(#linearGradient870)"
+   d="M 9.2890625 6.40625 L 6.0078125 18.527344 L 27.041016 24.222656 L 30.324219 12.101562 L 9.2890625 6.40625 z " /><path
+   id="p2"
+   style="stroke:#ffffff;fill:#ffffff"
+   d="M 9.2890625 6.40625 L 8.7382812 8.4414062 L 24.296875 23.480469 L 27.041016 24.222656 L 27.599609 22.158203 L 12.357422 7.2363281 L 9.2890625 6.40625 z " /><polygon
+   class="fil2 str0"
+   points="27.0415,24.2232 6.00738,18.5277 9.28983,6.40661 30.3239,12.1022 "
+   id="p3" /><line
+   class="fil2 str1"
+   x1="9.5425997"
+   y1="4.5817199"
+   x2="2.37413"
+   y2="29.979"
+   id="line26" />
+</svg>
diff --git a/profile-widget/divepixmapcache.cpp b/profile-widget/divepixmapcache.cpp
index e553081af..5feeb0af8 100644
--- a/profile-widget/divepixmapcache.cpp
+++ b/profile-widget/divepixmapcache.cpp
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 #include "divepixmapcache.h"
 #include "core/metrics.h"
+#include "core/qthelper.h" // for renderSVGIconWidth
 
 #include <cmath>
 
@@ -40,7 +41,7 @@ DivePixmaps::DivePixmaps(int dpr) : dpr(dpr)
 	violation = createPixmap(":status-violation-icon", sz_pix);
 	bailout = createPixmap(":bailout-icon", sz_pix);
 	onCCRLoop = createPixmap(":onCCRLoop-icon", sz_pix);
-	bookmark = createPixmap(":dive-bookmark-icon", sz_pix);
+	bookmark = QPixmap::fromImage(renderSVGIconWidth(":dive-bookmark-icon", sz_pix));
 	gaschangeTrimixICD = createPixmap(":gaschange-trimix-ICD-icon", sz_bigger);
 	gaschangeTrimix = createPixmap(":gaschange-trimix-icon", sz_bigger);
 	gaschangeAirICD = createPixmap(":gaschange-air-ICD-icon", sz_bigger);
diff --git a/subsurface.qrc b/subsurface.qrc
index 462857b88..2203a5011 100644
--- a/subsurface.qrc
+++ b/subsurface.qrc
@@ -37,7 +37,7 @@
         <file alias="onCCRLoop-icon">icons/CCR.png</file>
         <file alias="bailout-icon">icons/OC.png</file>
         <file alias="salinity-warning-icon">icons/bluewarning.png</file>
-        <file alias="dive-bookmark-icon">icons/flag.png</file>
+        <file alias="dive-bookmark-icon">icons/flag.svg</file>
         <file alias="ruler-icon">icons/ruler.png</file>
         <file alias="poster-icon">icons/poster.png</file>
         <file>xslt/commonTemplates.xsl</file>