From 5f95c226ef4d0def6aafc60a9f4880a3a3374167 Mon Sep 17 00:00:00 2001 From: Willem Ferguson Date: Thu, 5 Apr 2018 14:50:11 +0200 Subject: [PATCH] Provide icons for bailout events on the dive profile. Signed-off-by: Willem Ferguson --- icons/CCR.png | Bin 0 -> 998 bytes icons/OC.png | Bin 0 -> 1347 bytes profile-widget/diveeventitem.cpp | 4 ++++ subsurface.qrc | 2 ++ 4 files changed, 6 insertions(+) create mode 100644 icons/CCR.png create mode 100644 icons/OC.png diff --git a/icons/CCR.png b/icons/CCR.png new file mode 100644 index 0000000000000000000000000000000000000000..9f29c08543ac7351fa552abc60173d88fdb04129 GIT binary patch literal 998 zcmVP000;W1^@s654Bdt00006VoOIv0RI60 z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru;sgW}0|40fZ&UyP02y>e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00T}*L_t(Y$DP(oXdPt~2k_tA zM_Q#-RBYAIrYb?36dxcW!D~^hAVk!K8$rQ^c0dUj65~xJE%wJl!Cov0pkfuxC9TPTb^zK1Fx)8UiKo%EjWoJ zp5O2`-jJt1&j+f^0@SiHy3mVkejCauN{qZ^)@`OedZJl!KtpTm>* zCRjJngNM|zYoV+@d_sNrLp_5hu&Dr)gwhf9;df`j#&^xFp!zWN;iGy6f524{kw(0K z)ib!KR7iSX0icP=2U5Y~&;O+ov#lhEcH~`NMh+X)o5Vq^k zTZ+wITpXLzcwe3l;c?`ak`B;JHGPkxQU2#+Z6#vgTgXELUxxAsM%1!Ip0>{j)J{69 zgE)jW5tVfvCaVkm(8MqEJZ&$@=8Mgp)iE3oCet%Hi2|MPm;W#AdHRhG$nOy<;lb*2 zHhn7j7h+{NUdC7{Q1=(SsN&{%isvFdk&kAyz<~~v0|ho!Y>H%`9Z+YI&rI+e1Eh_= zP%p(4J|5$x8sX~0eGBx#;s7&p6K)SXRqQP?Y2nR4POt)xs%6)o5vT}I%ev!=SRYk2 zjZZL|6coC!B_{Gz(ESdXJl(lOxcc!J?u^mj6;1rCJl&Vf^X3Y?6f@`FV09=)#b?+n zPydXw=S33_gz*i9FdfG8@^pvUvYiXG0b6lf0cZ+GVq8oF%N4jB-BGr!U{J@act@U| zRLcV7*6k$iBG5H>BrddSjGE5f-z@Z#LaCPGPT7u~9RTe_a#}N;0=hIpaeus5#?M15 zn3TeSCPwfcKES9vZ58b$a}szuqcSdw23sGadrbfwixT}2qZpH?ld}%Dli7LpAJy_P U+XyX@bpQYW07*qoM6N<$f*63nO#lD@ literal 0 HcmV?d00001 diff --git a/icons/OC.png b/icons/OC.png new file mode 100644 index 0000000000000000000000000000000000000000..6c4e7a7ff66e19f0502a1fcc6eed4efa65c21eaf GIT binary patch literal 1347 zcmV-J1-$x+P)P000;W1^@s654Bdt00006VoOIv0RI60 z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru;sgW}0~x%W$CLm702y>e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00gT^L_t(Y$9m)Fyy{)*VwZtKJ0F0$c;m11Eu#c<$9OHS0Ldz&2nWuwLDyxB?8I9(V>w;<>K@ z(7Lk;GqDBK13(^7^85uHAfDW(d)-N+D!vM9BVEe}9F%2>TMtiG1%p93FtvD3RDKpGC1njbamB1Rnk>VrVER2{z$A&>*53t8beHsgt zH5*v|*l5qncQeN(-J8D}yP+%!%3xTYWcqi3L2n(?#o>3 z+(F>2EdZUmDOr9JxaQ_z?il?E<=FT_*4x@G+2(_lJO8KwFJ} zAzQWu)eBq%rpQ*B!bv7Y^iTr&qZiLQP8@h1*c<^El$*S5`+hdO8E_rQ$RtJJu8>W^ zSSCdPV!&EpO9bFL@By&H_We@Uaj<oBVEK$);wK)VI%Oq*bZWZn}Dsh@9QxWgfUI-Q4-ztgzM^& zY3e{(lZ%5ZXiByKuSb&q1m3cJe{ZOp3P9-OWe2}UKr}E6Tr$LkGi7^GRzolnZ_6B6 zm{+kVKp*hZEdk1LKd=yp$#VwiDc{7L5MU&}YzRgMw+|kkxN77~ZGghkfv(ntE))Ht z?fYNd5+IdMiiTzhtBSx8pts^r?K2*17*>g&=I1U>FCRzIXVnhxx95D)*7?N-ZWXC? z3$Pk^RPGlS5x;}yo>S7@oeI4zrh}&n$}|<4ezT_N)-4(M!Jc`VAn$=b0i3~ehoo?| zh`3dX-yK;~AFvtEJp`b#jx!b5Cm*fy0j$~)w{G#s@hWEs9T@VRxlGwE2IZ*Zfkq%H zv<+l}OX3O#@!UMAG#2nm6aYBeZPl$mUe&x1onIxLh5j}pVwgt6Aq=7G&%kHEu@C^Q zu*RspUBSAgT}OYTVO1y40j!Xf)QJ6u+EUU$N&M{_;CrAK&kZW#Y+r-QI!+_-f^@Rq z_9N;le`oFxfz1-@o+3ckg`%f{USI&v%~n{a6|}Db;9nDc!*~qd(rN$z002ovPDHLk FV1kWGP+0%~ literal 0 HcmV?d00001 diff --git a/profile-widget/diveeventitem.cpp b/profile-widget/diveeventitem.cpp index f3c81f102..7e7c602a1 100644 --- a/profile-widget/diveeventitem.cpp +++ b/profile-widget/diveeventitem.cpp @@ -84,6 +84,10 @@ void DiveEventItem::setupPixmap(struct gasmix *lastgasmix) #define EVENT_PIXMAP_BIGGER(PIX) QPixmap(QString(PIX)).scaled(sz_bigger, sz_bigger, Qt::KeepAspectRatio, Qt::SmoothTransformation) if (empty_string(internalEvent->name)) { setPixmap(EVENT_PIXMAP(":status-warning-icon")); + } else if (same_string_caseinsensitive(internalEvent->name, "OC")) { + setPixmap(EVENT_PIXMAP(":bailout-icon")); + } else if (same_string_caseinsensitive(internalEvent->name, "CCR") || same_string_caseinsensitive(internalEvent->name, "PSCR")) { + setPixmap(EVENT_PIXMAP(":onCCRLoop-icon")); } else if (internalEvent->type == SAMPLE_EVENT_BOOKMARK) { setPixmap(EVENT_PIXMAP(":dive-bookmark-icon")); } else if (event_is_gaschange(internalEvent)) { diff --git a/subsurface.qrc b/subsurface.qrc index e15ec2077..c4d43b2fe 100644 --- a/subsurface.qrc +++ b/subsurface.qrc @@ -41,6 +41,8 @@ icons/Nx_changeICD.png icons/Tmx_changeICD.png icons/Oxy_changeICD.png + icons/CCR.png + icons/OC.png icons/flag.png icons/scale.png icons/ruler.png