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

meerk40t/gui/notes.py

@@ -1,7 +1,7 @@
 import wx
 from wx import aui
 
-from .icons import STD_ICON_SIZE, icons8_comments_50
+from .icons import STD_ICON_SIZE, icons8_comments
 from .mwindow import MWindow
 
 _ = wx.GetTranslation
@@ -115,7 +115,7 @@ class Notes(MWindow):
         self.panel = NotePanel(self, wx.ID_ANY, context=self.context)
         self.add_module_delegate(self.panel)
         _icon = wx.NullIcon
-        _icon.CopyFromBitmap(icons8_comments_50.GetBitmap())
+        _icon.CopyFromBitmap(icons8_comments.GetBitmap())
         self.SetIcon(_icon)
         self.SetTitle(_("Notes"))
         self.Children[0].SetFocus()
@@ -127,7 +127,7 @@ class Notes(MWindow):
             "button/project/Notes",
             {
                 "label": _("Notes"),
-                "icon": icons8_comments_50,
+                "icon": icons8_comments,
                 "tip": _("Open Notes Window"),
                 "action": lambda v: kernel.console("window toggle Notes\n"),
                 "size": STD_ICON_SIZE,

meerk40t/gui/opassignment.py

@@ -3,12 +3,12 @@ from wx import aui
 
 from meerk40t.core.elements.element_types import op_nodes
 from meerk40t.gui.icons import (
-    icons8_diagonal_20,
-    icons8_direction_20,
-    icons8_image_20,
-    icons8_laser_beam_20,
-    icons8_scatter_plot_20,
-    icons8_small_beam_20,
+    icon_effect_hatch,
+    icon_points,
+    icons8_direction,
+    icons8_image,
+    icons8_laser_beam,
+    icons8_laserbeam_weak,
 )
 from meerk40t.gui.laserrender import swizzlecolor
 from meerk40t.gui.wxutils import dip_size
@@ -165,7 +165,7 @@ class OperationAssignPanel(wx.Panel):
             d = None
             if node.type == "op raster":
                 c, d = get_color()
-                result = icons8_direction_20.GetBitmap(
+                result = icons8_direction.GetBitmap(
                     color=c,
                     resize=(iconsize, iconsize),
                     noadjustment=True,
@@ -173,7 +173,7 @@ class OperationAssignPanel(wx.Panel):
                 )
             elif node.type == "op image":
                 c, d = get_color()
-                result = icons8_image_20.GetBitmap(
+                result = icons8_image.GetBitmap(
                     color=c,
                     resize=(iconsize, iconsize),
                     noadjustment=True,
@@ -181,7 +181,7 @@ class OperationAssignPanel(wx.Panel):
                 )
             elif node.type == "op engrave":
                 c, d = get_color()
-                result = icons8_small_beam_20.GetBitmap(
+                result = icons8_laserbeam_weak.GetBitmap(
                     color=c,
                     resize=(iconsize, iconsize),
                     noadjustment=True,
@@ -189,7 +189,7 @@ class OperationAssignPanel(wx.Panel):
                 )
             elif node.type == "op cut":
                 c, d = get_color()
-                result = icons8_laser_beam_20.GetBitmap(
+                result = icons8_laser_beam.GetBitmap(
                     color=c,
                     resize=(iconsize, iconsize),
                     noadjustment=True,
@@ -197,7 +197,7 @@ class OperationAssignPanel(wx.Panel):
                 )
             elif node.type == "op dots":
                 c, d = get_color()
-                result = icons8_scatter_plot_20.GetBitmap(
+                result = icon_points.GetBitmap(
                     color=c,
                     resize=(iconsize, iconsize),
                     noadjustment=True,
@@ -217,7 +217,7 @@ class OperationAssignPanel(wx.Panel):
                 self.buttons[myidx].SetBitmap(wx.NullBitmap)
             else:
                 self.buttons[myidx].SetBitmap(image)
-                # self.buttons[myidx].SetBitmapDisabled(icons8_padlock_50.GetBitmap(color=Color("Grey"), resize=(self.iconsize, self.iconsize), noadjustment=True, keepalpha=True))
+                # self.buttons[myidx].SetBitmapDisabled(icons8_unlock.GetBitmap(color=Color("Grey"), resize=(self.iconsize, self.iconsize), noadjustment=True, keepalpha=True))
             self.buttons[myidx].SetToolTip(
                 str(node)
                 + "\n"

meerk40t/gui/operation_info.py

@@ -1,13 +1,13 @@
 import wx
 
 from meerk40t.gui.icons import (
-    icons8_computer_support_50,
-    icons8_diagonal_20,
-    icons8_direction_20,
-    icons8_image_20,
-    icons8_laser_beam_20,
-    icons8_scatter_plot_20,
-    icons8_small_beam_20,
+    icon_effect_hatch,
+    icon_points,
+    icons8_computer_support,
+    icons8_direction,
+    icons8_image,
+    icons8_laser_beam,
+    icons8_laserbeam_weak,
 )
 from meerk40t.gui.mwindow import MWindow
 from meerk40t.gui.wxutils import ScrolledPanel
@@ -62,11 +62,11 @@ class OpInfoPanel(ScrolledPanel):
         self.Layout()
 
         self.opinfo = {
-            "op cut": ("Cut", icons8_laser_beam_20, 0),
-            "op raster": ("Raster", icons8_direction_20, 0),
-            "op image": ("Image", icons8_image_20, 0),
-            "op engrave": ("Engrave", icons8_small_beam_20, 0),
-            "op dots": ("Dots", icons8_scatter_plot_20, 0),
+            "op cut": ("Cut", icons8_laser_beam, 0),
+            "op raster": ("Raster", icons8_direction, 0),
+            "op image": ("Image", icons8_image, 0),
+            "op engrave": ("Engrave", icons8_laserbeam_weak, 0),
+            "op dots": ("Dots", icon_points, 0),
         }
         self.state_images = wx.ImageList()
         self.state_images.Create(width=25, height=25)
@@ -284,7 +284,7 @@ class OperationInformation(MWindow):
         self.panel = OpInfoPanel(self, wx.ID_ANY, context=self.context)
         self.add_module_delegate(self.panel)
         _icon = wx.NullIcon
-        _icon.CopyFromBitmap(icons8_computer_support_50.GetBitmap())
+        _icon.CopyFromBitmap(icons8_computer_support.GetBitmap())
         self.SetIcon(_icon)
         self.SetTitle(_("Operation Information"))
 

meerk40t/gui/plugin.py

@@ -78,6 +78,10 @@ and a wxpython version <= 4.1.1."""
 
         kernel.register("module/Scene", Scene)
 
+        from meerk40t.gui.themes import Themes
+
+        kernel.add_service("themes", Themes(kernel))
+
     elif lifecycle == "boot":
         kernel_root = kernel.root
         choices = [
@@ -171,6 +175,7 @@ and a wxpython version <= 4.1.1."""
                 ),
                 "page": "Gui",
                 "section": "General",
+                "signals": "restart",
             },
             {
                 "attr": "disable_tree_tool_tips",

meerk40t/gui/position.py

@@ -3,7 +3,7 @@ from wx import aui
 
 from meerk40t.core.elements.element_types import elem_nodes
 from meerk40t.core.units import UNITS_PER_PIXEL, Length
-from meerk40t.gui.icons import icons8_compress_50
+from meerk40t.gui.icons import get_default_icon_size, icons8_compress
 from meerk40t.gui.wxutils import StaticBoxSizer, TextCtrl, dip_size
 from meerk40t.kernel import signal_listener
 
@@ -67,20 +67,10 @@ class PositionPanel(wx.Panel):
         self.text_h.SetMinSize(dip_size(self, 70, 23))
         self.chk_individually = wx.CheckBox(self, wx.ID_ANY, _("Individ."))
         self.chk_lock = wx.CheckBox(self, wx.ID_ANY, _("Keep ratio"))
-        if self.small:
-            resize_param = 32
-        else:
-            resize_param = None
+        resize_param = 0.5 * get_default_icon_size()
 
-        self.button_execute = wx.BitmapButton(
-            self, wx.ID_ANY, icons8_compress_50.GetBitmap(resize=resize_param)
-        )
-        w, h = self.button_execute.GetBitmap().Size
-        icon_size = w
-        self.pos_bitmaps = self.calculate_icons(icon_size)
-        self.button_param = wx.BitmapButton(
-            self, wx.ID_ANY, self.pos_bitmaps[self.offset_index]
-        )
+        self.button_execute = wx.BitmapButton(self, wx.ID_ANY)
+        self.button_param = wx.BitmapButton(self, wx.ID_ANY)
         self.choices = ["mm", "cm", "inch", "mil", "%"]
         self.combo_box_units = wx.ComboBox(
             self,
@@ -93,6 +83,12 @@ class PositionPanel(wx.Panel):
         self.__set_properties()
         self.__do_layout()
 
+        self.button_execute.SetBitmap(icons8_compress.GetBitmap(resize=resize_param))
+        w, h = self.button_execute.GetBitmap().Size
+        icon_size = w
+        self.pos_bitmaps = self.calculate_icons(icon_size)
+        self.button_param.SetBitmap(self.pos_bitmaps[self.offset_index])
+
         self.text_x.SetActionRoutine(self.on_text_x_enter)
         self.text_y.SetActionRoutine(self.on_text_y_enter)
         self.text_w.SetActionRoutine(self.on_text_w_enter)
@@ -223,6 +219,12 @@ class PositionPanel(wx.Panel):
         self.chk_lock.SetToolTip(
             _("If checked then the aspect ratio (width / height) will be maintained")
         )
+        self.button_param.SetToolTip(
+            _(
+                "Set the point of reference for the element,\n"
+                + "which edge/corner should be put on the given location"
+            )
+        )
         self.button_execute.SetSize(self.button_execute.GetBestSize())
         self.combo_box_units.SetSelection(0)
         # end wxGlade
@@ -568,7 +570,7 @@ class PositionPanel(wx.Panel):
             try:
                 w = Length(
                     self.text_w.GetValue(),
-                    relative_length=self.context.view.width,
+                    relative_length=self.context.device.view.width,
                     unitless=UNITS_PER_PIXEL,
                     preferred_units=self.context.units_name,
                 )
@@ -600,7 +602,7 @@ class PositionPanel(wx.Panel):
             try:
                 h = Length(
                     self.text_h.GetValue(),
-                    relative_length=self.context.view.height,
+                    relative_length=self.context.device.view.height,
                     unitless=UNITS_PER_PIXEL,
                     preferred_units=self.context.units_name,
                 )
@@ -631,7 +633,7 @@ class PositionPanel(wx.Panel):
             try:
                 pos_x = Length(
                     self.text_h.GetValue(),
-                    relative_length=self.context.view.height,
+                    relative_length=self.context.device.view.height,
                     unitless=UNITS_PER_PIXEL,
                     preferred_units=self.context.units_name,
                 )
@@ -649,7 +651,7 @@ class PositionPanel(wx.Panel):
             try:
                 pos_y = Length(
                     self.text_h.GetValue(),
-                    relative_length=self.context.view.width,
+                    relative_length=self.context.device.view.width,
                     unitless=UNITS_PER_PIXEL,
                     preferred_units=self.context.units_name,
                 )

meerk40t/gui/preferences.py

@@ -5,8 +5,10 @@ import platform
 
 import wx
 
+from meerk40t.kernel.kernel import signal_listener
+
 from .choicepropertypanel import ChoicePropertyPanel
-from .icons import icons8_administrative_tools_50
+from .icons import icons8_administrative_tools
 from .mwindow import MWindow
 from .wxmribbon import RibbonEditor
 from .wxutils import StaticBoxSizer, TextCtrl
@@ -125,6 +127,7 @@ class PreferencesLanguagePanel(wx.Panel):
         lang = self.combo_language.GetSelection()
         if lang != -1 and self.context.app is not None:
             self.context.app.update_language(lang)
+            self.context.signal("restart")
 
 
 # end of class PreferencesLanguagePanel
@@ -525,11 +528,14 @@ class Preferences(MWindow):
         )
         self.panel_color.SetupScrolling()
 
+        self.panel_ribbon = RibbonEditor(self, wx.ID_ANY, context=self.context)
+
         self.notebook_main.AddPage(self.panel_main, _("General"))
         self.notebook_main.AddPage(self.panel_classification, _("Classification"))
         self.notebook_main.AddPage(self.panel_gui, _("GUI"))
         self.notebook_main.AddPage(self.panel_scene, _("Scene"))
         self.notebook_main.AddPage(self.panel_color, _("Colors"))
+        self.notebook_main.AddPage(self.panel_ribbon, _("Ribbon"))
 
         self.panels = [
             self.panel_main,
@@ -537,10 +543,9 @@ class Preferences(MWindow):
             self.panel_gui,
             self.panel_scene,
             self.panel_color,
+            self.panel_ribbon,
         ]
-        self.panel_ribbon = RibbonEditor(self, wx.ID_ANY, context=self.context)
-        self.notebook_main.AddPage(self.panel_ribbon, _("Ribbon"))
-        self.panels.append(self.panel_ribbon)
+        self.panel_ids = ["main", "classification", "gui", "scene", "color", "ribbon"]
         self.context.setting(bool, "developer_mode", False)
         if self.context.developer_mode:
             panel_space = ChoicePropertyPanel(
@@ -548,13 +553,23 @@ class Preferences(MWindow):
             )
             self.notebook_main.AddPage(panel_space, _("Coordinate Space"))
             self.panels.append(panel_space)
+            self.panel_ids.append("space")
         self.Layout()
 
         _icon = wx.NullIcon
-        _icon.CopyFromBitmap(icons8_administrative_tools_50.GetBitmap())
+        _icon.CopyFromBitmap(icons8_administrative_tools.GetBitmap())
         self.SetIcon(_icon)
         self.SetTitle(_("Preferences"))
 
+    @signal_listener("preferences")
+    def on_pref_signal(self, origin, *args):
+        if not args:
+            return
+        panel = args[0]
+        if panel and panel in self.panel_ids:
+            self.Show()
+            self.notebook_main.SetSelection(self.panel_ids.index(panel))
+
     @property
     def color_reset(self):
         # Not relevant
@@ -605,7 +620,7 @@ class Preferences(MWindow):
                 "button/config/Preferences",
                 {
                     "label": _("Preferences"),
-                    "icon": icons8_administrative_tools_50,
+                    "icon": icons8_administrative_tools,
                     "tip": _("Opens Preferences Window"),
                     "action": lambda v: kernel.console("window toggle Preferences\n"),
                 },

meerk40t/gui/propertypanels/attributes.py

@@ -2,8 +2,8 @@ from math import sqrt
 
 import wx
 
+import meerk40t.gui.icons as mkicons
 from meerk40t.core.units import Length
-from meerk40t.gui.icons import STD_ICON_SIZE, icons8_lock_50, icons8_padlock_50
 from meerk40t.gui.laserrender import swizzlecolor
 from meerk40t.gui.wxutils import CheckBox, StaticBoxSizer, TextCtrl, dip_size
 from meerk40t.svgelements import Color
@@ -248,6 +248,9 @@ class IdPanel(wx.Panel):
         self.sizer_label.Add(self.text_label, 1, wx.EXPAND, 0)
         sizer_id_label.Add(self.sizer_id, 1, wx.EXPAND, 0)
         sizer_id_label.Add(self.sizer_label, 1, wx.EXPAND, 0)
+        self.icon_display = wx.StaticBitmap(self, wx.ID_ANY)
+        self.icon_display.SetSize(wx.Size(mkicons.STD_ICON_SIZE, mkicons.STD_ICON_SIZE))
+        sizer_id_label.Add(self.icon_display, 0, wx.EXPAND, 0)
 
         main_sizer.Add(sizer_id_label, 0, wx.EXPAND, 0)
 
@@ -308,6 +311,48 @@ class IdPanel(wx.Panel):
             # Could happen if the propertypanel has been destroyed
             pass
 
+        bmp = None
+        type_patterns = {
+            "util wait": mkicons.icon_timer,
+            "util home": mkicons.icons8_home_filled,
+            "util goto": mkicons.icon_return,
+            "util output": mkicons.icon_external,
+            "util input": mkicons.icon_internal,
+            "util console": mkicons.icon_console,
+            "op engrave": mkicons.icons8_laserbeam_weak,
+            "op cut": mkicons.icons8_laser_beam,
+            "op image": mkicons.icons8_image,
+            "op raster": mkicons.icons8_direction,
+            "op dots": mkicons.icon_points,
+            "effect hatch": mkicons.icon_effect_hatch,
+            "effect wobble": mkicons.icon_effect_wobble,
+            "place current": mkicons.icons8_home_filled,
+            "place point": mkicons.icons8_home_filled,
+            "elem point": mkicons.icon_points,
+            "file": mkicons.icons8_file,
+            "group": mkicons.icons8_group_objects,
+            "elem rect": mkicons.icon_mk_rectangular,
+            "elem ellipse": mkicons.icon_mk_ellipse,
+            "elem image": mkicons.icons8_image,
+            "elem path": mkicons.icon_path,
+            "elem line": mkicons.icon_line,
+            "elem polyline": mkicons.icon_mk_polyline,
+            "elem text": mkicons.icon_bmap_text,
+            "blob": mkicons.icons8_file,
+        }
+        if hasattr(self.node, "type"):
+            if node.type in type_patterns:
+                icon = type_patterns[node.type]
+                bmp = icon.GetBitmap(resize=mkicons.STD_ICON_SIZE, buffer=2)
+        if bmp is None:
+            self.icon_display.Show(False)
+        else:
+            try:
+                self.icon_display.SetBitmap(bmp)
+                self.icon_display.Show(True)
+            except RuntimeError:
+                pass
+
         if vis1 or vis2:
             self.Show()
         else:
@@ -476,7 +521,7 @@ class StrokeWidthPanel(wx.Panel):
         s_sizer.Add(self.text_width, 1, wx.EXPAND, 0)
         s_sizer.Add(self.combo_units, 1, wx.EXPAND, 0)
         s_sizer.Add(self.chk_scale, 0, wx.ALIGN_CENTER_VERTICAL, 0)
-        self.Bind(wx.EVT_COMBOBOX, self.on_stroke_width, self.combo_units)
+        self.Bind(wx.EVT_COMBOBOX, self.on_stroke_width_combo, self.combo_units)
         self.Bind(wx.EVT_CHECKBOX, self.on_chk_scale, self.chk_scale)
         self.text_width.SetActionRoutine(self.on_stroke_width)
         self.SetSizer(main_sizer)
@@ -496,6 +541,9 @@ class StrokeWidthPanel(wx.Panel):
         except (ValueError, AttributeError):
             pass
 
+    def on_stroke_width_combo(self, event):
+        self.on_stroke_width()
+
     def on_stroke_width(self):
         if self.node is None or self.node.lock:
             return
@@ -636,11 +684,11 @@ class PositionSizePanel(wx.Panel):
         )
         self.btn_lock_ratio = wx.ToggleButton(self, wx.ID_ANY, "")
         self.btn_lock_ratio.SetValue(True)
-        self.bitmap_locked = icons8_lock_50.GetBitmap(
-            resize=STD_ICON_SIZE / 2, use_theme=False
+        self.bitmap_locked = mkicons.icons8_lock.GetBitmap(
+            resize=mkicons.STD_ICON_SIZE / 2, use_theme=False
         )
-        self.bitmap_unlocked = icons8_padlock_50.GetBitmap(
-            resize=STD_ICON_SIZE / 2, use_theme=False
+        self.bitmap_unlocked = mkicons.icons8_unlock.GetBitmap(
+            resize=mkicons.STD_ICON_SIZE / 2, use_theme=False
         )
         self.__set_properties()
         self.__do_layout()
@@ -967,11 +1015,11 @@ class RoundedRectPanel(wx.Panel):
         self.btn_lock_ratio.SetMinSize(dip_size(self, 32, 32))
         self.btn_lock_ratio.SetToolTip(_("Lock the radii of X- and Y-axis"))
         # Set Bitmap
-        self.bitmap_locked = icons8_lock_50.GetBitmap(
-            resize=STD_ICON_SIZE / 2, use_theme=False
+        self.bitmap_locked = mkicons.icons8_lock.GetBitmap(
+            resize=mkicons.STD_ICON_SIZE / 2, use_theme=False
         )
-        self.bitmap_unlocked = icons8_padlock_50.GetBitmap(
-            resize=STD_ICON_SIZE / 2, use_theme=False
+        self.bitmap_unlocked = mkicons.icons8_unlock.GetBitmap(
+            resize=mkicons.STD_ICON_SIZE / 2, use_theme=False
         )
 
         sizer_x.Add(self.slider_x, 1, wx.EXPAND, 0)
@@ -1008,16 +1056,16 @@ class RoundedRectPanel(wx.Panel):
             return
         # Set values for rx and ry
         bb = self.node.bbox()
-        width = self.node.shape.width
-        height = self.node.shape.height
-        if self.node.shape.rx is None:
+        width = self.node.width
+        height = self.node.height
+        if self.node.rx is None:
             rx = 0
         else:
-            rx = self.node.shape.rx
-        if self.node.shape.ry is None:
+            rx = self.node.rx
+        if self.node.ry is None:
             ry = 0
         else:
-            ry = self.node.shape.ry
+            ry = self.node.ry
         flag = bool(rx == ry)
         self.btn_lock_ratio.SetValue(flag)
         self.on_toggle_ratio(None)
@@ -1039,21 +1087,21 @@ class RoundedRectPanel(wx.Panel):
 
     def set_values(self, axis, value):
         sync = self.btn_lock_ratio.GetValue()
-        width = self.node.shape.width
-        height = self.node.shape.height
+        width = self.node.width
+        height = self.node.height
         if axis == 0:  # x
             rx = value / 100 * width
-            self.node.shape.rx = rx
+            self.node.rx = rx
             if sync:
-                self.node.shape.ry = rx
+                self.node.ry = rx
                 max_val_y = self.slider_x.GetMax()
                 int_ry = int(100.0 * rx / height)
                 self.slider_y.SetValue(min(max_val_y, int_ry))
         else:
             ry = value / 100 * height
-            self.node.shape.ry = ry
+            self.node.ry = ry
             if sync:
-                self.node.shape.rx = ry
+                self.node.rx = ry
                 max_val_x = self.slider_x.GetMax()
                 int_rx = int(100.0 * ry / width)
                 self.slider_x.SetValue(min(max_val_x, int_rx))

meerk40t/gui/propertypanels/blobproperty.py

@@ -3,7 +3,7 @@ import wx
 from meerk40t.gui.wxutils import ScrolledPanel
 
 from ...core.node.blobnode import BlobNode
-from ..icons import icons8_vector_50
+from ..icons import icons8_vector
 from ..mwindow import MWindow
 from .attributes import IdPanel
 
@@ -100,7 +100,7 @@ class BlobProperty(MWindow):
         self.panel = BlobPropertyPanel(self, wx.ID_ANY, context=self.context, node=node)
         self.add_module_delegate(self.panel)
         _icon = wx.NullIcon
-        _icon.CopyFromBitmap(icons8_vector_50.GetBitmap())
+        _icon.CopyFromBitmap(icons8_vector.GetBitmap())
         self.SetIcon(_icon)
         self.SetTitle(_("Blob Properties"))
 

meerk40t/gui/propertypanels/consoleproperty.py

@@ -1,6 +1,6 @@
 import wx
 
-from ..icons import icons8_comments_50
+from ..icons import icons8_comments
 from ..mwindow import MWindow
 
 _ = wx.GetTranslation
@@ -14,7 +14,7 @@ class ConsoleProperty(MWindow):
             self, wx.ID_ANY, context=self.context, node=node
         )
         _icon = wx.NullIcon
-        _icon.CopyFromBitmap(icons8_comments_50.GetBitmap())
+        _icon.CopyFromBitmap(icons8_comments.GetBitmap())
         self.SetIcon(_icon)
         self.SetTitle(_("Console Properties"))
         self.Children[0].SetFocus()

meerk40t/gui/propertypanels/groupproperties.py

@@ -6,7 +6,7 @@ import wx
 from meerk40t.gui.wxutils import ScrolledPanel
 
 # from ...svgelements import SVG_ATTR_ID
-from ..icons import icons8_group_objects_50
+from ..icons import icons8_group_objects
 from ..mwindow import MWindow
 from ..wxutils import StaticBoxSizer
 from .attributes import IdPanel
@@ -100,7 +100,7 @@ class GroupProperty(MWindow):
         )
         self.add_module_delegate(self.panel)
         _icon = wx.NullIcon
-        _icon.CopyFromBitmap(icons8_group_objects_50.GetBitmap())
+        _icon.CopyFromBitmap(icons8_group_objects.GetBitmap())
         self.SetIcon(_icon)
         self.SetTitle(_("Group Properties"))
 
@@ -203,7 +203,7 @@ class FileProperty(MWindow):
         )
         self.add_module_delegate(self.panel)
         _icon = wx.NullIcon
-        _icon.CopyFromBitmap(icons8_group_objects_50.GetBitmap())
+        _icon.CopyFromBitmap(icons8_group_objects.GetBitmap())
         self.SetIcon(_icon)
         self.SetTitle(_("File Properties"))
 

meerk40t/gui/propertypanels/hatchproperty.py

@@ -2,8 +2,8 @@ import wx
 
 from meerk40t.gui.wxutils import ScrolledPanel, StaticBoxSizer
 
-from ...core.units import Length
-from ...svgelements import Angle, Matrix
+from ...core.units import Angle, Length
+from ...svgelements import Matrix
 from ..wxutils import TextCtrl, set_ctrl_value
 from .attributes import ColorPanel, IdPanel
 
@@ -28,8 +28,6 @@ class HatchPropertyPanel(ScrolledPanel):
         # `Id` at top in all cases...
         panel_id = IdPanel(self, id=wx.ID_ANY, context=self.context, node=self.node)
         main_sizer.Add(panel_id, 1, wx.EXPAND, 0)
-        self.check_active = wx.CheckBox(self, wx.ID_ANY, _("Active"))
-        main_sizer.Add(self.check_active, 0, wx.EXPAND, 0)
 
         panel_stroke = ColorPanel(
             self,
@@ -135,7 +133,6 @@ class HatchPropertyPanel(ScrolledPanel):
         self.text_distance.SetActionRoutine(self.on_text_distance)
         self.text_angle.SetActionRoutine(self.on_text_angle)
         self.text_angle_delta.SetActionRoutine(self.on_text_angle_delta)
-        self.check_active.Bind(wx.EVT_CHECKBOX, self.on_check_active)
         self.check_classify.Bind(wx.EVT_CHECKBOX, self.on_check_classify)
         self.Bind(wx.EVT_COMMAND_SCROLL, self.on_slider_loops, self.slider_loops)
         self.Bind(wx.EVT_COMMAND_SCROLL, self.on_slider_angle, self.slider_angle)
@@ -193,23 +190,17 @@ class HatchPropertyPanel(ScrolledPanel):
         set_ctrl_value(self.text_angle_delta, str(self.node.hatch_angle_delta))
         set_ctrl_value(self.text_distance, str(self.node.hatch_distance))
         try:
-            h_angle = float(Angle.parse(self.node.hatch_angle).as_degrees)
+            h_angle = float(Angle(self.node.hatch_angle).degrees)
             self.slider_angle.SetValue(int(h_angle))
         except ValueError:
             pass
         try:
-            h_angle = float(Angle.parse(self.node.hatch_angle_delta).as_degrees)
+            h_angle = float(Angle(self.node.hatch_angle_delta).degrees)
             self.slider_angle_delta.SetValue(int(h_angle))
         except ValueError:
             pass
-        self.check_active.SetValue(self.node.effect)
         self.Show()
 
-    def on_check_active(self, event):
-        value = self.check_active.GetValue()
-        self.node.effect = value
-        self.context.signal("refresh_scene", "Scene")
-
     def on_check_classify(self, event):
         self.context._auto_classify = self.check_classify.GetValue()
 
@@ -223,7 +214,9 @@ class HatchPropertyPanel(ScrolledPanel):
         if self.check_classify.GetValue():
             mynode = self.node
             wasemph = self.node.emphasized
-            self.context("declassify\nclassify\n")
+            data = [self.node]
+            self.context.elements.remove_elements_from_operations(data)
+            self.context.elements.classify(data)
             self.context.elements.signal("tree_changed")
             self.context.elements.signal("element_property_update", self.node)
             mynode.emphasized = wasemph
@@ -268,7 +261,7 @@ class HatchPropertyPanel(ScrolledPanel):
 
     def on_text_angle(self):
         try:
-            angle = f"{Angle.parse(self.text_angle.GetValue()).as_degrees}deg"
+            angle = Angle(self.text_angle.GetValue()).angle_degrees
             if angle == self.node.hatch_angle:
                 return
             self.node.hatch_angle = angle
@@ -278,7 +271,7 @@ class HatchPropertyPanel(ScrolledPanel):
         except ValueError:
             return
         try:
-            h_angle = float(Angle.parse(self.node.angle).as_degrees)
+            h_angle = float(Angle(self.node.angle).degrees)
             while h_angle > self.slider_angle.GetMax():
                 h_angle -= 360
             while h_angle < self.slider_angle.GetMin():
@@ -297,7 +290,7 @@ class HatchPropertyPanel(ScrolledPanel):
 
     def on_text_angle_delta(self):
         try:
-            angle = f"{Angle.parse(self.text_angle_delta.GetValue()).as_degrees}deg"
+            angle = Angle(self.text_angle_delta.GetValue()).angle_degrees
             if angle == self.node.hatch_angle_delta:
                 return
             self.node.hatch_angle_delta = angle
@@ -306,7 +299,7 @@ class HatchPropertyPanel(ScrolledPanel):
         except ValueError:
             return
         try:
-            h_angle_delta = float(Angle.parse(self.node.delta).as_degrees)
+            h_angle_delta = float(Angle(self.node.delta).degrees)
             while h_angle_delta > self.slider_angle_delta.GetMax():
                 h_angle_delta -= 360
             while h_angle_delta < self.slider_angle_delta.GetMin():