More minor color tweaks - use mute colors for some buttons

Laserology · Oct 19, 2024 · 1de92a0 · 1de92a0
1 parent 1fab92b
commit 1de92a0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 25 deletions.
diff --git a/meerk40t/gui/laserpanel.py b/meerk40t/gui/laserpanel.py
@@ -177,7 +177,6 @@ def __init__(self, *args, context=None, **kwds):
         self.button_start.SetBackgroundColour(self.context.themes.get("start_bg"))
         self.button_start.SetForegroundColour(self.context.themes.get("start_fg"))
         self.button_start.SetFocusColour(self.context.themes.get("start_fg_focus"))
-        # self.button_start.SetDisabledBackgroundColour(wx.Colour("FOREST GREEN"))
 
         sizer_control.Add(self.button_start, 1, wx.EXPAND, 0)
 

diff --git a/meerk40t/gui/themes.py b/meerk40t/gui/themes.py
@@ -52,44 +52,31 @@ def load_system_default(self):
             wx.Colour(87, 87, 0) if self._dark else wx.Colour(200, 200, 0)
         )
         # wx.Colour("ORANGE") if self._dark else wx.Colour("YELLOW")
-        tp["pause_fg"] = (
-            wx.WHITE if self._dark else wx.BLACK
-        )
+        tp["pause_fg"] = wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOWTEXT)
         # Start Button
-        tp["start_bg"] = wx.Colour(0, 127, 0)
-        tp["start_fg"] = (
-            wx.Colour("DARK SLATE GREY") if self._dark else wx.WHITE
-        )
-        tp["start_bg_inactive"] = (
-            wx.Colour("DARK SLATE GREY") if self._dark else wx.Colour(0, 127, 0)
-        )
+        tp["start_bg"] = wx.Colour(150, 210, 148) # Mute green
+        tp["start_fg"] = wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOWTEXT)
+        tp["start_bg_inactive"] = wx.Colour(86, 146, 84)
         tp["start_fg_focus"] = wx.BLACK
 
         # Stop button
-        tp["stop_bg_inactive"] = wx.Colour("#7F0000")
-        tp["stop_bg"] = wx.Colour(127, 0, 0)  # red
+        tp["stop_bg_inactive"] = wx.Colour(145, 2, 0)
+        tp["stop_bg"] = wx.Colour(172, 29, 27)  # Casual red
         tp["stop_fg"] = (
             wx.WHITE if self._dark else wx.BLACK
         )
         tp["stop_fg_focus"] = (
             wx.BLACK if self._dark else wx.WHITE
         )
 
-        tp["arm_bg"] = wx.Colour(0, 127, 0)  # green
-        tp["arm_fg"] = (
-            wx.WHITE if self._dark else wx.BLACK
-        )
-        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 self._dark else wx.WHITE
-        )
+        tp["arm_bg"] = wx.Colour(172, 29, 27)  # Casual red
+        tp["arm_fg"] = wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOWTEXT)
+        tp["arm_bg_inactive"] = wx.Colour(145, 2, 0)
+        tp["arm_fg_focus"] = wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOW)
 
         if buggy_darwin:
             for key, item in tp.items():
                 if isinstance(item, wx.Colour):
                     # System default
                     tp[key] = None
-            tp["pause_fg"] = wx.Colour("BLACK")
+            tp["pause_fg"] = wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOWTEXT)