From 9262d8a5187475b157dde399f84b58ee0ff8e4b5 Mon Sep 17 00:00:00 2001 From: roberto forini Date: Thu, 10 Jul 2014 10:54:05 -0700 Subject: [PATCH] Use different gas change icons [Dirk Hohndel: scaled PNG files and added the code to show them and to make them somewhat bigger] Signed-off-by: roberto forini Signed-off-by: Dirk Hohndel --- icons/Air_change.png | Bin 0 -> 2693 bytes icons/Nx_change.png | Bin 0 -> 2717 bytes icons/Tmx_change.png | Bin 0 -> 2725 bytes qt-ui/profile/diveeventitem.cpp | 9 +++++++-- subsurface.qrc | 3 +++ 5 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 icons/Air_change.png create mode 100644 icons/Nx_change.png create mode 100644 icons/Tmx_change.png diff --git a/icons/Air_change.png b/icons/Air_change.png new file mode 100644 index 0000000000000000000000000000000000000000..5e15ea4645a191a46cc54823f280472491e017d2 GIT binary patch literal 2693 zcmV;03VQX4P)Hf&M}hZT;10aL{l3K78slo%0%u~J2q zsFYYJ7}P3_5hyMH5WK@yS)@#m8^Wb#0}Cb+Qqd%YY_28QE4w>0yED`0^N;Bnmk>2V z^i{o@?$@vT+rR7k`%c42j`Pkt55TOP&zm>zbfwe}lF8&H{4a+PVixci@PL%^lTymH zfR<7|HF@9q_3KYL_ML!^rWegXDRnDAS63I0KKiIQ<*0^X+%XAQ16l|X8ivu;($aDz zz~RG(Pd#u$LqkRgaS^awDfMf>0rK&9{JF-)#&wl_J9g|iHGr07O+Gb&8l}`jQG6en ze6g;s?vxu`3w&|Lj2VyLeDlqRmMvSRP1Dq-Y3{49ufGgHDRpX)(&=>NaHeHhZ*17G zVPJ4@u;e&Suz&yl;o92TQWWbPaKR}7UA1Zz0GUjtuD!ke$?op%y;^HeYwc>S-B(|I z^=KlIC{9YW{XqRG^KV;Q+mBv*?KNjIsMgwDw{G2lQp!6n%YO`9p`XPdxF&6ZH4@$1|A>p6B6t z9#TpS!(i5|Sw~x1S|*-;`e{Beuw_~GhGCqUNF+!mlZ0W2l#g(&Nudk=3riLI0 zwC8zS$H&L>GiT2H?}3*uUtT%9+_Eez%c=qjA<$YAh9O}XqP0dTg;I(j2nfUQ^=F@b zHr%&wUnO_MzbmizxcZSt%G4{R{Dfs$n5K!85+Q_+tQEfRS3xV~<#}EZ1i|*`krMn^ z*{FmM1$S~e{!3Tic;k&}%d$EXiA2?!$_Ro0-}mu-pCAad*1B?>@9pi~Ro>;>#Fkzv zGOO=^!gL^ZQZcq|`^s1>hGkjWFpP>D0fdy2Xlfxu^<}~^+}hLA6GR@Y=h_=SFK_$S z_efm33}`q}62A{vDYeuv3{0~uuYBJp3`2wvS}BETnp!C(wARA&JW8b!V`F1a0%@QL ztWL&foD;mDV8uNvAag#5#PRWd&zoFx%{7K$80W-dF>RVAVHo23ewA#blsXJUp>@ba zF2~4dk%7EV&xqN=IZMBSA1X$IX(Xq&Qx6L(cz&Ap8>ZZiG|JIT6f`O+NCGv$iq$vp z^{2MOo?ilkK=3|bDdm}#W!1)FF@zA6#Hq$In;m86&N2S>(X|Zyp%tA2k_ha`ks2u0 z2wcDiY#?4ExNhT@czo_QU<;53%0yqOU&AoYwr$(6Z5ypMuIpC8$3{kZV}G4^efDp~ z;4fOygOTd$1O5tZi+=Y;(jW#TffP{JIi1e$+!8es^F2*s`SRt`vaILY+S;yYZf@3& ziFJM6({Kiv&|TTGJyQ4>YVq*ndD5vvQJP zw@lN#Ael@egur!O9LK?NN*sEpkM1eo7XC9y#CUQ=1gEZu&~Y~_1h)rq5+6%j0Xk=rge69)>@XOec#7*T|CbtpFKv;=rR$! z(oEXk#O!mQ)SaF0($LT%ve~9xeSPT%T{oxTcb%O5*||)kkrdDfOa*#@zijGb^QJ$N z|4A1D2aPr+5yv$ZZuWh@+V+NW4IC{l=Jd?hxbWgWJ$-sB>GZh>Aqd0aE%|(|A4otd z#(DFb$N+6o{C~RT2!CI>5%&&> zJw25kyeJ-zYv1=N6biVmi<+5C|cJ<2XZugM&TQ1dTW5dGhDa z)Az(1xG!`A?|?Ca_MND9_4}A>!GZ;6S(arQhM^tDp;Rj2`+k|1m4OlhrDUbn3B!;= zq0qg4{dx`7G>`$=H7}E83y2~x4wS&xlK?9fq^n$=N~JE0NF%Jow$gKhAgHoer48ou zS@!PO{5QDbGu*ZDLBxHx0xs|_=pmpG6`TeH(lE<;fQ@W2suo+8b%AM`q1IYdNMkaP z*1CE;I?~UctwYYATYj*dtrs_=l5y6oJ`z1EJkF&OgiYu-bJ3kwvvL6M==MWYpHyrVPVqvn)${o+lm0sm3=50&=5c>>fH@ z9G-C*!*v&;J5pt~od8;ZjeqI~#y}^dNJ=zGU~0^~`tqi(Z!C#lz3|+LM_xGquWv;w z7XoeAww*Ezqg_gg<2bmkTaBsj`@EB%$D6b7LLV~VG+-nmhFE0NX)QJIsZYWi)8TLy zeMX9=E9TbR^M#MKuDtN{z8GW%ivF%Ozu5@vj#{HOipAnw%d(6h2zYW#*xbyc*7!H?^^Pt&8BqbiO3#fPD(7nIv4i0s#kLo!D zkfv!a0w@#;c%BzdR*_Ol8k$Yc&fEv@P6Di`s3Blq^fjbW!i*RsB|2h@<^aZTS-Uy+ z@a=0*?2eW-fa>Vz=vPWz3#5V|(EsciB2tqkHR+-ledjQ_){D!{eFzws)Oi};D{O?X znU*WKgO}d(jQ_&wH6XX5b-p430Mvm42L@VOTQ>_K8i83-N>i5yK@da&&k`zpi~c=x z@kghY-F+Ic*8xv~BjAXJBV!?3-W)d9y|{Jky4xPsM<06_$=@T;@PvQb7B60G*|t5; zG|knfX)YE*m=z%(h9Sp}4YBjBDdD>_yCmmC+VQ)Wy-aG?HcU$ZC4?SkV&V{`WBY)k zAabC+<3X#y3l}b=ySux(c*!M~G-ooI%Y+aeLWmaEb*)@3H`2Rr%l@OI8&>eS8|KqH z=<`zZDv&QhSd1R-MiH-wA5J9Z-!~R5TJ)c`WFUPL=N}rQ<(J!l`H`}clji?q7-c=N z>Z@?pN)U}76zqe1iL-!sbZ;SY?f-3jXt(|YJ^81rrTN|%00000NkvXXu0mjfWO^q0 literal 0 HcmV?d00001 diff --git a/icons/Nx_change.png b/icons/Nx_change.png new file mode 100644 index 0000000000000000000000000000000000000000..584e31037259bf0d3cb44173ea067d25f958079b GIT binary patch literal 2717 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 XqSBK#+PylL00000NkvXXu0mjfVl6j$ literal 0 HcmV?d00001 diff --git a/icons/Tmx_change.png b/icons/Tmx_change.png new file mode 100644 index 0000000000000000000000000000000000000000..ce9844bac4f49a3d247d1fa440e3f20b9194cc64 GIT binary patch literal 2725 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 literal 0 HcmV?d00001 diff --git a/qt-ui/profile/diveeventitem.cpp b/qt-ui/profile/diveeventitem.cpp index aacb0af73..55408dfdc 100644 --- a/qt-ui/profile/diveeventitem.cpp +++ b/qt-ui/profile/diveeventitem.cpp @@ -59,7 +59,7 @@ void DiveEventItem::setEvent(struct event *ev) void DiveEventItem::setupPixmap() { #define EVENT_PIXMAP(PIX) QPixmap(QString(PIX)).scaled(20, 20, Qt::KeepAspectRatio, Qt::SmoothTransformation) -#define EVENT_PIXMAP_BIGGER(PIX) QPixmap(QString(PIX)).scaled(30, 28, Qt::KeepAspectRatio, Qt::SmoothTransformation) +#define EVENT_PIXMAP_BIGGER(PIX) QPixmap(QString(PIX)).scaled(40, 38, Qt::KeepAspectRatio, Qt::SmoothTransformation) if (!internalEvent->name) { setPixmap(EVENT_PIXMAP(":warning")); } else if (internalEvent->type == SAMPLE_EVENT_BOOKMARK) { @@ -67,7 +67,12 @@ void DiveEventItem::setupPixmap() } else if (strcmp(internalEvent->name, "heading") == 0) { setPixmap(EVENT_PIXMAP(":flag")); } else if (internalEvent->type == SAMPLE_EVENT_GASCHANGE || internalEvent->type == SAMPLE_EVENT_GASCHANGE2) { - setPixmap(EVENT_PIXMAP_BIGGER(":gaschange")); + if (internalEvent->value >> 16) + setPixmap(EVENT_PIXMAP_BIGGER(":gaschangeTrimix")); + else if (internalEvent->value == 0) + setPixmap(EVENT_PIXMAP_BIGGER(":gaschangeAir")); + else + setPixmap(EVENT_PIXMAP_BIGGER(":gaschangeNitrox")); } else { setPixmap(EVENT_PIXMAP(":warning")); } diff --git a/subsurface.qrc b/subsurface.qrc index 64f78a144..dfeea6819 100644 --- a/subsurface.qrc +++ b/subsurface.qrc @@ -14,6 +14,9 @@ icons/average.png icons/warning.png icons/gaschange.png + icons/Air_change.png + icons/Nx_change.png + icons/Tmx_change.png icons/flag.png icons/scale.png icons/ruler.png