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

meerk40t/gui/wxmribbon.py

@@ -29,11 +29,11 @@ from wx import aui
 from meerk40t.gui.icons import (
     STD_ICON_SIZE,
     get_default_icon_size,
-    icons8_add_new_25,
-    icons8_down_50,
-    icons8_opened_folder_50,
-    icons8_remove_25,
-    icons8_up_50,
+    icon_add_new,
+    icon_trash,
+    icons8_down,
+    icons8_opened_folder,
+    icons8_up,
 )
 from meerk40t.gui.ribbon import RibbonBarPanel
 from meerk40t.gui.wxutils import StaticBoxSizer, dip_size
@@ -141,8 +141,9 @@ class MKRibbonBarPanel(RibbonBarPanel):
         self.storage = Settings(self.context.kernel.name, f"ribbon_{identifier}.cfg")
         self.storage.read_configuration()
 
+        self.allow_labels = bool(show_labels is None or show_labels)
         # Layout properties.
-        if show_labels is None or show_labels:
+        if self.allow_labels:
             self.toggle_show_labels(context.setting(bool, "ribbon_show_labels", True))
 
         self._pages = []
@@ -158,19 +159,29 @@ class MKRibbonBarPanel(RibbonBarPanel):
                     "label": "Tools",  # Label
                     "panels": [  # Panels to include
                         {
-                            "id": "tool",
-                            "label": "Project",
+                            "id": "select",
+                            "label": "Select + Edit",
                             "seq": 1,
                         },
                         {
-                            "id": "extended_tools",
-                            "label": "group",
+                            "id": "lasercontrol",
+                            "label": "Laser",
                             "seq": 2,
                         },
+                        {
+                            "id": "tool",
+                            "label": "Create",
+                            "seq": 3,
+                        },
+                        {
+                            "id": "extended_tools",
+                            "label": "Extended Tools",
+                            "seq": 4,
+                        },
                         {
                             "id": "group",
                             "label": "Group",
-                            "seq": 3,
+                            "seq": 5,
                         },
                     ],
                     "seq": 1,  # Sequence
@@ -366,6 +377,7 @@ class MKRibbonBarPanel(RibbonBarPanel):
 
     def restart(self):
         self.storage.read_configuration()
+        self.art.establish_colors()
         self.pages = []
         self.set_default_pages()
         # Define Ribbon.
@@ -392,7 +404,8 @@ class MKRibbonBarPanel(RibbonBarPanel):
 
     @signal_listener("ribbon_show_labels")
     def on_show_labels_change(self, origin, value, *args):
-        self.toggle_show_labels(value)
+        if self.allow_labels:
+            self.toggle_show_labels(value)
 
     @lookup_listener("button/basicediting")
     def set_editing_buttons(self, new_values, old_values):
@@ -438,10 +451,18 @@ class MKRibbonBarPanel(RibbonBarPanel):
     def set_align_buttons(self, new_values, old_values):
         self.set_panel_buttons("align", new_values)
 
+    @lookup_listener("button/select")
+    def set_select_buttons(self, new_values, old_values):
+        self.set_panel_buttons("select", new_values)
+
     @lookup_listener("button/tool")
     def set_tool_buttons(self, new_values, old_values):
         self.set_panel_buttons("tool", new_values)
 
+    @lookup_listener("button/lasercontrol")
+    def set_lasercontrol_buttons(self, new_values, old_values):
+        self.set_panel_buttons("lasercontrol", new_values)
+
     @lookup_listener("button/extended_tools")
     def set_tool_extended_buttons(self, new_values, old_values):
         self.set_panel_buttons("extended_tools", new_values)
@@ -454,6 +475,10 @@ class MKRibbonBarPanel(RibbonBarPanel):
     def on_emphasis_change(self, origin, *args):
         self.apply_enable_rules()
 
+    @signal_listener("undoredo")
+    def on_undostate_change(self, origin, *args):
+        self.apply_enable_rules()
+
     @signal_listener("selected")
     def on_selected_change(self, origin, node=None, *args):
         self.apply_enable_rules()
@@ -497,7 +522,7 @@ class MKRibbonBarPanel(RibbonBarPanel):
                 name_id,
                 wx.ID_ANY,
                 label,
-                icons8_opened_folder_50.GetBitmap(resize=16),
+                icons8_opened_folder.GetBitmap(resize=16),
             )
             entry["_object"] = page
             for pentry in sorted(panel_list, key=lambda d: d["seq"]):
