From 8d9930a52d62c6c55b6199fe531ad99dba55e974 Mon Sep 17 00:00:00 2001 From: Kaalleen <36401965+kaalleen@users.noreply.github.com> Date: Thu, 9 Nov 2023 17:28:55 +0100 Subject: Save some space (simulator) (#2571) * combine and untoggle direction buttons * do not switch bitmap play/pause buttons --- icons/direction.png | Bin 0 -> 3655 bytes icons/direction.svg | 126 +++++++++++++++++++++++++++++++++++++++++++++++++++ icons/forward.png | Bin 5145 -> 0 bytes icons/forward.svg | 104 ------------------------------------------ icons/pause.png | Bin 2447 -> 0 bytes icons/pause.svg | 56 ----------------------- icons/reverse.png | Bin 5047 -> 0 bytes icons/reverse.svg | 104 ------------------------------------------ lib/gui/simulator.py | 36 +++++---------- 9 files changed, 137 insertions(+), 289 deletions(-) create mode 100644 icons/direction.png create mode 100644 icons/direction.svg delete mode 100644 icons/forward.png delete mode 100644 icons/forward.svg delete mode 100644 icons/pause.png delete mode 100644 icons/pause.svg delete mode 100644 icons/reverse.png delete mode 100644 icons/reverse.svg diff --git a/icons/direction.png b/icons/direction.png new file mode 100644 index 00000000..f6b6b717 Binary files /dev/null and b/icons/direction.png differ diff --git a/icons/direction.svg b/icons/direction.svg new file mode 100644 index 00000000..836e5e59 --- /dev/null +++ b/icons/direction.svg @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/icons/forward.png b/icons/forward.png deleted file mode 100644 index f7a95d11..00000000 Binary files a/icons/forward.png and /dev/null differ diff --git a/icons/forward.svg b/icons/forward.svg deleted file mode 100644 index 7e64613d..00000000 --- a/icons/forward.svg +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/icons/pause.png b/icons/pause.png deleted file mode 100644 index 39b55f3b..00000000 Binary files a/icons/pause.png and /dev/null differ diff --git a/icons/pause.svg b/icons/pause.svg deleted file mode 100644 index eec61f24..00000000 --- a/icons/pause.svg +++ /dev/null @@ -1,56 +0,0 @@ - - - -image/svg+xml diff --git a/icons/reverse.png b/icons/reverse.png deleted file mode 100644 index 982bf3e5..00000000 Binary files a/icons/reverse.png and /dev/null differ diff --git a/icons/reverse.svg b/icons/reverse.svg deleted file mode 100644 index 29e3d738..00000000 --- a/icons/reverse.svg +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/lib/gui/simulator.py b/lib/gui/simulator.py index 863800bd..423802f8 100644 --- a/lib/gui/simulator.py +++ b/lib/gui/simulator.py @@ -78,15 +78,10 @@ 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.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.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 left)')) + self.btnDirection = wx.Button(self, -1, style=self.button_style) + self.btnDirection.Bind(wx.EVT_BUTTON, self.on_direction_button) + self.btnDirection.SetBitmap(self.load_icon('direction')) + self.btnDirection.SetToolTip(_('Switch animation direction (arrow left, arrow right)')) 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')) @@ -143,8 +138,7 @@ class ControlPanel(wx.Panel): self.controls_inner_sizer.Add(self.btnBackwardStitch, 0, wx.EXPAND | wx.ALL, 2) self.controls_inner_sizer.Add(self.btnForwardStitch, 0, wx.EXPAND | wx.ALL, 2) self.controls_inner_sizer.Add(self.btnForwardCommand, 0, wx.EXPAND | wx.ALL, 2) - self.controls_inner_sizer.Add(self.btnReverse, 0, wx.EXPAND | wx.ALL, 2) - self.controls_inner_sizer.Add(self.btnForward, 0, wx.EXPAND | wx.ALL, 2) + self.controls_inner_sizer.Add(self.btnDirection, 0, wx.EXPAND | wx.ALL, 2) self.controls_inner_sizer.Add(self.btnPlay, 0, wx.EXPAND | wx.ALL, 2) self.controls_inner_sizer.Add(self.btnRestart, 0, wx.EXPAND | wx.ALL, 2) self.controls_sizer.Add((1, 1), 1) @@ -173,7 +167,7 @@ class ControlPanel(wx.Panel): self.speed_buttons_sizer.Add((1, 1), 1) self.speed_sizer.Add(self.speed_buttons_sizer, 0, wx.EXPAND | wx.ALL) self.speed_text = wx.StaticText(self, wx.ID_ANY, label="", style=wx.ALIGN_CENTRE_HORIZONTAL | wx.ST_NO_AUTORESIZE) - self.speed_text.SetFont(wx.Font(wx.FontInfo(15).Bold())) + self.speed_text.SetFont(wx.Font(wx.FontInfo(10).Bold())) extent = self.speed_text.GetTextExtent(self.format_speed_text(100000)) self.speed_text.SetMinSize(extent) self.speed_sizer.Add(self.speed_text, 0, wx.EXPAND | wx.ALL, 5) @@ -294,24 +288,20 @@ class ControlPanel(wx.Panel): self.set_speed(self.target_stitches_per_second) def animation_forward(self, event=None): - self.btnForward.SetValue(True) - self.btnReverse.SetValue(False) self.drawing_panel.forward() self.direction = 1 self.update_speed_text() def animation_reverse(self, event=None): - self.btnForward.SetValue(False) - self.btnReverse.SetValue(True) self.drawing_panel.reverse() self.direction = -1 self.update_speed_text() - def on_forward_button(self, event): - self.animation_forward() - - def on_reverse_button(self, event): - self.animation_reverse() + def on_direction_button(self, event): + if self.direction == -1: + self.animation_forward() + else: + self.animation_reverse() def set_speed(self, speed): self.speed = int(max(speed, 1)) @@ -376,19 +366,15 @@ class ControlPanel(wx.Panel): def animation_pause(self, event=None): self.drawing_panel.stop() - self.btnPlay.SetBitmap(self.load_icon('play')) def animation_start(self, event=None): self.drawing_panel.go() - self.btnPlay.SetBitmap(self.load_icon('pause')) def on_start(self): self.btnPlay.SetValue(True) - self.btnPlay.SetBitmap(self.load_icon('pause')) def on_stop(self): self.btnPlay.SetValue(False) - self.btnPlay.SetBitmap(self.load_icon('play')) def on_play_button(self, event): play = self.btnPlay.GetValue() -- cgit v1.2.3