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

meerk40t/gui/spoolerpanel.py

@@ -1,3 +1,4 @@
+import threading
 import time
 from math import isinf, isnan
 from pathlib import Path
@@ -8,13 +9,14 @@ from wx import aui
 
 from meerk40t.gui.icons import (
     STD_ICON_SIZE,
-    icons8_emergency_stop_button_50,
-    icons8_pause_50,
-    icons8_route_50,
+    get_default_icon_size,
+    icons8_emergency_stop_button,
+    icons8_pause,
+    icons8_route,
 )
 from meerk40t.gui.mwindow import MWindow
 from meerk40t.gui.wxutils import HoverButton
-from meerk40t.kernel import get_safe_path, signal_listener
+from meerk40t.kernel import Job, get_safe_path, signal_listener
 
 _ = wx.GetTranslation
 
@@ -105,20 +107,24 @@ class SpoolerPanel(wx.Panel):
         self.combo_device.SetSelection(0)  # All by default...
         self.button_pause = wx.Button(self.win_top, wx.ID_ANY, _("Pause"))
         self.button_pause.SetToolTip(_("Pause/Resume the laser"))
-        self.button_pause.SetBitmap(icons8_pause_50.GetBitmap(resize=STD_ICON_SIZE / 2))
+        self.button_pause.SetBitmap(
+            icons8_pause.GetBitmap(resize=0.5 * get_default_icon_size())
+        )
         self.button_stop = HoverButton(self.win_top, wx.ID_ANY, _("Abort"))
         self.button_stop.SetToolTip(_("Stop the laser"))
         self.button_stop.SetBitmap(
-            icons8_emergency_stop_button_50.GetBitmap(
-                resize=STD_ICON_SIZE / 2, color=wx.WHITE, keepalpha=True
+            icons8_emergency_stop_button.GetBitmap(
+                resize=0.5 * get_default_icon_size(),
+                color=self.context.themes.get("stop_fg"),
+                keepalpha=True,
             )
         )
         self.button_stop.SetBitmapFocus(
-            icons8_emergency_stop_button_50.GetBitmap(resize=STD_ICON_SIZE / 2)
+            icons8_emergency_stop_button.GetBitmap(resize=0.5 * get_default_icon_size())
         )
-        self.button_stop.SetBackgroundColour(wx.Colour(127, 0, 0))
-        self.button_stop.SetForegroundColour(wx.WHITE)
-        self.button_stop.SetFocusColour(wx.BLACK)
+        self.button_stop.SetBackgroundColour(self.context.themes.get("stop_bg"))
+        self.button_stop.SetForegroundColour(self.context.themes.get("stop_fg"))
+        self.button_stop.SetFocusColour(self.context.themes.get("stop_fg_focus"))
 
         self.list_job_spool = wx.ListCtrl(
             self.win_top,
@@ -180,11 +186,24 @@ class SpoolerPanel(wx.Panel):
         self.set_pause_color()
         if self.context.spool_history_clear_on_start:
             self.clear_history()
+        # We set a timer job that will periodically check the spooler queue
+        # in case no signal was received
+        self.shown = False
+        self.update_lock = threading.Lock()
+        self.timerjob = Job(
+            process=self.update_queue,
+            job_name="spooler-update",
+            interval=5,
+            run_main=True,
+        )
 
     def __set_properties(self):
         # begin wxGlade: SpoolerPanel.__set_properties
         self.combo_device.SetToolTip(_("Select the device"))
         self.list_job_spool.SetToolTip(_("List and modify the queued operations"))
+        self.button_clear_history.SetToolTip(
+            _("Clear spooler history (right click for more options)")
+        )
         self.list_job_spool.AppendColumn(_("#"), format=wx.LIST_FORMAT_LEFT, width=58)
         self.list_job_spool.AppendColumn(
             _("Device"),
@@ -492,6 +511,13 @@ class SpoolerPanel(wx.Panel):
             return
 
         menu = wx.Menu()
+        item = menu.Append(
+            wx.ID_ANY,
+            f"{str(element)[:30]} [{spooler.context.label}]",
+            "",
+            wx.ITEM_NORMAL,
+        )
+        item.Enable(False)
         can_enable = False
         action = _("Remove")
         if element.status == "Running":
@@ -507,21 +533,46 @@ class SpoolerPanel(wx.Panel):
 
         item = menu.Append(
             wx.ID_ANY,
-            f"{action} {str(element)[:30]} [{spooler.context.label}]",
+            f"{action}",
             "",
             wx.ITEM_NORMAL,
         )
         info_tuple = [spooler, element, remove_mode]
         self.Bind(wx.EVT_MENU, self.on_menu_popup_delete(info_tuple), item)
+        # Are there more loops than just one?
+        if hasattr(element, "loops"):
+            # Still something to go?
+            if element.loops > 1 and element.loops_executed < element.loops:
+                item = menu.Append(
+                    wx.ID_ANY,
+                    _("Finish after this loop"),
+                    _(
+                        "Stop the current execution after the succesful execution of this loop"
+                    ),
+                    wx.ITEM_NORMAL,
+                )
+                info_tuple = [spooler, element]
+                self.Bind(wx.EVT_MENU, self.on_menu_popup_stop_loop(info_tuple), item)
+            if not isinf(element.loops):
+                item = menu.Append(
+                    wx.ID_ANY,
+                    _("add another loop"),
+                    _("add another loop to this job"),
+                    wx.ITEM_NORMAL,
+                )
+                info_tuple = [spooler, element]
+                self.Bind(wx.EVT_MENU, self.on_menu_popup_add_loop(info_tuple), item)
+
         if can_enable:
             item = menu.Append(
                 wx.ID_ANY,
-                f"{action2} {str(element)[:30]} [{spooler.context.label}]",
+                f"{action2}",
                 "",
                 wx.ITEM_NORMAL,
             )
             info_tuple = [spooler, element]
             self.Bind(wx.EVT_MENU, self.on_menu_popup_toggle_enable(info_tuple), item)
+        menu.AppendSeparator()
         item = menu.Append(wx.ID_ANY, _("Clear All"), "", wx.ITEM_NORMAL)
         self.Bind(wx.EVT_MENU, self.on_menu_popup_clear(element), item)
 
@@ -564,19 +615,52 @@ class SpoolerPanel(wx.Panel):
         return delete
 
     def on_menu_popup_toggle_enable(self, element):
-        def toggle(event=None):
+        def routine(event=None):
             spooler = element[0]
             job = element[1]
             job.enabled = not job.enabled
             self.refresh_spooler_list()
 
-        return toggle
+        return routine
+
+    # def on_menu_popup_next_placement(self, element):
+    #     def routine(event=None):
+    #         spooler = element[0]
+    #         job = element[1]
+    #         if hasattr(job, "jump_to_next"):
+    #             job.jump_to_next()
+    #         self.refresh_spooler_list()
+
+    #     return routine
+
+    def on_menu_popup_stop_loop(self, element):
+        def routine(event=None):
+            spooler = element[0]
+            job = element[1]
+            if hasattr(job, "stop_after_loop"):
+                job.stop_after_loop()
+            self.refresh_spooler_list()
+
+        return routine
+
+    def on_menu_popup_add_loop(self, element):
+        def routine(event=None):
+            spooler = element[0]
+            job = element[1]
+            if hasattr(job, "add_another_loop"):
+                job.add_another_loop()
+            self.refresh_spooler_list()
+
+        return routine
 
     def pane_show(self, *args):
+        self.shown = True
+        self.context.schedule(self.timerjob)
         self.refresh_spooler_list()
 
     def pane_hide(self, *args):
-        pass
+        self.context.unschedule(self.timerjob)
+        self.shown = False
 
     @staticmethod
     def _name_str(named_obj):
@@ -908,15 +992,18 @@ class SpoolerPanel(wx.Panel):
             self.list_job_history.SetItem(list_id, col_id, new_data)
 
     def set_pause_color(self):
-        new_color = None
+        new_bg_color = None
+        new_fg_color = None
         new_caption = _("Pause")
         try:
             if self.context.device.driver.paused:
-                new_color = wx.YELLOW
+                new_bg_color = self.context.themes.get("pause_bg")
+                new_fg_color = self.context.themes.get("pause_fg")
                 new_caption = _("Resume")
         except AttributeError:
             pass
-        self.button_pause.SetBackgroundColour(new_color)
+        self.button_pause.SetBackgroundColour(new_bg_color)
+        self.button_pause.SetForegroundColour(new_fg_color)
         self.button_pause.SetLabelText(new_caption)
 
     @signal_listener("pause")
@@ -958,11 +1045,19 @@ class SpoolerPanel(wx.Panel):
 
     @signal_listener("driver;position")
     @signal_listener("emulator;position")
-    def on_device_update(self, origin, pos):
-        # Only update every 2 seconds or so
-        dtime = time.time()
-        if dtime - self._last_invokation < 2:
+    @signal_listener("pipe;usb_status")
+    def on_device_update(self, origin, *args):
+        doit = True
+        with self.update_lock:
+            # Only update every 2 seconds or so
+            dtime = time.time()
+            if dtime - self._last_invokation < 2:
+                doit = False
+            else:
+                self._last_invokation = dtime
+        if not doit:
             return
+
         # Two things (at least) could go wrong:
         # 1) You are in the wrong queue, ie there's a job running in the background a
         #    that provides an update but the user has changed the device so a different
@@ -975,7 +1070,6 @@ class SpoolerPanel(wx.Panel):
             listctrl = self.list_job_spool
         except RuntimeError:
             return
-        self._last_invokation = dtime
         for list_id, entry in enumerate(self.queue_entries):
             spooler = entry[0]
             qindex = entry[1]
@@ -1040,6 +1134,10 @@ class SpoolerPanel(wx.Panel):
             self.refresh_spooler_list()
             self.refresh_history()
 
+    def update_queue(self):
+        if self.shown:
+            self.on_device_update(None)
+
 
 class JobSpooler(MWindow):
     def __init__(self, *args, **kwds):
@@ -1052,7 +1150,7 @@ class JobSpooler(MWindow):
         )
         self.add_module_delegate(self.panel)
         _icon = wx.NullIcon
-        _icon.CopyFromBitmap(icons8_route_50.GetBitmap())
+        _icon.CopyFromBitmap(icons8_route.GetBitmap())
         self.SetIcon(_icon)
         self.SetTitle(_("Job Spooler"))
         self.Layout()
@@ -1064,7 +1162,7 @@ class JobSpooler(MWindow):
             "button/control/Spooler",
             {
                 "label": _("Spooler"),
-                "icon": icons8_route_50,
+                "icon": icons8_route,
                 "tip": _("Opens Spooler Window"),
                 "action": lambda v: kernel.console("window toggle JobSpooler\n"),
                 "priority": -1,

meerk40t/gui/statusbarwidgets/defaultoperations.py

@@ -133,13 +133,13 @@ class DefaultOperationWidget(StatusBarWidget):
                 fontsize = 8
             elif len(opid) > 4:
                 fontsize = 6
-
+            # use_theme=False is needed as othewise colors will get reversed
             icon = EmptyIcon(
                 size=(self.iconsize, min(self.iconsize, self.height)),
                 color=wx.Colour(swizzlecolor(op.color)),
                 msg=opid,
                 ptsize=fontsize,
-            ).GetBitmap(noadjustment=True)
+            ).GetBitmap(noadjustment=True, use_theme=False)
             btn.SetBitmap(icon)
             op_label = op.label
             if op_label is None:
@@ -175,11 +175,13 @@ class DefaultOperationWidget(StatusBarWidget):
 
     def on_button_left(self, event):
         button = event.GetEventObject()
+        shift_pressed = event.ShiftDown()
+        # print (f"Shift: {event.ShiftDown()}, ctrl={event.ControlDown()}, alt={event.AltDown()}, bitmask={event.GetModifiers()}")
         idx = 0
         while idx < len(self.assign_buttons):
             if button is self.assign_buttons[idx]:
                 node = self.assign_operations[idx]
-                self.execute_on(node)
+                self.execute_on(node, shift_pressed)
                 break
             idx += 1
 
@@ -289,9 +291,19 @@ class DefaultOperationWidget(StatusBarWidget):
             self.first_to_show = 0
         self.Show(True)
 
-    def execute_on(self, targetop):
-        data = None  # == selected elements
-        self.context.elements.assign_default_operation(data, targetop)
+    def execute_on(self, targetop, use_parent):
+        targetdata = []
+        data = list(self.context.elements.elems(emphasized=True))
+        for node in data:
+            add_node = node
+            if use_parent:
+                if node.parent is not None and node.parent.type.startswith("effect"):
+                    add_node = node.parent
+            if add_node not in targetdata:
+                targetdata.append(add_node)
+
+        self.context.elements.assign_default_operation(targetdata, targetop)
+        self.context.elements.set_emphasis(data)
 
         self.reset_tooltips()
 

meerk40t/gui/statusbarwidgets/infowidget.py

@@ -8,7 +8,7 @@ from meerk40t.core.elements.element_types import elem_nodes
 from meerk40t.core.laserjob import LaserJob
 from meerk40t.core.node.node import Node
 from meerk40t.core.units import UNITS_PER_INCH, Length
-from meerk40t.gui.icons import icons8_up_50
+from meerk40t.gui.icons import icons8_up
 from meerk40t.gui.statusbarwidgets.statusbarwidget import StatusBarWidget
 from meerk40t.svgelements import Color
 
@@ -47,7 +47,7 @@ class SimpleInfoWidget(StatusBarWidget):
         self.btn_next = wx.StaticBitmap(
             self.parent,
             id=wx.ID_ANY,
-            bitmap=icons8_up_50.GetBitmap(resize=20),
+            bitmap=icons8_up.GetBitmap(resize=20),
             size=wx.Size(20, 20),
             style=wx.BORDER_RAISED,
         )

meerk40t/gui/statusbarwidgets/opassignwidget.py

@@ -2,12 +2,12 @@ import wx
 
 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.svgelements import Color
@@ -230,7 +230,7 @@ class OperationAssignWidget(StatusBarWidget):
             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,
@@ -238,7 +238,7 @@ class OperationAssignWidget(StatusBarWidget):
                 )
             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,
@@ -246,7 +246,7 @@ class OperationAssignWidget(StatusBarWidget):
                 )
             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,
