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

meerk40t/gui/wordlisteditor.py

@@ -7,13 +7,14 @@ from wx import aui
 from ..kernel import signal_listener
 from .icons import (
     STD_ICON_SIZE,
-    icons8_add_new_25,
-    icons8_circled_left_50,
-    icons8_circled_right_50,
-    icons8_curly_brackets_50,
-    icons8_edit_25,
-    icons8_paste_25,
-    icons8_remove_25,
+    get_default_icon_size,
+    icon_add_new,
+    icon_edit,
+    icon_trash,
+    icons8_circled_left,
+    icons8_circled_right,
+    icons8_curly_brackets,
+    icons8_paste,
 )
 from .mwindow import MWindow
 from .wxutils import StaticBoxSizer, dip_size
@@ -47,13 +48,13 @@ class WordlistMiniPanel(wx.Panel):
         main_sizer = wx.BoxSizer(wx.HORIZONTAL)
         self.button_edit = wx.Button(self, wx.ID_ANY, _("Edit"))
         self.button_edit.SetBitmap(
-            icons8_curly_brackets_50.GetBitmap(resize=STD_ICON_SIZE / 2)
+            icons8_curly_brackets.GetBitmap(resize=0.5 * get_default_icon_size())
         )
         self.button_edit.SetToolTip(_("Manages Wordlist-Entries"))
 
         self.button_next = wx.Button(self, wx.ID_ANY, _("Next"))
         self.button_next.SetBitmap(
-            icons8_circled_right_50.GetBitmap(resize=STD_ICON_SIZE / 2)
+            icons8_circled_right.GetBitmap(resize=0.5 * get_default_icon_size())
         )
         self.button_next.SetToolTip(
             _("Wordlist: go to next page (right-click to next entry)")
@@ -61,7 +62,7 @@ class WordlistMiniPanel(wx.Panel):
 
         self.button_prev = wx.Button(self, wx.ID_ANY, _("Prev"))
         self.button_prev.SetBitmap(
-            icons8_circled_left_50.GetBitmap(resize=STD_ICON_SIZE / 2)
+            icons8_circled_left.GetBitmap(resize=0.5 * get_default_icon_size())
         )
         self.button_prev.SetToolTip(
             _("Wordlist: go to previous page (right-click to previous entry)")
@@ -196,6 +197,8 @@ class WordlistPanel(wx.Panel):
         sizer_index_left.Add(
             sizer_edit_wordlist_buttons, 0, wx.ALIGN_CENTER_VERTICAL, 0
         )
+        testsize = dip_size(self, 22, 22)
+        icon_size = testsize[0]
 
         self.btn_edit_wordlist_del = wx.StaticBitmap(
             self, wx.ID_ANY, size=dip_size(self, 25, 25)
@@ -215,12 +218,24 @@ class WordlistPanel(wx.Panel):
         self.btn_edit_content_paste = wx.StaticBitmap(
             self, wx.ID_ANY, size=dip_size(self, 25, 25)
         )
-        self.btn_edit_wordlist_del.SetBitmap(icons8_remove_25.GetBitmap())
-        self.btn_edit_wordlist_edit.SetBitmap(icons8_edit_25.GetBitmap())
-        self.btn_edit_content_add.SetBitmap(icons8_add_new_25.GetBitmap())
-        self.btn_edit_content_del.SetBitmap(icons8_remove_25.GetBitmap())
-        self.btn_edit_content_edit.SetBitmap(icons8_edit_25.GetBitmap())
-        self.btn_edit_content_paste.SetBitmap(icons8_paste_25.GetBitmap())
+        self.btn_edit_wordlist_del.SetBitmap(
+            icon_trash.GetBitmap(resize=icon_size, buffer=1)
+        )
+        self.btn_edit_wordlist_edit.SetBitmap(
+            icon_edit.GetBitmap(resize=icon_size, buffer=1)
+        )
+        self.btn_edit_content_add.SetBitmap(
+            icon_add_new.GetBitmap(resize=icon_size, buffer=1)
+        )
+        self.btn_edit_content_del.SetBitmap(
+            icon_trash.GetBitmap(resize=icon_size, buffer=1)
+        )
+        self.btn_edit_content_edit.SetBitmap(
+            icon_edit.GetBitmap(resize=icon_size, buffer=1)
+        )
+        self.btn_edit_content_paste.SetBitmap(
+            icons8_paste.GetBitmap(resize=icon_size, buffer=1)
+        )
 
         self.btn_edit_wordlist_del.SetToolTip(_("Delete the current variable"))
         self.btn_edit_wordlist_edit.SetToolTip(
@@ -854,7 +869,7 @@ class WordlistEditor(MWindow):
         self.panel_about.set_parent(self)
 
         _icon = wx.NullIcon
-        _icon.CopyFromBitmap(icons8_curly_brackets_50.GetBitmap())
+        _icon.CopyFromBitmap(icons8_curly_brackets.GetBitmap())
         self.SetIcon(_icon)
         self.notebook_main = wx.aui.AuiNotebook(
             self,
@@ -892,7 +907,7 @@ class WordlistEditor(MWindow):
             "button/config/Wordlist",
             {
                 "label": _("Wordlist Editor"),
-                "icon": icons8_curly_brackets_50,
+                "icon": icons8_curly_brackets,
                 "tip": _("Manages Wordlist-Entries"),
                 "action": lambda v: kernel.console("window toggle Wordlist\n"),
             },

meerk40t/gui/wxmeerk40t.py

@@ -20,6 +20,7 @@ from meerk40t.gui.navigationpanels import Navigation
 from meerk40t.gui.spoolerpanel import JobSpooler
 from meerk40t.gui.wxmscene import SceneWindow
 from meerk40t.kernel import CommandSyntaxError, ConsoleFunction, Module, get_safe_path
+from meerk40t.kernel.kernel import Job
 
 from ..main import APPLICATION_NAME, APPLICATION_VERSION
 from ..tools.kerftest import KerfTool
@@ -35,10 +36,11 @@ from .hersheymanager import (
     register_hershey_stuff,
 )
 from .icons import (
-    icons8_emergency_stop_button_50,
-    icons8_gas_industry_50,
-    icons8_home_filled_50,
-    icons8_pause_50,
+    DARKMODE,
+    icons8_emergency_stop_button,
+    icons8_gas_industry,
+    icons8_home_filled,
+    icons8_pause,
 )
 from .imagesplitter import RenderSplit
 from .keymap import Keymap
@@ -75,6 +77,7 @@ from .propertypanels.rasterwizardpanels import (
 )
 from .propertypanels.textproperty import TextPropertyPanel
 from .propertypanels.waitproperty import WaitPropertyPanel
+from .propertypanels.wobbleproperty import WobblePropertyPanel
 from .simpleui import SimpleUI
 from .simulation import Simulation
 from .wordlisteditor import WordlistEditor
@@ -95,28 +98,103 @@ The Transformations work in Windows/OSX/Linux for wxPython 4.0+ (and likely befo
 _ = wx.GetTranslation
 
 
-class GoPanel(wx.Panel):
-    def __init__(self, *args, context=None, **kwds):
-        # begin wxGlade: PassesPanel.__init__
+class ActionPanel(wx.Panel):
+    def __init__(
+        self,
+        *args,
+        context=None,
+        action=None,
+        action_right=None,
+        fgcolor=None,
+        bgcolor=None,
+        icon=None,
+        tooltip="",
+        **kwds,
+    ):
         kwds["style"] = kwds.get("style", 0)
         wx.Panel.__init__(self, *args, **kwds)
-        self.click_time = 0
+
         self.context = context
-        self.button_go = wx.BitmapButton(self, wx.ID_ANY)
-        self.button_go.SetBitmap(
-            icons8_gas_industry_50.GetBitmap(color=wx.WHITE, keepalpha=True)
-        )
-        self.button_go.SetBitmapFocus(icons8_gas_industry_50.GetBitmap())
-        self.was_mouse = False
-        self.button_go.Bind(wx.EVT_BUTTON, self.on_button_go_click)
-        self.button_go.Bind(wx.EVT_LEFT_DOWN, self.on_mouse_down)
-        self.button_go.SetBackgroundColour(wx.Colour(0, 127, 0))
-        self.button_go.SetToolTip(_("One Touch: Send Job To Laser "))
+        self.button_go = wx.Button(self, wx.ID_ANY)
+        self.icon = icon
+        self.fgcolor = fgcolor
+        if bgcolor is not None:
+            self.button_go.SetBackgroundColour(bgcolor)
+        self.button_go.SetToolTip(tooltip)
+        # self.button_go.SetBitmapMargins(0, 0)
+        self.action = action
+        self.action_right = action_right
 
         main_sizer = wx.BoxSizer(wx.HORIZONTAL)
         main_sizer.Add(self.button_go, 1, wx.EXPAND, 0)
         self.SetSizer(main_sizer)
         main_sizer.Fit(self)
+        self.button_go.Bind(wx.EVT_BUTTON, self.on_button_go_click)
+        if self.action_right is not None:
+            self.button_go.Bind(wx.EVT_RIGHT_DOWN, self.on_button_go_click_right)
+
+        self.button_go.Bind(wx.EVT_SIZE, self.on_button_resize)
+        # Initial resize
+        self.resize_button()
+        self.resize_job = Job(
+            process=self.resize_button,
+            job_name=f"_resize_actionpanel_{self.Id}",
+            interval=0.1,
+            times=1,
+            run_main=True,
+        )
+
+    def on_button_go_click(self, event):
+        if self.action is not None:
+            self.action()
+
+    def on_button_go_click_right(self, event):
+        if self.action_right is not None:
+            self.action_right()
+
+    def resize_button(self):
+        size = self.button_go.Size
+        minsize = min(size[0], size[1])
+        # Leave some room at the edges,
+        # for every 25 pixel 1 pixel at each side
+        room = int(minsize / 25) * 2
+        best_size = minsize - room
+        # At least 20 px high
+        best_size = max(best_size, 20)
+        border = 2
+        bmp = self.icon.GetBitmap(color=self.fgcolor, resize=best_size, buffer=border)
+        # s = bmp.Size
+        # print(f"Was asking for {best_size}x{best_size}, got {s[0]}x{s[1]}")
+        self.button_go.SetBitmap(bmp)
+        bmp = self.icon.GetBitmap(resize=best_size, buffer=border)
+        self.button_go.SetBitmapFocus(bmp)
+
+    def on_button_resize(self, event):
+        self.context.schedule(self.resize_job)
+        event.Skip()
+
+
+class GoPanel(ActionPanel):
+    def __init__(self, *args, context=None, **kwds):
+        # begin wxGlade: PassesPanel.__init__
+        kwds["style"] = kwds.get("style", 0)
+        fgcol = context.themes.get("start_fg")
+        bgcol = context.themes.get("start_bg")
+        ActionPanel.__init__(
+            self,
+            context=context,
+            action=None,
+            fgcolor=fgcol,
+            bgcolor=bgcol,
+            icon=icons8_gas_industry,
+            tooltip=_("One Touch: Send Job To Laser "),
+            *args,
+            **kwds,
+        )
+        self.click_time = 0
+        self.was_mouse = False
+        self.button_go.Bind(wx.EVT_BUTTON, self.on_button_go_click)
+        self.button_go.Bind(wx.EVT_LEFT_DOWN, self.on_mouse_down)
 
     def on_mouse_down(self, event):
         self.was_mouse = True
@@ -175,19 +253,9 @@ def register_panel_go(window, context):
 
 def register_panel_stop(window, context):
     # Define Stop.
-    stop = wx.BitmapButton(window, wx.ID_ANY)
-    window.Bind(
-        wx.EVT_BUTTON,
-        ConsoleFunction(context, "estop\n"),
-        stop,
-    )
-    stop.SetBackgroundColour(wx.Colour(127, 0, 0))
-    stop.SetBitmap(
-        icons8_emergency_stop_button_50.GetBitmap(color=wx.WHITE, keepalpha=True)
-    )
-    stop.SetBitmapFocus(icons8_emergency_stop_button_50.GetBitmap())
-    stop.SetToolTip(_("Emergency stop/reset the controller."))
-    stop.SetSize(stop.GetBestSize())
+    def action():
+        context("estop\n")
+
     pane = (
         aui.AuiPaneInfo()
         .Bottom()
@@ -200,17 +268,31 @@ def register_panel_stop(window, context):
     )
     pane.submenu = "_10_" + _("Laser")
     pane.dock_proportion = 98
-    pane.control = stop
-
+    fgcol = context.themes.get("stop_fg")
+    bgcol = context.themes.get("stop_bg")
+    panel = ActionPanel(
+        window,
+        wx.ID_ANY,
+        context=context,
+        action=action,
+        fgcolor=fgcol,
+        bgcolor=bgcol,
+        icon=icons8_emergency_stop_button,
+        tooltip=_("Emergency stop/reset the controller."),
+    )
+    pane.control = panel
     window.on_pane_create(pane)
     context.register("pane/stop", pane)
 
 
 def register_panel_home(window, context):
     # Define Home.
-    home = wx.BitmapButton(window, wx.ID_ANY, icons8_home_filled_50.GetBitmap())
-    # home.SetBackgroundColour((200, 225, 250))
-    window.Bind(wx.EVT_BUTTON, lambda e: context("home\n"), home)
+    def action():
+        context("home\n")
+
+    def action_right():
+        context("physical_home\n")
+
     pane = (
         aui.AuiPaneInfo()
         .Bottom()
@@ -223,35 +305,30 @@ def register_panel_home(window, context):
     )
     pane.submenu = "_10_" + _("Laser")
     pane.dock_proportion = 98
-    pane.control = home
+
+    fgcol = None
+    bgcol = None
+    panel = ActionPanel(
+        window,
+        wx.ID_ANY,
+        context=context,
+        action=action,
+        action_right=action_right,
+        fgcolor=fgcol,
+        bgcolor=bgcol,
+        icon=icons8_home_filled,
+        tooltip=_("Send laser to home position"),
+    )
+    pane.control = panel
     window.on_pane_create(pane)
     context.register("pane/home", pane)
 
 
 def register_panel_pause(window, context):
     # Define Pause.
-    pause = wx.BitmapButton(
-        window, wx.ID_ANY, icons8_pause_50.GetBitmap(use_theme=False)
-    )
-
-    def on_pause_button(event=None):
-        try:
-            context("pause\n")
-            # if self.pipe_state != 3:
-            #     pause.SetBitmap(icons8_play_50.GetBitmap())
-            # else:
-            # pause.SetBitmap(icons8_pause_50.GetBitmap(use_theme=False))
-        except AttributeError:
-            pass
+    def action():
+        context("pause\n")
 
-    window.Bind(
-        wx.EVT_BUTTON,
-        on_pause_button,
-        pause,
-    )
-    pause.SetBackgroundColour(wx.Colour(255, 255, 0))
-    pause.SetToolTip(_("Pause/Resume the controller"))
-    pause.SetSize(pause.GetBestSize())
     pane = (
         aui.AuiPaneInfo()
         .Caption(_("Pause"))
@@ -264,8 +341,20 @@ def register_panel_pause(window, context):
     )
     pane.submenu = "_10_" + _("Laser")
     pane.dock_proportion = 98
-    pane.control = pause
 
+    bgcol = context.themes.get("pause_bg")
+    fgcol = None
+    panel = ActionPanel(
+        window,
+        wx.ID_ANY,
+        context=context,
+        action=action,
+        fgcolor=fgcol,
+        bgcolor=bgcol,
+        icon=icons8_pause,
+        tooltip=_("Pause/Resume the controller"),
+    )
+    pane.control = panel
     window.on_pane_create(pane)
     context.register("pane/pause", pane)
 
@@ -303,10 +392,9 @@ class wxMeerK40t(wx.App, Module):
         # Is this a Windows machine? If yes:
         # Turn on high-DPI awareness to make sure rendering is sharp on big
         # monitors with font scaling enabled.
-        from platform import system
 
         high_dpi = context.setting(bool, "high_dpi", True)
-        if system() == "Windows" and high_dpi:
+        if platform.system() == "Windows" and high_dpi:
             try:
                 # https://discuss.wxpython.org/t/support-for-high-dpi-on-windows-10/32925
                 from ctypes import OleDLL
@@ -325,8 +413,12 @@ class wxMeerK40t(wx.App, Module):
         self.Bind(wx.EVT_TIMER, context._kernel.scheduler_main, self.timer)
         context._kernel.scheduler_handles_main_thread_jobs = False
         self.timer.Start(50)
-
-        icons.DARKMODE = 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
+        icons.DARKMODE = res
         icons.icon_r = 230
         icons.icon_g = 230
         icons.icon_b = 230
@@ -714,6 +806,7 @@ class wxMeerK40t(wx.App, Module):
         kernel.register("property/PolylineNode/PathProperty", PathPropertyPanel)
         kernel.register("property/RectNode/PathProperty", PathPropertyPanel)
         kernel.register("property/HatchEffectNode/HatchProperty", HatchPropertyPanel)
+        kernel.register("property/WobbleEffectNode/WobbleProperty", WobblePropertyPanel)
         kernel.register("property/PointNode/PointProperty", PointPropertyPanel)
         kernel.register("property/TextNode/TextProperty", TextPropertyPanel)
         kernel.register("property/BlobNode/BlobProperty", BlobPropertyPanel)
@@ -810,10 +903,17 @@ class wxMeerK40t(wx.App, Module):
         context = kernel.root
 
         context.setting(bool, "developer_mode", False)
-        # if context.developer_mode:
-        #     from meerk40t.gui.mkdebug import register_panel_debugger
+        context.setting(bool, "debug_mode", False)
+        if context.debug_mode:
+            from meerk40t.gui.mkdebug import (
+                register_panel_color,
+                register_panel_debugger,
+                register_panel_icon,
+            )
 
-        #     kernel.register("wxpane/debug_tree", register_panel_debugger)
+            kernel.register("wxpane/debug_tree", register_panel_debugger)
+            kernel.register("wxpane/debug_color", register_panel_color)
+            kernel.register("wxpane/debug_icons", register_panel_icon)
 
         @context.console_argument("sure", type=str, help="Are you sure? 'yes'?")
         @context.console_command("nuke_settings", hidden=True)