From d404b93fea6e31621d26f2db0d08ad44754ad792 Mon Sep 17 00:00:00 2001
From: pip <pip>
Date: Wed, 23 Jun 2010 17:50:27 +0000
Subject: [PATCH] Updated user controls on the new map plug-in

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@875 ebee16cc-31ac-478f-84a7-5cbb03baadba
---
 .../src/plugins/opmap/images/button_bar.png   | Bin 0 -> 210 bytes
 ground/src/plugins/opmap/images/gcs.png       | Bin 1996 -> 1415 bytes
 ground/src/plugins/opmap/images/minus.png     | Bin 1006 -> 1006 bytes
 ground/src/plugins/opmap/images/plus.png      | Bin 1133 -> 1115 bytes
 ground/src/plugins/opmap/images/uav.png       | Bin 1201 -> 1090 bytes
 ground/src/plugins/opmap/images/waypoint.png  | Bin 1176 -> 1331 bytes
 ground/src/plugins/opmap/opmap.pro            |   1 -
 ground/src/plugins/opmap/opmap.qrc            |  12 +-
 .../src/plugins/opmap/opmap_controlpanel.ui   | 234 -----------
 ground/src/plugins/opmap/opmap_widget.ui      | 373 ++++++------------
 .../src/plugins/opmap/opmapgadgetwidget.cpp   |  75 ++--
 ground/src/plugins/opmap/opmapgadgetwidget.h  |  14 +-
 12 files changed, 166 insertions(+), 543 deletions(-)
 create mode 100644 ground/src/plugins/opmap/images/button_bar.png
 delete mode 100644 ground/src/plugins/opmap/opmap_controlpanel.ui

