From d45e2c4c2e814146a11d261f75a5c091162f77f9 Mon Sep 17 00:00:00 2001
From: phkahler <14852918+phkahler@users.noreply.github.com>
Date: Sat, 9 Jan 2021 12:27:27 -0500
Subject: [PATCH] Add toolbar icons for Revolve and Helix created by jkrei0 in
 issue #857. (#878)

---
 res/CMakeLists.txt                    |   2 ++
 res/icons/graphics-window/helix.png   | Bin 0 -> 664 bytes
 res/icons/graphics-window/revolve.png | Bin 0 -> 680 bytes
 src/toolbar.cpp                       |   6 +++++-
 4 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 res/icons/graphics-window/helix.png
 create mode 100644 res/icons/graphics-window/revolve.png

diff --git a/res/CMakeLists.txt b/res/CMakeLists.txt
index 5969039b..e261ba21 100644
--- a/res/CMakeLists.txt
+++ b/res/CMakeLists.txt
@@ -213,6 +213,7 @@ add_resources(
     icons/graphics-window/construction.png
     icons/graphics-window/equal.png
     icons/graphics-window/extrude.png
+    icons/graphics-window/helix.png
     icons/graphics-window/horiz.png
     icons/graphics-window/image.png
     icons/graphics-window/in3d.png
@@ -227,6 +228,7 @@ add_resources(
     icons/graphics-window/point.png
     icons/graphics-window/rectangle.png
     icons/graphics-window/ref.png
+    icons/graphics-window/revolve.png
     icons/graphics-window/same-orientation.png
     icons/graphics-window/sketch-in-3d.png
     icons/graphics-window/sketch-in-plane.png
diff --git a/res/icons/graphics-window/helix.png b/res/icons/graphics-window/helix.png
new file mode 100644
index 0000000000000000000000000000000000000000..4b2cda68d5138d636ffe3af605bf3ad5fbb696a0
GIT binary patch
literal 664
zcmV;J0%!e+P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0004nX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>7wRK|6>zWT@g`K~%(1s#pXIrLEAagUO{|(4-+r
zad8w}3l4rPRvlcNb#-tR1i=pwCr2km7b)?7NufoI2gm(*ckglc4iM^PrkWiSfT~$W
zG8Ppx*;O&{iXi&Yi!p>HX6o_OVj7;~>mEM7-bHwp_qjhukCHPP;1h}Gm~L3a8^kl4
zmd<&fIK+yQLVQj<ZqNmZAGt2O{KmQ9u)s4zMmjl993mDAZ7jDjD;g^CG;vr_HOdz<
zE-Re3IIHC<Yu=N;FqqR;Qe3Awj2M;>M*<>bR8c}179zB2q?kz3e$>N1<oFZhlF3y9
zBgX<NP$4;f@IUz7t(l*ibd!Qnp!3DHKSqGSF3_mi_V=-EH%<WmGjOG~{FOQ|`$>AO
zrG<}xzHQ**x~0i`z~v4w_@qmQ<Vb#+LOu_?pV2pEfq`3~d(G{wxsTHaAWdB@-v9@P
zz-WQ8*FE0d)!y5`XPW)}0Ja=*!rh0<!~g&Q24YJ`L;z3#PykTIhYRok000SaNLh0L
z01FZT01FZU(%pXi00007bV*G`2jmPD0wy1>WaB3Q005LpL_t(Y$L*6*4uBvGLutZU
z$DMZB`lXpfWWe~+eSs<Ke1()gQzAkU;pn+MB34yc6IDg1LEUuJtcz#|Lbt)F?sdw#
zN&U^P^KSlm7SnR5JuKb~&<n^r>3O!PpGn{IcX{QyhP~ugQ;!)um^_oVGC%|pl9#5G
ya?@dzKS=_BHM9GWm%Ozso~J#cO)Q?jTy+59P=<`q9VLJO0000<MNUMnLSTX|Hy|ni

literal 0
HcmV?d00001

diff --git a/res/icons/graphics-window/revolve.png b/res/icons/graphics-window/revolve.png
new file mode 100644
index 0000000000000000000000000000000000000000..0cef0fa669102188757aabc5750b5c0fe9b5b5f1
GIT binary patch
literal 680
zcmV;Z0$2TsP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0004nX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>7wRK|6>zWT@g`K~%(1s#pXIrLEAagUO{|(4-+r
zad8w}3l4rPRvlcNb#-tR1i=pwCr2km7b)?7NufoI2gm(*ckglc4iM^PrkWiSfT~$W
zG8Ppx*;O&{iXi&Yi!p>HX6o_OVj7;~>mEM7-bHwp_qjhukCHPP;1h}Gm~L3a8^kl4
zmd<&fIK+yQLVQj<ZqNmZAGt2O{KmQ9u)s4zMmjl993mDAZ7jDjD;g^CG;vr_HOdz<
zE-Re3IIHC<Yu=N;FqqR;Qe3Awj2M;>M*<>bR8c}179zB2q?kz3e$>N1<oFZhlF3y9
zBgX<NP$4;f@IUz7t(l*ibd!Qnp!3DHKSqGSF3_mi_V=-EH%<WmGjOG~{FOQ|`$>AO
zrG<}xzHQ**x~0i`z~v4w_@qmQ<Vb#+LOu_?pV2pEfq`3~d(G{wxsTHaAWdB@-v9@P
zz-WQ8*FE0d)!y5`XPW)}0Ja=*!rh0<!~g&Q24YJ`L;z3#PykTIhYRok000SaNLh0L
z01FZT01FZU(%pXi00007bV*G`2jmPD0VxgG12Fjj005*(L_t(Y$L&->5(6O!TO8k-
zKj~-bp{3(EP{?}f%;u;NP(rTj-yvB50R448=M=iYN}3Tcv89fWa!<%3j>aUbD&0V<
zyh1;)`{<?KdG}Odfn$uf5=6ub*&sc#H8=e~?>oG+o$zP|ckmQQ(b>g2T1HC-pp1&v
z-AGjgKue~z=|9?m#@a7y-JS6u5&3p`yAdPM1yS7YOJxB>L#`HjK;Z=v_ne2gg`(&H
O0000<MNUMnLSTZI_9mbJ

literal 0
HcmV?d00001

diff --git a/src/toolbar.cpp b/src/toolbar.cpp
index 4d0b8839..e6f76732 100644
--- a/src/toolbar.cpp
+++ b/src/toolbar.cpp
@@ -68,6 +68,10 @@ static ToolIcon Toolbar[] = {
       N_("New group extruding active sketch"),                {} },
     { "lathe",           Command::GROUP_LATHE,
       N_("New group rotating active sketch"),                 {} },
+    { "helix",           Command::GROUP_HELIX,
+      N_("New group helix from active sketch"),               {} },
+    { "revolve",         Command::GROUP_REVOLVE,
+      N_("New group revolve active sketch"),                  {} },
     { "step-rotate",     Command::GROUP_ROT,
       N_("New group step and repeat rotating"),               {} },
     { "step-translate",  Command::GROUP_TRANS,
@@ -153,7 +157,7 @@ bool GraphicsWindow::ToolbarDrawOrHitTest(int mx, int my, UiCanvas *canvas,
 
     // When changing these values, also change the asReference drawing code in drawentity.cpp.
     int fudge = 8;
-    int h = 34*16 + 3*16 + fudge;
+    int h = 36*16 + 3*16 + fudge;
     int aleft = 0, aright = 66, atop = y+16+fudge/2, abot = y+16-h;
 
     bool withinToolbar =