From 7c7d83755bdfa013549d2c7e18a6c7ebb9bf8fe6 Mon Sep 17 00:00:00 2001
From: Matthias Kuhn <matthias.kuhn@gmx.ch>
Date: Tue, 12 Nov 2013 16:12:36 +0100
Subject: [PATCH] [globe] Re-Enable sync extent button and disable home button
 The home button was a duplicate of the globe in the center of the navigation
 arrows

---
 src/plugins/globe/globe_plugin.cpp           |   9 ++++++---
 src/plugins/globe/images/gui/sync-extent.png | Bin 1337 -> 288 bytes
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/plugins/globe/globe_plugin.cpp b/src/plugins/globe/globe_plugin.cpp
index 449060b4c394..c23737cbad75 100644
--- a/src/plugins/globe/globe_plugin.cpp
+++ b/src/plugins/globe/globe_plugin.cpp
@@ -663,26 +663,29 @@ void GlobePlugin::setupControls()
   mControlCanvas->addControl( backgroundGrp2 );
 
   //Zoom Reset
+#if ENABLE_HOME_BUTTON
   osg::Image* homeImg = osgDB::readImageFile( imgDir + "/zoom-home.png" );
   ImageControl* home = new NavigationControl( homeImg );
   home->setPosition( imgLeft + 12 + 3, imgTop + 2 );
+  imgTop = imgTop + 23 + 2;
   home->addEventHandler( new HomeControlHandler( manip ) );
   mControlCanvas->addControl( home );
+#endif
 
   //refresh layers
   osg::Image* refreshImg = osgDB::readImageFile( imgDir + "/refresh-view.png" );
   ImageControl* refresh = new NavigationControl( refreshImg );
-  refresh->setPosition( imgLeft + 12 + 3, imgTop + 2 + 23 + 2 );
+  refresh->setPosition( imgLeft + 12 + 3, imgTop + 3 );
+  imgTop = imgTop + 23 + 2;
   refresh->addEventHandler( new RefreshControlHandler( this ) );
   mControlCanvas->addControl( refresh );
 
   //Sync Extent
-#if ENABLE_SYNC_BUTTON
   osg::Image* syncImg = osgDB::readImageFile( imgDir + "/sync-extent.png" );
   ImageControl* sync = new NavigationControl( syncImg );
+  sync->setPosition( imgLeft + 12 + 3, imgTop + 2 );
   sync->addEventHandler( new SyncExtentControlHandler( this ) );
   mControlCanvas->addControl( sync );
-#endif
 }
 
 void GlobePlugin::setupProxy()
