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

meerk40t/gui/imagesplitter.py

@@ -1,6 +1,11 @@
 import wx
 
-from meerk40t.gui.icons import STD_ICON_SIZE, icons8_keyhole_50, icons8_split_table_50
+from meerk40t.gui.icons import (
+    STD_ICON_SIZE,
+    get_default_icon_size,
+    icon_keyhole,
+    icon_split_image,
+)
 from meerk40t.gui.mwindow import MWindow
 from meerk40t.gui.wxutils import StaticBoxSizer, TextCtrl, dip_size
 from meerk40t.kernel import signal_listener
@@ -163,7 +168,7 @@ class SplitterPanel(wx.Panel):
         self.lbl_info = wx.StaticText(self, wx.ID_ANY, "")
         self.btn_align = wx.Button(self, wx.ID_ANY, _("Create split images"))
         self.btn_align.SetBitmap(
-            icons8_split_table_50.GetBitmap(resize=STD_ICON_SIZE / 2)
+            icon_split_image.GetBitmap(resize=0.5 * get_default_icon_size())
         )
 
         lbl_dpi = wx.StaticText(self, wx.ID_ANY, "DPI:")
@@ -303,7 +308,9 @@ class KeyholePanel(wx.Panel):
         self.info_panel = InfoPanel(self, wx.ID_ANY, context=self.context)
 
         self.btn_align = wx.Button(self, wx.ID_ANY, _("Create keyhole image"))
