From d039729878d2b31ba667953340642d9a3f259962 Mon Sep 17 00:00:00 2001
From: Torsten Paul <Torsten.Paul@gmx.de>
Date: Thu, 18 Sep 2014 23:14:12 +0200
Subject: [PATCH] Add "ViewAll" and remove "Crosshair" icon from toolbar.

---
 images/zoom-all-white.png | Bin 0 -> 927 bytes
 images/zoom-all.png       | Bin 0 -> 934 bytes
 openscad.qrc              |   2 ++
 src/MainWindow.ui         |   6 +++++-
 src/mainwin.cc            |   1 +
 5 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 images/zoom-all-white.png
 create mode 100644 images/zoom-all.png

diff --git a/images/zoom-all-white.png b/images/zoom-all-white.png
new file mode 100644
index 0000000000000000000000000000000000000000..251fe217671dbc9f078a40e923100a0e0c43866c
GIT binary patch
literal 927
zcmV;Q17Q4#P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000XU
z000XU0RWnu7ytkO2XskIMF-vq5)}*tqSe3@0009%Nkl<ZSi|jCOG_J382#>bCX+@@
zG^iL+7g9tLM58sB&{pljKVXWKEJ_zeS}disn<Cv;go2B9QMAxau{#SzX<V2>qiMPj
z0%`~)DTP!72|95mndj{$14A%6N$g|cS>8GK+;bn_V*oDjkAaE@2qEM|B0}gip-Sgr
zLoUw{G0Hg!lu^NGG&)*aTRVj@z77Cw03Z@V;)<et%w#ezM@B||>F1O>5yMxYiLI@z
zSsf0?BEvBL!Z;LbtEzg;^ZX;X+r3aqry>KvV6d*Eqhp<>=_`eAP)d&w0vyLZ?(gq^
zQI3IA-+;s6nAa8u0FWdpn$2c!rPFEG{{H?D&-2d|MLE<?#$vI|MWaz)Id7sQDI5;>
zG&eVIV~jBXKrWYi6N|;B0)c?6=WT3kblL6pb&8@o0RRL+_~LT8t{HuVB~QR=wFVGE
zm=FSzBz@o6*|}G|H~@gp=S#9IdzTObgb*;9OjkppP*>FkFvi0OAwUR$EX!{vCnv>H
zT#v^Slx6v+#<$sQo~jMdG~J->3S*owkO$%#pJ5n#)dpl)&TEfLmgTmygj7{+)A5h1
zHlV6%ObaiXrf;4m5)OxZD2j4we3oTnRU6<q?!E3hd|O*v_fO)juC7`d8ygo9Lb$N|
zL?jY1Y~aL1q{Z;|_Vzl%Fr$TWHJ{JFIyg9(8yg$@IX^#7dA;7z`uh4=nx+S|-Dk7e
zz`(%3yJD@fYJoQK=;-K<-ERL{Q&ZD|5W;4&dAhy5eR_9y_Yh-j#u%IRnXmxUxz>V6
zB;vH$Y#%6!x@<&{5R&ii?!I&`sTcrYczAdxl}h#Ha=95vl718|CX1pNDGEn(JRVP-
zYeS;n#mdS`XH!#Co1!RUI-O4V{r=-vEH-DcSf1$T2!arFI-TPcSHp4|j-{m~s<*fI
zlgVVdp&#dY{&`<t-_weUQMm|(LM^SWt>3hwq(u(PvJ-=YgUf&1K%r~$G&D4P)<=h;
zC~PK^8S;9)iHdtdqwsh<QI6vtYBixy)U0)Nb+c79rRBiwcE8T&^9x#T5Cma)Z*TAR
zUo!vzkW3~Yh@u$bIBsThb8}*Re4M@b1G>O}i{Euzn+<{i(DwiU002ovPDHLkV1kJv
Bp7H<y

literal 0
HcmV?d00001

diff --git a/images/zoom-all.png b/images/zoom-all.png
new file mode 100644
index 0000000000000000000000000000000000000000..d3fc804166c19b29c3b304c04f4b6a93181f69fb
GIT binary patch
literal 934
zcmV;X16lluP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000XU
z000XU0RWnu7ytkO2XskIMF-vq5)}&vbe#uj0009;Nkl<ZSi|jCPe>F|82{ePo1NL2
zW{5=+U0QMpj15hqRcEPILPHOoDkM5YhmeAVs7plmLI^t4AuQ@5BnSpw(t{?!t_kkC
z(h?dKNv^1@yQ?nEAK&ZZ#J26$>TJ}(-|_MLzW4jy``&N90ocJm1}d;dx4^X>$Jh|M
z9nLSnr6%<I{VnV3>s^G9;{Z?%06IeGJ<GB$T`t#yv9YoFyclZt3J?H5Yip~LNF*L>
znsx>NfKmzw{T#+H%$g{Q*P_vAZ?Qbv642Jxwrg%~Zp1K*BLDyhA)vHyVF)3RB<cFp
z)YQGL2>5LeBoc}H*5&{J9LK$tW%-=j?LJspS?L!=@ixn{DeGji*=&#B?+<LHCyJ5+
zfxv;KrKNX-5C#Ci>2yA+udnaw>+3Ufd8(><lgZ?WX__7Y0G{XH#N+W}r8Z&F6UbyT
z=P9KOLI^mH`{48WF6VC!01yg=J}QcG2_XasA<%XGXfPP`+7>_vX{M9{r4%s6&-(lO
z^<vzKiHRYM@fVAqPNy4f3os00w^bD(WadwaD5dW$zNTp|+X67g->l}s7+3!>5yMpH
z@Yie$U>GK5JukyB&i*b*AP_iUnx@a<D~b}cEkKf_=Q-CAXlQ7-Qi#{y-Y%}JtURWa
zGMm-UG&eVwETEVXApiiM&o`oJTFYi-L=c3B6%`ddqobo=y1Tn^C=_a0U0uCv7{+0%
zdRdmwM<S8F{9M~|LRD4wC6meVjg5^xxfYBuP7y)`LWq!W&$29Ej6@<&%VNa<08LFz
zzH~bM!ZgkOB^@b3-)3iLon^6N0D$rF@pw&5%^|1Ld5hz?&v~1f4u>P0_Z)@V+S*U$
z9!P%hIyyQ$%gf8vEX(R{w|iz_U|_ATuC6DW&ECij;CX&19*>{2a|I=TH#$2z@$~fc
zD_z%5<gSaNcqbN%-7NbQQwYIeaL>ZR!i4ovvR;m&D5obUCkOw!fX%6?F_lWawq6GS
z0L!u&m&@f3hr<Q!oGqt-`T6;;9*<|qFpN_<Qxi`J*}J&7_}tD=S~8;1=p#W8dM#t(
zd48~}s_KH>sd!89dc9X24o6s$q+6=0o*o_^&g}dF?cl$~cL1tX#*7s5XaE2J07*qo
IM6N<$g4_bH4gdfE

literal 0
HcmV?d00001

diff --git a/openscad.qrc b/openscad.qrc
index 2de2e60c..f202c2d4 100644
--- a/openscad.qrc
+++ b/openscad.qrc
@@ -45,6 +45,8 @@
     <file>images/surface.png</file>
     <file>images/Zoom-In-32.png</file>
     <file>images/Zoom-Out-32.png</file>
+    <file>images/zoom-all.png</file>
+    <file>images/zoom-all-white.png</file>
     <file>images/surfaceWhite.png</file>
     <file>images/wireframeWhite.png</file>
     <file>images/orthogonal.png</file>
diff --git a/src/MainWindow.ui b/src/MainWindow.ui
index 79611b55..c47daf90 100644
--- a/src/MainWindow.ui
+++ b/src/MainWindow.ui
@@ -112,6 +112,7 @@
          <addaction name="designActionPreview"/>
          <addaction name="designActionRender"/>
          <addaction name="separator"/>
+         <addaction name="viewActionViewAll"/>
          <addaction name="viewActionZoomIn"/>
          <addaction name="viewActionZoomOut"/>
          <addaction name="separator"/>
@@ -125,7 +126,6 @@
          <addaction name="viewActionPerspective"/>
          <addaction name="viewActionOrthogonal"/>
          <addaction name="viewActionShowAxes"/>
-         <addaction name="viewActionShowCrosshairs"/>
          <addaction name="viewActionShowEdges"/>
         </widget>
        </item>
@@ -1064,6 +1064,10 @@
    </property>
   </action>
   <action name="viewActionViewAll">
+   <property name="icon">
+    <iconset resource="../openscad.qrc">
+     <normaloff>:/images/zoom-all.png</normaloff>:/images/zoom-all.png</iconset>
+   </property>
    <property name="text">
     <string>View All</string>
    </property>
diff --git a/src/mainwin.cc b/src/mainwin.cc
index 429dff38..b524db7a 100644
--- a/src/mainwin.cc
+++ b/src/mainwin.cc
@@ -492,6 +492,7 @@ MainWindow::MainWindow(const QString &filename)
 	 viewActionOrthogonal->setIcon(QIcon("://images/orthogonalwhite.png"));
 	 viewActionAnimate->setIcon(QIcon("://images/animate.png"));
 	 designActionExportSTL->setIcon(QIcon(":/images/export-white.png"));
+	 viewActionViewAll->setIcon(QIcon(":/images/zoom-all-white.png"));
 	}
 	
 	// make sure it looks nice..