[PATCH 1/3] Add top-right edit and back buttons for mobile
Henrik Brautaset Aronsen
subsurface at henrik.synth.no
Sun Feb 7 13:34:24 PST 2016
Oops, this patch has "Fixes #1008" in it, which is very wrong. Should I
resend it, or can you remove it Dirk?
Henrik
On Sun, Feb 7, 2016 at 10:23 PM, <subsurface at henrik.synth.no> wrote:
> From: Henrik Brautaset Aronsen <subsurface at henrik.synth.no>
>
> Adds a back button in edit mode, and an edit button for view mode.
>
> Fixes #1008
>
> Signed-off-by: Henrik Brautaset Aronsen <subsurface at henrik.synth.no>
> ---
> qt-mobile/qml/DiveDetails.qml | 51 ++++++++++++++++--------------
> qt-mobile/qml/TopBar.qml | 62
> ++++++++++++++++++++++++++++++++++++-
> qt-mobile/qml/icons/menu-back.png | Bin 0 -> 3715 bytes
> qt-mobile/qml/icons/menu-edit.png | Bin 0 -> 7369 bytes
> qt-mobile/qml/mobile-resources.qrc | 4 ++-
> 5 files changed, 92 insertions(+), 25 deletions(-)
> create mode 100644 qt-mobile/qml/icons/menu-back.png
> create mode 100644 qt-mobile/qml/icons/menu-edit.png
>
> diff --git a/qt-mobile/qml/DiveDetails.qml b/qt-mobile/qml/DiveDetails.qml
> index ef51a71..b2744ec 100644
> --- a/qt-mobile/qml/DiveDetails.qml
> +++ b/qt-mobile/qml/DiveDetails.qml
> @@ -56,29 +56,7 @@ MobileComponents.Page {
> state = "view"
> Qt.inputMethod.hide()
> } else {
> - // set things up for editing - so make
> sure that the detailsEdit has
> - // all the right data (using the property
> aliases set up above)
> - dive_id =
> diveDetailsListView.currentItem.modelData.dive.id
> - number =
> diveDetailsListView.currentItem.modelData.dive.number
> - date =
> diveDetailsListView.currentItem.modelData.dive.date + " " +
> diveDetailsListView.currentItem.modelData.dive.time
> - location =
> diveDetailsListView.currentItem.modelData.dive.location
> - duration =
> diveDetailsListView.currentItem.modelData.dive.duration
> - depth =
> diveDetailsListView.currentItem.modelData.dive.depth
> - airtemp =
> diveDetailsListView.currentItem.modelData.dive.airTemp
> - watertemp =
> diveDetailsListView.currentItem.modelData.dive.waterTemp
> - suit =
> diveDetailsListView.currentItem.modelData.dive.suit
> - buddy =
> diveDetailsListView.currentItem.modelData.dive.buddy
> - divemaster =
> diveDetailsListView.currentItem.modelData.dive.divemaster
> - notes =
> diveDetailsListView.currentItem.modelData.dive.notes
> - if
> (diveDetailsListView.currentItem.modelData.dive.singleWeight) {
> - // we have only one weight, go
> ahead, have fun and edit it
> - weight =
> diveDetailsListView.currentItem.modelData.dive.sumWeight
> - } else {
> - // careful when translating, this
> text is "magic" in DiveDetailsEdit.qml
> - weight = "cannot edit multiple
> weight systems"
> - }
> -
> - diveDetailsPage.state = "edit"
> + startEditMode()
> }
> }
> }
> @@ -87,6 +65,33 @@ MobileComponents.Page {
> currentIndex = index;
> diveDetailsListView.positionViewAtIndex(index,
> ListView.Beginning);
> }
> +
> + function startEditMode() {
> + // set things up for editing - so make sure that the
> detailsEdit has
> + // all the right data (using the property aliases set up
> above)
> + dive_id =
> diveDetailsListView.currentItem.modelData.dive.id
> + number =
> diveDetailsListView.currentItem.modelData.dive.number
> + date = diveDetailsListView.currentItem.modelData.dive.date
> + " " + diveDetailsListView.currentItem.modelData.dive.time
> + location =
> diveDetailsListView.currentItem.modelData.dive.location
> + duration =
> diveDetailsListView.currentItem.modelData.dive.duration
> + depth =
> diveDetailsListView.currentItem.modelData.dive.depth
> + airtemp =
> diveDetailsListView.currentItem.modelData.dive.airTemp
> + watertemp =
> diveDetailsListView.currentItem.modelData.dive.waterTemp
> + suit = diveDetailsListView.currentItem.modelData.dive.suit
> + buddy =
> diveDetailsListView.currentItem.modelData.dive.buddy
> + divemaster =
> diveDetailsListView.currentItem.modelData.dive.divemaster
> + notes =
> diveDetailsListView.currentItem.modelData.dive.notes
> + if
> (diveDetailsListView.currentItem.modelData.dive.singleWeight) {
> + // we have only one weight, go ahead, have fun and
> edit it
> + weight =
> diveDetailsListView.currentItem.modelData.dive.sumWeight
> + } else {
> + // careful when translating, this text is "magic"
> in DiveDetailsEdit.qml
> + weight = "cannot edit multiple weight systems"
> + }
> +
> + diveDetailsPage.state = "edit"
> + }
> +
> onWidthChanged:
> diveDetailsListView.positionViewAtIndex(diveDetailsListView.currentIndex,
> ListView.Beginning);
>
> ScrollView {
> diff --git a/qt-mobile/qml/TopBar.qml b/qt-mobile/qml/TopBar.qml
> index 5eeef7d..4f3f6fe 100644
> --- a/qt-mobile/qml/TopBar.qml
> +++ b/qt-mobile/qml/TopBar.qml
> @@ -82,6 +82,67 @@ Rectangle {
> Layout.fillWidth: true
> }
> Item {
> + id: editButton
> + anchors.right: parent.right
> + anchors.top: parent.top
> + Layout.preferredHeight: editButtonIcon.height
> + width: editButtonIcon.width
> + visible: (detailsWindow.state === "view" &&
> detailsWindow.visible)
> + Image {
> + id: editButtonIcon
> + source: "qrc:/qml/menu-edit.png"
> + anchors {
> + top: parent.top
> + right: parent.right
> + topMargin:
> MobileComponents.Units.smallSpacing * -1
> + rightMargin:
> MobileComponents.Units.smallSpacing
> + }
> + width:
> Math.round(MobileComponents.Units.gridUnit * 1.7)
> + height: width
> + }
> + MouseArea {
> + height: parent.height
> + width: parent.width
> + onClicked: {
> + detailsWindow.open()
> + }
> + }
> + MouseArea {
> + height: parent.height
> + width: parent.width
> + onClicked: {
> + detailsWindow.startEditMode()
> + }
> + }
> + }
> + Item {
> + id: backButton
> + anchors.right: parent.right
> + anchors.top: parent.top
> + Layout.preferredHeight: backButtonIcon.height
> + width: backButtonIcon.width
> + visible: (detailsWindow.state === "edit" &&
> detailsWindow.visible)
> + Image {
> + id: backButtonIcon
> + source: "qrc:/qml/menu-back.png"
> + anchors {
> + top: parent.top
> + right: parent.right
> + topMargin:
> MobileComponents.Units.smallSpacing * -1
> + rightMargin:
> MobileComponents.Units.smallSpacing
> + }
> + width:
> Math.round(MobileComponents.Units.gridUnit * 1.7)
> + height: width
> + }
> + MouseArea {
> + height: parent.height
> + width: parent.width
> + onClicked: {
> + endEditMode()
> + }
> + }
> + }
> + Item {
> id: contextMenu
> visible: contextDrawer.enabled
> anchors.right: parent.right
> @@ -108,6 +169,5 @@ Rectangle {
> }
> }
> }
> -
> }
> }
> diff --git a/qt-mobile/qml/icons/menu-back.png
> b/qt-mobile/qml/icons/menu-back.png
> new file mode 100644
> index
> 0000000000000000000000000000000000000000..dc96b7728cd566385c759a4cc7e85ed3af728cba
> GIT binary patch
> literal 3715
> zcma);Ra6xG7RCPq2t#*?ASER*G}16b4BY|}0t!QjfS@!Eof6V92r3;a2#9ne9g;(b
> zNc#;SAa(uT?!$e!5BvPqUgzoTwf0&k#z0Sloa8160DxQ*scQ6>w*LxB_;;>m`rP{q
> zVh^N+7XYNR{|W-KbD01j(RW553=Evyz1_W>+&$Pe5eRmVXYP*9PaFX7ox>QTOpLb}
> z6iyb8;M&pXRBd-7dMLXQJPu8l%p<@-Or;ggQ7}ty*iNmcM!?dSAB~@ofR3j(6eNo!
> znIT%|c$*ORE;_dVd?nzW>r~UpkD;sDX~oToLrl#GQ5%#j9Vu=oi6$$Bvr#XH^>+2F
> ztP3lLkZ^kdDrn7P4zEit2sjOvm%q!|M$`fzz7wQS(59QyCUPt4nsOVSWd%WpL)yHP
> z?`cEPbU at iZ0bT@@)gfq1CXX at 5CjhnskL=fgfe^6eefeVopfRUe0T5uB%0UmwPX_F?
> z4$-Q>Ne)zu+>ccQ<|2U3QM*e9%m at JyO*2O%_*f6xhN(!a0hA1g7)D3%1A+ix+sDP_
> z3&OJiojT4;{-3*5RGR{Slgg@=Z{U_u3$cU>c at mkK3A6DHYck%Yld{9J%T^Zd at XKNr
> z3z48)J{$xfKbijTwTG9!!xUA+!%_)#6c2^ATM4f@?d{jDHb%-llmS at r4j#J_gw@<c
> z%Mqg8uHN3+CvdVM&3}Fp=U7dtTnqBI=FAQ~{>?_MAgN(?c4K{gMym^MY1eNSbcO18
> z*k*S5<SbbJ;^cU_WtBTb%sNDa;B>iT at JOfd*2rt(aQpcmi5eI6q}La$6P#U|_6_C&
> zbZdq*o(Zbi at rPoCoH6j%{M~oPuOF{237+FCE=huqE{c$VWT6u4NBF<Bd8y33+g48i
> zz%{zJf9HeZqn*N5MtrUhlrA;$?*O!;=4(#?Y*e|0P5Nt;dZ7TQ=7$J;RAD)4XA*29
> zyw!eVzMb^KRw^9M-PHl7f|EQ(-+E at tUl9uDiyZpMDqsuyuFNXYX6O`|;z1$YVfuwa
> z!GrRT9W<|<uPKC>K&1~#YsWDc4Y7|k=SqMwW<{KGv?B><;<(wrMbjB_Y9~t~MU7%j
> z*iDhFIE80;GEr9QUz6qffLQ27WRr$yYDl%A!gsP-L_>-6&2aU%q@$0$MY9tb@^eO?
> zeZHv>FIBKPTJA(Sm#B#76>0m)L?qtzL`1l!6aML*AaTm0flr(jWaT|KKi;pvZ;Uy9
> zH1f%ZfF?w(jaZ7n2hMKCrh+urG1r?xmayOAmY|*^mL|pzH|*f$OexX+%=4A{tc%HB
> zOf<?IDabWNlSm7r3W!E at NpsW0AjEhZlJGP?y*C-B8CM^FYQ(iASehe&yvddFZSJva
> zHIYoJAp70Eh;__*=eqbh%Q^?nk_2O~?D_uGc$Lqn-$jdggK9%!gU}&UOvUtFw$VaK
> zfeE!_;sbbPL7mYD!>AHkiRaleLtzY>+J%*G(<W{@F*=<%fB5PBm3kqKO)q2AY<yr#
> z<7dWC{39PS@<{ry-e?pba}E;`6N=e~=|iSY5%WYGbFYbrwCGOeW)@|ZyQ#TAoj at Rc
> zaz9C$RvJ$livY}|w5+IXv5eI8&~(5gvDC&ms7l>b+<2{&_<MS}X&J^~$C$+!RVr5!
> zRfZ~YH&J>YY;hSwXwj+DsgHPXnE&bFT2l`@=_BSEUqKF6^76>%A(CA at pN3`wUkEg2
> zUa~gEDU_8K$RNbE#La4q4pSYKh}JSaPjkKXh&TC)GY*4e7wHc8SNU0rBy<`?9jsi-
> z(lgS{%aP at V<r+K9QdN7!n4)I2MvL<h3YA_hUMpS=RO0Xr%%<_I at j@|4F at vsx>~WQF
> znQI|SL8Gcq>(k=>%)AyGbe at iT@uFYz=AT<ZuuGFmw?D<l8f4~#HDug`Sh8Uz`EE&1
> zcX?J=FZLfpgmtGfqR=kQE at LG;xnWHH-K6>}b;@|>9;-F(HMbtOo_9QiJRCgQy4$+@
> z*+#kzMf^o_I&wO_LxV$aho-V5a}-3U#Wr&`bEb2a>TMtRJ`k)csr%xfS-t+C$YQ^)
> z>1o6R8H+-5(+Acy>Xn$vJ5!C7jm6Z(4SFeh<#|)6&X51peXA?2Xa2Y`Lx`=abE^xo
> zL)kN;>bt8t_fwivg1!d5x>O({kD8?@XMMmL?DhE>o$P(t#q8nSeWjr8qx3Bp%6x=s
> zWJY|gj&^{*%Nb*wGogWEL^XJY9Y)8+Xon66XDABiu=FhSHLq)VAA4G__>UiBa%yrq
> z_DZlH_NDfn_oL?D3`)G=&$AHs8tv>uEE{f&DUrTO6LDRt2-ZjFhoEXVxnPfA$!3+)
> zAL|Q!%1-PK7!`jjK6|sKxF#>XD7I+va8SCfzOQ~jztcVMVZ;*RCD--iYyaypP>j9<
> zLE*=QsDxPJouB##a<nEW$zmOTSI_RL#OF7t(5obdR)%i0S8_P@?Iu-noNQ(eCl5PQ
> zL>L7BoEjyv`(YQ?8BE3-5fxz;sg&RmZGLl1G(*y7Y#!mYr20oSU3D=BC8{s;K}btd
> zK(S2NMSf2DtHf8O9$`m|!AWzBx#kn?TQb4|RZ>r%v at Bih9Y(EUR!P?a7&Bpg)*gNZ
> z!yQKv#SEpwG=j3}$~w_{_fmhUPzjVU#NWZu`rJt%@#|piKykvxq{gCW5LN<gdN`zj
> zuK(-Z<R(c!?r!ly!HtG+-qNHd9dez89N9dE>=*2AVhXa&qG7L-lRV*N9J(oWsBP2_
> z#}@+?4iVK?-B07{VQgtc-&|{wDsET^k<`J9ewsYsn-(CdMmd-{whqPg%cPg*-5uH+
> ztm(%lN#`ECx!$AcpjmlcR~V^nCd6v~qq)LGrdr<94@<H}f8%cCeZmU)FR^t3Zj<`u
> zduAC`!OcAWx~?HM?fs$cwGh`GQd5$Rh at hSM={;+GbC|_at=*qU42vRtOl%b$mNA3=
> z<qY4v?*>bhdw*-zeCp at Y@~(!*BaY*aTR#?s at +>LR%QAjsP&_4{o%>9_bpP|- at ozOO
> zEMtfd+Za}dXn5Bu|E0;H_}lQ1oRZ0VlOvNqCQ|$33$=FBr%%WBSpu4VOYBZ!Et^g*
> z6~DD$O(CYbla7-P=bGm=CrVW at Wm~7|=Wf=OdTyS3z4+t!mqc6?b<+*sCt1f8OpFqz
> z?(S$%^xkf{!W{SrkxP-AzRK-c<?>MVTi-e%UOHhTmz{eNA5gJEG;#X{D~c870?)=}
> ztLGSJpIh2ne$^jT9Glu+^uN%+-loizkhk#DIyCv_Jhv4(k%GdF#ADJhLBYaj^S0Qx
> zbpe}?hL>C at -4DJ}d9RGCUB_+8HOUQI;l6m|s<9iiW?#&*Kgd3G+xFg;ze<_V?`_O&
> z%&uy%a&6f6Z>|k+JlSH&lOA3;YWDkw;d*K^Pex&(`Ox3}r2FJ}iD4o58SmxrK;x_r
> z?|x;Ie$&Gv<vo>I#6r}hlI7L>%)$Iimo}gL!?Agd6T*nFk*nn6L`uYs#H_ at DNb<;?
> zynBi=GOJ3 at F1Id<5hIUBc=8yp-d+t<F*3k{PbYV#hsQF<3NmmRDXngSg_qlHJIo)j
> zJsmx4E#G{_MQx7mpYOH%%=@q&yj!BwUk_w|$#?B^_UYJowD>%QIVI(q06+8a;*q!z
> z_V2&R{s?KL3xNL}0MKCooL&Fr768vh0NAz#KsFNqM)%hbyVU`}uhLXiG4Y+-U1-;)
> zGX#Xc-0gY7Jv3HL>2 at oHSJl}VRH30pP+4Dw_Lp`rHnrcolS*ycSCDEts0uT(fV;t_
> z`YDUcDWBQ<3RYj%z;~ABU*#GPnlYD(N!^}|(+Bn9=Z=BmJN$)hGXr<-D+4?c0(OA-
> zFZ|3teKkLOC~uZ`s0$!yH=t3KHrEHyYwffV!3UAo59&y4o9|Ac-_L2T`q>1XHTxf0
> z+(?=p=_G-VSB6d_LylW at w48Sn>EOAkZ-yKX=tv?0?3n&^+k4g;l?KL66Yv+-N~%DU
> zhjm9SHuUxM6k}i72r?8<<KWO4RpbKS&n8 at NPY>JR;NW`A?5<lgA1s`S8y$ihQDI{L
> zi|a5E!SG+iw)q$S;qU^H5)I_&ISGM?p(0Q<^cGQ4Y9(DZfX#8C+i at D|>I?%LI393g
> zxjYpY4Soz<6Xp{xOD=`)rCsZ2okak_B{z`nPL1BMB(ObWfS9+a{XbUvO&4v=oWWHh
> z#jdBuOE<_X-9asa(N)|;k~N4^2L{rHQYvQw{QOr`y(u6V&$l#n&P7^zVq?ct!bnTa
> zc{V|tzyAFE{0-hI*>afC_N3Zv?BIH#>V_+F=}=xt2-q=20{>NatPBY*C4Gb&KN^*D
> zTpcI}{<&;shssZ(*laDA*anA(t6+kHO|}t^5Erlrlnaf{km2jjj@;D+?okqWz&0 at O
> z!mgeIQ9kKHUyO3Sk0noH;)s3QIW{(CMB>x6+DX$xp*DX*gpN|XxTuH_7Hd#G`CAgs
> z+@?sWCIJEYlhD at X<(O&4XiS)==N$T1(*%WvbU?O?_SJ3n!g;3`-gE>iOXK6?DOSQ6
> z_ at hM2V(4CYG|R0>ngTBny$k^LEx;a%4^%w>8cG4E+981R9#AGA`k%|>og1}~6-CG{
> zhcBoi;qZsrGTGVNugaqD`j1KCF{$#UX$^RJc^!EAkF~JkF~R@!6B85eJ5^lGoQ3gF
> zTd)$3n|_~~6G$tC{*{PZdOjYEK17uw`K6C?bCily9L2KoCkBXKW8M?B{Uo}Vt8;~y
> zH0F8`Y}I1auXUy=r%7ge?-=Si1 at 0a9>x%=Aixq`>k3SrWOV-$m&*bQ>YC|dr6CM?s
> g1N=9for5XCH>nUKzKmGEzbyxvYI>?waNE%T0L-Yy+W-In
>
> literal 0
> HcmV?d00001
>
> diff --git a/qt-mobile/qml/icons/menu-edit.png
> b/qt-mobile/qml/icons/menu-edit.png
> new file mode 100644
> index
> 0000000000000000000000000000000000000000..ea7dd055adce2f31a0ca5078b6ca6c82c7a38e86
> GIT binary patch
> literal 7369
> zcmYjVWmHvN*FAKHNOw0}y5Rzs?vzwQIwX}wKxrjJIz*IikgiKecS>HmOF|mH^Sr;l
> zAN%Yv&N$<&z4n at G&bfEAj+QbWHYGLy0C=h at 3VPsd`QN}q2cPR{K4Rd6<*s7l1pqkD
> z{~Jg^Miw~$U~4<VU^+SuZr*NQ4sP!BsxTP6yQiC-ql+y7_%3AY+Z*WbkxE~!T*#|O
> zg?v?a(<8y8*OQM8Ax>oFWWXX+i(>dbPomrTOi>Y)sy{ahB`z-H6NxT2ZVdJxj7^5T
> zxDP*~Vg~Ql0)9Bpwq9+IJl4(0?3A5n*N$PpF>zB=1a*Z&aEs+>pRIoA>*-zF<dqG@
> zW_AY%F>7rYydId4fa_o>DK17hMmvDyJB5P at z%?`BeAJOo1pD&o=13tQk>K8mV(OS7
> z#DJ`SoO}TwtArGioyMvU<e~zWL$9qj039B{lI{KW6cCbqogRP$n0;j+LCQ at 8=%3q0
> zDF6<VK-t)f7)8LC4<NQv?-2+7 at Bn<OMs_MdRRaJYCB&%#FmVAs-KcO505t%x>}O)~
> z1wN(bvIQh&KB2zNNaol38fYGM{w3^l{#@xU-L;-zIDRVCvh7O_IM%8=#l@=K=>
> z2o)k&Js$>u+(Z&E+w%wCQT&S0QIWWMd<&la4)iBRYwL~2t+7&fSpZn`4xV`AhSXAq
> zNTP?hKIX9;qdL68$$fhjYga=cTL<LsEf}4<|F<`a-xHeV=eIUD|ETrIn^_GS1wGn#
> zS-_1RTyBD;?yoLa+t-;x1zv_Kqh7Ce4PR*FQ;&VY`e?nh9j|=ffb(=uGsW1WYTaba
> zNxY#;<PoQk@#$P3pD|kg3&(Gk$tRn21os_^3_=*Fa*{y`NaQJc`5NV)Ivb&}H+=mH
> z0M1(6I;Yt&Q9>L(td03Roj at Oyb6J28JJl~90PsqInb%;j7TSji01COGoK<pE7oFtX
> zaCGWUw53j*drOgz^2|M5@`Uo(HX+oWmK<ea^6U{KRWzKIkZD;OA-JwXM3Or`Z<k>s
> zzO*~RtrccYCwprs7OGr7=5s5Cg(xKJ7-Ob5OtSRwYlco0RH9gB`hh57T}JgpVHJM8
> z7z27k6`C_?Ph{~(bEW1)$$mf}>^`DZng45Ojjr at GZXK+tNR;xUQXbB at jW>TrJZWy`
> zxaTiQ=}#ixcg9N{2o~aHV10b>U2+V;9v42|-fsD7F>b7+*F)8eWw at oilvOXvP+Fod
> zUyoJ$pb~{D!m&h9edOt_XysIlHH@|Xs1(stGYdUiz!Jqm`Ka5)#+X#3{)@Hw*-a0*
> zwE%ylu?jcSEK&S(2w^}JtVfiYC>kcf)|7y(TK&^tl4w$C@{JzT9(Qr3kP0PJ(!hd^
> za}9?0S8jT){_xH0&F)RXO{z_XGc)XLYgvz<*ZS-1dV@}C6kCK_LR;vzX##SFKQi=|
> zi at qB?6OK2PFaKVzSE(CW^jzp|hWN+_QdRZ*^1S3JN(VBBE62)R at 8)OA$+TLj<3^K1
> zd&;}1yC at evxOfpHANr!~*(ox~G05#He8?-)GzuuDVk!Cz_(b^+(st4b(%lS=IqNwC
> zNfHOKlhu-0lc_i%2E`=>B`YO3hUbPu2JywO^n)st3<dQ!im|3sN)1c0bq at 5Y^zDl!
> ziy}+xi`)#LKZ8vkqR~ydHM+H7KXr4fEjC(v>2Y3D)cSHWIOCN at ybTrZVXYpS4}8bj
> zlJ-E;5-VL&{9PO-s3vGst9Sm at 4vMjn=5d|nt%bG2UYL3w9J4}v!m-XlRUo9%#BXcv
> zT#}NSVqB_Hs#~gj&?ZuGRG3}Rrr2U~7m6>}r^aT^rfeTSik7{jKd--Bh+RmkDJ^kX
> z!CT^-PxZY;!KdR*;c;3{`>T)~4Y$G-zqXxQ>LAF2!Gr5<;iWRJF?ua7Gx{R#D7n;c
> zVGlPc8c5&bUtQSCZdq8qRkBs;+Q-DE38^15N}rVoJ~{T9Z!mAT_PX}|U`1zTU{%-L
> z*F4V9(`+i>D3H{U)aV--9?2V-O&89T=ARST$=u1D%S1F-n);e@*B8|{+N#!UniiNG
> z*SEe2Hx)O at H#RhVS*ui at UCuJwQr=SdtguNdNvkwx*1o&yZ~Z`haRWuw)*tl6ih9 at j
> zAS-)oGW&+#72U^4ZAn4RL7yL_G4LYi at k?n;X at b3ec@j&!kXXqW%{qn#{k}-qgV-C7
> z5sv*4+^By(#L?rJt)DriY)@w2<n`e^DmGd at Y=}2ihBuR{ce%f9Q_cI*<K>$F<Yjhd
> zZD!X|(PHJX$g$&b<kGicp>G^HCW2n$-Tkmt-K_~I&bMSfXGB at BHcUIzzHWyJ@*0w8
> zR6bYLkndA+WpzR(^H0X}+lI`Bl<11UiiyRrD7>M+VMx2%Eyp4p0ejE%Wb@?zGyxQb
> zuprr^M2E_Snjzm^`v)>~#6cw%ZU5EGAIW{nZIUCAiw`Rg+v+T5aOgiwC}+6ZNgGWZ
> zb;J+X3ErI@$FSPAitP@@WeblCH;RD9xknjOPVlD+`%Emsybubv3MmRJnfCnJ;*~sV
> z!kjWCyiQUJqRm3h&|Y3Uli?ZTY-3dyb!u^5&I*w?F71f>qw~o1>~)-t0J1bl|4Vnj
> z at 1tE8;f18dyhPj*DY6<-T4G;M<p?>8NI$WhJ@;XW!}jZ<>9S{pOo&WG{ehWt(rTTl
> zaBBL0IZSL7_GA7nn9se{^pUMNp;ZG<V>weIhcx3Iy{mw<L>vEyFNp~r at +AzKN%i*o
> z_S<&vhRSTiYaV~UiEV(;CSwdZ*Cv#qnebrO%NOh#n6l4tV$|5%8rgM>L=TFml;&`a
> z91YhFE+&X(oqT&bBI+Vq`%<4Dp>D)OW4zr~<|JMt<>9x8y+MM;74ZVSOsX-ap3`+k
> zyY$E?wIaBU)nC&&^i}6zSZ5uQ^8t<__Evb%!P4B(OKoF_38K#GHX at r!h9o+sf_RZE
> zmE`>&_9fpfsz|rNj`XFkzluwHnrz1GChhjNS9o&F at KZ`sw^Q-o;LR`m!b80Hb#(bp
> zaS at U_!oJw at p&r)sqeH5()wXb8bVL$r at YCSJ;MPFocyhVUYVP{Y#4%Ms>p!8xnMJeK
> zs|T5Z_C-S^L(Lhx8QVM6yV@&gMRdvDb;_OV%W^GOkE1 at 6Nt6c+Cj9!jrs)})NofPU
> z_*t$4W&A$6_Q&iKA09jrJj2gfz3WWw3Vxe=S6GNET0Dt`cb@{v)-a~%-qG08K%C?=
> z&N7rT^)v3wtj(IWhh-*a_gDPyl^5v<vV^2e{M6131{@dm!lsh!&&EDwCuau*^WH33
> zF6Pw-?7SXDI1#v=G!uHSO)5Uc?nt&uj+&n}dY{!SZap_ at G|H%yuyEb?-j{kzn$qrT
> z$!f`{Xfk(hI`(g?3$VM|qskE-UA}1Z`%C&XJCh?Wz1(*0?{@Y3>JmY^9PG*VFgnyS
> z at 56Rn-m2YdaUpvoHxFBmoPnA>F8w)KdhZ1H$vvM~QoceD|1kELco|OsLyJ$3ABw<>
> zILHx`5f@*FdOqyk7sAGD##nR69`hcDD#%D7!PhefbE6Y!6W>$MQj<Dd1M?sD;Rh6z
> zi at jaFwCw}Fg8Z*8UfdmZ`Yid-ocur#Xm1A6zh{4PxT(I>A1}O1qDV at 5LPbeCzke;r
> zvk3Z4`qwIYngHO>0stW&0N~~coc93WEgt~vTLOSY8UT>FeX;nh1OU%2R2Ae5d>0P0
> z0}Kod at A^9I(VHlH#A2X&LJGP_RB13uR at PfR$34j~>-0J9TJs at +$>bOHM7G6$!jfxJ
> zCY`LJ82nW6NPgn{aH#aML*H0;<@>#!hrzcg(UpautJS8Cmh5&-+o4NK_xg8u6L_^U
> zR{O2?N}RaQqssUsy*~`j7@`QonxIx;T2`;{m(I%kWOt&krC`2((lx?%;+g!l at 5D30
> z at hP8u5G_O!FaltxbcO&sst(*^$yHxOuS7WHh+~NwHJ5#m1axnzlK7%PKXO91hq<c}
> z1)d6$n!5VajRj}27QpxUX#j}0xxI}mtE{9Oreh+Fb*`zYIY#yca!u)b{8DTyMXzY|
> zil-T6&5%{{CjnpuSUov`u8fWz7x(w~W6{#m{`hVE_jwqi2*SzP>~(+r7aDxM7P)9z
> z{sLpw?d)$5BdYVW+y_`3PY4B|gbZj-$$bC*eZ#2SRJgR<>(W2S#N3?PYk#_!3b)&w
> z34Z}tr5>vB;YR+2_g*Z-1UN)8o)S8uc=qg>?9?v{<v|W^?$##j-`I7g<)i5EhDYxd
> zTQ?I_hnuTU$ft~cdz%Lb2Z;#@d|ub5Yp*5rb2=@HZZ?y&C+kdI+tu=$)m9$UZB4Qj
> zL$+bVPYEedAu%yyQaU<18&_AJJ*WA^#Kgj6wJlB1JSeZ+CVnhmh7#;5i+qOr1l}Dr
> zu(>VPA1TJ<m1*jp_R+nU3K-9ovqvH~;G7W#LV+*QZsdQ?ftWn0{vIbOU~qPJ76OGr
> zr+a&qtoKj+56T<jXrRGT&t+Lc5Wu}mZX|t7-YbUF at a^55ogG~Z3pY9<qV+r-_MCTb
> z-(J#th47jf8X88+e-|s5aHs)xk$MP>k=SGO0CH at 2$~_5E5yRgA8u4LTc#>z+k{~Ci
> zQ&@cbnBdEYm8htwue-auLO>lb2`tgNBV(>E4sChHf50FZt*@@G=HTSyl=MAaJyK8Q
> zT^<@793=Y~|Fxsz>7!M5gmj(Pjuw=RjO=PO*vG at eqrIWQhcToB*ahyTazQl3X!HE}
> z?_Zmnn|@kaT1*+!Chw1z#O-!Qv*$7}tzc6ZjWeZ2+IsB7q1k0&R@=krSVk4*O)8V5
> z7-p|+;^t5u<L_w}r~?_lymfbXmo+tAaK8I at gj3+S5Q%H}7Ps5x1kqv9;y6{He-v$<
> z at p{lBE7>y2S$I;23QV0ymsl7Jpfg>uX!ds8zB%7{GP1C+m^h3li$0W>moK1`@OG#$
> z=Y5Y4PXcoFiqHO?Al~~OE!44z$4&Xzw<+2oBhX~oLpXq?{>7Q}^z;r+;+PFc$Nkw_
> zQBhH?u(0q|rlbX9Vq^Z#pTjTMiIb3UncNWSYHHRpx4S<CX=uXOW7Z+71}H_M2Y!H}
> zE=<+GlNN5d9$0SG8g(X0In@^z92`trYE(%JR#Komyw^S|CPqzNTf1X`PXiygzPr=L
> z#KQXfMmrB57#teH>5Zew1afnwwf<1sb%h3sQIM0fYpbZFy>WJyY^<s}t(=~o4*U7@
> zXG_n-%AA8x2Dr0N>1k=kU((XVx<^OfI7~fbkdnI3f5xQr2YHn|V!*K2z(_o<*3-+Y
> zmH;0g-=S0h1E0G81HU335mx#Mp at QyL$xo^Ht_51z`#xZMSYlvckX0KW at _BCddz8K?
> z&v<*h)bu+NpC*GRX at C_a0lBfzfYb1NdqnabSYPLn<Q9jCJhB4qZ^xYk%3!VD-)yC3
> zoSmJ8)tf%e*V at 0eX`cXAo97D{`^Pu1EEz+dH8nNGn#CgU&|xD!h at dMout>b!e0~6X
> zMgg14Qe$Ec|Lfkb+gc_q?~Vq*JQ2WGlq!7?Iw0`Q&Dc9cgoG}B>J_)Dp!Tn#@s;v@
> z%`5UCRxAf{=}(bXA8TxfwBFzD6+%hL$aWft|8l=-^;L3laY-=ey+XDe;nVmRM<bb5
> z+3_gR)}(K3ZEdHOEisdN{WSynbbo$aZq{&?!S%j70<TytUmz9^an?RK at sSS6E3yQB
> z45*t4ER$v6X-?4+Mfbezi=#<WilY{<Xz~PG2RjvF5iD11 at CpfDzwHnk8+-oWiwrSa
> z4@=8c9PnE+b}3d4j=eb)4161`3al(ZXOdQFdH-WLSx1YLUa>c6C^V{I?{BT$$eD_&
> zDhHL2!#INSGb<e&CXhIY=KiCstn3d0 at zk5bV}@K_Rz^)X)GIF0Oe^lWIrH{l*5tsu
> z8EWeFt2>f_ZsX+SNvNBz0m<Nnkr9Fm0)e={d-o0{<Y2CHr>C!PhYz>A8`@pt5`7w`
> zQF#gIW67?zpb$<8N%Qma@}{{hgZ#qc=;%0ibvW;JFqq7B0~}*%z5RE2NmJ{FXfHlK
> zK7O9bB?&@IAuv!1WtA3W?iQaD{EM@*jA^x$DRFV}n+`cSIejN5r{l3q(UUZ#9}~!{
> zfVqu{NaS?W%TKqh1PN;Sa`M+8>&SI||J~WysrX$7wV<%DqZ$lg0=7##a7}`@1xm%;
> zam&eL*4M8W&R$z53w6$;d5W={Ko&*Bz|HCh0^XUKnPjYZ50Es{r33y=0f&IW)7cP&
> zyU*j&t^LL>0*w6ZTGa2FhVsRo=YLTJflp}kd5#NQA|fJ1`6<I at Ai>}LCbKY~bP#H|
> z86XD6g^n&K)ghk)o*u3&ocy(5u<mXU#f3#P`>}w_tAL}rVvC^5nfGS>o}>#43%4Mc
> z*Lpuw`KZR10`5QaP24&Tk-%z7glbO+9o5;7<%q1Igp`+;dxL~l*?zSW(9S%dlxQp?
> zDlB~Iub`lyHs#d=$|NHA?x<EsGagOn`_$esAMTH5w1O^wstRoc=JkQbg$2`*&s3tG
> zsNKtzuKCor$pC6Qo8!$2KR-Xj*Vk9$P=%th{dWKSzcT!ET*y?=&?z?X1G!9eV}1RR
> z<Xv-PW8?qu4P=3;R0pDb#f7MMff5&;s$I9+S67*Uo<_EMo_Qk!eiaiPoqoKxx3`>L
> z)7sj~iY1V(P57*WR at z_aWOw2R#YoTD7-$Rp0lwYK+peXhB}67Ji~OrTvA9?a_aT>>
> z?|Q{T3GhPH)1YR(0tH47Nssj&?k01s=WN&!R-WK;g6H<U<26gl%F9_!TF>Ly0Oe%0
> z{Mfj-*}vatz#!edy%9d6zp4AG?ULhIPy3!n?zIJ69m6ZS$Zo?yHUKgTq=BetOh4z@
> zvZg=d<2o!-BJAwDju{2YNJSl9JEITH&CNAEJv|od>+3ZjPFN$i()N8~Z!zxyq`+ at 4
> zTi$6pQ^xwtWMyYBTfct&!69QiC|a&`W?NZF>2cvgEN<f`!2Vh3$N9yDRLz^^<|*Xs
> z4i9RdAs1A_3Z3n>OzXGuUfajVG9C}Nm%&1s0f`NRyylIk%2V8h@$vCA14IS}FJ3sQ
> zreOhO;&FG&U*8g4vRp6LyW;HfUbmuw)an}$5Rbg75W%>-(iTt~-uH=|ze_2hfFIrn
> zS!M3?5HF~RFM at QY4s8WX|6N{eaQmi|M*|cM^!Kx`2O$mBG-PgG5O`9j4ttn;_)IHK
> zldUQ%C|r;S$}E_41V1Pw1X-Gv{~PP->gxDUOICb0KGRV|G|Ayhk9nBCZLsqVkRV}5
> zR{Mss%JdO2QFl|o_n}jVikdnrEjjruMM!dN?2sS}3(J*NYnCxgek92i`H+!Gm!RQ(
> zAP7kYTKlrbX21c!2lheztAP75w4uY>{=rX-U<n4CL8Nd&srxbLQ=pn#=Z@=WmiTKx
> zEGhL8C;@ETsjpz#Go2+EYeT-*--7<lZ*u4tjJMGst1}ak2^Cb(xl^YuZAe!auDPwW
> z&O_<x;T;eSfKDdRIHvb4%*Ab5ZhGppP%~4c2?DPyDq=TpbYDXgs#xO?-~t^$9@=S}
> z=$j>#E0XKv<YYx0Qf{4+nf<3kTK8`ojiq)>K<Eiu$O)orA(OVDq@?6aLP7#=ooP at y
> z9D?TF-muTKkAB at 9ek$tnXWV|(2&BwR==(>AQ=O?IV~zmPWmTIYTatDUdyFaOhQNu{
> zz`%f4SXkICZeY0l-&)ghJ4^GfGoUxT)`g799FZQSOKhvX8jDUqD<uHpa=sntC at 9zt
> zetu2D_om1$pyf>gZJ3MdkN}91m25Ch;^E;Tmw#J(ndlnC^w+LE=wC_U+9x=tni8nG
> z#FyG(n#QO=ab;zt84UITrOzWz+-qA*Qe51m+_Y{VEhew|Eu*oS*-%7y_`}!q^Z~-t
> zr!c5ZKjFnTp$!qZHDBP3Ff=|p@^2qKyimVQmb*@>Q)}l)i8n~H*&ttY$_+h5+s^mB
> z8 at QlCGCimcJ7|LG>FdMV+S-&YK=~cr8cJ0MOT8ZqDk^rhvAL#*+E?V<P0t&gLhWxk
> zT%@r_ns^qKbE!PWRjXORBW&{QsZMdg9Mu?2mN{u4M^jzhjGHLhC6jgv?9_+#SV*w)
> zWCy@!Gm;^UWY+K|C_i(xR2Aa#EZBlDcSy^aGui)(Cp8FOC1DIYpvSs8$k_M~yU<E%
> zxk0|(g9msRz$plO0%-_CbJeH;y#tcQkw-7{`;eBBQlg>`1 at x3RS)kKHXT}-g(-;N&
> ztB!{!>xlh+e0+R*cv#~z5bR_Tfv`ma?Ze0TI~Jk=_u!F0bym_?8qgF%emMFgKhbvc
> ziT`Jhun7pDx at KmJ#p6}&?d^=*+}xkx at 5e1xGxIP`on5k^_ov<OmMyHNi*z?Y;K(M0
> z*8-o0&^9(U#>TQGulmyk?Rm*@BNpP|79dnj^7ZCVR(<BNaI#J|fBpJ3r@)x_GN2>P
> zihN{yBok6R<3vO0bq4S$uqJ(W97u0K?#TMsQp`P+@~eUNVHQi&qx}s{sCHlk;tKJ;
> z5)&UkC#H9K575a-PQHX&^8NCU4T*?|h(v8~u06fGBb<J-v-m|^0yGDp^9}a&Jflw6
> z_{UA at MrK|)ci?OmYEfs|873HJrHr6k^DzyHlR(t(6A}{(vGDM?R%@_soV+sDH#NP@
> zCAsEM%hyvkePl}b?6Dg;J5M`qwX<lasK98ZtlY<@^0*6<{e5ZEz|t2M^-;oWThzzB
> zN9+zR<WCqty2kd}!GUC_L9$7;bvW0jQew`Io9)b&5jZqEC8dC$>^hrBb~W&b1p9Xs
> zxPV!1K0fzf=Dc)x0C+yizpuCe6WUMaGCDg|R}DMScpr(Fr-fI#P at Uf%RK|<i+Gb^C
> zDT#@R;iAbF8<b?Ot*wcJR^aMIg}I*u3yUHqG~9OHIxW=XZPlf^3U6dhLj&Ec;?823
> z>wJyv;c&WOC144j=WInq8=#iv5@!jKh?iW+cQAt0>`EKZ+0riSepgLm_3QMVVj<jZ
> z7*87$<+`RhM&f&uE7)|trCB(&rKqfoklnB at cIM;F;XzFp at -UYk9xjvMyZ7yC>>N2x
> zHhSeDoO~X1u{-hM;^HC;JW81Tml<a=C*5a)k%2X_3S2uEnmwe}^GoA;m-(KGU=LN*
> zfpSo&ODQNQ!Z)LdyQ1e{<f6)H!uN5QmP9+weB at 5QOpj(<7wh**N=wzrBPQ1V9{g at l
> zErs*|)&H>J4c82rBCh*Y=j9+lYG`SVf{n}BKR7s<7)|_*ak{(lL?qI7-V~S5xe{nS
> zr`g!qnR~S}wCCMiD*5iP at r90#&a}ot6K+Vv`^`Stx__8_6-=W>U~lJx`~_yalSIXy
> zy#7}*dK0PtwMjiLsdFlj<h#@2y*C+ME<Tf%mS&!;W;ngcuT9T?f5JVqZIa-l5z?1c
> z37P=seFKO^dlnT1MY at HNkx#r;TBbv*D72rMGv0Py9%p|PYjq*(f9sYCymnt%>yE_f
> zw=NYBT5)X6(8xvqsV`gybPrfWdTjLKfhy<!&cI-L1SDbWb%SspN)EJKnq95BAG5QH
> zH_<>2hTp~W==pH18F<6HxD8rdl at RGFA%4_&=)xskAvXP37OnlF5!x!7b;Zw1GI at 6+
> z<Jj+as8z;SnOo^+q)6Pz#>4;blI2y^6CFSvKNr&J&71+=6#=S>S_&2NmSO(~<^eOV
>
> literal 0
> HcmV?d00001
>
> diff --git a/qt-mobile/qml/mobile-resources.qrc
> b/qt-mobile/qml/mobile-resources.qrc
> index 50565e0..e57fa5e 100644
> --- a/qt-mobile/qml/mobile-resources.qrc
> +++ b/qt-mobile/qml/mobile-resources.qrc
> @@ -1,5 +1,5 @@
> <RCC>
> -<qresource prefix="/qml">
> + <qresource prefix="/qml">
> <file>main.qml</file>
> <file>TextButton.qml</file>
> <file>Preferences.qml</file>
> @@ -19,6 +19,8 @@
> <file
> alias="subsurface-mobile-icon.png">../../icons/subsurface-mobile-icon.png</file>
> <file alias="main-menu.png">icons/main-menu.png</file>
> <file
> alias="context-menu.png">icons/context-menu.png</file>
> + <file alias="menu-edit.png">icons/menu-edit.png</file>
> + <file alias="menu-back.png">icons/menu-back.png</file>
> </qresource>
> <qresource prefix="/imports">
> <file
> alias="org/kde/plasma/mobilecomponents/qmldir">mobilecomponents/qmldir</file>
> --
> 2.7.0
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.subsurface-divelog.org/pipermail/subsurface/attachments/20160207/fe125e34/attachment-0001.html>
More information about the subsurface
mailing list