diff --git a/ground/src/plugins/opmap/images/button_bar.png b/ground/src/plugins/opmap/images/button_bar.png
new file mode 100644
index 0000000000000000000000000000000000000000..5e9b1b07642aa464a3d38f25df928e653bddf21b
GIT binary patch
literal 210
zcmeAS@N?(olHy`uVBq!ia0vp^q9DuxBp7;Xet7{Yof6lG66d1S#FEVXJcW?V+*F3}
z)D#6HV+F6$JOv{ILjwgvb1PF*D+411T>~J<=aTsj)W=@p>FdgVi%nd>O6^+h_t`)p
z&H|6fVg?3oArNM~bhqvgP>?0v(btiIVPik{pF~z5U(?gYF{I*F@|L6nOcD3861esy
wCjMx2ox(Yrk!SIuD?+JL{<ir>NX%AXP`<!gu)HN`3Q!Y+r>mdKI;Vst015;;mjD0&

literal 0
HcmV?d00001

diff --git a/ground/src/plugins/opmap/images/gcs.png b/ground/src/plugins/opmap/images/gcs.png
index d1e13338df8bb08aacce148d63255d7dbd34d93b..a9e5a640b3a9327e02ec86d369389c8fbd790758 100644
GIT binary patch
literal 1415
zcmd5)hf~vc6#qfA2x`x3sX?!L@mfa<G7=JHC<cKBkkq7+ih#_3VUMuF3M(ubrmP^4
zm_))Td+#6t*%%Pndkd5x5&~7|PydR3?mpko`+nZNd++YO*!$SuPRpH_0|4N(Aw~}m
zD(nkSK)_dz8`lAf5?TKt`K}kyhD>sIgAqusM1bH!gu&r3BOf;yTvbgKrmCR{M`<Du
zu<NQIBJZTFf^{-vLlb?O@o%7K6u#A?oI`__tOv%-8vx`)Unr&fw|WL>9&<#SfXT9?
zlb>vk0{{fLe~+LK`qZzaeibVCqf+@GCi%JDU^xJRK%h{lva+&@iVE0MO-&6Bha(UO
zb#-+l5{W{gZrr$W^X5$r4Gm3AO)V`gZEfvaw{G3OeOpII2aQG>7#J8C85tWJo0ynj
zu~-}qhsWay1cIrlshOGCqeqX-&CM+=EG#W8A3uI<Wo2b;ZEa&?V{2<`XJ=<`Z%-r=
z9UL4S9UVy|l9Q8@v$L~{i;JtPtDBpfySuxGhli)9r<a$Px3@Q$O!o2d@%8of^Yiof
z_YVjNpin4*fq_9mLBYYnAt525p`lbNH7qPFJUl!iA|f&}GAb&HMx#YXN5{m(#Ky+P
z#l^+P$0sBtBqk;%B_$;%C)4Tll$4az)YP=JwDk1!jEoEhgOQn;`TY6wtgNi;?ChMJ
z943>=VzFMlc)@0~IUEj`%YFIsC6C9;%gf8p&o3w_C@d^2Dk>^2E-oo4DJ?B6D=RB6
zFR!SmsI084s;a84uCA%6sjaQ8tE;Q8uWx8*Xl!h3YHDh3Zf<F50r$|_+WP9%tG2c_
zfk4pS-rmvC@%r`a&d$!RuCDIx?w+2W-rnB6zP|qc{(*skH*ekug~GwX!J(m{w{PDL
z4-db4_ikilWOQ_NY;0_Ne0*YJVsdhFYHDhFdU|GNW_EUVZf<UVetuzLVR3PBX=!PB
zd3j}JWp#CRZEfxS`}gbX>l+&zo12?kTU#QLXnTA6!-o$$J3Ajge%#&N6^q3ZiDZ9&
z|KQ*NJeB_^j{X&~SX^-RN8o%%z|mI$6^uZvJiX!y`ch;(_7C9B@~8tCw;SrA3I5~5
z&-#8pk5=fY3#gH@9D>NK=R-My4oa)Foi(KQ{-;_6%w^pJ5=V_9)T3X1c04WW2jBF6
z@V=IN->aUuj68I`phA=7u80}-biW*{oV{R#@<<C0ZM|0#!aP=%-DP_Bf$%d@`jY%r
zY2M6tn={ckiJH`$;3?<fhW4p8$LxM(;I9~a?VOla%z$U@HENY7OmcCIUwyBzZ?kpP
z-{4HRh_U$)Bc3{|!2C%e)<tvb>P+RtkFvVb4mw<v^m<+k5e5(~BKQVR1Y6fjn)e4Q
zPEFkz6sl=0j+-BK${9D0Bo;Z-B68I)d^R09si@f8jhGEZmJ}ASr-$iX_UwrV@=Lj;
zwaFntSFp5lC1ah0KIp|7-V+S{XT|IV;V;qbYjSjKy{v5_X*(SDsk9VHlOEVPjZ}}I
z;wugblk<EezG>Hu0gJ(Nx;=;MX%HoIn>y3gr41#Vd^fS$f;0!TvHoOaT{^>up34=?
z@>$8eH8uv@AUs>8nAyKVJSEY`X~d=ReCN$4GEu2LIQheKpIuOaW=>D`A`Y9zdM(*<
vGL068^P(Nzy@R{IRxvdsA(VEC<x#>R01s=QPGO40U#`+nAFEfaYaRX{_@sNR

delta 1952
zcmV;R2VeMy3(OB8iBL{Q4GJ0x0000DNk~Le0000s0000s2m=5B0K1!-?~x%xe-;QG
zCZ;jaQvd(}32;bRa{vGf5&!@T5&_cPe*6Fc00d`2O+f$vv5yP<VFdsH0_adoR7C&)
z09#jA($c}u&cDgVy2r!0xwfjZv7oA>ouZ(UqNACfq@j(QmyD;LjI5)To~)IQubPpu
zik+^BrmU2gw4$1&qo10dnw6lPf0U}Io4mTK#lyDE%e&_1*ucM=yt<RZy_CDRn83A{
zzO<Ih%dE@M$HLCd&e_z*&(YM**v!(^#L&>q%hbKRo3^%<(a^o|?%cn;j={f-&C8<E
z+|A$W<lW-n<K*J->+Rz7?A!S2+V<$<>EhSm<kHTo#=@G#!j!qWht$=#fAsR=%)^h#
z#FWz9!td?s)TyetY-_`GcDHqFy>e^6cXI03%;W3U%Eg-U?&H$hyR>6wh6W0c2nwSC
z2%!K2ngIcn7aZ%jsp;R+#KMl;+Of^aoYBgg_4MkzVr7&A1EC5Fo(T<|2nLZG9Ok;M
z+S<GH`Rkhl3ZM-boDvh7e;gp^x3uiw)zQtO)6kyn_wS(#6rKzgofjS6y|3Qf!u<O2
z*wm=W*QEaN?zvlDpdu%$WlrC}u%|FBvUXGB-@~LiHsHXq>E^@I+Ohlm?d<f&-PW+;
z*{<2=#q;>(>fXW2+Qp5$mGbo2^y$XBTxHeexBKeTzRj?kx0vetfA7THwM=(E8d4aL
zse0qwxANt^k{1%~vZK7wmO61Tz1y=`i9;f14K8UKiLGkr<h##zfXRV*$$ojqiGuXv
z(L{SDCUXxybS9Cpi8h88GkX~2_Sfm@*F}pZ-s{+Rt7tEa8$XdAm9%U;hatGxsowV1
zN|hz?@W^7BJm~x5e^QDxRgWvl*qLgWMO2$7<^JGLr6oz48eE$=#o(-5s57I*b^h$x
zYOpk)&W2W=9a*L*WT!M}r$wmLkW-``pT}%uo+x6fDXY<rcdJRh;jy*RjhV%FdA2lo
zw^Xvsg_*`jdA3BV-K>ecYm3E3W~^K9?BR*Ma!;Wdp~h)+f1Fvx;<cpET#dR_yUdl4
zxl5nTT!pwjhO|a=q)_7Y;JxLqCU#vU00001bW%=J06^y0W&i*LB1uF+RCwC$(tCJP
zWgG|aS(e>PyWa%M%$75Cm8}bqj?A<=S-BY<7_w>`I6<&+=4wTqjmxNxBlB`jEvGwO
zY{iVtZ3(Fif7yE1;y?&l-g4Ho`}N;`FRSO##ewXvdLF;;!voLnydQq=?}eP46Zx-Z
z^PYqMMh*I7zaO{SIusX#<95Fd#lr{*vDN=%b6sO&qbt>GP>3Uhl8IkG%C3I+@yJg<
z|I&`tVIhf<f{+ZyKF`YbANcOj-e`Ny&Y_4Ppv3oIe+uvx`!+i}6cN7qdfU+9B+PXr
zP&XhT6#gcg+kXJQf8W8uK7=BPU7Hvt7z-n~&n)NsV($P-#`g6^Q9RLaXK2nI+#MF+
zKG$bv3AhIog##w{&<xMhv?sVbj*^kg{XUDpOpvg!3oBr7PH@q9M)zq1`V1=%hZW5;
zTs7QFe^iKlkcq({D2{t^*rb*x7!4tm$S~h0&`l6R{anDEYQ+KLnUoVkF|q&4vX<Tu
z3i<nKJI%p<j>Zi5$JGP9DAe1N-tBDJ9t!(+bOmS}d?Q>+aWqri<M)Sp`_j2>9ou*K
zJN;dDj&Vbuqr&k_u&2`>@-_c`zO5Zwe12bde^-FP``oZ_Y<%hi7ijvh+wb!=kGxM;
zN86T8Z(A2f+j!Q=vv@e(?Y7Z0%kn(Sb4|_N-9GO~_udAtx2>%OcDQXUZ`<6^P+nhe
zwOUI`-Ur8G=WFwNTi3K7!`3%%*tiiZmbI~@y`=JuH*wy2d($*G)Ic&#@3gkQyRQ7$
ze|D?atX;=)EXlG?CrQs<X(_H)40-i656L=7T<4lzU%RSd<ej|m;!6w#goKyNy0W4|
zuea#Tiz@AnxC+bdd3n_<X?}tRl5#jmhm)dQR&B8!Vm2>--tM5F<Zw`wJN>_8Hc8>f
z4$A2&*DlmsumeUxaFwD(SRM6es_M1He-`Y_%WLhjzp6G729HvEOg3wc;W@+bA!*8p
zt1_sHF}%S@8BJ9yYMy!4oH}H!$|y79qEVE|OxPGr)nzMco_bnuz};$9CL=(IsY-+a
zNkvm-)moOoY`~sWsfUaCYB83t##>ApP1!PSk=bG~V762ZRgF=jCPdgYU=WR_e{ey$
zwnC>j7<8peDwh(eYCfSZOV1tvMi6R3Q#h+cyI5CRs?$C8_!BBQuE7Jj7?UfNgpweX
zg$w39_|U@(i;9Yh7d@iF6#~?wq{wV?MWI3|2YlC@yXW3Bciz1D^Y6XyenP3hOEF`X
z$ZX@M&yeEe-+0r_GjAy<xb?PzcA2-|A(Km`3aNDZog(bY@e+x2!i1}?o_NiqN!L!k
zE_d?vxw%uOOw5})RU(n(<=v2;jXLS%(Wjg`=Csq#IP<Kt&pG$JvE$Akcfr^TFS_`W
mOUGPx`RFS~<($a>JbwUy>1L-MA;Ikc0000<MNUMnLSTZ}6(eN;

diff --git a/ground/src/plugins/opmap/images/minus.png b/ground/src/plugins/opmap/images/minus.png
index ed29f8f1861262fbb7fa00e632364c0434126e35..2088a3a58cf755ee00d2dbcc67ed1d32abc3b4ff 100644
GIT binary patch
delta 178
zcmaFI{*HY@3WvCW2{*4|Tf)Q~U3&%wh6XTh08<S>UPHqHAh>g2*{KhVjEttHrnR-T
zU0q#g&YZb<^X7vG4<0{$3>4JT((?EB-?(uxlhXg+9~LZF($LWGA868lhW}s+NCR0w
zV0CI!%;dSuvL<(KFiv7}Wb`@EzQ&<JUiibMNJe>mwFeK?4$fYjP{F`(Xa?tT^NSXT
QfQB%5y85}Sb4q9e08x-lXaE2J

delta 112
zcmV-$0FVFf2kr-uWC#)nH7u0d0I-p4Ef@g-0SiV?f%D5sq_9JkpPT>vj{n}H|NpV!
zngWsVP6X9gMv#-8106Js*a4CPc2-Qlgsgy-4HGcaSpgF>CSYMC!JDICcmM#090JNn
SyJc(u0000<MNUMnLSTZnGA+~q

diff --git a/ground/src/plugins/opmap/images/plus.png b/ground/src/plugins/opmap/images/plus.png
index e191fde5de07d7787df46d72fffab70441842f01..2b07a753f1b67d07389888433d5fd9e7ff2efcc9 100644
GIT binary patch
delta 340
zcmaFMahqd83WvCWiQ=_c{@W(z7(_KNFfcSQG=M1}4P+evf;$J6o%#TjF*P-<sHo`b
z>gw+9o-kp;{Q2`YY}l}4$Bt{)uHCqC<L1qqw{G3Kef##EJ9qBhy?gK8y$25-JbLu#
z@#Dw-{{EX88C#j^|Ns85V8N1xhKBz@<Nh=J2U9>A$N~bvxLa3&;*2Fhe!&b5&u*jv
zIWs+7978H@ot<==@2~<7OYw8r<euiw|My2;HVgW-Ae3*d(RNYgBT4?3PZ~%&C&n)2
zJP;v}c_&GRd#&N5;{9T$tP@wOZ&FzH<<_+fTh~Mv2|<N;W*MO^`!^W~Yb|Zx_MdNY
ze|6iP$Gk2fdF)$*+W*EiyqLn$5b@md%Y(Oy5B<)uYPLMQ^51k#e^cI+Z{L#{x2)S<
grc-nK)#f6`1q~8DK8GcMj$~l)boFyt=akR{07~JejQ{`u

delta 329
zcmV-P0k;0z2<-@vWC#)nHWLYueom2WFjoskPm2H2TfVzWq_9e+vOkcSpa1`x|NE2w
z=am2MoB#cl|M8Ch-kbmVmH+FF|JjiL;*$U9POG#?rmkty!HNITl>h2*+{BIl-I4$0
zm;dpj|No!=|FZ!BdIFOW0W5!s!&A-x0004WQchC<K<3zH00021Nkl<Zc-qa9%MODe
z5Jd$Ck;<s}K&kTozuCK}iLIfHi#DF!O-?3UX0q&Jh>fJMuDa4vrUk7_TjqIMs4B~b
z=+}Z9hNH06i*eyFj>onF^+1f#a`3*b5wtudpg&lw?HITQq1=Cmz~fckG4wjY7~?_+
z%=c;P5X?>O1(_4kFnZ5C&2x`HsyHP)X<Nr#-zT>&>bm*IvOWs9DD+opL87iIinQ?U
bs;|lelk5yIU=3o!00000NkvXXu0mjf&TFv}

diff --git a/ground/src/plugins/opmap/images/uav.png b/ground/src/plugins/opmap/images/uav.png
index f9e14fd7a13d0f6a72819b54c87cebe0c377854f..bee268370565dddf2ee65692ca977e8935f6c4c1 100644
GIT binary patch
delta 356
zcmdnUd5B{|3WvCWjFyb3#gvITy7deU3=Lr10Hzv%yoQDYKyc^4vQr;`GE7WNEG#Sn
z0s=BJG71U`s;a71R#uLVj?T``Zf<UYfq@Yb5z*1nB_$<YU0o9=PMkb>@{AcXR;^lf
z<j9d@$BtdUe*O0C+s~grfBEv|n>TMhfByXc|9_ydP_Q|hQIBbI0i$XC|KA@LELhUe
z&;XMC&j3~gBtR@6cyDrB5h%`B666=m;PC858j#cA>Eaktack>@(?U%K0xaMAnrxbw
zv;`8L|F^$5#mVDD++6RhUlZO+Da~JW+VkXwlUYGAISe_ctP5k}IM0V4SASZcoG5?m
zq57&Hj~=#rMBmtZUpn^!|Nb8FGd17V-#0yX{rAU?dGFKB!|LjKW*zc7tJn57H>tik
i=)Q3Mz2Gml%KP~@ofF<ZQHIY9<QY#_KbLh*2~7at=blgi

delta 506
zcmX@av5|8^3I~sn5a*KIgc%cabnA;57&bF9Zf0Uyqo=pl)AK(g<9}Ax|Lp8PI5_?T
z5hv$=e*XVLLjPrC{>#bzFfjOUY5CvA=D)4&d0*dyF)@cTGEStYpRBF@@9X<NKK?;r
z;j8lUk0~iXl9T@>B>YcF`JbEnKQHfpef{}{hI<VS*C$WDF?H(G>C=BTH2m-B`S0G_
z`+xG}|5K*?o<INptXco(&3m|X>4TLkAFf&Rf6=1<TeiG9bm-OL!*9=@e}3`er(3uF
zU%B$}$&;V&-u?Xi`Tv(Me}De`_xJDr|Nl1&GFma!|7?_c%fP_kR1)MD3>2gcFt~^b
z01abU=jq}YQgQ3(h2vsP4m=JQBbc<rLPFNuIB;*n!j41#|4%XKJ-Wkuwq@n)`km?m
zA3x?C{&<v4>AGmhT8CHLnmTTIzG73mJZabBV>^o`@5;|~&6V=9<zhR%?}ypDJKtx{
zn0<x&j<{V`>%-`Z#$SEU->zs$-Fq`JZo$59RjF$EX6N@f)Lws{8h-RxVqtn*N3BPV
zzOC`HdnxT21?hSpOB4O~r1<}h(>MQr-u9!^ciWxQ&xi{tM;vdx{lo+0cu!Y9mvv4F
FO#lvNDxLrU

diff --git a/ground/src/plugins/opmap/images/waypoint.png b/ground/src/plugins/opmap/images/waypoint.png
index de44730784d75edc9d8b664334095c14243d83cc..7951fc7431e81f85c1c394b006d56937d91cfc92 100644
GIT binary patch
literal 1331
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyIwh_VCC){ui6xo&c?uz!xv31n
zi6sh#Mhae~c?w1bh6W0T7FI?UR)!`Dx&}aSakWAdP#=4Vr>`sfEjDpMHGL0}icp{s
zXMsm#F#`kF2M}g-T4OQ;D9DoT=<CS9u(6-}Pa-P=12aQ_Plzi}ya9|Gz*GZ}*U)eP
z2<{wMb_%GSfsv7siHV7snVE%!g_V_+jg5_ylarg9n}>%-NJvOjR8&k%Oj1%(N=iyj
zPEKB4UO_=YQBhG@Sy@$8Rb5?OTU%R4M@L^@-_X#|$jHdV#Kg?Z%)-LL($dn##>URh
z&cVUK+1c5}#l_9d&BMdP%gf8x*VoU_&)?raFfcGABqTgMJTfveDk>^EIyxpMCN?%U
zE-o%UK0YBKAt@;-BO@a-GczkID?2+oCnqN_FR!4Wps=v8sHmv8xVWUGq_niOqN1Xz
zs;auWx~8V4uCA`WzP_QMp|P>CwY9aat*xV@qqDQKtE;Q8uW!PH36myGnml>()TvWv
z&YU@G)~tE+<}F;faPi{BOO`BIx^(HXWy@BqSg~f!nsw{eZQi_j%a$$Mw{PFEW5?dT
zd-v_z2Mo4DhYlS%a^(2&<0np>IC=8qsZ*y;pFVx&%$bW9FJ8NL?Z%B8w{G3Kef##E
zJ9i#Dc<}Jy!)MQ)y?*`r!-o%FzI^%m_3O89-+ul2_2<u@zkmP!`}gnv|Np=!7zLDs
z!2jPL7A#l-jB!v<{$~J(D3AcLfI$2BE=!;|V@Z%-FoVOh8)-mxp{I*uNX4z>gavvJ
zgpVkn)LonV>Oo@a3eC3IxDzTmOSkM=Wn+6KbgFpwo;k^m&e_r4!OppnX&w6v+V<pl
zxVi&VY<je}b8cna48>iNf6PSZ#wJ|277`yh<>~sCWe&=VWtHw<y?H4jdfx0T{Z1wQ
z7h%^~nR69bB^{4xaH%|=eNp5{#DX2cOE>WPIyQBSY+`DjHO)`NJVm8qwW9WhHF-^v
zjNe@SqGBfKZDLwGscqUezX}VH6t$yOT1wgh9xHP*vNE%o+f!Tv{oI^-#Jzeveu!Sb
zX5Qpr8(?Rytf_Y=l0$Xc*~zE1vmF;~+M{7^tgCnIx|pfTQ`^nmryLioP*7LaRWv)~
z$)v0Mf+giilY^hyg+Dhk>_flY5HbDib%vp7%aWEIGgf>t;Vfb0IrM5<ogpV@;YP!U
z``&TBnK(mBB86vd?BByowRheeQB~Tw>VaVBHRCJ6VvIkfcXK_NuyA@;fZ`vmrrwGV
gS_uLV(iX5WFesT%+hrlo=mv^sPgg&ebxsLQ0BWbA9RL6T

delta 1091
zcmV-J1ibsR3YZBYiBL{Q4GJ0x0000DNk~Le0000L0000L2m=5B0G`QJq>&**2n-T6
zF;=Q-W07npe*&pcOjJex|Ns8}{^#Z1-`di>yS3rn)yKfF!@RDmsG{4}&aS19s-TO&
zxvJ^s=G)fKtDugnpNqk{s`T>k+}F^rqm-$fiNLm~{r&y!>gd+Kvci>u#E^W&lY`sB
zyz}z%+}6&lpN^@WiNCg|^YZWU@$tW_owj>c$9PQMe|t*mdP&%EO2KGMv~^^#os+Ad
zjHsN3zqY3F@$k5ocg=)I@s&~hl~ezbQ~!)p|A$lhfK%*sPqtb=lxR}Dw50U%@A>)p
zxTcWMj79vRP5+)v|CmkxlTH7PP5+2Z|AS5ceNFXsOtn@z!LY03-`BW`PWGin|D{L&
zphy3ke@FkANB@#X|BOffhDZN_NB?|B>up1_abCl+l+Knu|F1#+szLvyLI0pZ|C&Mn
zltKTFLH~(C|ARsQeL?zmLAzZ&*uuQ`_xG@wYv!jo|FS#(tvmmxJO83P|D8MkmOKBE
zJO7J2|AjmMe>?wqJJMk^zLJCO?d`IbSM{|ufB&^L|FAXxsx|+mHUFPA|C%-blQsX2
zHUEb-|A96Cdo|~4GO}`5`uh6y_4TixblRyo?5!{Cr!VZHFYKK!?3XX>lP~O!FYJde
z?1C@sd@t;FFUMdhvxs!JtA@UxO4y|-*q|xcn<?0qDcF)J*o-OIhbh>DDcF7~*m)_|
ze{w0JSSZP}r`OZNw4-jsoioFfBg2p*!;2%sha<y-Bg1|p!+9gabtA)ZBerHDl3+XR
z=;o)Nd%C7+vx_0Jh8?nk9kPBMvU(k|b{(>D9kOj5uV)>RSR=EcljGvvpOa;(mQ|#I
zBcXT~p>-FbaTlR&7olnwonse;R2!Ope_`U`-Jg|mm4#D?Z!v{s6^djNfLRc8PZM}p
zD5aHv(apW1n0JeQR(fbUhjmV;ntt8c(M;ARO#lD@0d!JMQvg8b*k%9#0WC>HK~#9!
zV_*OS@$RZD1~kxp=kC4x4<0_UM;5$v`O4L6*Kgdsb=wdjc<lIzlc!FfIeYH>e}#)G
zaP2#H?cTF@-~Iy!4;?;oR2(Y0YW146>(+1BxM}m2t=qQmfZ9HL&fIzP7c5+~c*)Xb
z%U7&~8qm|**FRz6q{&mJPMbbs<}8R2Rn;}Mb@dI6P0cN>ZS5VMU0~6y?3~=Z{DQ)w
z;*!#`@`_5RZP78Yaq$U>Ny#axe`)C%nNU$*KmUNhpx}_uu<(e;C^@L8y@R8Zvx}>n
zyN9Qjw-4NJhDOFFre@|AmR8m_wsvq~6;(BL4NWa=9bG+r17*0dxP+vXw2Z7Aqr8Hm
z5<(aT7==Yd#e^`0`S=9{u?TZ=ar5wE3bV4Yb1+~EGcmIO0H;%E0ce&{4JQBq002ov
JPDHLkV1o4$QX&8V

diff --git a/ground/src/plugins/opmap/opmap.pro b/ground/src/plugins/opmap/opmap.pro
index 6108c5f2d..479b7ff11 100644
--- a/ground/src/plugins/opmap/opmap.pro
+++ b/ground/src/plugins/opmap/opmap.pro
@@ -18,6 +18,5 @@ SOURCES += opmapplugin.cpp \
     opmapgadget.cpp
 OTHER_FILES += OPMapGadget.pluginspec
 FORMS += opmapgadgetoptionspage.ui \
-    opmap_controlpanel.ui \
     opmap_widget.ui
 RESOURCES += opmap.qrc
diff --git a/ground/src/plugins/opmap/opmap.qrc b/ground/src/plugins/opmap/opmap.qrc
index 6a0eebb56..832bd195c 100644
--- a/ground/src/plugins/opmap/opmap.qrc
+++ b/ground/src/plugins/opmap/opmap.qrc
@@ -1,17 +1,15 @@
 <RCC>
     <qresource prefix="/opmap">
-        <file>images/uav.png</file>
-        <file>images/waypoint.png</file>
-        <file>images/minus.png</file>
-        <file>images/plus.png</file>
         <file>images/ok.png</file>
-        <file>images/gcs.png</file>
-        <file>images/pause.png</file>
-        <file>images/stop.png</file>
         <file>images/circle.png</file>
         <file>images/go.png</file>
         <file>images/home.png</file>
         <file>images/hover.png</file>
         <file>images/hold.png</file>
+        <file>images/uav.png</file>
+        <file>images/gcs.png</file>
+        <file>images/plus.png</file>
+        <file>images/minus.png</file>
+        <file>images/waypoint.png</file>
     </qresource>
 </RCC>
diff --git a/ground/src/plugins/opmap/opmap_controlpanel.ui b/ground/src/plugins/opmap/opmap_controlpanel.ui
deleted file mode 100644
index bae9bcaa0..000000000
--- a/ground/src/plugins/opmap/opmap_controlpanel.ui
+++ /dev/null
@@ -1,234 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>OPMapControlPanel</class>
- <widget class="QWidget" name="OPMapControlPanel">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>606</width>
-    <height>83</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="minimumSize">
-   <size>
-    <width>0</width>
-    <height>0</height>
-   </size>
-  </property>
-  <property name="maximumSize">
-   <size>
-    <width>16777215</width>
-    <height>16777215</height>
-   </size>
-  </property>
-  <property name="font">
-   <font>
-    <pointsize>7</pointsize>
-   </font>
-  </property>
-  <property name="windowTitle">
-   <string>OPMap Control Panel</string>
-  </property>
-  <widget class="QWidget" name="layoutWidget">
-   <property name="geometry">
-    <rect>
-     <x>20</x>
-     <y>40</y>
-     <width>579</width>
-     <height>25</height>
-    </rect>
-   </property>
-   <layout class="QHBoxLayout" name="horizontalLayout_7">
-    <property name="leftMargin">
-     <number>5</number>
-    </property>
-    <property name="rightMargin">
-     <number>5</number>
-    </property>
-    <item>
-     <widget class="QLabel" name="label_13">
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="font">
-       <font>
-        <pointsize>8</pointsize>
-        <weight>50</weight>
-        <italic>false</italic>
-        <bold>false</bold>
-       </font>
-      </property>
-      <property name="styleSheet">
-       <string notr="true">background-color: rgba(255, 255, 255, 0);
-color: rgb(255, 255, 255, 200);</string>
-      </property>
-      <property name="text">
-       <string>Home Geo Fence Distance</string>
-      </property>
-      <property name="alignment">
-       <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-      </property>
-     </widget>
-    </item>
-    <item>
-     <widget class="QSpinBox" name="spinBoxGeoFenceDistance">
-      <property name="font">
-       <font>
-        <pointsize>8</pointsize>
-        <weight>75</weight>
-        <bold>true</bold>
-       </font>
-      </property>
-      <property name="styleSheet">
-       <string notr="true">background-color: rgba(255, 255, 255, 0);
-color: rgb(255, 255, 255);</string>
-      </property>
-      <property name="frame">
-       <bool>false</bool>
-      </property>
-      <property name="alignment">
-       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-      </property>
-      <property name="buttonSymbols">
-       <enum>QAbstractSpinBox::NoButtons</enum>
-      </property>
-      <property name="minimum">
-       <number>10</number>
-      </property>
-      <property name="maximum">
-       <number>2000</number>
-      </property>
-      <property name="singleStep">
-       <number>50</number>
-      </property>
-      <property name="value">
-       <number>100</number>
-      </property>
-     </widget>
-    </item>
-    <item>
-     <widget class="QLabel" name="label_6">
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="font">
-       <font>
-        <pointsize>8</pointsize>
-        <weight>50</weight>
-        <bold>false</bold>
-       </font>
-      </property>
-      <property name="styleSheet">
-       <string notr="true">background-color: rgba(255, 255, 255, 0);
-color: rgb(255, 255, 255);</string>
-      </property>
-      <property name="text">
-       <string>Meters</string>
-      </property>
-      <property name="alignment">
-       <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-      </property>
-     </widget>
-    </item>
-    <item>
-     <widget class="QPushButton" name="pushButtonGeoFenceM">
-      <property name="font">
-       <font>
-        <weight>50</weight>
-        <bold>false</bold>
-       </font>
-      </property>
-      <property name="cursor">
-       <cursorShape>OpenHandCursor</cursorShape>
-      </property>
-      <property name="text">
-       <string/>
-      </property>
-      <property name="icon">
-       <iconset resource="../coreplugin/core.qrc">
-        <normaloff>:/core/images/minus.png</normaloff>:/core/images/minus.png</iconset>
-      </property>
-      <property name="iconSize">
-       <size>
-        <width>12</width>
-        <height>12</height>
-       </size>
-      </property>
-      <property name="autoRepeat">
-       <bool>true</bool>
-      </property>
-      <property name="flat">
-       <bool>true</bool>
-      </property>
-     </widget>
-    </item>
-    <item>
-     <widget class="QPushButton" name="pushButtonGeoFenceP">
-      <property name="font">
-       <font>
-        <weight>50</weight>
-        <bold>false</bold>
-       </font>
-      </property>
-      <property name="cursor">
-       <cursorShape>OpenHandCursor</cursorShape>
-      </property>
-      <property name="styleSheet">
-       <string notr="true">QPushButton {
-border-color: rgba(0, 0, 0, 0);
-}
-QPushButton:hover {
-	background-color: qradialgradient(spread:pad, cx:0.5, cy:0.5, radius:0.1, fx:0.5, fy:0.5, stop:0 rgba(255, 0, 0, 255), stop:0.479904 rgba(255, 0, 0, 255), stop:0.522685 rgba(255, 255, 255, 255), stop:1 rgba(255, 255, 255, 0));
-}
-</string>
-      </property>
-      <property name="text">
-       <string/>
-      </property>
-      <property name="icon">
-       <iconset resource="../coreplugin/core.qrc">
-        <normaloff>:/core/images/plus.png</normaloff>:/core/images/plus.png</iconset>
-      </property>
-      <property name="iconSize">
-       <size>
-        <width>12</width>
-        <height>12</height>
-       </size>
-      </property>
-      <property name="autoRepeat">
-       <bool>true</bool>
-      </property>
-      <property name="autoDefault">
-       <bool>false</bool>
-      </property>
-      <property name="default">
-       <bool>false</bool>
-      </property>
-      <property name="flat">
-       <bool>true</bool>
-      </property>
-     </widget>
-    </item>
-   </layout>
-  </widget>
-  <zorder>layoutWidget</zorder>
-  <zorder>label_6</zorder>
- </widget>
- <resources>
-  <include location="../coreplugin/core.qrc"/>
- </resources>
- <connections/>
-</ui>
diff --git a/ground/src/plugins/opmap/opmap_widget.ui b/ground/src/plugins/opmap/opmap_widget.ui
index 505080d55..72a9224a8 100644
--- a/ground/src/plugins/opmap/opmap_widget.ui
+++ b/ground/src/plugins/opmap/opmap_widget.ui
@@ -30,7 +30,7 @@
     <number>0</number>
    </property>
    <item>
-    <layout class="QHBoxLayout" name="layoutWidget_7">
+    <layout class="QHBoxLayout" name="layoutWidgetToolBar">
      <property name="spacing">
       <number>0</number>
      </property>
@@ -54,14 +54,17 @@
          <height>0</height>
         </size>
        </property>
+       <property name="autoFillBackground">
+        <bool>false</bool>
+       </property>
        <property name="styleSheet">
-        <string notr="true">background-color: rgb(72, 72, 72);</string>
+        <string notr="true">background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(71, 71, 71, 255), stop:1 rgba(120, 120, 120, 255));</string>
        </property>
        <property name="frameShape">
         <enum>QFrame::NoFrame</enum>
        </property>
        <property name="frameShadow">
-        <enum>QFrame::Raised</enum>
+        <enum>QFrame::Plain</enum>
        </property>
        <layout class="QHBoxLayout" name="horizontalLayout_2">
         <property name="spacing">
@@ -77,7 +80,7 @@
          <number>0</number>
         </property>
         <property name="bottomMargin">
-         <number>0</number>
+         <number>5</number>
         </property>
         <item>
          <layout class="QHBoxLayout" name="layoutWidget_8">
@@ -102,7 +105,7 @@
              <string>Show/Hide Flight Controls</string>
             </property>
             <property name="styleSheet">
-             <string notr="true">background-color: rgba(255, 255, 255, 0);
+             <string notr="true">background-color: rgba(71, 71, 71, 0);
 color: rgb(255, 255, 255);</string>
             </property>
             <property name="text">
@@ -139,8 +142,9 @@ color: rgb(255, 255, 255);</string>
              <string>Find place</string>
             </property>
             <property name="styleSheet">
-             <string notr="true">background-color: rgba(255, 255, 255, 0);
-color: rgb(255, 255, 255);</string>
+             <string notr="true">background-color: rgba(71, 71, 71, 0);
+color: rgb(255, 255, 255);
+</string>
             </property>
             <property name="text">
              <string/>
@@ -179,240 +183,13 @@ color: rgb(255, 255, 255);</string>
             </property>
            </spacer>
           </item>
-          <item>
-           <widget class="QToolButton" name="toolButtonZoomM">
-            <property name="toolTip">
-             <string>Zoom out</string>
-            </property>
-            <property name="styleSheet">
-             <string notr="true">background-color: rgba(255, 255, 255, 0);
-color: rgb(255, 255, 255);</string>
-            </property>
-            <property name="text">
-             <string/>
-            </property>
-            <property name="icon">
-             <iconset resource="../coreplugin/core.qrc">
-              <normaloff>:/core/images/minus.png</normaloff>:/core/images/minus.png</iconset>
-            </property>
-            <property name="iconSize">
-             <size>
-              <width>16</width>
-              <height>16</height>
-             </size>
-            </property>
-            <property name="autoRaise">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QToolButton" name="toolButtonZoomP">
-            <property name="toolTip">
-             <string>Zoom in</string>
-            </property>
-            <property name="styleSheet">
-             <string notr="true">background-color: rgba(255, 255, 255, 0);
-color: rgb(255, 255, 255);</string>
-            </property>
-            <property name="text">
-             <string/>
-            </property>
-            <property name="icon">
-             <iconset resource="../coreplugin/core.qrc">
-              <normaloff>:/core/images/plus.png</normaloff>:/core/images/plus.png</iconset>
-            </property>
-            <property name="iconSize">
-             <size>
-              <width>16</width>
-              <height>16</height>
-             </size>
-            </property>
-            <property name="autoRaise">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QComboBox" name="comboBoxZoom">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="toolTip">
-             <string>Zoom level</string>
-            </property>
-            <property name="autoFillBackground">
-             <bool>false</bool>
-            </property>
-            <property name="styleSheet">
-             <string notr="true">background-color: rgba(128, 128, 128, 0);
-color: rgb(255, 255, 255);
-</string>
-            </property>
-            <property name="maxVisibleItems">
-             <number>20</number>
-            </property>
-            <property name="frame">
-             <bool>false</bool>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <spacer name="horizontalSpacer_6">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeType">
-             <enum>QSizePolicy::Fixed</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>20</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-          <item>
-           <widget class="QToolButton" name="toolButtonRL">
-            <property name="toolTip">
-             <string>Rotate anticlockwise</string>
-            </property>
-            <property name="styleSheet">
-             <string notr="true">background-color: rgba(255, 255, 255, 0);
-color: rgb(255, 255, 255);</string>
-            </property>
-            <property name="text">
-             <string/>
-            </property>
-            <property name="icon">
-             <iconset resource="../coreplugin/core.qrc">
-              <normaloff>:/core/images/undo.png</normaloff>:/core/images/undo.png</iconset>
-            </property>
-            <property name="iconSize">
-             <size>
-              <width>16</width>
-              <height>16</height>
-             </size>
-            </property>
-            <property name="autoRepeat">
-             <bool>true</bool>
-            </property>
-            <property name="autoRaise">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QToolButton" name="toolButtonRC">
-            <property name="toolTip">
-             <string>Reset rotation</string>
-            </property>
-            <property name="styleSheet">
-             <string notr="true">background-color: rgba(255, 255, 255, 0);
-color: rgb(255, 255, 255);</string>
-            </property>
-            <property name="text">
-             <string/>
-            </property>
-            <property name="icon">
-             <iconset resource="../coreplugin/core.qrc">
-              <normaloff>:/core/images/clear.png</normaloff>:/core/images/clear.png</iconset>
-            </property>
-            <property name="iconSize">
-             <size>
-              <width>16</width>
-              <height>16</height>
-             </size>
-            </property>
-            <property name="autoRaise">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QToolButton" name="toolButtonRR">
-            <property name="toolTip">
-             <string>Rotate clockwise</string>
-            </property>
-            <property name="styleSheet">
-             <string notr="true">background-color: rgba(255, 255, 255, 0);
-color: rgb(255, 255, 255);</string>
-            </property>
-            <property name="text">
-             <string/>
-            </property>
-            <property name="icon">
-             <iconset resource="../coreplugin/core.qrc">
-              <normaloff>:/core/images/redo.png</normaloff>:/core/images/redo.png</iconset>
-            </property>
-            <property name="iconSize">
-             <size>
-              <width>16</width>
-              <height>16</height>
-             </size>
-            </property>
-            <property name="autoRepeat">
-             <bool>true</bool>
-            </property>
-            <property name="autoRaise">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QLabel" name="labelRotate">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="font">
-             <font>
-              <pointsize>8</pointsize>
-              <weight>50</weight>
-              <bold>false</bold>
-             </font>
-            </property>
-            <property name="styleSheet">
-             <string notr="true">background-color: rgba(255, 255, 255, 0);
-color: rgb(255, 255, 255);</string>
-            </property>
-            <property name="text">
-             <string>Rotate</string>
-            </property>
-            <property name="alignment">
-             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <spacer name="horizontalSpacer_7">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeType">
-             <enum>QSizePolicy::Fixed</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>20</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
           <item>
            <widget class="QToolButton" name="toolButtonMapHome">
             <property name="toolTip">
              <string>Center map over home position</string>
             </property>
             <property name="styleSheet">
-             <string notr="true">background-color: rgba(255, 255, 255, 0);
+             <string notr="true">background-color: rgba(71, 71, 71, 0);
 color: rgb(255, 255, 255);</string>
             </property>
             <property name="text">
@@ -442,7 +219,7 @@ color: rgb(255, 255, 255);</string>
              <string>Center map over UAV position</string>
             </property>
             <property name="styleSheet">
-             <string notr="true">background-color: rgba(255, 255, 255, 0);
+             <string notr="true">background-color: rgba(71, 71, 71, 0);
 color: rgb(255, 255, 255);</string>
             </property>
             <property name="text">
@@ -491,7 +268,7 @@ color: rgb(255, 255, 255);</string>
              <string>Add a waypoint</string>
             </property>
             <property name="styleSheet">
-             <string notr="true">background-color: rgba(255, 255, 255, 0);
+             <string notr="true">background-color: rgba(71, 71, 71, 0);
 color: rgb(255, 255, 255);</string>
             </property>
             <property name="text">
@@ -515,6 +292,118 @@ color: rgb(255, 255, 255);</string>
             </property>
            </widget>
           </item>
+          <item>
+           <spacer name="horizontalSpacer_6">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeType">
+             <enum>QSizePolicy::Fixed</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>20</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item>
+           <widget class="QToolButton" name="toolButtonZoomM">
+            <property name="toolTip">
+             <string>Zoom out</string>
+            </property>
+            <property name="styleSheet">
+             <string notr="true">background-color: rgba(71, 71, 71, 0);
+color: rgb(255, 255, 255);</string>
+            </property>
+            <property name="text">
+             <string/>
+            </property>
+            <property name="icon">
+             <iconset resource="opmap.qrc">
+              <normaloff>:/opmap/images/minus.png</normaloff>:/opmap/images/minus.png</iconset>
+            </property>
+            <property name="iconSize">
+             <size>
+              <width>16</width>
+              <height>16</height>
+             </size>
+            </property>
+            <property name="autoRaise">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QToolButton" name="toolButtonZoomP">
+            <property name="toolTip">
+             <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; color:#ffffff;&quot;&gt;Zoom in&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            </property>
+            <property name="styleSheet">
+             <string notr="true">background-color: rgba(71, 71, 71, 0);
+color: rgb(255, 255, 255);</string>
+            </property>
+            <property name="text">
+             <string/>
+            </property>
+            <property name="icon">
+             <iconset resource="opmap.qrc">
+              <normaloff>:/opmap/images/plus.png</normaloff>:/opmap/images/plus.png</iconset>
+            </property>
+            <property name="iconSize">
+             <size>
+              <width>16</width>
+              <height>16</height>
+             </size>
+            </property>
+            <property name="autoRaise">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QSlider" name="horizontalSliderZoom">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimumSize">
+             <size>
+              <width>130</width>
+              <height>0</height>
+             </size>
+            </property>
+            <property name="maximumSize">
+             <size>
+              <width>130</width>
+              <height>16777215</height>
+             </size>
+            </property>
+            <property name="styleSheet">
+             <string notr="true">background-color: rgba(255, 255, 255, 0);
+color: rgb(255, 255, 255);</string>
+            </property>
+            <property name="minimum">
+             <number>2</number>
+            </property>
+            <property name="maximum">
+             <number>19</number>
+            </property>
+            <property name="pageStep">
+             <number>1</number>
+            </property>
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+           </widget>
+          </item>
           <item>
            <spacer name="horizontalSpacer_2">
             <property name="orientation">
@@ -540,7 +429,7 @@ color: rgb(255, 255, 255);</string>
              <string>Reload map</string>
             </property>
             <property name="styleSheet">
-             <string notr="true">background-color: rgba(255, 255, 255, 0);
+             <string notr="true">background-color: rgba(71, 71, 71, 0);
 color: rgb(255, 255, 255);</string>
             </property>
             <property name="text">
@@ -568,7 +457,7 @@ color: rgb(255, 255, 255);</string>
     </layout>
    </item>
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_3">
+    <layout class="QHBoxLayout" name="horizontalLayoutCenter">
      <property name="spacing">
       <number>0</number>
      </property>
@@ -596,7 +485,7 @@ color: rgb(255, 255, 255);</string>
         <bool>false</bool>
        </property>
        <property name="styleSheet">
-        <string notr="true">background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(72, 72, 72, 255), stop:1 rgba(68, 68, 68, 255));</string>
+        <string notr="true">background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(120, 120, 120, 255), stop:1 rgba(68, 68, 68, 255));</string>
        </property>
        <layout class="QVBoxLayout" name="verticalLayout_4">
         <property name="margin">
@@ -714,7 +603,7 @@ color: rgb(255, 255, 255);</string>
     </layout>
    </item>
    <item>
-    <layout class="QHBoxLayout" name="layoutWidget_5">
+    <layout class="QHBoxLayout" name="layoutWidgetStatusBar_2">
      <property name="spacing">
       <number>0</number>
      </property>
@@ -764,7 +653,7 @@ color: rgb(255, 255, 255);</string>
          <number>5</number>
         </property>
         <item>
-         <layout class="QHBoxLayout" name="layoutWidget_3">
+         <layout class="QHBoxLayout" name="layoutWidgetStatusBar">
           <property name="spacing">
            <number>8</number>
           </property>
diff --git a/ground/src/plugins/opmap/opmapgadgetwidget.cpp b/ground/src/plugins/opmap/opmapgadgetwidget.cpp
index 2e33ffc83..009e5ab0e 100644
--- a/ground/src/plugins/opmap/opmapgadgetwidget.cpp
+++ b/ground/src/plugins/opmap/opmapgadgetwidget.cpp
@@ -56,7 +56,8 @@ OPMapGadgetWidget::OPMapGadgetWidget(QWidget *parent) : QWidget(parent)
     // **************
     // create the widget that holds the user controls and the map
 
-    m_widget = new Ui_OPMap_Widget();
+    m_widget = new Ui::OPMap_Widget();
+//    m_widget = new Ui_OPMap_Widget();
     m_widget->setupUi(this);
 
     // **************
@@ -79,17 +80,11 @@ OPMapGadgetWidget::OPMapGadgetWidget(QWidget *parent) : QWidget(parent)
     // **************
     // set the user control options
 
-    m_widget->labelRotate->setText(QString::number(m_map->Rotate()));
 //  m_widget->labelNumTilesToLoad->setText(" 0");
     m_widget->labelMapPos->setText("");
     m_widget->labelMousePos->setText("");
     m_widget->progressBarMap->setMaximum(1);
 
-    m_widget->comboBoxZoom->clear();
-    for (int i = 2; i <= 19; i++)
-	m_widget->comboBoxZoom->addItem(QString::number(i), i);
-    m_widget->comboBoxZoom->setCurrentIndex((int)(m_map->Zoom() + 0.5) - 2);
-
     m_widget->widgetFlightControls->setVisible(false);
     m_widget->toolButtonFlightControlsShowHide->setIcon(QIcon(QString::fromUtf8(":/core/images/next.png")));
 
@@ -148,8 +143,6 @@ OPMapGadgetWidget::OPMapGadgetWidget(QWidget *parent) : QWidget(parent)
     m_statusUpdateTimer->start();
 
     // **************
-
-    connect(m_widget->comboBoxZoom, SIGNAL(currentIndexChanged(int)), this, SLOT(on_comboBoxZoom_currentIndexChanged(int)));
 }
 
 // *************************************************************************************
@@ -241,6 +234,9 @@ void OPMapGadgetWidget::contextMenuEvent(QContextMenuEvent *event)
     menu.addAction(goMouseClickAct);
     menu.addAction(goHomeAct);
     menu.addAction(goUAVAct);
+
+    menu.addSeparator()->setText(tr("Follow"));
+
     menu.addAction(followUAVpositionAct);
     menu.addAction(followUAVheadingAct);
 
@@ -253,7 +249,7 @@ void OPMapGadgetWidget::contextMenuEvent(QContextMenuEvent *event)
 
     menu.addSeparator();
 
-    menu.addAction(gridLinesAct);
+//    menu.addAction(gridLinesAct);
     menu.addAction(openGLAct);
 
     menu.exec(event->globalPos());
@@ -327,6 +323,9 @@ void OPMapGadgetWidget::updatePosition()
 
 		if (followUAVheadingAct->isChecked())
 		    m_map->SetRotate(-uav_heading);							// rotate the map to match the uav heading
+		else
+		if (m_map->Rotate() != 0)
+		    m_map->SetRotate(0);								// reset the rotation to '0'
 	    }
 	}
     }
@@ -357,10 +356,7 @@ void OPMapGadgetWidget::zoomChanged(double zoom)
     if (m_widget)
     {
 //	m_widget->labelZoom->setText(" " + QString::number(zoom));
-
-	disconnect(m_widget->comboBoxZoom, SIGNAL(currentIndexChanged(int)), this, 0);
-	m_widget->comboBoxZoom->setCurrentIndex(i_zoom - 2);
-	connect(m_widget->comboBoxZoom, SIGNAL(currentIndexChanged(int)), this, SLOT(on_comboBoxZoom_currentIndexChanged(int)));
+	m_widget->horizontalSliderZoom->setValue(i_zoom);
     }
 
     switch (i_zoom)
@@ -448,33 +444,6 @@ void OPMapGadgetWidget::on_toolButtonFindPlace_clicked()
     findPlace();
 }
 
-void OPMapGadgetWidget::on_toolButtonRL_clicked()
-{
-    if (m_map)
-    {
-	m_map->SetRotate(m_map->Rotate() - 1);
-	if (m_widget) m_widget->labelRotate->setText(" " + QString::number(m_map->Rotate()));
-    }
-}
-
-void OPMapGadgetWidget::on_toolButtonRC_clicked()
-{
-    if (m_map)
-    {
-	m_map->SetRotate(0);
-	if (m_widget) m_widget->labelRotate->setText(" " + QString::number(m_map->Rotate()));
-    }
-}
-
-void OPMapGadgetWidget::on_toolButtonRR_clicked()
-{
-    if (m_map)
-    {
-	m_map->SetRotate(m_map->Rotate() + 1);
-	if (m_widget) m_widget->labelRotate->setText(" " + QString::number(m_map->Rotate()));
-    }
-}
-
 void OPMapGadgetWidget::on_toolButtonZoomP_clicked()
 {
     zoomIn();
@@ -522,18 +491,6 @@ void OPMapGadgetWidget::on_pushButtonGeoFenceP_clicked()
     }
 }
 
-void OPMapGadgetWidget::on_comboBoxZoom_currentIndexChanged(int index)
-{
-    if (m_widget)
-    {
-	bool ok;
-	int i = (int)m_widget->comboBoxZoom->itemData(index).toInt(&ok);
-
-	setZoom(2 + index);
-    }
-}
-
-
 void OPMapGadgetWidget::on_toolButtonFlightControlsShowHide_clicked()
 {
     if (m_widget)
@@ -557,6 +514,11 @@ void OPMapGadgetWidget::on_toolButtonMapUAV_clicked()
     followUAVpositionAct->toggle();
 }
 
+void OPMapGadgetWidget::on_horizontalSliderZoom_sliderMoved(int position)
+{
+    setZoom(position);
+}
+
 void OPMapGadgetWidget::on_toolButtonHome_clicked()
 {
 }
@@ -952,12 +914,19 @@ void OPMapGadgetWidget::goUAV()
 void OPMapGadgetWidget::on_followUAVpositionAct_toggled(bool checked)
 {
     if (m_widget)
+    {
 	if (m_widget->toolButtonMapUAV->isChecked() != followUAVpositionAct->isChecked())
 	    m_widget->toolButtonMapUAV->setChecked(followUAVpositionAct->isChecked());
+
+	if (m_map)
+	    m_map->SetRotate(0);				    				// reset the rotation to '0'
+    }
 }
 
 void OPMapGadgetWidget::on_followUAVheadingAct_toggled(bool checked)
 {
+    if (!checked && m_map)
+	m_map->SetRotate(0);									// reset the rotation to '0'
 }
 
 void OPMapGadgetWidget::openWayPointEditor()
diff --git a/ground/src/plugins/opmap/opmapgadgetwidget.h b/ground/src/plugins/opmap/opmapgadgetwidget.h
index bb3e0533e..4013ad403 100644
--- a/ground/src/plugins/opmap/opmapgadgetwidget.h
+++ b/ground/src/plugins/opmap/opmapgadgetwidget.h
@@ -34,7 +34,11 @@
 #include "uavobjects/uavobjectmanager.h"
 #include "uavobjects/positionactual.h"
 
-class Ui_OPMap_Widget;
+//class Ui_OPMap_Widget;
+
+namespace Ui {
+    class OPMap_Widget;
+}
 
 using namespace mapcontrol;
 
@@ -71,17 +75,14 @@ private slots:
     // user control signals
     void on_toolButtonReload_clicked();
     void on_toolButtonFindPlace_clicked();
-    void on_toolButtonRR_clicked();
-    void on_toolButtonRC_clicked();
-    void on_toolButtonRL_clicked();
     void on_toolButtonZoomM_clicked();
     void on_toolButtonZoomP_clicked();
     void on_pushButtonGeoFenceM_clicked();
     void on_pushButtonGeoFenceP_clicked();
-    void on_comboBoxZoom_currentIndexChanged(int index);
     void on_toolButtonFlightControlsShowHide_clicked();
     void on_toolButtonMapHome_clicked();
     void on_toolButtonMapUAV_clicked();
+    void on_horizontalSliderZoom_sliderMoved(int position);
 
     void on_toolButtonHome_clicked();
     void on_toolButtonHoldPosition_clicked();
@@ -145,7 +146,8 @@ private:
 
    PositionActual *m_positionActual;
 
-    Ui_OPMap_Widget *m_widget;
+//    Ui_OPMap_Widget *m_widget;
+    Ui::OPMap_Widget *m_widget;
 
     mapcontrol::OPMapWidget *m_map;