@@ -254,7 +254,7 @@ class OperationAssignWidget(StatusBarWidget):
                 )
             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,
@@ -262,7 +262,7 @@ class OperationAssignWidget(StatusBarWidget):
                 )
             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,
@@ -284,7 +284,7 @@ class OperationAssignWidget(StatusBarWidget):
                 self.assign_buttons[myidx].SetBitmap(wx.NullBitmap)
             else:
                 self.assign_buttons[myidx].SetBitmap(image)
-                # self.assign_buttons[myidx].SetBitmapDisabled(icons8_padlock_50.GetBitmap(color=Color("Grey"), resize=(self.iconsize, self.iconsize), noadjustment=True, keepalpha=True))
+                # self.assign_buttons[myidx].SetBitmapDisabled(icons8_unlock.GetBitmap(color=Color("Grey"), resize=(self.iconsize, self.iconsize), noadjustment=True, keepalpha=True))
             self.assign_buttons[myidx].SetToolTip(
                 str(node)
                 + "\n"

meerk40t/gui/statusbarwidgets/shapepropwidget.py

@@ -1,14 +1,14 @@
 import wx
 
 from meerk40t.gui.icons import (
-    cap_butt_20,
-    cap_round_20,
-    cap_square_20,
-    fill_evenodd,
-    fill_nonzero,
-    join_bevel,
-    join_miter,
-    join_round,
+    icon_cap_butt,
+    icon_cap_round,
+    icon_cap_square,
+    icon_fill_evenodd,
+    icon_fill_nonzero,
+    icon_join_bevel,
+    icon_join_miter,
+    icon_join_round,
 )
 
 from .statusbarwidget import StatusBarWidget
@@ -38,7 +38,12 @@ class LinecapWidget(StatusBarWidget):
         self.btn_cap_butt = wx.StaticBitmap(
             self.parent, id=wx.ID_ANY, size=wx.Size(30, -1), style=wx.BORDER_RAISED
         )
-        self.btn_cap_butt.SetBitmap(cap_butt_20.GetBitmap(noadjustment=True))
+
+        self.btn_cap_butt.SetBitmap(
+            icon_cap_butt.GetBitmap(
+                resize=max(20, self.parent.available_height - 4), buffer=1
+            )
+        )
         self.btn_cap_butt.SetMaxSize(wx.Size(50, -1))
         self.btn_cap_butt.SetToolTip(_("Set the end of the lines to a butt-shape"))
         self.btn_cap_butt.Bind(wx.EVT_LEFT_DOWN, self.on_cap_butt)
@@ -46,7 +51,11 @@ class LinecapWidget(StatusBarWidget):
         self.btn_cap_round = wx.StaticBitmap(
             self.parent, id=wx.ID_ANY, size=wx.Size(30, -1), style=wx.BORDER_RAISED
         )
-        self.btn_cap_round.SetBitmap(cap_round_20.GetBitmap(noadjustment=True))
+        self.btn_cap_round.SetBitmap(
+            icon_cap_round.GetBitmap(
+                resize=max(20, self.parent.available_height - 4), buffer=1
+            )
+        )
         self.btn_cap_round.SetMaxSize(wx.Size(50, -1))
         self.btn_cap_round.SetToolTip(_("Set the end of the lines to a round-shape"))
         self.btn_cap_round.Bind(wx.EVT_LEFT_DOWN, self.on_cap_round)
@@ -54,7 +63,12 @@ class LinecapWidget(StatusBarWidget):
         self.btn_cap_square = wx.StaticBitmap(
             self.parent, id=wx.ID_ANY, size=wx.Size(30, -1), style=wx.BORDER_RAISED
         )
-        self.btn_cap_square.SetBitmap(cap_square_20.GetBitmap(noadjustment=True))
+
+        self.btn_cap_square.SetBitmap(
+            icon_cap_square.GetBitmap(
+                resize=max(20, self.parent.available_height - 4), buffer=1
+            )
+        )
         self.btn_cap_square.SetMaxSize(wx.Size(50, -1))
         self.btn_cap_square.SetToolTip(_("Set the end of the lines to a square-shape"))
         self.btn_cap_square.Bind(wx.EVT_LEFT_DOWN, self.on_cap_square)
@@ -101,7 +115,12 @@ class LinejoinWidget(StatusBarWidget):
         self.btn_join_bevel = wx.StaticBitmap(
             self.parent, id=wx.ID_ANY, size=wx.Size(25, -1), style=wx.BORDER_RAISED
         )
-        self.btn_join_bevel.SetBitmap(join_bevel.GetBitmap(noadjustment=True))
+
+        self.btn_join_bevel.SetBitmap(
+            icon_join_bevel.GetBitmap(
+                resize=max(20, self.parent.available_height - 4), buffer=1
+            )
+        )
         self.btn_join_bevel.SetMaxSize(wx.Size(50, -1))
         self.btn_join_bevel.SetToolTip(_("Set the join of the lines to a bevel-shape"))
         self.btn_join_bevel.Bind(wx.EVT_LEFT_DOWN, self.on_join_bevel)
@@ -109,7 +128,11 @@ class LinejoinWidget(StatusBarWidget):
         self.btn_join_round = wx.StaticBitmap(
             self.parent, id=wx.ID_ANY, size=wx.Size(25, -1), style=wx.BORDER_RAISED
         )
-        self.btn_join_round.SetBitmap(join_round.GetBitmap(noadjustment=True))
+        self.btn_join_round.SetBitmap(
+            icon_join_round.GetBitmap(
+                resize=max(20, self.parent.available_height - 4), buffer=1
+            )
+        )
         self.btn_join_round.SetMaxSize(wx.Size(50, -1))
         self.btn_join_round.SetToolTip(_("Set the join of lines to a round-shape"))
         self.btn_join_round.Bind(wx.EVT_LEFT_DOWN, self.on_join_round)
@@ -117,18 +140,22 @@ class LinejoinWidget(StatusBarWidget):
         self.btn_join_miter = wx.StaticBitmap(
             self.parent, id=wx.ID_ANY, size=wx.Size(25, -1), style=wx.BORDER_RAISED
         )
-        self.btn_join_miter.SetBitmap(join_miter.GetBitmap(noadjustment=True))
+        self.btn_join_miter.SetBitmap(
+            icon_join_miter.GetBitmap(
+                resize=max(20, self.parent.available_height - 4), buffer=1
+            )
+        )
         self.btn_join_miter.SetMaxSize(wx.Size(50, -1))
         self.btn_join_miter.SetToolTip(_("Set the join of lines to a miter-shape"))
         self.btn_join_miter.Bind(wx.EVT_LEFT_DOWN, self.on_join_miter)
 
         # self.btn_join_arcs = wx.StaticBitmap(self.parent, id=wx.ID_ANY, size=wx.Size(25, -1), style=wx.BORDER_RAISED)
-        # self.btn_join_arcs.SetBitmap(join_round.GetBitmap(noadjustment=True))
+        # self.btn_join_arcs.SetBitmap(icon_join_round.GetBitmap(noadjustment=True))
         # self.btn_join_arcs.SetToolTip(_("Set the join of lines to an arc-shape"))
         # self.btn_join_arcs.Bind(wx.EVT_LEFT_DOWN, self.on_join_arcs)
 
         # self.btn_join_miterclip = wx.StaticBitmap(self.parent, id=wx.ID_ANY, size=wx.Size(25, -1), style=wx.BORDER_RAISED)
-        # self.btn_join_miterclip.SetBitmap(join_miter.GetBitmap(noadjustment=True))
+        # self.btn_join_miterclip.SetBitmap(icon_join_miter.GetBitmap(noadjustment=True))
         # self.btn_join_miterclip.SetToolTip(_("Set the join of lines to a miter-clip-shape"))
         # self.btn_join_miterclip.Bind(wx.EVT_LEFT_DOWN, self.on_join_miterclip)
 
@@ -182,14 +209,14 @@ class FillruleWidget(StatusBarWidget):
             self.parent, id=wx.ID_ANY, size=wx.Size(30, -1), style=wx.BORDER_RAISED
         )
         self.btn_fill_nonzero.SetMaxSize(wx.Size(50, -1))