-        self.btn_align.SetBitmap(icons8_keyhole_50.GetBitmap(resize=STD_ICON_SIZE / 2))
+        self.btn_align.SetBitmap(
+            icon_keyhole.GetBitmap(resize=0.5 * get_default_icon_size())
+        )
 
         lbl_dpi = wx.StaticText(self, wx.ID_ANY, "DPI:")
         sizer_dpi = StaticBoxSizer(
@@ -385,11 +392,11 @@ class KeyholePanel(wx.Panel):
         except ValueError:
             mydpi = 500
         if self.check_invert.GetValue():
-            invert = " --invert 1"
+            invert = " --invert"
         else:
             invert = ""
         if self.check_outline.GetValue():
-            outline = " --outline 1"
+            outline = " --outline"
         else:
             outline = ""
         cmdstr = f"render_keyhole {mydpi} --order {esort}{invert}{outline}\n"
@@ -455,7 +462,7 @@ class RenderSplit(MWindow):
         self.Layout()
 
         _icon = wx.NullIcon
-        _icon.CopyFromBitmap(icons8_split_table_50.GetBitmap(resize=STD_ICON_SIZE / 2))
+        _icon.CopyFromBitmap(icon_split_image.GetBitmap())
         self.SetIcon(_icon)
         self.SetTitle(_("Create split images"))
 
@@ -479,7 +486,7 @@ class RenderSplit(MWindow):
             "button/align/SplitImage",
             {
                 "label": _("Image ops"),
-                "icon": icons8_split_table_50,
+                "icon": icon_split_image,
                 "tip": _("Open create split image dialog / keyhole generation"),
                 "action": lambda v: kernel.console("window toggle SplitImage\n"),
                 "size": bsize_normal,

meerk40t/gui/keymap.py

@@ -2,7 +2,7 @@ import platform
 
 import wx
 
-from .icons import icons8_keyboard_50
+from .icons import icons8_keyboard
 from .mwindow import MWindow
 from .wxutils import get_key_name
 
@@ -315,7 +315,7 @@ class Keymap(MWindow):
         self.panel = KeymapPanel(self, wx.ID_ANY, context=self.context)
         self.add_module_delegate(self.panel)
         _icon = wx.NullIcon
-        _icon.CopyFromBitmap(icons8_keyboard_50.GetBitmap())
+        _icon.CopyFromBitmap(icons8_keyboard.GetBitmap())
         self.SetIcon(_icon)
         # begin wxGlade: Keymap.__set_properties
         self.SetTitle(_("Keymap Settings"))
@@ -326,7 +326,7 @@ class Keymap(MWindow):
             "button/config/Keymap",
             {
                 "label": _("Keymap"),
-                "icon": icons8_keyboard_50,
+                "icon": icons8_keyboard,
                 "tip": _("Opens Keymap Window"),
                 "action": lambda v: kernel.console("window toggle Keymap\n"),
             },

meerk40t/gui/laserpanel.py

@@ -3,15 +3,18 @@ from wx import aui
 
 from meerk40t.gui.choicepropertypanel import ChoicePropertyPanel
 from meerk40t.gui.icons import (
-    STD_ICON_SIZE,
-    icons8_delete_50,
-    icons8_emergency_stop_button_50,
-    icons8_gas_industry_50,
-    icons8_goal_50,
-    icons8_laser_beam_hazard2_50,
-    icons8_pause_50,
-    icons8_pentagon_50,
-    icons8_save_50,
+    DARKMODE,
+    get_default_icon_size,
+    icon_closed_door,
+    icon_open_door,
+    icon_update_plan,
+    icons8_delete,
+    icons8_emergency_stop_button,
+    icons8_gas_industry,
+    icons8_laser_beam_hazard,
+    icons8_pause,
+    icons8_pentagon,
+    icons8_save,
 )
 from meerk40t.gui.navigationpanels import Drag, Jog, MovePanel
 from meerk40t.gui.wxutils import (
@@ -34,15 +37,13 @@ def register_panel_laser(window, context):
     # jog_drag = wx.Panel(window, wx.ID_ANY)
     jog_drag = ScrolledPanel(window, wx.ID_ANY)
     jog_drag.SetupScrolling()
-    iconsize = 50
-    jog_panel = Jog(jog_drag, wx.ID_ANY, context=context, icon_size=iconsize)
-    drag_panel = Drag(jog_drag, wx.ID_ANY, context=context, icon_size=iconsize)
+    jog_panel = Jog(jog_drag, wx.ID_ANY, context=context)
+    drag_panel = Drag(jog_drag, wx.ID_ANY, context=context)
     main_sizer = wx.BoxSizer(wx.HORIZONTAL)
-    main_sizer.AddStretchSpacer()
-    main_sizer.Add(jog_panel, 0, wx.ALIGN_CENTER_VERTICAL, 0)
-    main_sizer.AddSpacer(25)
-    main_sizer.Add(drag_panel, 0, wx.ALIGN_CENTER_VERTICAL, 0)
-    main_sizer.AddStretchSpacer()
+    # main_sizer.AddStretchSpacer()
+    main_sizer.Add(jog_panel, 1, wx.ALIGN_CENTER_VERTICAL, 0)
+    main_sizer.Add(drag_panel, 1, wx.ALIGN_CENTER_VERTICAL, 0)
+    # main_sizer.AddStretchSpacer()
     jog_drag.SetSizer(main_sizer)
     jog_drag.Layout()
     move_panel = MovePanel(window, wx.ID_ANY, context=context)
@@ -90,6 +91,15 @@ def register_panel_laser(window, context):
     ]
     context.kernel.register_choices("preferences", choices)
 
+    def on_resize(event):
+        wb_size = jog_drag.ClientSize
+        panel_size = (wb_size[0] / 2, wb_size[1])
+
+        jog_panel.set_icons(dimension=panel_size)
+        drag_panel.set_icons(dimension=panel_size)
+
+    jog_drag.Bind(wx.EVT_SIZE, on_resize)
+
 
 class LaserPanel(wx.Panel):
     """
@@ -103,36 +113,28 @@ class LaserPanel(wx.Panel):
         self.context = context
 
         sizer_main = wx.BoxSizer(wx.VERTICAL)
+        self.icon_size = 0.5 * get_default_icon_size()
 
-        sizer_devices = StaticBoxSizer(self, wx.ID_ANY, _("Device"), wx.HORIZONTAL)
-        sizer_main.Add(sizer_devices, 0, wx.EXPAND, 0)
+        self.sizer_devices = StaticBoxSizer(self, wx.ID_ANY, _("Device"), wx.HORIZONTAL)
+        sizer_main.Add(self.sizer_devices, 0, wx.EXPAND, 0)
 
         # Devices Initialize.
         self.available_devices = self.context.kernel.services("device")
 
-        self.selected_device = self.context.device
-        index = -1
-        for i, s in enumerate(self.available_devices):
-            if s is self.selected_device:
-                index = i
-                break
-        spools = [s.label for s in self.available_devices]
-
         self.combo_devices = wx.ComboBox(
-            self, wx.ID_ANY, choices=spools, style=wx.CB_DROPDOWN | wx.CB_READONLY
+            self, wx.ID_ANY, style=wx.CB_DROPDOWN | wx.CB_READONLY
         )
         self.combo_devices.SetToolTip(
             _("Select device from list of configured devices")
         )
-        self.combo_devices.SetSelection(index)
         self.btn_config_laser = wx.Button(self, wx.ID_ANY, "*")
         self.btn_config_laser.SetToolTip(
             _("Opens device-specific configuration window")
         )
 
-        sizer_devices.Add(self.combo_devices, 1, wx.EXPAND, 0)
+        self.sizer_devices.Add(self.combo_devices, 1, wx.EXPAND, 0)
         self.btn_config_laser.SetMinSize(dip_size(self, 20, -1))
-        sizer_devices.Add(self.btn_config_laser, 0, wx.EXPAND, 0)
+        self.sizer_devices.Add(self.btn_config_laser, 0, wx.EXPAND, 0)
 
         sizer_control = wx.BoxSizer(wx.HORIZONTAL)
         sizer_main.Add(sizer_control, 0, wx.EXPAND, 0)
@@ -140,49 +142,73 @@ class LaserPanel(wx.Panel):
         self.button_start = HoverButton(self, wx.ID_ANY, _("Start"))
         self.button_start.SetToolTip(_("Execute the Job"))
         self.button_start.SetBitmap(
-            icons8_gas_industry_50.GetBitmap(
-                resize=STD_ICON_SIZE / 2, color=wx.WHITE, keepalpha=True
+            icons8_gas_industry.GetBitmap(
+                resize=self.icon_size,
+                color=wx.WHITE,
+                keepalpha=True,
+                force_darkmode=True,
             )
         )
         self.button_start.SetBitmapFocus(
-            icons8_gas_industry_50.GetBitmap(resize=STD_ICON_SIZE / 2)
+            icons8_gas_industry.GetBitmap(
+                resize=self.icon_size,
+            )
         )
-        self.button_start.SetBackgroundColour(wx.Colour(0, 127, 0))
-        self.button_start.SetForegroundColour(wx.WHITE)
-        self.button_start.SetFocusColour(wx.BLACK)
-        self.button_start.SetDisabledBackgroundColour(wx.Colour(172, 192, 172))
+        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)
 
-        self.button_pause = wx.Button(self, wx.ID_ANY, _("Pause"))
-        self.button_pause.SetForegroundColour(wx.BLACK)  # Dark Mode correction.
+        self.button_pause = HoverButton(self, 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, use_theme=False)
+            icons8_pause.GetBitmap(
+                resize=self.icon_size,
+            )
         )
-        self.button_pause.SetBackgroundColour(wx.Colour(255, 255, 0))
         sizer_control.Add(self.button_pause, 1, wx.EXPAND, 0)
 
         self.button_stop = HoverButton(self, wx.ID_ANY, _("Stop"))
         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=self.icon_size,
+                color=self.context.themes.get("stop_fg"),
+                keepalpha=True,
+                force_darkmode=True,
             )
         )
         self.button_stop.SetBitmapFocus(
-            icons8_emergency_stop_button_50.GetBitmap(resize=STD_ICON_SIZE / 2)
+            icons8_emergency_stop_button.GetBitmap(
+                resize=self.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"))
         sizer_control.Add(self.button_stop, 1, wx.EXPAND, 0)
 
         sizer_control_misc = wx.BoxSizer(wx.HORIZONTAL)
         sizer_main.Add(sizer_control_misc, 0, wx.EXPAND, 0)
 
-        self.arm_toggle = wx.ToggleButton(self, wx.ID_ANY, _("Arm"))
+        self.arm_toggle = HoverButton(self, wx.ID_ANY, _("Arm"))
         self.arm_toggle.SetToolTip(_("Arm the job for execution"))
+        self.arm_toggle.SetBitmap(
+            icon_closed_door.GetBitmap(
+                resize=self.icon_size,
+                color=self.context.themes.get("arm_fg"),
+            )
+        )
+        self.arm_toggle.SetBitmapFocus(
+            icon_closed_door.GetBitmap(
+                resize=self.icon_size,
+            )
+        )
+        self.arm_toggle.SetForegroundColour(self.context.themes.get("arm_fg"))
+        self.arm_toggle.SetFocusColour(self.context.themes.get("stop_fg_focus"))
+        self.armed = False
         sizer_control_misc.Add(self.arm_toggle, 1, wx.EXPAND, 0)
 
         self.check_laser_arm()
@@ -190,14 +216,18 @@ class LaserPanel(wx.Panel):
         self.button_outline = wx.Button(self, wx.ID_ANY, _("Outline"))
         self.button_outline.SetToolTip(_("Trace the outline the job"))
         self.button_outline.SetBitmap(
-            icons8_pentagon_50.GetBitmap(resize=STD_ICON_SIZE / 2)
+            icons8_pentagon.GetBitmap(
+                resize=self.icon_size,
+            )
         )
         sizer_control_misc.Add(self.button_outline, 1, wx.EXPAND, 0)
 
         self.button_simulate = wx.Button(self, wx.ID_ANY, _("Simulate"))
         self.button_simulate.SetToolTip(_("Simulate the Design"))
         self.button_simulate.SetBitmap(
-            icons8_laser_beam_hazard2_50.GetBitmap(resize=STD_ICON_SIZE / 2)
+            icons8_laser_beam_hazard.GetBitmap(
+                resize=self.icon_size,
+            )
         )
         sizer_control_misc.Add(self.button_simulate, 1, wx.EXPAND, 0)
 
@@ -207,10 +237,9 @@ class LaserPanel(wx.Panel):
         sizer_source = wx.BoxSizer(wx.HORIZONTAL)
         sizer_main.Add(sizer_source, 0, wx.EXPAND, 0)
 
-        self._optimize = True
         self.checkbox_optimize = wx.CheckBox(self, wx.ID_ANY, _("Optimize"))
         self.checkbox_optimize.SetToolTip(_("Enable/Disable Optimize"))
-        self.checkbox_optimize.SetValue(self._optimize)
+        self.checkbox_optimize.SetValue(self.context.planner.do_optimization)
         self.checkbox_adjust = wx.CheckBox(self, wx.ID_ANY, _("Override"))
         self.checkbox_adjust.SetToolTip(
             _("Allow ad-hoc adjustment of speed and power.")
@@ -263,7 +292,7 @@ class LaserPanel(wx.Panel):
         self.button_start.Bind(wx.EVT_LEFT_DOWN, self.on_start_left)
         self.Bind(wx.EVT_BUTTON, self.on_button_pause, self.button_pause)
         self.Bind(wx.EVT_BUTTON, self.on_button_stop, self.button_stop)
-        self.Bind(wx.EVT_TOGGLEBUTTON, self.on_check_arm, self.arm_toggle)
+        self.Bind(wx.EVT_BUTTON, self.on_check_arm, self.arm_toggle)
         self.Bind(wx.EVT_RIGHT_DOWN, self.on_menu_arm, self)
         self.Bind(wx.EVT_BUTTON, self.on_button_outline, self.button_outline)
         self.button_outline.Bind(wx.EVT_RIGHT_DOWN, self.on_button_outline_right)
@@ -275,11 +304,13 @@ class LaserPanel(wx.Panel):
         self.Bind(wx.EVT_CHECKBOX, self.on_optimize, self.checkbox_optimize)
         self.Bind(wx.EVT_BUTTON, self.on_config_button, self.btn_config_laser)
         # end wxGlade
-        if index == -1:
-            disable_window(self)
         self.checkbox_adjust.SetValue(False)
         self.on_check_adjust(None)
         self.update_override_controls()
+        self.on_device_changes()
+        index = self.combo_devices.GetSelection()
+        if index == -1:
+            disable_window(self)
         # Check for a real click of the execute button
         self.button_start_was_clicked = False
 
@@ -366,7 +397,8 @@ class LaserPanel(wx.Panel):
 
     def on_optimize(self, event):
         newval = bool(self.checkbox_optimize.GetValue())
-        if newval != self._optimize:
+        if newval != self.context.planner.do_optimization:
+            self.context.planner.do_optimization = newval
             self.context.signal("optimize", newval)
 
     @signal_listener("optimize")
@@ -376,27 +408,32 @@ class LaserPanel(wx.Panel):
         except ValueError:
             # You never know
             return
-        if self._optimize != newvalue:
-            self._optimize = newvalue
+        if self.context.planner.do_optimization != newvalue:
+            self.context.planner.do_optimization = newvalue
             self.checkbox_optimize.SetValue(newvalue)
 
     @signal_listener("device;modified")
     @signal_listener("device;renamed")
     @lookup_listener("service/device/active")
     @lookup_listener("service/device/available")
-    def spooler_lookup(self, *args):
+    def on_device_changes(self, *args):
         # Devices Initialize.
         self.available_devices = self.context.kernel.services("device")
         self.selected_device = self.context.device
         index = -1
+        count = 0
         self.combo_devices.Clear()
         for i, spool in enumerate(self.available_devices):
             if index < 0 and spool is self.selected_device:
                 index = i
             self.combo_devices.Append(spool.label)
+            count += 1
         self.combo_devices.SetSelection(index)
         self.set_pause_color()
         self.update_override_controls()
+        showit = count > 1
+        self.sizer_devices.ShowItems(showit)
+        self.Layout()
 
     @signal_listener("device;connected")
     def on_connectivity(self, *args):
@@ -404,15 +441,18 @@ class LaserPanel(wx.Panel):
         self.update_override_controls()
 
     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")
@@ -426,19 +466,51 @@ class LaserPanel(wx.Panel):
             if not self.arm_toggle.Shown:
                 self.arm_toggle.Show(True)
                 self.Layout()
-            if self.arm_toggle.GetValue():
-                self.arm_toggle.SetBackgroundColour(wx.RED)
+            if self.armed:
+                self.arm_toggle.SetBackgroundColour(self.context.themes.get("arm_bg"))
+                self.button_start.SetBackgroundColour(
+                    self.context.themes.get("start_bg")
+                )
+                self.arm_toggle.SetBitmap(
+                    icon_open_door.GetBitmap(
+                        resize=self.icon_size,
+                        color=self.context.themes.get("arm_fg"),
+                    )
+                )
+                self.arm_toggle.SetBitmapFocus(
+                    icon_open_door.GetBitmap(
+                        resize=self.icon_size,
+                    )
+                )
                 self.button_start.Enable(True)
             else:
-                self.arm_toggle.SetBackgroundColour(wx.GREEN)
+                self.arm_toggle.SetBackgroundColour(
+                    self.context.themes.get("arm_bg_inactive")
+                )
+                self.button_start.SetBackgroundColour(
+                    self.context.themes.get("start_bg_inactive")
+                )
                 self.button_start.Enable(False)
+                self.arm_toggle.SetBitmap(
+                    icon_closed_door.GetBitmap(
+                        resize=self.icon_size,
+                        color=self.context.themes.get("arm_fg"),
+                    )
+                )
+                self.arm_toggle.SetBitmapFocus(
+                    icon_closed_door.GetBitmap(
+                        resize=self.icon_size,
+                    )
+                )
         else:
             if self.arm_toggle.Shown:
                 self.arm_toggle.Show(False)
                 self.Layout()
+            self.button_start.SetBackgroundColour(self.context.themes.get("start_bg"))
             self.button_start.Enable(True)
 
     def on_check_arm(self, event):
+        self.armed = not self.armed
         self.check_laser_arm()
 
     def on_menu_arm_enable(self, event):
@@ -497,7 +569,7 @@ class LaserPanel(wx.Panel):
                 )
             else:
                 self.context("planz clear copy preprocess validate blob spool\n")
-        self.arm_toggle.SetValue(False)
+        self.armed = False
         self.check_laser_arm()
         if self.context.auto_spooler:
             self.context("window open JobSpooler\n")
@@ -563,27 +635,23 @@ class JobPanel(wx.Panel):
 
         sizer_main = wx.BoxSizer(wx.VERTICAL)
         self._optimize = True
-
+        self.icon_size = 0.5 * get_default_icon_size()
         sizer_control_update = wx.BoxSizer(wx.HORIZONTAL)
         sizer_main.Add(sizer_control_update, 0, wx.EXPAND, 0)
 
         self.button_clear = wx.Button(self, wx.ID_ANY, _("Clear"))
         self.button_clear.SetToolTip(_("Clear locally defined plan"))
-        self.button_clear.SetBitmap(
-            icons8_delete_50.GetBitmap(resize=STD_ICON_SIZE / 2)
-        )
+        self.button_clear.SetBitmap(icons8_delete.GetBitmap(resize=self.icon_size))
         sizer_control_update.Add(self.button_clear, 1, 0, 0)
 
         self.button_update = wx.Button(self, wx.ID_ANY, _("Update"))
         self.button_update.SetToolTip(_("Update the Plan"))
-        self.button_update.SetBitmap(icons8_goal_50.GetBitmap(resize=STD_ICON_SIZE / 2))
+        self.button_update.SetBitmap(icon_update_plan.GetBitmap(resize=self.icon_size))
         sizer_control_update.Add(self.button_update, 1, 0, 0)
 
         self.button_save_file = wx.Button(self, wx.ID_ANY, _("Save"))
         self.button_save_file.SetToolTip(_("Save the job"))
-        self.button_save_file.SetBitmap(
-            icons8_save_50.GetBitmap(resize=STD_ICON_SIZE / 2)
-        )
+        self.button_save_file.SetBitmap(icons8_save.GetBitmap(resize=self.icon_size))
         sizer_control_update.Add(self.button_save_file, 1, 0, 0)
 
         sizer_source = wx.BoxSizer(wx.HORIZONTAL)
@@ -628,7 +696,8 @@ class JobPanel(wx.Panel):
         except ValueError:
             # You never know
             return
-        self._optimize = newvalue
+        if newvalue != self.context.planner.do_optimization:
+            self.context.planner.do_optimization = newvalue
 
     def on_button_save(self, event):  # wxGlade: LaserPanel.<event_handler>
         gui = self.context.gui
@@ -660,7 +729,7 @@ class JobPanel(wx.Panel):
 
     def on_button_update(self, event):  # wxGlade: LaserPanel.<event_handler>
         self.context.kernel.busyinfo.start(msg=_("Updating Plan..."))
-        if self._optimize:
+        if self.context.planner.do_optimization:
             self.context("planz clear copy preprocess validate blob preopt optimize\n")
         else:
             self.context("planz clear copy preprocess validate blob\n")
@@ -690,12 +759,10 @@ class OptimizePanel(wx.Panel):
         kwds["style"] = kwds.get("style", 0) | wx.TAB_TRAVERSAL
         wx.Panel.__init__(self, *args, **kwds)
         self.context = context
-
         sizer_main = wx.BoxSizer(wx.VERTICAL)
-        self._optimize = True
         self.checkbox_optimize = wx.CheckBox(self, wx.ID_ANY, _("Optimize"))
         self.checkbox_optimize.SetToolTip(_("Enable/Disable Optimize"))
-        self.checkbox_optimize.SetValue(self._optimize)
+        self.checkbox_optimize.SetValue(self.context.planner.do_optimization)
         prechoices = context.lookup("choices/optimize")
         choices = list(map(copy, prechoices))
         # Clear the page-entry
@@ -720,15 +787,15 @@ class OptimizePanel(wx.Panel):
         except ValueError:
             # You never know
             return
-        if self._optimize != newvalue:
-            self._optimize = newvalue
+        if self.context.planner.do_optimization != newvalue:
+            self.context.planner.do_optimization = newvalue
             self.checkbox_optimize.SetValue(newvalue)
             self.optimize_panel.Enable(newvalue)
 
     def on_optimize(self, event):
         newvalue = bool(self.checkbox_optimize.GetValue())
-        if newvalue != self._optimize:
-            self._optimize = newvalue
+        if newvalue != self.context.planner.do_optimization:
+            self.context.planner.do_optimization = newvalue
             self.context.signal("optimize", newvalue)
             self.optimize_panel.Enable(newvalue)