@@ -508,7 +533,7 @@ class MKRibbonBarPanel(RibbonBarPanel):
                     parent=page,
                     id=wx.ID_ANY,
                     label=p_label,
-                    icon=icons8_opened_folder_50.GetBitmap(),
+                    icon=icons8_opened_folder.GetBitmap(),
                 )
                 pentry["_object"] = panel
 
@@ -601,15 +626,15 @@ class RibbonEditor(wx.Panel):
         self.button_down_page = wx.StaticBitmap(
             self, wx.ID_ANY, size=dip_size(self, 30, 20)
         )
+        testsize = dip_size(self, 20, 20)
+        iconsize = testsize[0]
         self.button_add_page.SetBitmap(
-            icons8_add_new_25.GetBitmap(resize=STD_ICON_SIZE / 2)
+            icon_add_new.GetBitmap(resize=iconsize, buffer=1)
         )
-        self.button_del_page.SetBitmap(
-            icons8_remove_25.GetBitmap(resize=STD_ICON_SIZE / 2)
-        )
-        self.button_up_page.SetBitmap(icons8_up_50.GetBitmap(resize=STD_ICON_SIZE / 2))
+        self.button_del_page.SetBitmap(icon_trash.GetBitmap(resize=iconsize, buffer=1))
+        self.button_up_page.SetBitmap(icons8_up.GetBitmap(resize=iconsize, buffer=1))
         self.button_down_page.SetBitmap(
-            icons8_down_50.GetBitmap(resize=STD_ICON_SIZE / 2)
+            icons8_down.GetBitmap(resize=iconsize, buffer=1)
         )
 
         self.button_del_panel = wx.StaticBitmap(
@@ -621,12 +646,10 @@ class RibbonEditor(wx.Panel):
         self.button_down_panel = wx.StaticBitmap(
             self, wx.ID_ANY, size=dip_size(self, 30, 30)
         )
-        self.button_del_panel.SetBitmap(
-            icons8_remove_25.GetBitmap(resize=STD_ICON_SIZE / 2)
-        )
-        self.button_up_panel.SetBitmap(icons8_up_50.GetBitmap(resize=STD_ICON_SIZE / 2))
+        self.button_del_panel.SetBitmap(icon_trash.GetBitmap(resize=iconsize, buffer=1))
+        self.button_up_panel.SetBitmap(icons8_up.GetBitmap(resize=iconsize, buffer=1))
         self.button_down_panel.SetBitmap(
-            icons8_down_50.GetBitmap(resize=STD_ICON_SIZE / 2)
+            icons8_down.GetBitmap(resize=iconsize, buffer=1)
         )
 
         self.list_options = wx.ListBox(self, wx.ID_ANY, style=wx.LB_SINGLE)
@@ -824,6 +847,7 @@ class RibbonEditor(wx.Panel):
             self.ribbon_identifier = rlist[idx]
             rib = self.current_ribbon()
             self.check_labels.SetValue(rib.art.show_labels)
+            self.check_labels.Enable(rib.allow_labels)
             self.fill_pages(reload=True)
 
     def on_move_page_up(self, event):

meerk40t/gui/wxmscene.py

@@ -11,9 +11,9 @@ from meerk40t.core.units import UNITS_PER_PIXEL, Length
 from meerk40t.gui.icons import (
     STD_ICON_SIZE,
     icon_meerk40t,
-    icons8_menu_50,
+    icons8_menu,
     icons8_r_white,
-    icons8_text_50,
+    icons8_text,
 )
 from meerk40t.gui.laserrender import DRAW_MODE_BACKGROUND, DRAW_MODE_GUIDES, LaserRender
 from meerk40t.gui.mwindow import MWindow
@@ -34,6 +34,8 @@ from meerk40t.gui.toolwidgets.toolcircle import CircleTool
 from meerk40t.gui.toolwidgets.toolcontainer import ToolContainer
 from meerk40t.gui.toolwidgets.tooldraw import DrawTool
 from meerk40t.gui.toolwidgets.toolellipse import EllipseTool
+from meerk40t.gui.toolwidgets.toolimagecut import ImageCutTool
+from meerk40t.gui.toolwidgets.toolline import LineTool
 from meerk40t.gui.toolwidgets.toollinetext import LineTextTool
 from meerk40t.gui.toolwidgets.toolmeasure import MeasureTool
 from meerk40t.gui.toolwidgets.toolnodeedit import EditTool
@@ -207,6 +209,7 @@ class MeerK40tScenePanel(wx.Panel):
 
         context.register("tool/draw", DrawTool)
         context.register("tool/rect", RectTool)
+        context.register("tool/line", LineTool)
         context.register("tool/polyline", PolylineTool)
         context.register("tool/polygon", PolygonTool)
         context.register("tool/point", PointTool)
@@ -222,6 +225,7 @@ class MeerK40tScenePanel(wx.Panel):
         context.register("tool/placement", PlacementTool)
         context.register("tool/nodemove", NodeMoveTool)
         context.register("tool/parameter", ParameterTool)
+        context.register("tool/imagecut", ImageCutTool)
 
         bsize_normal = STD_ICON_SIZE
 
@@ -237,7 +241,7 @@ class MeerK40tScenePanel(wx.Panel):
             "button/tools/Linetext",
             {
                 "label": _("Vector Text"),
-                "icon": icons8_text_50,
+                "icon": icons8_text,
                 "tip": _("Add a vector text element"),
                 "action": lambda v: proxy_linetext(),
                 "group": "tool",
@@ -280,34 +284,34 @@ class MeerK40tScenePanel(wx.Panel):
                     pass
             dlg.Destroy()
 
-        @context.console_command("tool_menu", hidden=True)
-        def tool_menu(channel, _, **kwgs):
-            orgx = 5
-            orgy = 5
-            # Are guides drawn?
-            if self.context.draw_mode & DRAW_MODE_GUIDES == 0:
-                orgx += 25
-                orgy += 25
-            if self._tool_widget is not None:
-                visible = self._tool_widget.visible
-                self._tool_widget.show(not visible)
-                self.widget_scene.request_refresh()
-
-            if self._tool_widget is None:
-                self._tool_widget = ToggleWidget(
-                    self.widget_scene,
-                    orgx,
-                    orgy,
-                    orgx + 25,
-                    orgy + 25,
-                    icons8_menu_50.GetBitmap(use_theme=False),
-                    "button/tool",
-                )
-                self.widget_scene.widget_root.interface_widget.add_widget(
-                    -1,
-                    self._tool_widget,
-                )
-            channel(_("Added tool widget to interface"))
+        # @context.console_command("tool_menu", hidden=True)
+        # def tool_menu(channel, _, **kwgs):
+        #     orgx = 5
+        #     orgy = 5
+        #     # Are guides drawn?
+        #     if self.context.draw_mode & DRAW_MODE_GUIDES == 0:
+        #         orgx += 25
+        #         orgy += 25
+        #     if self._tool_widget is not None:
+        #         visible = self._tool_widget.visible
+        #         self._tool_widget.show(not visible)
+        #         self.widget_scene.request_refresh()
+
+        #     if self._tool_widget is None:
+        #         self._tool_widget = ToggleWidget(
+        #             self.widget_scene,
+        #             orgx,
+        #             orgy,
+        #             orgx + 25,
+        #             orgy + 25,
+        #             icons8_menu.GetBitmap(use_theme=False),
+        #             "button/tool",
+        #         )
+        #         self.widget_scene.widget_root.interface_widget.add_widget(
+        #             -1,
+        #             self._tool_widget,
+        #         )
+        #     channel(_("Added tool widget to interface"))
 
         @context.console_command("seek_bar", hidden=True)
         def seek_bar(channel, _, **kwgs):
@@ -422,8 +426,8 @@ class MeerK40tScenePanel(wx.Panel):
                             )
                             select_values = (
                                 (
-                                    context.lookup("button/tools/Scene"),
-                                    "button/tools/Scene",
+                                    context.lookup("button/select/Scene"),
+                                    "button/select/Scene",
                                     "Select",
                                 ),
                             )
@@ -1290,12 +1294,19 @@ class MeerK40tScenePanel(wx.Panel):
     def on_close(self, event):
         self.save_magnets()
 
+    @signal_listener("pause")
     @signal_listener("pipe;running")
-    def on_driver_mode(self, origin, state):
-        if state:
-            self.widget_scene.overrule_background = wx.RED
-        else:
-            self.widget_scene.overrule_background = None
+    def on_driver_mode(self, origin, *args):
+        # pipe running has (state) as args
+        new_color = None
+        try:
+            if self.context.device.driver.paused:
+                new_color = self.context.themes.get("pause_bg")
+            elif self.context.device.laser_status == "active":
+                new_color = self.context.themes.get("stop_bg")
+        except AttributeError:
+            pass
+        self.widget_scene.overrule_background = new_color
         self.widget_scene.request_refresh_for_animation()
 
     @signal_listener("background")