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 00000000..4b2cda68 Binary files /dev/null and b/res/icons/graphics-window/helix.png differ diff --git a/res/icons/graphics-window/revolve.png b/res/icons/graphics-window/revolve.png new file mode 100644 index 00000000..0cef0fa6 Binary files /dev/null and b/res/icons/graphics-window/revolve.png differ 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 =