meerk40t 0.9.2000__py2.py3-none-any.whl → 0.9.3001__py2.py3-none-any.whl

meerk40t/gui/toolwidgets/toolnodeedit.py

@@ -3,7 +3,21 @@ from copy import copy
 
 import wx
 
-from meerk40t.gui.icons import STD_ICON_SIZE, PyEmbeddedImage
+from meerk40t.gui.icons import (
+    STD_ICON_SIZE,
+    icon_node_add,
+    icon_node_append,
+    icon_node_break,
+    icon_node_close,
+    icon_node_curve,
+    icon_node_delete,
+    icon_node_join,
+    icon_node_line,
+    icon_node_line_all,
+    icon_node_smooth,
+    icon_node_smooth_all,
+    icon_node_symmetric,
+)
 from meerk40t.gui.laserrender import swizzlecolor
 from meerk40t.gui.mwindow import MWindow
 from meerk40t.gui.scene.sceneconst import (
@@ -45,7 +59,6 @@ class EditTool(ToolWidget):
         self.path = None
         self.element = None
         self.selected_index = None
-        self.anyselected = False
 
         self.move_type = "node"
         self.node_type = "path"
@@ -65,6 +78,8 @@ class EditTool(ToolWidget):
         self.pen_selection = wx.Pen()
         self.pen_selection.SetColour(self.scene.colors.color_selection3)
         self.pen_selection.SetStyle(wx.PENSTYLE_SHORT_DASH)
+        self.brush_highlight = wx.Brush(wx.RED_BRUSH)
+        self.brush_normal = wx.Brush(wx.TRANSPARENT_BRUSH)
         # want to have sharp edges
         self.pen_selection.SetJoin(wx.JOIN_MITER)
         # "key": (routine, info, available for poly, available for path)
@@ -87,108 +102,6 @@ class EditTool(ToolWidget):
         self.message = ""
 
     def define_buttons(self):
-        node_add = PyEmbeddedImage(
-            b"iVBORw0KGgoAAAANSUhEUgAAABkAAAAZAQMAAAD+JxcgAAAABlBMVEUAAAD///+l2Z/dAAAA"
-            b"CXBIWXMAAA7EAAAOxAGVKw4bAAAAJ0lEQVQImWP4//h/AwM24g+DPDKBU93//yCCoR5G2KEQ"
-            b"YIAmBlcMABg0P3m4MIsZAAAAAElFTkSuQmCC"
-        )
-
-        node_append = PyEmbeddedImage(
-            b"iVBORw0KGgoAAAANSUhEUgAAABkAAAAZAQMAAAD+JxcgAAAABlBMVEUAAAD///+l2Z/dAAAA"
-            b"CXBIWXMAAA7EAAAOxAGVKw4bAAAALklEQVQImWP4//h/AwM24g+DPDKBU93//zCC/wd7A8P7"
-            b"39+RiRfM3zHEwOpAOgBQXErXEDO0NAAAAABJRU5ErkJggg=="
-        )
-
-        node_break = PyEmbeddedImage(
-            b"iVBORw0KGgoAAAANSUhEUgAAABcAAAAZAQMAAADg7ieTAAAABlBMVEUAAAD///+l2Z/dAAAA"
-            b"CXBIWXMAAA7EAAAOxAGVKw4bAAAAOElEQVQImWP4//8fw39GIK6FYIYaBjgbLA6Sf4+EGaG4"
-            b"GYiPQ8Qa/jEx7Pv3C4zt/v2As0HiQP0AnIQ8UXzwP+sAAAAASUVORK5CYII="
-        )
-
-        node_curve = PyEmbeddedImage(
-            b"iVBORw0KGgoAAAANSUhEUgAAABkAAAAZAQMAAAD+JxcgAAAABlBMVEUAAAD///+l2Z/dAAAA"
-            b"CXBIWXMAAA7EAAAOxAGVKw4bAAAARklEQVQImWP4//9/AwOUOAgi7gKJP7JA4iGIdR4kJg+U"
-            b"/VcPIkDq/oCInyDiN4j4DCK+w4nnIOI9iGgGEbtRiWYk2/43AADobVHMAT+avQAAAABJRU5E"
-            b"rkJggg=="
-        )
-
-        node_delete = PyEmbeddedImage(
-            b"iVBORw0KGgoAAAANSUhEUgAAABkAAAAZAQMAAAD+JxcgAAAABlBMVEUAAAD///+l2Z/dAAAA"
-            b"CXBIWXMAAA7EAAAOxAGVKw4bAAAAKUlEQVQImWP4//9/AwM24g+DPDKBUx0SMakeSOyvh3FB"
-            b"LDBAE4OoA3IBbltJOc3s08cAAAAASUVORK5CYII="
-        )
-
-        node_join = PyEmbeddedImage(
-            b"iVBORw0KGgoAAAANSUhEUgAAABkAAAAZAQMAAAD+JxcgAAAABlBMVEUAAAD///+l2Z/dAAAA"
-            b"CXBIWXMAAA7EAAAOxAGVKw4bAAAAPklEQVQImWP4//9/A8OD/80NDO/+74YSff93IHPBsv+/"
-            b"/0chGkDEQRDxGC72H04wgIg6GNFQx4DMhcgC1QEARo5M+gzPuwgAAAAASUVORK5CYII="
-        )
-
-        node_line = PyEmbeddedImage(
-            b"iVBORw0KGgoAAAANSUhEUgAAABkAAAAZAQMAAAD+JxcgAAAABlBMVEUAAAD///+l2Z/dAAAA"
-            b"CXBIWXMAAA7EAAAOxAGVKw4bAAAARElEQVQImWP4//9/A8P//wdAxD0sRAOIsAcS/+qBxB+Q"
-            b"4p8g4jOIeA4izoOI+SDCHkj8qwcSf0CGNoKIvViIRoiV/xsA49JQrrbQItQAAAAASUVORK5C"
-            b"YII="
-        )
-
-        node_symmetric = PyEmbeddedImage(
-            b"iVBORw0KGgoAAAANSUhEUgAAABkAAAAZAQMAAAD+JxcgAAAABlBMVEUAAAD///+l2Z/dAAAA"
-            b"CXBIWXMAAA7EAAAOxAGVKw4bAAAAV0lEQVQImV3NqxGAMBRE0R2qQoXS2ApICVDJowRKQEYi"
-            b"YsIAWX6DIObIeyGJeGgllDTKwKjMl147MesgJq3Eoo0IjES0QCTzROdqYnAV4S1dZbvz/B5/"
-            b"TrOwSVb5BTbFAAAAAElFTkSuQmCC"
-        )
-
-        node_smooth = PyEmbeddedImage(
-            b"iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAYAAADE6YVjAAAAAXNSR0IArs4c6QAAAARnQU1B"
-            b"AACxjwv8YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAIgSURBVEhLY/wPBAw0BkxQmqZg+FhC"
-            b"VJx8+fyZ4fKVK1AeBEhKSDAoKCpCefgBUZZcvHCBITo6CsqDgJjYWIaKikooDz8gKrjevX8P"
-            b"ZSHAh3fvGX7//g3l4Qc4ffLz50+G9evWMSxftpTh7r17UFFUwM3NzeDm6saQlJLMoKioBBXF"
-            b"BFgtOX/+HENNdRXDw4ePwHwZGVmGJ08eg9kwICQkxPDj+3eGb0DMxMTEkJySwpCdncPAwsIC"
-            b"VYEAGJZs3bqFoaaqiuH3nz8Mjg6ODHkFBWADFy1cCFUBAdo6Ogx2dnYMq1etYpg6dQrDly9f"
-            b"GKysbRgmTpzIwMnJCVUFBSBLYODgwYP/dXV1/usB8do1a6CihMGLF8//h4YE/9fW0vyfmZn5"
-            b"/++fP1AZCIBb8ubNm/8W5mb/dbS1/m/ftg0qSjz4/Pnz/4AAf7BF8+bOhYpCANyS2tpqsIKO"
-            b"jnaoCOng/v37/40MDf4bGxmCHQ0DYEtAAoYG+mCfAMMWLEEu6O7qAjt22rSpUJH//8H55MD+"
-            b"/Qy/fv1i8A8IACdLSkBkZCSY3rVzJ5gGAWZ+Pr6G7du3MgB9wyAsJMzwB5iq1DU0oNKkg/Xr"
-            b"1zFcOHeO4dWrVwzfvn4DZofzDIwgr0HlwcDZ2Ylh4qQpUB7pwNfHh+H+fUTmBYXMaH1CEmA8"
-            b"duwYSpyAihB1dXUoj3QAqhZA5RkMMDMzEVefUApGI54EwMAAANLW9DiEznjCAAAAAElFTkSu"
-            b"QmCC"
-        )
-
-        node_smooth_all = PyEmbeddedImage(
-            b"iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAAACXBIWXMAAAsTAAALEwEAmpwY"
-            b"AAACs0lEQVR4nO2YO2hUQRSGj4r4loh2Rldws3P+/+zdK2xhSB+idop2FqJgFUEt1FJERBtt"
-            b"VKy0UvCBz0IR0UKsTBoRBEVREcEHiEh8JBrlZu+uIbmYx97sA+eDKbaY/86/c86cMyPi8Xg8"
-            b"Ho/nP6RYLM404PDIETjnpJlob22dY8TvkQPAOmkmzCxMMkJq9yaRGdLIFAqFeaa606DPkkwM"
-            b"Gx8NOBoE2VZpNACsJfR1ZbHQH0b8SjDxrbI70D5Sd4vIdGkESN1rxGApdPAmCp8gCBYRuEui"
-            b"Z/gw0w1mroPE5coc4FImk5ldVxMG7Bm2C6edcwvGPddcF6HvYjM36pY7Zq6rEj7Agclp2Mpy"
-            b"SJJ6UGpNsVicS+JFbOJMNVr5fK5A4iuh/aqal1pCanc5J7LZ7MIU9PbF4XkxnRWOEwJPSka4"
-            b"Q1LaYSM+EDoQtrUtlVpAMhsfn/1hGLakp4sTkW4e2CpTjVEvEHgQn1Sfo9+q2l6tLum2EHhY"
-            b"0tWnQ9+h7qpWN3DORVojhyS3HdxYvREcS2hnzlera+Y6ktbsjYyF35HJh9boxEkr2UsHifbF"
-            b"CX81tWSH3owNDEZ1aijZpxoC14eOYNXOtDTzwOa4eD+SWkHq9rjtOZeaJnAv1jyUlubYHyXn"
-            b"E/opqvCBc0G1ennVzrh4DwDISJ2uBr3R3X+yOrlcbolRX8Y16aTU5QWG6C0nfTabnTVRjTAM"
-            b"WyodCPRVmq3UhDCzZUa8jRdy3zm3YrxzA+cCoz6O534huUrqCYA2As//LkiPRIai4jnqCg3s"
-            b"V9WcAcfj94LolHoPYLU0Aqq62ICzw4pZdM///q9HDStdnW+RXC6NRqlC65Xyv53cvOKnUe+Q"
-            b"XCMi06SRiR43DHotwURPtHvSTBj0VIKR29Js5FXXJzyQb6v3ujwej8fj8Uid+AMS4JbuhXD/"
-            b"gAAAAABJRU5ErkJggg=="
-        )
-
-        node_close = PyEmbeddedImage(
-            b"iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAAACXBIWXMAAAsTAAALEwEAmpwY"
-            b"AAACpklEQVR4nO2YSWsVQRRGjwlOcWM0YCDguFHzUKMrccClszEgiCKSgBiCYOJGI7qX4MYg"
-            b"auLsD3DnhD5F/AGaxAHEZKFunDfqwiQ+KbgNl6K7051+TbpNHajV++7te19VV9dX4HA4HA7H"
-            b"xDAFOA5cAGrJMTuBkoy3QB05Za1qJPfNHMtzM3OBrUCLvCOvIjSzAOgQfdhoAbbIM1KhEjgI"
-            b"PAFGrML9xh0r/k2EGD2GgcfAAaCiXE1sAgZiFvLUyvExZnxJjT5gY9Imjsi/Yyd/DzwEbslS"
-            b"0r99ApZbeVYD3UBPyDC5TM4PATPUNt4mTvkkuww0KM1ea6mZJgokpwG44rOMO+MmagL+qgTv"
-            b"gBWWZpU1W6aJesrLSmBQPWMUaIwaPAf4oYL7A3aRfSk34VFjvaPfgGoicFYFfQUWBuhmAL3A"
-            b"bWAp6bIY+K7q6horYBbwWwUcJTt0qLp+AVVh4t1K/BmYRnaYLivEq29XmLhXCa+RPW6o+i6F"
-            b"CR8o4SGyx2FV3/0w4Usl3Eb22GHtpoH0K+F2su2B+ibF0upRwutkj5uqvotRt98vsuXlcvut"
-            b"ko+NJ24nm270JzBzrIAu61yzKOUClwH3gPPA1ADNEuuIciZK4moraEAObmlQLwdO71l7fDQ1"
-            b"1mfBLK/ZUR/QKEdmL3hQju1pNmEsQcHHlwxZx3izBcei0zI1xuRcFbeXlILVxIiYNO/ib40c"
-            b"kWxjZS4oxkVbgNU1drQo9jTMvnZbjtJvJkpil02uYoC//wO0kpANwIsElwemMM2zmPHPgXWU"
-            b"iQq5mikGzFDYeG3luhshZhh4BOwv53WQnxXeDDQDp2UrDBongPlWfJ3PzcuQ5GqW3JGsbBao"
-            b"lZnSzZwkp/jNzHr+k2aayDHzgHPyjlROdDEOh8PhmJz8A+PVbUCLkfVDAAAAAElFTkSuQmCC"
-        )
-
         def becomes_enabled(needs_selection, active_for_path, active_for_poly):
             def routine(*args):
                 # print(
@@ -244,7 +157,7 @@ class EditTool(ToolWidget):
             #           active_for_path, active_for_poly,
             #           "tooltiptext", button],
             "i": [
-                node_add,
+                icon_node_add,
                 True,
                 True,
                 True,
@@ -252,7 +165,7 @@ class EditTool(ToolWidget):
                 _("Insert"),
             ],
             "a": [
-                node_append,
+                icon_node_append,
                 False,
                 True,
                 True,
@@ -260,7 +173,7 @@ class EditTool(ToolWidget):
                 _("Append"),
             ],
             "d": [
-                node_delete,
+                icon_node_delete,
                 True,
                 True,
                 True,
@@ -268,7 +181,7 @@ class EditTool(ToolWidget):
                 _("Delete"),
             ],
             "l": [
-                node_line,
+                icon_node_line,
                 True,
                 True,
                 False,
@@ -276,7 +189,7 @@ class EditTool(ToolWidget):
                 _("> Line"),
             ],
             "c": [
-                node_curve,
+                icon_node_curve,
                 True,
                 True,
                 False,
@@ -284,7 +197,7 @@ class EditTool(ToolWidget):
                 _("> Curve"),
             ],
             "s": [
-                node_symmetric,
+                icon_node_symmetric,
                 True,
                 True,
                 False,
@@ -292,7 +205,7 @@ class EditTool(ToolWidget):
                 _("Symmetric"),
             ],
             "j": [
-                node_join,
+                icon_node_join,
                 True,
                 True,
                 False,
@@ -300,7 +213,7 @@ class EditTool(ToolWidget):
                 _("Join"),
             ],
             "b": [
-                node_break,
+                icon_node_break,
                 True,
                 True,
                 False,
@@ -308,7 +221,7 @@ class EditTool(ToolWidget):
                 _("Break"),
             ],
             "o": [
-                node_smooth,
+                icon_node_smooth,
                 True,
                 True,
                 False,
@@ -316,15 +229,23 @@ class EditTool(ToolWidget):
                 _("Smooth"),
             ],
             "v": [
-                node_smooth_all,
+                icon_node_smooth_all,
                 False,
                 True,
                 False,
                 _("Convert all lines into smooth curves"),
                 _("Very smooth"),
             ],
+            "w": [
+                icon_node_line_all,
+                False,
+                True,
+                False,
+                _("Convert all segments into lines"),
+                _("Line all"),
+            ],
             "z": [
-                node_close,
+                icon_node_close,
                 False,
                 True,
                 True,
@@ -332,7 +253,7 @@ class EditTool(ToolWidget):
                 _("Close"),
             ],
             "p": [
-                node_smooth_all,
+                icon_node_smooth_all,
                 False,
                 False,
                 True,
@@ -476,6 +397,8 @@ class EditTool(ToolWidget):
             else:
                 return
             # print(self.path.d(), self.path)
+            if self.path is None:
+                return
             self.path.approximate_arcs_with_cubics()
             # print(self.path.d(), self.path)
             # try:
@@ -808,13 +731,24 @@ class EditTool(ToolWidget):
             if entry["type"] == "point":
                 if idx == self.selected_index or entry["selected"]:
                     gc.SetPen(self.pen_highlight)
+                    gc.SetBrush(self.brush_highlight)
+                    factor = 1.25
                 else:
                     gc.SetPen(self.pen)
-                gc.DrawEllipse(ptx - offset, pty - offset, offset * 2, offset * 2)
+                    gc.SetBrush(self.brush_normal)
+                    factor = 1
+                gc.DrawEllipse(
+                    ptx - factor * offset,
+                    pty - factor * offset,
+                    offset * 2 * factor,
+                    offset * 2 * factor,
+                )
             elif entry["type"] == "control":
                 if idx == self.selected_index or entry["selected"]:
+                    factor = 1.25
                     gc.SetPen(self.pen_highlight)
                 else:
+                    factor = 1
                     gc.SetPen(self.pen_ctrl)
                     # Do we have a second controlpoint at the same segment?
                     if isinstance(entry["segment"], CubicBezier):
@@ -826,11 +760,11 @@ class EditTool(ToolWidget):
                         if orgnode is not None and orgnode["selected"]:
                             gc.SetPen(self.pen_ctrl_semi)
                 pattern = [
-                    (ptx - offset, pty),
-                    (ptx, pty + offset),
-                    (ptx + offset, pty),
-                    (ptx, pty - offset),
-                    (ptx - offset, pty),
+                    (ptx - factor * offset, pty),
+                    (ptx, pty + factor * offset),
+                    (ptx + factor * offset, pty),
+                    (ptx, pty - factor * offset),
+                    (ptx - factor * offset, pty),
                 ]
                 gc.DrawLines(pattern)
                 if 0 <= entry["connector"] < len(self.nodes):
@@ -841,15 +775,17 @@ class EditTool(ToolWidget):
                     gc.DrawLines(pattern)
             elif entry["type"] == "midpoint":
                 if idx == self.selected_index or entry["selected"]:
+                    factor = 1.25
                     gc.SetPen(self.pen_highlight)
                 else:
+                    factor = 1
                     gc.SetPen(self.pen_ctrl)
                 pattern = [
-                    (ptx - offset, pty),
-                    (ptx, pty + offset),
-                    (ptx + offset, pty),
-                    (ptx, pty - offset),
-                    (ptx - offset, pty),
+                    (ptx - factor * offset, pty),
+                    (ptx, pty + factor * offset),
+                    (ptx + factor * offset, pty),
+                    (ptx, pty - factor * offset),
+                    (ptx - factor * offset, pty),
                 ]
                 gc.DrawLines(pattern)
 
@@ -998,12 +934,7 @@ class EditTool(ToolWidget):
             modified = True
         else:
             dealt_with = []
-            anyselected = False
-            for entry in self.nodes:
-                if entry["selected"] and entry["type"] == "point":
-                    anyselected = True
-                    break
-            if not anyselected:
+            if not self.anyselected:
                 # Let's select the last point, so the last segment will be closed/opened
                 for idx in range(len(self.nodes) - 1, -1, -1):
                     entry = self.nodes[idx]
@@ -1852,6 +1783,14 @@ class EditTool(ToolWidget):
         if modified:
             self.modify_element(True)
 
+    @property
+    def anyselected(self):
+        if self.nodes:
+            for entry in self.nodes:
+                if entry["selected"]:
+                    return True
+        return False
+
     def event(
         self,
         window_pos=None,
@@ -1895,7 +1834,6 @@ class EditTool(ToolWidget):
 
             xp = space_pos[0]
             yp = space_pos[1]
-            self.anyselected = False
             if self.nodes:
                 w = offset * 4
                 h = offset * 4
@@ -1920,19 +1858,13 @@ class EditTool(ToolWidget):
                             if orgnode is not None:
                                 orgnode["selected"] = True
                             entry["selected"] = True
-                            self.anyselected = True
                         else:
                             # Shift-Key Pressed?
                             if "shift" not in modifiers:
                                 self.clear_selection()
                                 entry["selected"] = True
-                                self.anyselected = True
                             else:
                                 entry["selected"] = not entry["selected"]
-                                for chk in self.nodes:
-                                    if chk["selected"]:
-                                        self.anyselected = True
-                                        break
                         break
                 else:  # For-else == icky
                     self.selected_index = None
@@ -2086,7 +2018,6 @@ class EditTool(ToolWidget):
                 if abs(dx) < 1e-10 or abs(dy) < 1e-10:
                     return RESPONSE_CONSUME
                 # We select all points (not controls) inside
-                anyselected = False
                 if self.element:
                     for entry in self.nodes:
                         pt = entry["point"]
@@ -2096,10 +2027,6 @@ class EditTool(ToolWidget):
                             and y0 <= pt.y <= y1
                         ):
                             entry["selected"] = True
-                        if entry["selected"]:
-                            # Could as well be another one not inside the
-                            # current selection
-                            anyselected = True
                 self.scene.request_refresh()
                 self.enable_rules()
             self.p1 = None

meerk40t/gui/toolwidgets/toolpoint.py

@@ -33,7 +33,7 @@ class PointTool(ToolWidget):
                 sx, sy = self.scene.get_snap_point(
                     space_pos[0], space_pos[1], modifiers
                 )
-                point = Point(sx, sx)
+                point = Point(sx, sy)
             else:
                 point = Point(nearest_snap[0], nearest_snap[1])
             elements = self.scene.context.elements

meerk40t/gui/toolwidgets/toolpolygon.py

@@ -3,7 +3,13 @@ from math import sin, sqrt, tan, tau
 import wx
 
 from meerk40t.core.units import Angle, Length
-from meerk40t.gui.icons import STD_ICON_SIZE, PyEmbeddedImage, icons8_polygon_50
+from meerk40t.gui.icons import (
+    STD_ICON_SIZE,
+    icon_crossing_star,
+    icon_mk_polygon,
+    icon_polygon,
+    icon_regular_star,
+)
 from meerk40t.gui.laserrender import swizzlecolor
 from meerk40t.gui.scene.sceneconst import (
     RESPONSE_ABORT,
@@ -64,65 +70,12 @@ class PolygonTool(ToolWidget):
 
     def define_buttons(self):
         icon_size = STD_ICON_SIZE
-        icon_regular_star = PyEmbeddedImage(
-            b"iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAAACXBIWXMAAAsTAAALEwEAmpwY"
-            b"AAAD5klEQVR4nO2ZaahNaxjHf8c5uAfXlEPGpMzDByGzW265fCDXUPcDMuSTWfKB4pshlClj"
-            b"XVxdRd2MR9dMXeEDkumQFNec46Acw3G2Hv1Xve32OXvtY6119opfrdq969nP87zvWut9hhd+"
-            b"4IsawFngjH7Hll+BhK6hxJg9zkT+JqY0BkqBMl2lGosds/QkCoGj+j2TGHJFzo8Bxur3NWJG"
-            b"bzn+AqgN1AKeaawXMWKznF7ljK3W2CZiQj7wSk53ccY7aawEqEMMmCSH/0tx77zuTSQGnJOz"
-            b"U1Lcm6p7Fu2zmg5AOfAW+DnF/XrAG03GXrWsZbmc3FaJzHbJLCNLyQMey8m+lcj1k8xToCZZ"
-            b"yCg5eMuH7A3JjiQLOSjn5vmQnS/ZA1RDbCgA2gE9gcHAcGAcMB1YAHwCPkguHQWS/aT/Tpeu"
-            b"4dLdU7YKZNsXE4A/gX3AceACcB24DxQrc034vPZmsDh7M9BbJl/uy7cL8nWffLc58NyHolLl"
-            b"TfeAy4oVhXJmK7AGWAI0z2AiLfSfNdJhugql+7JsvZDtdP7ZHPhNaUNCe/x4oBvQFmgE5FL9"
-            b"5MqXtvJtvBOPSjSHr7QHbjoZ6y9kL/2BJ/L1blI+95X6zs5jH+EMso9p2iTMx3/1lCp8hF50"
-            b"tmtLlgStvBR+2Vha/gDe6U/28TWl+mgMnJAv74HJmSqwvfyBFNzTRxY1HYHb8uFxmtQn7RZ5"
-            b"UYosox1NdIxwdlPbjtt8q0KruXdIYbne1TC7hjnAQuCzbO4JuqKc7UR5C151CZ6fgL+cRVuq"
-            b"iYX6uK3d0zpA3abLayGVyFaoWGVXJIOW5wSF9/oWRVk9rpdRy5WCwl4j07mOCPHSmQEB6hwo"
-            b"nVZ0RUILJ8EMMupbpH4t3a2IsG91KATdh6Pse+2SsTkh6J4r3TuJgIcyFkbK0l26HxEynWXo"
-            b"ic9A1UlnI0d9bqk5Tq1htkJjpoxY9E334S5MKlM/Kr2xI4bK2C35UOuh/TJSWSrdRwc6Xpqx"
-            b"XVe5c9hjMhUxWXJmKxRyneOCVKlJvla8zEn97VTXY5CadwklhFvUC06mlZOm+CqeMsVrdVp9"
-            b"kMwQ4I5TJq+tIKnMVwT3ylVr7wxLIVfko/VaZRZL+QZnrKFW1nttrurYLR09gEtJ/bAmzv2N"
-            b"Gl8Uwjw4LeVecTXOORd8p5XOJNLnqTR4Kx0v1XE0ftfYqaAnUUf1sr3/XYF/nNU8p5K0qlhr"
-            b"9Jij74ieWJlewUDrnmHOynuNsWKdSgVR+ORIV7GTx3nNj1TfUJVZmdSitDyrJcHTzEmBvGtF"
-            b"kAZOSun/OgcJm1GylZDtwBiiXasB0dFANs3298MXw0hXuTS4jKMAAAAASUVORK5CYII="
-        )
-        icon_crossing_star = PyEmbeddedImage(
-            b"iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAIAAACRXR/mAAAABnRSTlMA/wD/AP83WBt9AAAA"
-            b"CXBIWXMAAA7EAAAOxAGVKw4bAAACbUlEQVRYhd2YO08CQRDHZw/LCw0tHb3PgoJeOv08+gV8"
-            b"ND4a/QAajYaHET8CCT0JoaAlAZUooiWsxSXruXc7O8tsjLkJ1e3M3H/3tzO7h5BSwv+zwFsi"
-            b"kQtEzls2X4n8WqZlKXy+OGZ6tQBgIecLOfeVzYMsDZwXjpmGqPD54siVlYqMzzG7EDVwXjiy"
-            b"ZCGwmBwzCjEVGZ/j8rJywQrTAbHlZVnvj5wLJgtiuVw2DVUqFU5mIf7nrpdSCggEBCcnp5Js"
-            b"UQjfJ25HR8cqBOIp6FkEBLs7u7hPdbvqlDAuANRAvd4gKqNPwClhrVb/eSJ/14vqzkjviXwo"
-            b"zcnqaXqdvt/VMH56FAoFqyYAyOfzyCiyBCllqK6/gcj1ej1t9ObmFgBeXp8pst6nbwDQaj1p"
-            b"z7vdrlrI1LXUIf6SnDYbOkGTP2mfIBlNQEulElETABSLxaRKXBMAgLE8EpVyd3c/HA6dWpEK"
-            b"n0wmV1fXDiWMQEydpX2iPmKpJ89Czi8uL5zUaHZ2fuYwHzqLfr+verFTO41+g8GA/i4qRIjV"
-            b"FHHbxt2c65foF7d4YxuPx0mH0WiEtyW7EVe13W4nwaUCNVEWEHQ6Hc8QTRQ0oNh54sJx+eu2"
-            b"pobaJ2lG2luPjy3++5zCSRDx9Y9G9/f3pJQHB4dWT4o+lizkLEf8SRc1qwf+juQQcmPz2beQ"
-            b"v4qaD03TV3Wj2cBjcbND1FbeqeKSzkSOJIha0jAMiTgWch6GYao+liyVbm11XU30YzalpI7s"
-            b"YzZVvW1zY0tLazILRC2e07qcUlEr8fNrxm+nn18zorPzJwbfuJ8Y1uDlzFuX/3v7BikOKD82"
-            b"lTxEAAAAAElFTkSuQmCC"
-        )
-        icon_polygon = PyEmbeddedImage(
-            b"iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAAACXBIWXMAAAsTAAALEwEAmpwY"
-            b"AAACZUlEQVR4nO2aT0sVURjGf7qo0EVIEUUYiYFCFLRIsEViGXTzC1hgfYeSbFVt0o1pu3Kj"
-            b"req61BbZoqCWldEHUFKvtJBKKPpH6Y0DT3AW/rn3zJxzz8j9wV3NnOd5z9yZOe/7noEqVaKh"
-            b"G1gCZoGzKeoaLaNZAHIEwBgVPf8WQ0xkLsBEZn1PYjewbJmleWt1WRdpWV7eGJTRS48ez+Ux"
-            b"4MvgIPAdWAPafZkAJ+XxEzjkw+ChrtQj/PNYXuNpCx8HVoHfQDP+OQz8kueJNIWf6QoNEY67"
-            b"8pxOS7BTgl+APYSjAfgk73NJxWqBGYldJTzX5P1esThzRUIfgJ2EZ4fWKxPDZVeRXcCCRHqo"
-            b"HBcVg8nv6lwEbkjgXdK/NSE1wGvF0u/yoH3W4DNUntOKZQXYW87Aexo4STxMKaaRUgc0aTH6"
-            b"CxwlHlqAP1qUj5QyYEIzv098PFBs+a1ObFPC9g3YT3zsA74qxlObnfhCM75JvNxSjK/WO3hB"
-            b"72lzwkegnnipV4zF9er7Quh6OSGFjeLN8kQW7AM562DWbq3zm9XL5oGKldul9A3s1+8B4n79"
-            b"tm91cl4zNotPbIwqNlPTZzZFaS03RUGJWVGJWiw8UUzDrml8mt1EVzqsNL7svkF/RIXVG8Vy"
-            b"3bXUnZeAKTcrxSVrzXAqdVHBH0vzoTeJkLml3krItGZC05dWO8hu0Dk9aAlosF44iRt0/5mW"
-            b"oGljhmJYnk/TFD2mBTJUE7vJVxMbtfhLTg8SkpfXWJY3etrk8QNo9GUyEHDr7U6ozdC5LG+G"
-            b"bpvt6W31wUBOk/H1CcfiRnV4lSqE5x+0Tyg887i34gAAAABJRU5ErkJggg=="
-        )
 
         self.scene.context.kernel.register(
             "button/secondarytool_polygon/tool_freehand",
             {
                 "label": _("Freehand"),
-                "icon": icons8_polygon_50,
+                "icon": icon_mk_polygon,
                 "tip": _("Draw a freehand polygon (f)"),
                 "action": lambda v: self.set_designmode(0),
                 "size": icon_size,

meerk40t/gui/toolwidgets/toolrect.py

@@ -135,7 +135,8 @@ class RectTool(ToolWidget):
             self.p2 = None
             self.scene.pane.tool_active = False
             self.scene.request_refresh()
-            response = RESPONSE_ABORT
+            # Allow other widgets (like the selection widget to take over)
+            response = RESPONSE_CHAIN
         elif event_type == "leftup":
             self.scene.pane.tool_active = False
             try:

meerk40t/gui/usbconnect.py

@@ -1,6 +1,6 @@
 import wx
 
-from meerk40t.gui.icons import icons8_usb_connector_50
+from meerk40t.gui.icons import icons8_usb_connector
 from meerk40t.gui.mwindow import MWindow
 
 _ = wx.GetTranslation
@@ -75,7 +75,7 @@ class UsbConnect(MWindow):
         self.panel = UsbConnectPanel(self, wx.ID_ANY, context=self.context)
         self.add_module_delegate(self.panel)
         _icon = wx.NullIcon
-        _icon.CopyFromBitmap(icons8_usb_connector_50.GetBitmap())
+        _icon.CopyFromBitmap(icons8_usb_connector.GetBitmap())
         self.SetIcon(_icon)
         # begin wxGlade: Terminal.__set_properties
         self.SetTitle(_("UsbConnect"))

meerk40t/gui/utilitywidgets/cyclocycloidwidget.py

@@ -208,7 +208,7 @@ class MajorHandleWidget(Widget):
         self.pen.SetColour(wx.BLUE)
         self.pen.SetWidth(1000)
         self.widget = cyclowidget
-        self.bitmap = icons.icons8_point_50.GetBitmap(use_theme=False)
+        self.bitmap = icons.icon_mk_point.GetBitmap(use_theme=False)
         self._start_x = None
         self._start_y = None
         self._current_x = None
@@ -283,7 +283,7 @@ class MinorHandleWidget(Widget):
         self.pen.SetColour(wx.BLUE)
         self.pen.SetWidth(1000)
         self.widget = cyclowidget
-        self.bitmap = icons.icons8_point_50.GetBitmap(use_theme=False)
+        self.bitmap = icons.icon_mk_point.GetBitmap(use_theme=False)
         self._start_x = None
         self._start_y = None
         self._current_x = None

meerk40t/gui/utilitywidgets/harmonograph.py

@@ -178,7 +178,7 @@ class HarmonographWidget(Widget):
             size * -0.5,
             size * -1,
             size * 0.5,
-            icons.icons8_checkmark_50.GetBitmap(use_theme=False),
+            icons.icons8_checkmark.GetBitmap(use_theme=False),
             self.confirm,
         )
         accept_widget.background_brush = wx.WHITE_BRUSH
@@ -190,7 +190,7 @@ class HarmonographWidget(Widget):
             size * -2,
             size * 0.5,
             size * -1,
-            icons.icons8_next_page_20.GetBitmap(use_theme=False, resize=50),
+            icons.icons8_circled_right.GetBitmap(use_theme=False, resize=50),
             self.set_random_harmonograph,
         )
         random_widget.background_brush = wx.WHITE_BRUSH
@@ -202,7 +202,7 @@ class HarmonographWidget(Widget):
             size * -0.5,
             size * 2,
             size * 0.5,
-            icons.icons8_delete_50.GetBitmap(use_theme=False),
+            icons.icons8_delete.GetBitmap(use_theme=False),
             self.cancel,
         )
         remove_widget.background_brush = wx.WHITE_BRUSH
@@ -222,7 +222,7 @@ class HarmonographWidget(Widget):
             size * 1,
             size * 0,
             size * 2,
-            icons.icons8_rotate_left_50.GetBitmap(use_theme=False),
+            icons.icons8_rotate_left.GetBitmap(use_theme=False),
             delta_theta,
         )
         rotation_widget.background_brush = wx.WHITE_BRUSH
@@ -241,7 +241,7 @@ class HarmonographWidget(Widget):
             size * 1,
             size * 1,
             size * 2,
-            icons.icons8_fantasy_50.GetBitmap(use_theme=False),
+            icons.icon_magic_wand.GetBitmap(use_theme=False),
             delta_step,
         )
         step_handle.background_brush = wx.WHITE_BRUSH
@@ -258,7 +258,7 @@ class HarmonographWidget(Widget):
             size * 2,
             size * 0,
             size * 3,
-            icons.icons8_roll_50.GetBitmap(use_theme=False),
+            icons.icon_rotary.GetBitmap(use_theme=False),
             delta_rotations,
         )
         rotate_widget.background_brush = wx.WHITE_BRUSH
@@ -277,7 +277,7 @@ class HarmonographWidget(Widget):
                 -1,
                 CurveWidget(
                     scene,
-                    icons.icons8_computer_support_50.GetBitmap(use_theme=False),
+                    icons.icons8_computer_support.GetBitmap(use_theme=False),
                     c,
                 ),
             )

meerk40t/gui/utilitywidgets/scalewidget.py

@@ -19,7 +19,7 @@ class ScaleWidget(HandleWidget):
             top,
             right,
             bottom,
-            icons.icons8_resize_horizontal_50.GetBitmap(use_theme=False),
+            icons.icon_resize_horizontal.GetBitmap(use_theme=False),
         )
         self.scale = 1.0
         self.current_scale = 1.0