-        self.btn_fill_nonzero.SetBitmap(fill_nonzero.GetBitmap(noadjustment=True))
+        self.btn_fill_nonzero.SetBitmap(icon_fill_nonzero.GetBitmap(noadjustment=True))
         self.btn_fill_nonzero.SetToolTip(_("Set the fillstyle to non-zero (regular)"))
         self.btn_fill_nonzero.Bind(wx.EVT_LEFT_DOWN, self.on_fill_nonzero)
 
         self.btn_fill_evenodd = wx.StaticBitmap(
             self.parent, id=wx.ID_ANY, size=wx.Size(30, -1), style=wx.BORDER_RAISED
         )
-        self.btn_fill_evenodd.SetBitmap(fill_evenodd.GetBitmap(noadjustment=True))
+        self.btn_fill_evenodd.SetBitmap(icon_fill_evenodd.GetBitmap(noadjustment=True))
         self.btn_fill_evenodd.SetMaxSize(wx.Size(50, -1))
         self.btn_fill_evenodd.SetToolTip(
             _("Set the fillstyle to even-odd (alternating areas)")

meerk40t/gui/statusbarwidgets/statusbar.py

@@ -1,6 +1,6 @@
 import wx
 
-from meerk40t.gui.icons import icons8_next_page_20
+from meerk40t.gui.icons import icons8_circled_right
 
 
 class CustomStatusBar(wx.StatusBar):
@@ -32,12 +32,14 @@ class CustomStatusBar(wx.StatusBar):
             btn = wx.StaticBitmap(
                 self,
                 id=wx.ID_ANY,
-                bitmap=icons8_next_page_20.GetBitmap(noadjustment=True),
-                size=wx.Size(20, self.MinHeight),
+                bitmap=icons8_circled_right.GetBitmap(
+                    resize=max(20, self.available_height - 4), buffer=1
+                ),
+                size=wx.Size(self.available_height - 2, self.available_height - 2),
                 # style=wx.BORDER_RAISED,
             )
             # btn.SetBackgroundColour(wx.RED)
-            # btn.SetBitmap(icons8_next_page_20.GetBitmap(noadjustment=True, color=Color("red")))
+            # btn.SetBitmap(icons8_circled_right.GetBitmap(noadjustment=True, color=Color("red")))
             btn.Show(False)
             btn.Bind(wx.EVT_LEFT_DOWN, self.on_button_next)
             btn.Bind(wx.EVT_RIGHT_DOWN, self.on_button_prev)
@@ -49,6 +51,11 @@ class CustomStatusBar(wx.StatusBar):
         self.Reposition()
         self.startup = False
 
+    @property
+    def available_height(self):
+        sb_size = self.GetSize()
+        return sb_size[1]
+
     def Clear(self):
         """
         Resets all panels

meerk40t/gui/themes.py

@@ -0,0 +1,78 @@
+"""
+Basic Module to provide infmoration about the GUI
+"""
+import wx
+
+from meerk40t.kernel import Service
+
+
+class Themes(Service):
+    def __init__(self, kernel, index=None, *args, **kwargs):
+        Service.__init__(self, kernel, "themes" if index is None else f"themes{index}")
+        self.registered_themes = {
+            "system": self.load_system_default,
+        }
+        self._theme = None
+        self._dark = False
+        self._theme_properties = dict()
+        self.theme = "system"
+
+    @property
+    def dark(self):
+        return self._dark
+
+    @property
+    def theme(self):
+        return self._theme
+
+    @theme.setter
+    def theme(self, new_theme):
+        if new_theme in self.registered_themes:
+            self._theme = new_theme
+            self.registered_themes[new_theme]()
+
+    def get(self, property_value):
+        if property_value in self._theme_properties:
+            return self._theme_properties[property_value]
+        # property not found
+        return None
+
+    def load_system_default(self):
+        self._theme = "system"
+        self._dark = wx.SystemSettings().GetColour(wx.SYS_COLOUR_WINDOW)[0] < 127
+        from platform import system
+
+        buggy_darwin = bool(system() == "Darwin" and not self._dark)
+
+        self._theme_properties = dict()
+        tp = self._theme_properties
+        # Just a scaffold, will be extended later
+        # tp["button"] = wx.Button
+        tp["pause_bg"] = wx.Colour(200, 200, 0)
+        # wx.Colour("ORANGE") if self._dark else wx.Colour("YELLOW")
+        tp["pause_fg"] = wx.Colour("WHITE") if self._dark else wx.Colour("BLACK")
+        # Start Button
+        tp["start_bg"] = wx.Colour(0, 127, 0)
+        tp["start_fg"] = wx.Colour("WHITE")
+        tp["start_bg_inactive"] = (
+            wx.Colour("DARK SLATE GREY") if self._dark else wx.Colour(0, 127, 0)
+        )
+        tp["start_fg_focus"] = wx.BLACK
+        # Stop button
+        tp["stop_bg"] = wx.Colour(127, 0, 0)  # red
+        tp["stop_fg"] = wx.Colour("WHITE")
+        tp["stop_fg_focus"] = wx.BLACK
+
+        tp["arm_bg"] = wx.Colour(0, 127, 0)  # green
+        tp["arm_fg"] = wx.WHITE
+        tp["arm_bg_inactive"] = (
+            # wx.Colour("MAROON") if self._dark else wx.Colour("PALE_GREEN")
+            wx.Colour(127, 0, 0)
+        )
+        tp["arm_fg_focus"] = wx.BLACK
+
+        if buggy_darwin:
+            for key, item in tp.items():
+                if isinstance(item, wx.Colour):
+                    # System default
+                    tp[key] = None