From 427dac519bb9ceadf03012ccca44c012b7990b36 Mon Sep 17 00:00:00 2001
From: Kaalleen <36401965+kaalleen@users.noreply.github.com>
Date: Fri, 8 Sep 2023 17:03:33 +0200
Subject: [PATCH] Fix Param Simulator (win/mac) (#2507)

* add pause icon

* fix params simulator for mac
---
 icons/pause.png      | Bin 8 -> 2447 bytes
 icons/pause.svg      |  56 +++++++++++++++++++++++++++++++++++++++++++
 lib/gui/simulator.py |  18 +++++++-------
 3 files changed, 65 insertions(+), 9 deletions(-)
 mode change 120000 => 100644 icons/pause.png
 create mode 100644 icons/pause.svg

diff --git a/icons/pause.png b/icons/pause.png
deleted file mode 120000
index 6222e6f71..000000000
--- a/icons/pause.png
+++ /dev/null
@@ -1 +0,0 @@
-stop.png
\ No newline at end of file
diff --git a/icons/pause.png b/icons/pause.png
new file mode 100644
index 0000000000000000000000000000000000000000..39b55f3b2010cddec35d383867e2d250c6bc3174
GIT binary patch
literal 2447
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

literal 0
HcmV?d00001

diff --git a/icons/pause.svg b/icons/pause.svg
new file mode 100644
index 000000000..eec61f249
--- /dev/null
+++ b/icons/pause.svg
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="256"
+   height="256"
+   viewBox="0 0 256 256"
+   id="svg8375"
+   version="1.1"
+   inkscape:version="1.3 (0e150ed6c4, 2023-07-21)"
+   sodipodi:docname="pause.svg"
+   xml:space="preserve"
+   inkscape:export-filename="pause.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><defs
+     id="defs8377" /><sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.3991985"
+     inkscape:cx="133.29059"
+     inkscape:cy="120.42609"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="mm"
+     inkscape:window-width="1920"
+     inkscape:window-height="1011"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:showpageshadow="2"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1" /><metadata
+     id="metadata8380"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"><path
+       id="path1"
+       style="opacity:1;fill:#000000;fill-opacity:0.97692001;fill-rule:evenodd;stroke:none;stroke-width:0.377953;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       d="m 75.675755,39.52655 h 19.06887 c 11.080005,0 20.000005,8.92 20.000005,20 v 139.35948 c 0,11.08 -8.92,20 -20.000005,20 h -19.06887 c -11.08,0 -20,-8.92 -20,-20 V 59.52655 c 0,-11.08 8.92,-20 20,-20 z" /><path
+       id="path2"
+       style="opacity:1;fill:#000000;fill-opacity:0.97692001;fill-rule:evenodd;stroke:none;stroke-width:0.377953;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       d="m 165.10513,39.52655 h 19.06888 c 11.08,0 20,8.92 20,20 v 139.35948 c 0,11.08 -8.92,20 -20,20 h -19.06888 c -11.08,0 -20,-8.92 -20,-20 V 59.52655 c 0,-11.08 8.92,-20 20,-20 z" /></g></svg>
diff --git a/lib/gui/simulator.py b/lib/gui/simulator.py
index 963acd451..e1357432c 100644
--- a/lib/gui/simulator.py
+++ b/lib/gui/simulator.py
@@ -76,20 +76,20 @@ class ControlPanel(wx.Panel):
         self.btnForwardCommand.Bind(wx.EVT_BUTTON, self.animation_one_command_forward)
         self.btnForwardCommand.SetBitmap(self.load_icon('forward_command'))
         self.btnForwardCommand.SetToolTip(_('Go forward one command (page-up)'))
-        self.btnForward = wx.ToggleButton(self, -1, style=self.button_style)
+        self.btnForward = wx.BitmapToggleButton(self, -1, style=self.button_style)
         self.btnForward.SetValue(True)
         self.btnForward.Bind(wx.EVT_TOGGLEBUTTON, self.on_forward_button)
         self.btnForward.SetBitmap(self.load_icon('forward'))
         self.btnForward.SetToolTip(_('Animate forward (arrow right)'))
-        self.btnReverse = wx.ToggleButton(self, -1, style=self.button_style)
+        self.btnReverse = wx.BitmapToggleButton(self, -1, style=self.button_style)
         self.btnReverse.Bind(wx.EVT_TOGGLEBUTTON, self.on_reverse_button)
         self.btnReverse.SetBitmap(self.load_icon('reverse'))
         self.btnReverse.SetToolTip(_('Animate in reverse (arrow right)'))
-        self.btnPlay = wx.ToggleButton(self, -1, style=self.button_style)
+        self.btnPlay = wx.BitmapToggleButton(self, -1, style=self.button_style)
         self.btnPlay.Bind(wx.EVT_TOGGLEBUTTON, self.on_play_button)
         self.btnPlay.SetBitmap(self.load_icon('play'))
         self.btnPlay.SetToolTip(_('Play (P)'))
-        self.btnPause = wx.ToggleButton(self, -1, style=self.button_style)
+        self.btnPause = wx.BitmapToggleButton(self, -1, style=self.button_style)
         self.btnPause.Bind(wx.EVT_TOGGLEBUTTON, self.on_pause_button)
         self.btnPause.SetBitmap(self.load_icon('pause'))
         self.btnPause.SetToolTip(_('Pause (P)'))
@@ -97,7 +97,7 @@ class ControlPanel(wx.Panel):
         self.btnRestart.Bind(wx.EVT_BUTTON, self.animation_restart)
         self.btnRestart.SetBitmap(self.load_icon('restart'))
         self.btnRestart.SetToolTip(_('Restart (R)'))
-        self.btnNpp = wx.ToggleButton(self, -1, style=self.button_style)
+        self.btnNpp = wx.BitmapToggleButton(self, -1, style=self.button_style)
         self.btnNpp.Bind(wx.EVT_TOGGLEBUTTON, self.toggle_npp)
         self.btnNpp.SetBitmap(self.load_icon('npp'))
         self.btnNpp.SetToolTip(_('Display needle penetration point (O)'))
@@ -109,19 +109,19 @@ class ControlPanel(wx.Panel):
         self.stitchBox.Bind(wx.EVT_TEXT_ENTER, self.on_stitch_box_focusout)
         self.stitchBox.Bind(wx.EVT_KILL_FOCUS, self.on_stitch_box_focusout)
         self.Bind(wx.EVT_LEFT_DOWN, self.on_stitch_box_focusout)
-        self.btnJump = wx.ToggleButton(self, -1, style=self.button_style)
+        self.btnJump = wx.BitmapToggleButton(self, -1, style=self.button_style)
         self.btnJump.SetToolTip(_('Show jump stitches'))
         self.btnJump.SetBitmap(self.load_icon('jump'))
         self.btnJump.Bind(wx.EVT_TOGGLEBUTTON, lambda event: self.on_marker_button('jump', event))
-        self.btnTrim = wx.ToggleButton(self, -1, style=self.button_style)
+        self.btnTrim = wx.BitmapToggleButton(self, -1, style=self.button_style)
         self.btnTrim.SetToolTip(_('Show trims'))
         self.btnTrim.SetBitmap(self.load_icon('trim'))
         self.btnTrim.Bind(wx.EVT_TOGGLEBUTTON, lambda event: self.on_marker_button('trim', event))
-        self.btnStop = wx.ToggleButton(self, -1, style=self.button_style)
+        self.btnStop = wx.BitmapToggleButton(self, -1, style=self.button_style)
         self.btnStop.SetToolTip(_('Show stops'))
         self.btnStop.SetBitmap(self.load_icon('stop'))
         self.btnStop.Bind(wx.EVT_TOGGLEBUTTON, lambda event: self.on_marker_button('stop', event))
-        self.btnColorChange = wx.ToggleButton(self, -1, style=self.button_style)
+        self.btnColorChange = wx.BitmapToggleButton(self, -1, style=self.button_style)
         self.btnColorChange.SetToolTip(_('Show color changes'))
         self.btnColorChange.SetBitmap(self.load_icon('color_change'))
         self.btnColorChange.Bind(wx.EVT_TOGGLEBUTTON, lambda event: self.on_marker_button('color_change', event))