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

meerk40t/gui/wxmmain.py

@@ -30,53 +30,57 @@ from meerk40t.kernel import lookup_listener, signal_listener
 
 from ..core.units import UNITS_PER_INCH, UNITS_PER_PIXEL, Length
 from ..svgelements import Color, Matrix, Path
-from .icons import (  # icons8_replicate_rows_50,
+from .icons import (  # icon_duplicate,
     STD_ICON_SIZE,
-    icon_cag_common_50,
-    icon_cag_subtract_50,
-    icon_cag_union_50,
-    icon_cag_xor_50,
+    PyEmbeddedImage,
+    icon_bmap_text,
+    icon_cag_common,
+    icon_cag_subtract,
+    icon_cag_union,
+    icon_cag_xor,
+    icon_hatch,
     icon_meerk40t,
-    icons8_align_bottom_50,
-    icons8_align_left_50,
-    icons8_align_right_50,
-    icons8_align_top_50,
-    icons8_centerh_50,
-    icons8_centerv_50,
-    icons8_circle_50,
-    icons8_circled_left_50,
-    icons8_circled_right_50,
-    icons8_copy_50,
-    icons8_curly_brackets_50,
-    icons8_cursor_50,
-    icons8_delete_50,
-    icons8_finger_50,
+    icon_mk_align_bottom,
+    icon_mk_align_left,
+    icon_mk_align_right,
+    icon_mk_align_top,
+    icon_mk_circle,
+    icon_mk_ellipse,
+    icon_mk_point,
+    icon_mk_polygon,
+    icon_mk_polyline,
+    icon_mk_rectangular,
+    icon_mk_redo,
+    icon_mk_undo,
+    icon_power_button,
+    icons8_centerh,
+    icons8_centerv,
+    icons8_circled_left,
+    icons8_circled_right,
+    icons8_copy,
+    icons8_curly_brackets,
+    icons8_cursor,
+    icons8_delete,
+    icons8_finger,
+    icons8_flip_horizontal,
     icons8_flip_vertical,
-    icons8_group_objects_50,
-    icons8_measure_50,
-    icons8_mirror_horizontal,
-    icons8_node_edit_50,
-    icons8_opened_folder_50,
-    icons8_oval_50,
-    icons8_paste_50,
-    icons8_pencil_drawing_50,
-    icons8_place_marker_50,
-    icons8_point_50,
-    icons8_polygon_50,
-    icons8_polyline_50,
-    icons8_rectangular_50,
-    icons8_redo_50,
-    icons8_rotate_left_50,
-    icons8_rotate_right_50,
-    icons8_save_50,
-    icons8_scissors_50,
-    icons8_type_50,
-    icons8_undo_50,
-    icons8_ungroup_objects_50,
-    icons8_user_location_50,
-    icons8_vector_50,
+    icons8_group_objects,
+    icons8_measure,
+    icons8_node_edit,
+    icons8_opened_folder,
+    icons8_paste,
+    icons8_pencil_drawing,
+    icons8_place_marker,
+    icons8_rotate_left,
+    icons8_rotate_right,
+    icons8_save,
+    icons8_scissors,
+    icons8_ungroup_objects,
+    icons8_user_location,
+    icons8_vector,
     icons_evenspace_horiz,
     icons_evenspace_vert,
+    set_default_icon_size,
     set_icon_appearance,
 )
 from .laserrender import (
@@ -120,6 +124,15 @@ class MeerK40t(MWindow):
             # Not WX 4.1
             pass
         # print(self.GetDPIScaleFactor())
+        # What is the standardsize of a textbox?
+        testbox = wx.TextCtrl(self, wx.ID_ANY)
+        tb_size = testbox.Size
+        testbox.Destroy()
+        factor = 4 * tb_size[1] / 100.0
+        # Round to nearest 5...
+        def_size = int(round(factor * 50 / 5, 0) * 5)
+        set_default_icon_size(def_size)
+
         self.context.gui = self
         self._usb_running = dict()
         context = self.context
@@ -154,6 +167,7 @@ class MeerK40t(MWindow):
 
         self.edit_menu_choice = None
         self._setup_edit_menu_choice()
+        self.view_menu_choice = None
 
         # Menu Bar
         self.main_menubar = wx.MenuBar()
@@ -378,6 +392,7 @@ class MeerK40t(MWindow):
                 "help": _("Undo last action"),
                 "action": on_click_undo,
                 "id": wx.ID_UNDO,
+                "enabled": self.context.elements.undo.has_undo,
                 "level": 1,
                 "segment": "",
             },
@@ -386,6 +401,7 @@ class MeerK40t(MWindow):
                 "help": _("Revert last undo"),
                 "action": on_click_redo,
                 "id": wx.ID_REDO,
+                "enabled": self.context.elements.undo.has_redo,
                 "level": 1,
                 "segment": "",
             },
@@ -593,7 +609,8 @@ class MeerK40t(MWindow):
     @signal_listener("emphasized")
     def on_update_statusbar(self, origin, *args):
         value = self.context.elements.has_emphasis()
-        self._update_status_edit_menu()(None)
+        self._update_status_menu(self.edit_menu, self.edit_menu_choice)
+        self._update_status_menu(self.view_menu, self.view_menu_choice)
         if not self.widgets_created:
             return
 
@@ -660,6 +677,7 @@ class MeerK40t(MWindow):
                 ),
                 "page": "Gui",
                 "section": "Appearance",
+                "signals": "restart",
             },
             {
                 "attr": "mini_icon",
@@ -914,19 +932,19 @@ class MeerK40t(MWindow):
         ]
         context.kernel.register_choices("preferences", choices)
         choices = [
-            {
-                "attr": "use_toolmenu",
-                "object": context.root,
-                "default": True,
-                "type": bool,
-                "label": _("Use in-scene tool-menu"),
-                "tip": _(
-                    "The scene-menu will appear if you right-click on the scene-background"
-                ),
-                "page": "Gui",
-                "hidden": True,
-                "section": "Scene",
-            },
+            # {
+            #     "attr": "use_toolmenu",
+            #     "object": context.root,
+            #     "default": True,
+            #     "type": bool,
+            #     "label": _("Use in-scene tool-menu"),
+            #     "tip": _(
+            #         "The scene-menu will appear if you right-click on the scene-background"
+            #     ),
+            #     "page": "Gui",
+            #     "hidden": True,
+            #     "section": "Scene",
+            # },
             {
                 "attr": "button_repeat",
                 "object": self.context.root,
@@ -1011,11 +1029,36 @@ class MeerK40t(MWindow):
         bsize_normal = STD_ICON_SIZE
         # bsize_small = STD_ICON_SIZE / 2
         bsize_small = STD_ICON_SIZE
+
+        def contains_a_param():
+            result = False
+            for e in kernel.elements.elems(emphasized=True):
+                if e.functional_parameter is not None:
+                    result = True
+                    break
+            return result
+
+        def contains_a_path():
+            result = False
+            for e in kernel.elements.elems(emphasized=True):
+                if e.type in ("elem polyline", "elem path"):
+                    result = True
+                    break
+            return result
+
+        def contains_an_element():
+            from meerk40t.core.elements.element_types import elem_nodes
+
+            for e in kernel.elements.elems(emphasized=True):
+                if e.type in elem_nodes:
+                    return True
+            return False
+
         kernel.register(
             "button/project/Open",
             {
                 "label": _("Open"),
-                "icon": icons8_opened_folder_50,
+                "icon": icons8_opened_folder,
                 "tip": _("Opens new project"),
                 "action": lambda e: kernel.console(".dialog_load\n"),
                 "priority": -200,
@@ -1026,7 +1069,7 @@ class MeerK40t(MWindow):
             "button/project/Save",
             {
                 "label": _("Save"),
-                "icon": icons8_save_50,
+                "icon": icons8_save,
                 "tip": _("Saves a project to disk"),
                 "action": lambda e: kernel.console(".dialog_save\n"),
                 "priority": -100,
@@ -1038,10 +1081,10 @@ class MeerK40t(MWindow):
         buttonsize = STD_ICON_SIZE
 
         kernel.register(
-            "button/tools/Scene",
+            "button/select/Scene",
             {
                 "label": _("Select"),
-                "icon": icons8_cursor_50,
+                "icon": icons8_cursor,
                 "tip": _("Regular selection tool"),
                 "action": lambda v: kernel.elements("tool none\n"),
                 "group": "tool",
@@ -1053,7 +1096,7 @@ class MeerK40t(MWindow):
         #     "button/tools/Nodeeditor",
         #     {
         #         "label": _("Node Edit"),
-        #         "icon": icons8_node_edit_50,
+        #         "icon": icons8_node_edit,
         #         "tip": _("Edit nodes of a polyline/path-object"),
         #         "action": lambda v: kernel.elements("tool nodemove\n"),
         #         "group": "tool",
@@ -1062,10 +1105,10 @@ class MeerK40t(MWindow):
         #     },
         # )
         kernel.register(
-            "button/tools/Parameter",
+            "button/select/Parameter",
             {
                 "label": _("Parametric Edit"),
-                "icon": icons8_finger_50,
+                "icon": icons8_finger,
                 "tip": _("Parametric edit of a shape"),
                 "action": lambda v: kernel.elements("tool parameter\n"),
                 "group": "tool",
@@ -1075,10 +1118,10 @@ class MeerK40t(MWindow):
             },
         )
         kernel.register(
-            "button/tools/Nodeeditor",
+            "button/select/Nodeeditor",
             {
                 "label": _("Node Edit"),
-                "icon": icons8_node_edit_50,
+                "icon": icons8_node_edit,
                 "tip": _("Edit nodes of a polyline/path-object"),
                 "action": lambda v: kernel.elements("tool edit\n"),
                 "group": "tool",
@@ -1087,12 +1130,24 @@ class MeerK40t(MWindow):
                 "rule_enabled": lambda cond: contains_a_path(),
             },
         )
-
         kernel.register(
-            "button/tools/Relocate",
+            "button/select/Hatch",
+            {
+                "label": _("Hatch"),
+                "icon": icon_hatch,
+                "tip": _("Wrap the current node in a hatch"),
+                "action": lambda v: kernel.elements("effect-hatch\n"),
+                # "group": "tool",
+                "size": bsize_normal,
+                # "identifier": "edit",
+                "rule_enabled": lambda cond: contains_an_element(),
+            },
+        )
+        kernel.register(
+            "button/lasercontrol/Relocate",
             {
                 "label": _("Set Position"),
-                "icon": icons8_place_marker_50,
+                "icon": icons8_place_marker,
                 "tip": _("Set position to given location"),
                 "action": lambda v: kernel.elements("tool relocate\n"),
                 "group": "tool",
@@ -1102,10 +1157,10 @@ class MeerK40t(MWindow):
         )
 
         kernel.register(
-            "button/tools/Placement",
+            "button/lasercontrol/Placement",
             {
                 "label": _("Job Start"),
-                "icon": icons8_user_location_50,
+                "icon": icons8_user_location,
                 "tip": _("Add a job starting point to the scene"),
                 "action": lambda v: kernel.elements("tool placement\n"),
                 "group": "tool",
@@ -1115,15 +1170,15 @@ class MeerK40t(MWindow):
         )
 
         kernel.register(
-            "button/tools/Draw",
+            "button/tools/circle",
             {
-                "label": _("Draw"),
-                "icon": icons8_pencil_drawing_50,
-                "tip": _("Add a free-drawing element"),
-                "action": lambda v: kernel.elements("tool draw\n"),
+                "label": _("Circle"),
+                "icon": icon_mk_circle,
+                "tip": _("Add a circle element"),
+                "action": lambda v: kernel.elements("tool circle\n"),
                 "group": "tool",
                 "size": bsize_normal,
-                "identifier": "draw",
+                "identifier": "circle",
             },
         )
 
@@ -1131,7 +1186,7 @@ class MeerK40t(MWindow):
             "button/tools/ellipse",
             {
                 "label": _("Ellipse"),
-                "icon": icons8_oval_50,
+                "icon": icon_mk_ellipse,
                 "tip": _("Add an ellipse element"),
                 "action": lambda v: kernel.elements("tool ellipse\n"),
                 "group": "tool",
@@ -1141,15 +1196,15 @@ class MeerK40t(MWindow):
         )
 
         kernel.register(
-            "button/tools/circle",
+            "button/tools/Rectangle",
             {
-                "label": _("Circle"),
-                "icon": icons8_circle_50,
-                "tip": _("Add a circle element"),
-                "action": lambda v: kernel.elements("tool circle\n"),
+                "label": _("Rectangle"),
+                "icon": icon_mk_rectangular,
+                "tip": _("Add a rectangular element"),
+                "action": lambda v: kernel.elements("tool rect\n"),
                 "group": "tool",
                 "size": bsize_normal,
-                "identifier": "circle",
+                "identifier": "rect",
             },
         )
 
@@ -1157,7 +1212,7 @@ class MeerK40t(MWindow):
             "button/tools/Polygon",
             {
                 "label": _("Polygon"),
-                "icon": icons8_polygon_50,
+                "icon": icon_mk_polygon,
                 "tip": _(
                     "Add a polygon element\nLeft click: point/line\nDouble click: complete\nRight click: cancel"
                 ),
@@ -1172,7 +1227,7 @@ class MeerK40t(MWindow):
             "button/tools/Polyline",
             {
                 "label": _("Polyline"),
-                "icon": icons8_polyline_50,
+                "icon": icon_mk_polyline,
                 "tip": _(
                     "Add a polyline element\nLeft click: point/line\nDouble click: complete\nRight click: cancel"
                 ),
@@ -1183,24 +1238,11 @@ class MeerK40t(MWindow):
             },
         )
 
-        kernel.register(
-            "button/tools/Rectangle",
-            {
-                "label": _("Rectangle"),
-                "icon": icons8_rectangular_50,
-                "tip": _("Add a rectangular element"),
-                "action": lambda v: kernel.elements("tool rect\n"),
-                "group": "tool",
-                "size": bsize_normal,
-                "identifier": "rect",
-            },
-        )
-
         kernel.register(
             "button/tools/Point",
             {
                 "label": _("Point"),
-                "icon": icons8_point_50,
+                "icon": icon_mk_point,
                 "tip": _("Add point to the scene"),
                 "action": lambda v: kernel.elements("tool point\n"),
                 "group": "tool",
@@ -1213,7 +1255,7 @@ class MeerK40t(MWindow):
             "button/tools/Vector",
             {
                 "label": _("Vector"),
-                "icon": icons8_vector_50,
+                "icon": icons8_vector,
                 "tip": _(
                     "Add a shape\nLeft click: point/line\nClick and hold: curve\nDouble click: complete\nRight click: end"
                 ),
@@ -1223,11 +1265,25 @@ class MeerK40t(MWindow):
                 "identifier": "vector",
             },
         )
+
+        kernel.register(
+            "button/tools/Draw",
+            {
+                "label": _("Draw"),
+                "icon": icons8_pencil_drawing,
+                "tip": _("Add a free-drawing element"),
+                "action": lambda v: kernel.elements("tool draw\n"),
+                "group": "tool",
+                "size": bsize_normal,
+                "identifier": "draw",
+            },
+        )
+
         kernel.register(
             "button/tools/Text",
             {
                 "label": _("Text"),
-                "icon": icons8_type_50,
+                "icon": icon_bmap_text,
                 "tip": _("Add a text element"),
                 "action": lambda v: kernel.elements("tool text\n"),
                 "group": "tool",
@@ -1240,7 +1296,7 @@ class MeerK40t(MWindow):
             "button/basicediting/Delete",
             {
                 "label": _("Delete"),
-                "icon": icons8_delete_50,
+                "icon": icons8_delete,
                 "tip": _("Delete selected items"),
                 "action": lambda v: kernel.elements("tree selected delete\n"),
                 "size": bsize_normal,
@@ -1251,7 +1307,7 @@ class MeerK40t(MWindow):
             "button/basicediting/Cut",
             {
                 "label": _("Cut"),
-                "icon": icons8_scissors_50,
+                "icon": icons8_scissors,
                 "tip": _("Cut selected elements"),
                 "action": lambda v: kernel.elements("clipboard cut\n"),
                 "size": bsize_small,
@@ -1266,7 +1322,7 @@ class MeerK40t(MWindow):
             "button/basicediting/Copy",
             {
                 "label": _("Copy"),
-                "icon": icons8_copy_50,
+                "icon": icons8_copy,
                 "tip": _("Copy selected elements to clipboard"),
                 "action": lambda v: kernel.elements("clipboard copy\n"),
                 "size": bsize_small,
@@ -1292,7 +1348,7 @@ class MeerK40t(MWindow):
             "button/basicediting/Paste",
             {
                 "label": _("Paste"),
-                "icon": icons8_paste_50,
+                "icon": icons8_paste,
                 "tip": _("Paste elements from clipboard"),
                 "action": lambda v: kernel.elements(
                     "clipboard paste -dx 3mm -dy 3mm\n"
@@ -1306,10 +1362,8 @@ class MeerK40t(MWindow):
         #     "button/basicediting/Duplicate",
         #     {
         #         "label": _("Duplicate"),
-        #         "icon": icons8_replicate_rows_50,
-        #         "tip": _(
-        #             "Duplicate selected elements"
-        #         ),
+        #         "icon": icon_duplicate,
+        #         "tip": _("Duplicate selected elements"),
         #         "action": lambda v: kernel.elements("element copy --dx=3mm --dy=3mm\n"),
         #         "size": bsize_small,
         #         "identifier": "editduplicate",
@@ -1323,24 +1377,24 @@ class MeerK40t(MWindow):
             "button/undo/Undo",
             {
                 "label": _("Undo"),
-                "icon": icons8_undo_50,
+                "icon": icon_mk_undo,
                 "tip": _("Undo last operation"),
                 "action": lambda v: kernel.elements("undo\n"),
                 "size": bsize_small,
                 "identifier": "editundo",
-                # "rule_enabled": lambda cond: kernel.elements.undo.has_undo,
+                "rule_enabled": lambda cond: kernel.elements.undo.has_undo(),
             },
         )
         kernel.register(
             "button/undo/Redo",
             {
                 "label": _("Redo"),
-                "icon": icons8_redo_50,
+                "icon": icon_mk_redo,
                 "tip": _("Redo last operation"),
                 "action": lambda v: kernel.elements("redo\n"),
                 "size": bsize_small,
                 "identifier": "editredo",
-                # "rule_enabled": lambda cond: kernel.elements.undo.has_undo,
+                "rule_enabled": lambda cond: kernel.elements.undo.has_redo(),
             },
         )
 
@@ -1348,7 +1402,7 @@ class MeerK40t(MWindow):
             "button/extended_tools/Measure",
             {
                 "label": _("Measure"),
-                "icon": icons8_measure_50,
+                "icon": icons8_measure,
                 "tip": _(
                     "Measure distance / perimeter / area\nLeft click: point/line\nDouble click: complete\nRight click: cancel"
                 ),
@@ -1359,22 +1413,6 @@ class MeerK40t(MWindow):
             },
         )
 
-        def contains_a_param():
-            result = False
-            for e in kernel.elements.elems(emphasized=True):
-                if e.functional_parameter is not None:
-                    result = True
-                    break
-            return result
-
-        def contains_a_path():
-            result = False
-            for e in kernel.elements.elems(emphasized=True):
-                if e.type in ("elem polyline", "elem path"):
-                    result = True
-                    break
-            return result
-
         # Default Size for smaller buttons
         buttonsize = STD_ICON_SIZE / 2
 
@@ -1396,7 +1434,7 @@ class MeerK40t(MWindow):
             "button/modify/Mirror",
             {
                 "label": _("Mirror Horizontal"),
-                "icon": icons8_mirror_horizontal,
+                "icon": icons8_flip_horizontal,
                 "tip": _("Mirror the selected element horizontally"),
                 "action": lambda v: kernel.elements("scale -1 1\n"),
                 "size": bsize_small,
@@ -1410,7 +1448,7 @@ class MeerK40t(MWindow):
             "button/modify/Rotate90CW",
             {
                 "label": _("Rotate CW"),
-                "icon": icons8_rotate_right_50,
+                "icon": icons8_rotate_right,
                 "tip": _("Rotate the selected element clockwise by 90 deg"),
                 "action": lambda v: kernel.elements("rotate 90deg\n"),
                 "size": bsize_small,
@@ -1424,7 +1462,7 @@ class MeerK40t(MWindow):
             "button/modify/Rotate90CCW",
             {
                 "label": _("Rotate CCW"),
-                "icon": icons8_rotate_left_50,
+                "icon": icons8_rotate_left,
                 "tip": _("Rotate the selected element counterclockwise by 90 deg"),
                 "action": lambda v: kernel.elements("rotate -90deg\n"),
                 "size": bsize_small,
@@ -1438,7 +1476,7 @@ class MeerK40t(MWindow):
             "button/geometry/Union",
             {
                 "label": _("Union"),
-                "icon": icon_cag_union_50,
+                "icon": icon_cag_union,
                 "tip": _("Create a union of the selected elements"),
                 "action": lambda v: kernel.elements("element union\n"),
                 "size": bsize_small,
@@ -1452,7 +1490,7 @@ class MeerK40t(MWindow):
             "button/geometry/Difference",
             {
                 "label": _("Difference"),
-                "icon": icon_cag_subtract_50,
+                "icon": icon_cag_subtract,
                 "tip": _("Create a difference of the selected elements"),
                 "action": lambda v: kernel.elements("element difference\n"),
                 "size": bsize_small,
@@ -1466,7 +1504,7 @@ class MeerK40t(MWindow):
             "button/geometry/Xor",
             {
                 "label": _("Xor"),
-                "icon": icon_cag_xor_50,
+                "icon": icon_cag_xor,
                 "tip": _("Create a xor of the selected elements"),
                 "action": lambda v: kernel.elements("element xor\n"),
                 "size": bsize_small,
@@ -1480,7 +1518,7 @@ class MeerK40t(MWindow):
             "button/geometry/Intersection",
             {
                 "label": _("Intersection"),
-                "icon": icon_cag_common_50,
+                "icon": icon_cag_common,
                 "tip": _("Create a intersection of the selected elements"),
                 "action": lambda v: kernel.elements("element intersection\n"),
                 "size": bsize_small,
@@ -1537,7 +1575,7 @@ class MeerK40t(MWindow):
             "button/group/Group",
             {
                 "label": _("Group"),
-                "icon": icons8_group_objects_50,
+                "icon": icons8_group_objects,
                 "tip": _("Group elements together"),
                 "action": lambda v: group_selection(),
                 "size": bsize_normal,
@@ -1582,7 +1620,7 @@ class MeerK40t(MWindow):
             "button/group/Ungroup",
             {
                 "label": _("Ungroup"),
-                "icon": icons8_ungroup_objects_50,
+                "icon": icons8_ungroup_objects,
                 "tip": _("Ungroup elements"),
                 "action": lambda v: ungroup_selection(),
                 "size": bsize_normal,
@@ -1594,7 +1632,7 @@ class MeerK40t(MWindow):
             "button/align/AlignLeft",
             {
                 "label": _("Left"),
-                "icon": icons8_align_left_50,
+                "icon": icon_mk_align_left,
                 "tip": _(
                     "Align selected elements at the leftmost position (right click: of the bed)"
                 ),
@@ -1616,7 +1654,7 @@ class MeerK40t(MWindow):
             "button/preparation/Wordlist",
             {
                 "label": _("Wordlist"),
-                "icon": icons8_curly_brackets_50,
+                "icon": icons8_curly_brackets,
                 "tip": _("Manages Wordlist-Entries")
                 + "\n"
                 + _(" (right go to next entry)"),
@@ -1627,7 +1665,7 @@ class MeerK40t(MWindow):
                 "multi": [
                     {
                         "identifier": "prep_wordlist_edit",
-                        "icon": icons8_curly_brackets_50,
+                        "icon": icons8_curly_brackets,
                         "tip": _("Manages Wordlist-Entries")
                         + _(" (right go to next entry)"),
                         "label": _("Wordlist Editor"),
@@ -1636,7 +1674,7 @@ class MeerK40t(MWindow):
                     },
                     {
                         "identifier": "prep_wordlist_plus_1",
-                        "icon": icons8_circled_right_50,
+                        "icon": icons8_circled_right,
                         "tip": _("Wordlist: go to next entry")
                         + _(" (right go to prev entry)"),
                         "label": _("Next"),
@@ -1646,7 +1684,7 @@ class MeerK40t(MWindow):
                     {
                         "identifier": "prep_wordlist_minus_1",
                         "label": _("Prev"),
-                        "icon": icons8_circled_left_50,
+                        "icon": icons8_circled_left,
                         "tip": _("Wordlist: go to prev entry")
                         + _(" (right go to next entry)"),
                         "action": lambda v: kernel.elements.wordlist_advance(-1),
@@ -1663,7 +1701,7 @@ class MeerK40t(MWindow):
             "button/align/AlignRight",
             {
                 "label": _("Right"),
-                "icon": icons8_align_right_50,
+                "icon": icon_mk_align_right,
                 "tip": _(
                     "Align selected elements at the rightmost position (right click: of the bed)"
                 ),
@@ -1680,7 +1718,7 @@ class MeerK40t(MWindow):
             "button/align/AlignTop",
             {
                 "label": _("Top"),
-                "icon": icons8_align_top_50,
+                "icon": icon_mk_align_top,
                 "tip": _(
                     "Align selected elements at the topmost position (right click: of the bed)"
                 ),
@@ -1697,7 +1735,7 @@ class MeerK40t(MWindow):
             "button/align/AlignBottom",
             {
                 "label": _("Bottom"),
-                "icon": icons8_align_bottom_50,
+                "icon": icon_mk_align_bottom,
                 "tip": _(
                     "Align selected elements at the lowest position (right click: of the bed)"
                 ),
@@ -1714,7 +1752,7 @@ class MeerK40t(MWindow):
             "button/align/AlignCenterH",
             {
                 "label": _("Center X"),
-                "icon": icons8_centerh_50,
+                "icon": icons8_centerh,
                 "tip": _(
                     "Align selected elements at their center horizontally (right click: of the bed)"
                 ),
@@ -1731,7 +1769,7 @@ class MeerK40t(MWindow):
             "button/align/AlignCenterV",
             {
                 "label": _("Center Y"),
-                "icon": icons8_centerv_50,
+                "icon": icons8_centerv,
                 "tip": _(
                     "Align selected elements at their center vertically (right click: of the bed)"
                 ),
@@ -2371,7 +2409,12 @@ class MeerK40t(MWindow):
 
     @property
     def is_dark(self):
-        return wx.SystemSettings().GetColour(wx.SYS_COLOUR_WINDOW)[0] < 127
+        # try:
+        #     res = wx.SystemSettings().GetAppearance().IsDark()
+        # except AttributeError:
+        #     res = wx.SystemSettings().GetColour(wx.SYS_COLOUR_WINDOW)[0] < 127
+        res = wx.SystemSettings().GetColour(wx.SYS_COLOUR_WINDOW)[0] < 127
+        return res
 
     def __kernel_initialize(self):
         context = self.context
@@ -2800,9 +2843,9 @@ class MeerK40t(MWindow):
         self.Bind(wx.EVT_MENU, self.on_click_exit, id=menu_item.GetId())
         self.main_menubar.Append(self.file_menu, _("File"))
 
-    def _update_status_edit_menu(self, *args):
+    def _update_status_menu(self, menu, choices, *args):
         def handler(event):
-            for entry in self.edit_menu_choice:
+            for entry in local_choices:
                 if "label" in entry and "enabled" in entry:
                     flag = True
                     label = entry["label"]
@@ -2811,13 +2854,15 @@ class MeerK40t(MWindow):
                     except AttributeError:
                         flag = True
                     if label:
-                        menu_id = self.edit_menu.FindItem(label)
+                        menu_id = local_menu.FindItem(label)
                         if menu_id != wx.NOT_FOUND:
-                            menu_item = self.edit_menu.FindItemById(menu_id)
+                            menu_item = local_menu.FindItemById(menu_id)
                             menu_item.Enable(flag)
             if event:
                 event.Skip()
 
+        local_menu = menu
+        local_choices = choices
         return handler
 
     def __set_edit_menu(self):
@@ -2833,7 +2878,10 @@ class MeerK40t(MWindow):
         else:
             self.main_menubar.Append(self.edit_menu, label)
 
-        self.edit_menu.Bind(wx.EVT_MENU_OPEN, self._update_status_edit_menu())
+        self.edit_menu.Bind(
+            wx.EVT_MENU_OPEN,
+            self._update_status_menu(self.edit_menu, self.edit_menu_choice),
+        )
 
     def __set_view_menu(self):
         def toggle_draw_mode(bits):
@@ -2874,6 +2922,7 @@ class MeerK40t(MWindow):
                 "action": self.on_click_zoom_selected,
                 "id": wx.ID_ZOOM_100,
                 "level": 1,
+                "enabled": self.context.elements.has_emphasis,
                 "segment": "",
             },
             {
@@ -3138,8 +3187,13 @@ class MeerK40t(MWindow):
         ]
 
         self.view_menu = wx.Menu()
+        self.view_menu_choice = choices
         self._create_menu_from_choices(self.view_menu, choices)
         self.main_menubar.Append(self.view_menu, _("View"))
+        self.view_menu.Bind(
+            wx.EVT_MENU_OPEN,
+            self._update_status_menu(self.view_menu, self.view_menu_choice),
+        )
 
     def __set_pane_menu(self):
         # ==========
@@ -3354,6 +3408,7 @@ class MeerK40t(MWindow):
                             message="This requires a program restart before the language change will kick in!",
                             caption="Language changed",
                         )
+                        self.context.signal("restart")
 
                     return check
 
@@ -3363,6 +3418,19 @@ class MeerK40t(MWindow):
                 i += 1
             self.main_menubar.Append(wxglade_tmp_menu, _("Languages"))
 
+    @signal_listener("restart")
+    def on_restart_required(self, *args):
+        self.context.kernel.register(
+            "button/project/Restart",
+            {
+                "label": _("Restart"),
+                "icon": icon_power_button,
+                "tip": _("Restart needed to apply new parameters"),
+                "action": lambda v: self.context("restart\n"),
+                "size": STD_ICON_SIZE,
+            },
+        )
+
     @signal_listener("file;loaded")
     @signal_listener("file;saved")
     @signal_listener("file;cleared")
@@ -3636,9 +3704,15 @@ class MeerK40t(MWindow):
         else:
             label = " - " + label
 
+        try:
+            dev_label = self.context.device.label
+        except AttributeError:
+            # Label cannot be found because device does not exist.
+            dev_label = ""
+
         title = (
             f"{str(self.context.kernel.name)} v{self.context.kernel.version} - "
-            f"{self.context.device.label}{label}"
+            f"{dev_label}{label}"
         )
         self.SetTitle(title)
 
@@ -3777,7 +3851,8 @@ class MeerK40t(MWindow):
         self.context(".laserpath_clear\n")
         self.validate_save()
         kernel.busyinfo.end()
-        self.context("tool none\n")
+        self.context(".tool none\n")
+        context.elements.undo.mark("blank")
 
     def clear_and_open(self, pathname, preferred_loader=None):
         self.clear_project(ops_too=False)
@@ -3878,9 +3953,11 @@ class MeerK40t(MWindow):
 
     def on_click_open(self, event=None):  # wxGlade: MeerK40t.<event_handler>
         self.context(".dialog_load\n")
+        self.context(".tool none\n")
 
     def on_click_import(self, event=None):  # wxGlade: MeerK40t.<event_handler>
         self.context(".dialog_import\n")
+        self.context(".tool none\n")
 
     def on_click_stop(self, event=None):
         self.context("estop\n")
@@ -3890,9 +3967,11 @@ class MeerK40t(MWindow):
 
     def on_click_save(self, event):
         self.context(".dialog_save\n")
+        self.context(".tool none\n")
 
     def on_click_save_as(self, event=None):
         self.context(".dialog_save_as\n")
+        self.context(".tool none\n")
 
     def on_click_close(self, event=None):
         try: