From 49c8c966fc60d5c7939873607f05013a92fce8ed Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Mon, 16 Oct 2017 00:12:20 +0300 Subject: [PATCH] qml-icons: add a third, grayed-out map marker It can be difficult to distinguish the new marker which is added on the map and has to be dragged when editing a new dive location. By adding a new grayed-out marker it becomes possible to gray out all other markers, while the current marker which is being edited is still bright red. Suggested-by: Dietrich Meyer Signed-off-by: Lubomir I. Ivanov --- mobile-widgets/qml/MapWidget.qml | 2 +- .../qml/icons/mapwidget-marker-gray.png | Bin 0 -> 2033 bytes subsurface.qrc | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 mobile-widgets/qml/icons/mapwidget-marker-gray.png diff --git a/mobile-widgets/qml/MapWidget.qml b/mobile-widgets/qml/MapWidget.qml index 140c279ff..d291dd4d7 100644 --- a/mobile-widgets/qml/MapWidget.qml +++ b/mobile-widgets/qml/MapWidget.qml @@ -51,7 +51,7 @@ Item { z: mapHelper.model.selectedUuid === model.uuid ? mapHelper.model.count - 1 : 0 sourceItem: Image { id: mapItemImage - source: "qrc:///mapwidget-marker" + (mapHelper.model.selectedUuid === model.uuid ? "-selected" : "") + source: "qrc:///mapwidget-marker" + (mapHelper.model.selectedUuid === model.uuid ? "-selected" : (mapHelper.editMode ? "-gray" : "")) SequentialAnimation { id: mapItemImageAnimation PropertyAnimation { target: mapItemImage; property: "scale"; from: 1.0; to: 0.7; duration: 120 } diff --git a/mobile-widgets/qml/icons/mapwidget-marker-gray.png b/mobile-widgets/qml/icons/mapwidget-marker-gray.png new file mode 100644 index 0000000000000000000000000000000000000000..856db9f5bd9a0c34a729e5e4aa5945d9bf6c6758 GIT binary patch literal 2033 zcmVz@;o?%Qu_W%F@AY({UO#lFTB>(_`g8%^e{{R4h=l}px z2mk>USO5SzmjD14Z`WEMkN^M&XGugsRCwCNms?DfXBx+U-(d!ZVU9AOf+u7VVL+%j znhfzUHg?nYVsF;1b=@WPxLx8!H>nrhn@zMEtks(AlA7IZY_ln8-E_NgLo^Vv+K3^s zfS^!@%EBNA2j|FXU=Dl1JM746<8Hg|mpnJ~ecwC3_xZoi|9L(skx20Wyi~v6|D<~o zpojp7iTGZL)o;0{1&ks9!axv+e4haFxBPAd3hL|Yk2Ezk{SsI!ev_X?1~h;z5C~M& z)zuwTRaJ31ol`oU?lRCPvJnBI-&K+)0i*-V1_uX!c<0U?6Tra0z)M9%MKW+37zKPl z2$%q-1<-$dM${)9K0UC!p`oD&z+fL8eP(7x0`T_IWHQ|YhDD43eqdVi`FxA@&jVgKe*E}})2B~on+*n> z<>lnASi#;yhcH{M$dZI4NqqkC$MoF3jjAZ9s)|NcQ51z}G>ShIV)(%WM#sld)6-|| z8#YXA*|KHK;c&E+l$87(=m16*1E@ezBocYW<#PS1ySqC*KQ9k^K>@K?jJ#E=`1z3| zSZy{WKvh-#^5KVcwY8xt3bHIC%QA{AqpB)ejRt_o>@4GcKSLuU^m#n|=IyszckkZ) zYv8NJrjiC&M@B|UySuy70jx$Ni9`ZPk{I@QIA2%C)WihZv@{e&;njl&*-%+YEFLG3 zNGwD&8f7LDVRmi~RaME&$zgMOIlEtck>8#;Q32!vI{7jBXI;H|wFp2}6!aMx#9}d$ zO>1;`m_MI8$IR3e8jS`;QTWMgud%+glz0*%Wx+%uK|GNl7N4)k=-eDjtk#(D8bw}Y zzXo7wdwY8pfKjhUr`7&zVF7W^?dA{fy~jj2jH;@nr>9e0Q-i&t;*l&QpHGPQ0S1SM z+421I!DKbai}W}9e7+wvG&C3htR@qZBt3S~{=PnbS6fRc7(|w3v|24cd;N9FHg22; z7Q0`75Pvc-Jk0j(+wY6=oR%M>f7$r>xCX#tFwAS4lFo&45ohA}wY3C%J|sy(RaJg^ zEFLGGNDvnqCN)hi z>KPoQ?wxm-nw*^1QI^@WfB(E3Dd4gs;SUBWShsGm`!qoZuwzC9?6C=A5pRQQ0^{916|*xmL@o zhYwTo+;a=h42_QBbUMEg4Qw)XAkhI?ot>Sf!B9xiXf%mGeegk7)0Hb1KdP^9JWx~9 zZ^_FGd_6Q2ZSCyDJupB>q&(?^wN-D*$Y6PPHhIgJqfbv~bZCfk@4m|~-h7ixg8@ZR_;GbLqh2p1u~=BI*Y}D} zIhO=b07E<;&%Jc%k`Z9%&YdAymOFr3qLb->OpC>0ayT4I91cfLO-;?pyLazyY-?*P zX=!P(wcWa9mnrW(=va5{i!Ur6 zefnwUwboY6o_+f;o6Vd*e?D>H!i6TlBTQ)F@acf8uCA_)JTRizitJp}HH z`j4do7-wc?RyQ{{8vu6f*x?hCO!#SLx)h)}5fdVNNgz$i{ePRJRlw@;c0RA}uX_rfVa}@Qp P00000NkvXXu0mjfse8dx literal 0 HcmV?d00001 diff --git a/subsurface.qrc b/subsurface.qrc index fc4e2ce6c..0e910675a 100644 --- a/subsurface.qrc +++ b/subsurface.qrc @@ -4,6 +4,7 @@ mobile-widgets/qml/MapWidgetError.qml mobile-widgets/qml/MapWidgetContextMenu.qml mobile-widgets/qml/icons/mapwidget-marker.png + mobile-widgets/qml/icons/mapwidget-marker-gray.png mobile-widgets/qml/icons/mapwidget-marker-selected.png mobile-widgets/qml/icons/mapwidget-toggle-satellite.png mobile-widgets/qml/icons/mapwidget-toggle-street.png