diff --git a/src/plugins/globe/images/gui/sync-extent.png b/src/plugins/globe/images/gui/sync-extent.png
index b97bb387c301480e90ce63623e4e64a24ff7f75e..6849f41d04a7b61cb3cfeb8e46eb21b414bf081c 100644
GIT binary patch
delta 250
zcmV<W00sZK3ZMcZiBL{Q4GJ0x0000DNk~Le0000N0000N2nGNE0N^Urpph;xf87fV
z4*@W1>}@Cj006B?L_t(Y$L-Ux4T4Y*#_=B%#tB$~L|Z4IaSI#c9LCZiY}|r|31}%;
zfiQuU&7&b|M9{+Ub(eSd&)s+Tm^EvRB3x0vnO}zdsQ(c6;w8>l4Qyx?>Xy&o2`<P!
zoHz^hNguurqopG)O#^4$`MbptP>TuocEc$eu(-jBzkPPEY}vediVtmxk>h}NqK4bR
z%R5^t>`;#c*MU>@J#Vl_@gcYf_03Pd|ExdL9r>{xvVOt!U;qFB07*qoM6N<$f>LB_
A4FCWD

delta 1307
zcmV+$1?2jm0=Wt<iBL{Q4GJ0x0000DNk~Le0000K0000K2nGNE0F8+q4FCWD0drDE
zLIAGL9O;oEFn`+u3J?_|D5Sw&000EJNkl<ZILl3xO>7j|6@|b1>Zhx^{R7BGFdcqu
zV#6p(#3YafAg{6;g+&%f*|AK>3du$wwn#|Rg6y(N*0V`=fkh-D3n2ty;sj47vBr)Z
z#SV?J@pN}pm#gYky_?0@qdDuV?;c&9d*t4|d-VH#I)9xG2U=KIm^8-x)bqT{A~L6{
z-w~0nsy?mj`k8a?QK!@C9?ajmb&K)waqix|i!3ZGd;^=GpO1at|2T@G-_Fd;jGj4j
z#(17b5CjZ|L*Bi6$Ii}<zIpQ|&9dxQRaO1r!Gj0cz6m;=4sx*N&Ye4xp67jX^yty+
zSFT*4EPqRSy&iAhzSTI6rPXSw=Xo+dK904PrKKfyc6L5>&duMyfBy}@?c2A%2F}mV
z$59mhW@cvQ`t0m1MNu#u4s|dXNEAgJIdX&~N$@<6y}dnERgN7yCTnYJtgfzpnq}E9
z9zJ|H05AZa=Y4$m@ZswxPMlzKb5pzBF8zLAT7Rt;s!G4#r`c>01OdM9OOhnAva+I6
zQ&UV%PX4^nXk5K<<Awmp!otF2v)Npoo0}Wo+}tF~GRDTnX*OG^)&K-SKp2MX?d>rb
zBvh5fT1y<qOixeq<jIp^nx-GB>W1+=@9L>jr^b4{9!Zku$jB&TqcNfBQ<N4}#W_co
zWq<g7$jNq#Lx)CaG$PV8)$Q$VCMG6YzVBZZ5i!8!cDpTQSrWyugkiu3M|Swp_iBp5
zQB@UHRiUbU)k~Q={uMv|zE7(aAz~!UGTQAn#+b{17+|idDjJPQ13zH;c%QSUh0niK
zN?Wm)TZ*D)I4nqq8UOsZFcQA!?8za%Z-1z3r$G>)s&fFos<w-wz=+EE*_;o*>+!y)
zM4|G-a~2VUszucyBIJcK%nj$J9lqzWyoMx6f~vL;9CmkicS(|g>V77T@$iEHYb|A2
z5(ELQRtw+v0YOzkgwmFTL7;h_19U}1ec)-5BvYv|^0$>S@}l4eXB*@NeEFXUb$=Ey
zCB9!{E9KO27;6ciuT(6rHYm%16h#j36u_wJv*B>)8exd4>R*;izE~|ed)fj@5D58R
z!Z7WVrU~axSFHc9=H;>_2pTE^Ns{24d#0-DJLeu{S(c8Dj*iuJEo0+{`0O8j);DW>
zKPC)9thIQaht`hIz6eN$P?nA$@PDMLDzYrgoO6FvRrQ`ff1X~tbZN6Fil4=COp)h`
zc#>w|`-Uvb$nzZM9Imdgb%UyQjEuB2&vWT^yI5;~dEvr^#hW*8e*Jo{U%!4-mgVnz
zy&ix>QG+N7H3$NBcXz4lnyRWOttE~d8pknF6v_7XHhG>udhz1LpRQfI7JmYGKx1uf
zEsUb*UlS7(AE@eVyWK`rWov5-RaHPlM2#`xd7fBn+1S`1Ns>RmdiAQaxVZR!KOoKn
zLZGp}zHYa-xBoghIk}Oh>7`z;=R4;x#)vTnRh7D~84Lyt1_Qgbwe{=Ak01YTX=&*#
zPy-go4*D<zMuBD=$IXiuFJzuPfByVW!Z7^E81s>cOsMLvbMAFf6n|e{US53p^5uW?
zJkNkVpa%>A_f5g>OMt)_6NO>eFvbKT66~KwopaVXS6OQd=Uf4lK=p0F{{bjFl8%9a
R;-3Hj002ovPDHLkV1h`>eOUki