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

meerk40t/grbl/emulator.py

@@ -83,7 +83,9 @@ lookup = {
 
 
 class GRBLEmulator:
-    def __init__(self, device=None, units_to_device_matrix=None):
+    def __init__(
+        self, device=None, units_to_device_matrix=None, reply=None, channel=None
+    ):
         self.device = device
         self.units_to_device_matrix = units_to_device_matrix
         self.settings = {
@@ -127,18 +129,23 @@ class GRBLEmulator:
         self.rapid_scale = 1.0
         self.power_scale = 1.0
 
-        self.reply = None
-        self.channel = None
+        self.reply = reply
+        self.channel = channel
 
         self._grbl_specific = False
 
         self._buffer = list()
+        try:
+            driver = device.driver
+        except AttributeError:
+            driver = None
         self.job = GcodeJob(
-            driver=device.driver,
+            driver=driver,
             priority=0,
             channel=self.channel,
             units_to_device_matrix=units_to_device_matrix,
         )
+        self.job.reply = self.reply
 
     def __repr__(self):
         return "GRBLInterpreter()"
@@ -154,19 +161,27 @@ class GRBLEmulator:
     def status_update(self):
         # TODO: This should reference only the driver.status.
         # Idle, Run, Hold, Jog, Alarm, Door, Check, Home, Sleep
-        pos, state, minor = self.device.driver.status()
-        x, y = self.units_to_device_matrix.point_in_inverse_space(pos)
+        try:
+            pos, state, minor = self.device.driver.status()
+            x, y = self.units_to_device_matrix.point_in_inverse_space(pos)
+            z = 0.0
+            if state == "busy":
+                state = "Run"
+            elif state == "hold":
+                state = "Hold"
+            else:
+                state = "Idle"
+            f = self.device.driver.speed
+            s = self.device.driver.power
+        except AttributeError:
+            state = "Idle"
+            x = self.job.x
+            y = self.job.y
+            z = self.job.z
+            f = 0
+            s = 0
         x /= self.job.scale
         y /= self.job.scale
-        z = 0.0
-        if state == "busy":
-            state = "Run"
-        elif state == "hold":
-            state = "Hold"
-        else:
-            state = "Idle"
-        f = self.device.driver.speed
-        s = self.device.driver.power
         return f"<{state}|MPos:{x:.3f},{y:.3f},{z:.3f}|FS:{f},{s}>\r\n"
 
     def write(self, data):
@@ -194,16 +209,18 @@ class GRBLEmulator:
                     self.device.driver.pause()
                 except AttributeError:
                     pass
-            elif c in (ord("\r"), ord("\n")):
+            elif c in (13, 10):  # "\r","\n"
                 # Process CRLF endlines
                 line = "".join(self._buffer)
                 if self._grbl_specific:
                     self._grbl_specific = False
                     self.reply_code(self._grbl_special(line))
                 else:
-                    self.device.spooler.send(self.job, prevent_duplicate=True)
-                    self.job.reply = self.reply
                     self.job.write(line)
+                    try:
+                        self.device.spooler.send(self.job, prevent_duplicate=True)
+                    except AttributeError:
+                        self.job.execute(None)
                 self._buffer.clear()
             elif c == 0x08:
                 # Process Backspaces.
@@ -214,6 +231,11 @@ class GRBLEmulator:
                     self.device.driver.reset()
                 except AttributeError:
                     pass
+                self._buffer.clear()
+                if self.reply:
+                    self.reply(
+                        "Grbl 1.1f ['$' for help]\r\n" "[MSG:’$H’|’$X’ to unlock]\r\n"
+                    )
             elif c > 0x80:
                 if c == 0x84:
                     # Safety Door
@@ -358,9 +380,47 @@ class GRBLEmulator:
         elif data == "$I":
             # View Build Info
             return 0
+        elif data == "$#":
+            if self.reply:
+                data = [
+                    "[G54:0.000,0.000,0.000]",
+                    "[G55:0.000,0.000,0.000]",
+                    "[G56:0.000,0.000,0.000]",
+                    "[G57:0.000,0.000,0.000]",
+                    "[G58:0.000,0.000,0.000]",
+                    "[G59:0.000,0.000,0.000]",
+                    "[G28:0.000,0.000,0.000]",
+                    "[G30:0.000,0.000,0.000]",
+                    "[G92:0.000,0.000,0.000]",
+                    "[TLO:0.000]",
+                    "[PRB:0.000,0.000,0.000:0]",
+                    "",
+                ]
+                self.reply("\r\n".join(data))
+            return 0
         elif data == "$G":
             # View GCode Parser state
-            return 3
+            if self.reply:
+                job = self.job
+                modals = list()
+                # G0 G54 G17 G21 G90 G94 M5 M9 T0 F0 S0
+                modals.append(f"G{job.move_mode}")
+                modals.append("G54")  # default coord system.
+                modals.append("G17")  # XY plane
+                modals.append("G21" if job.units == "mm" else "G20")  # MM data.
+                modals.append("G91" if job.relative else "G90")
+                modals.append(
+                    "G94" if job.feed_desc in ("inch/min", "mm/min") else "G93"
+                )
+                modals.append("M5")  # Not currently in a program job.
+                modals.append("M9")  # Mist cooling.
+                modals.append("T0")  # Tool 0
+                modals.append(f"F{int(job.get_feed_rate())}")
+                modals.append(f"S{int(job.get_power_rate())}")
+
+                modes = " ".join(modals)
+                self.reply(f"[GC:{modes}]\r\n")
+            return 0
         elif data == "$N":
             # View saved start up code.
             return 3

meerk40t/grbl/gcodejob.py

@@ -180,6 +180,16 @@ class GcodeJob:
             else:
                 return "Disabled"
 
+    def get_feed_rate(self):
+        if self.speed is None:
+            return 0
+        return self.feed_invert(self.speed)
+
+    def get_power_rate(self):
+        if self.power is None:
+            return 0
+        return self.power
+
     def inform(self, last_command):
         if not hasattr(self._driver, "signal"):
             return

meerk40t/grbl/gui/grblconfiguration.py

@@ -6,7 +6,7 @@ from meerk40t.device.gui.defaultactions import DefaultActionPanel
 from meerk40t.device.gui.formatterpanel import FormatterPanel
 from meerk40t.device.gui.warningpanel import WarningPanel
 from meerk40t.gui.choicepropertypanel import ChoicePropertyPanel
-from meerk40t.gui.icons import icons8_administrative_tools_50
+from meerk40t.gui.icons import icons8_administrative_tools
 from meerk40t.gui.mwindow import MWindow
 from meerk40t.gui.wxutils import ScrolledPanel, StaticBoxSizer
 from meerk40t.kernel import signal_listener
@@ -130,7 +130,7 @@ class GRBLConfiguration(MWindow):
         super().__init__(345, 415, *args, **kwds)
         self.context = self.context.device
         _icon = wx.NullIcon
-        _icon.CopyFromBitmap(icons8_administrative_tools_50.GetBitmap())
+        _icon.CopyFromBitmap(icons8_administrative_tools.GetBitmap())
         self.SetIcon(_icon)
         self.SetTitle(_("GRBL-Configuration"))
 

meerk40t/grbl/gui/grblcontroller.py

@@ -6,7 +6,11 @@ import threading
 
 import wx
 
-from meerk40t.gui.icons import icons8_connected_50, icons8_disconnected_50
+from meerk40t.gui.icons import (
+    get_default_icon_size,
+    icons8_connected,
+    icons8_disconnected,
+)
 from meerk40t.gui.mwindow import MWindow
 from meerk40t.gui.wxutils import dip_size
 from meerk40t.kernel import signal_listener
@@ -46,7 +50,7 @@ class GRBLControllerPanel(wx.Panel):
             _("Force connection/disconnection from the device.")
         )
         self.button_device_connect.SetBitmap(
-            icons8_connected_50.GetBitmap(use_theme=False)
+            icons8_connected.GetBitmap(use_theme=False, resize=get_default_icon_size())
         )
         sizer_1.Add(self.button_device_connect, 0, wx.EXPAND, 0)
 
@@ -87,7 +91,11 @@ class GRBLControllerPanel(wx.Panel):
             btn.Bind(wx.EVT_BUTTON, self.send_gcode(entry[0]))
             btn.SetToolTip(entry[2])
             if entry[3] is not None:
-                btn.SetBitmap(entry[3].GetBitmap(size=25, use_theme=False))
+                btn.SetBitmap(
+                    entry[3].GetBitmap(
+                        resize=0.5 * get_default_icon_size(), use_theme=False
+                    )
+                )
             sizer_2.Add(btn, 1, wx.EXPAND, 0)
         self.btn_clear = wx.Button(self, wx.ID_ANY, _("Clear"))
         self.btn_clear.SetToolTip(_("Clear log window"))
@@ -180,14 +188,18 @@ class GRBLControllerPanel(wx.Panel):
             self.button_device_connect.SetBackgroundColour("#ffff00")
             self.button_device_connect.SetLabel(_("Connect"))
             self.button_device_connect.SetBitmap(
-                icons8_disconnected_50.GetBitmap(use_theme=False)
+                icons8_disconnected.GetBitmap(
+                    use_theme=False, resize=get_default_icon_size()
+                )
             )
             self.button_device_connect.Enable()
         elif state == "connected":
             self.button_device_connect.SetBackgroundColour("#00ff00")
             self.button_device_connect.SetLabel(_("Disconnect"))
             self.button_device_connect.SetBitmap(
-                icons8_connected_50.GetBitmap(use_theme=False)
+                icons8_connected.GetBitmap(
+                    use_theme=False, resize=get_default_icon_size()
+                )
             )
             self.button_device_connect.Enable()
 
@@ -200,14 +212,18 @@ class GRBLControllerPanel(wx.Panel):
             self.button_device_connect.SetBackgroundColour("#ffff00")
             self.button_device_connect.SetLabel(_("Connect"))
             self.button_device_connect.SetBitmap(
-                icons8_disconnected_50.GetBitmap(use_theme=False)
+                icons8_disconnected.GetBitmap(
+                    use_theme=False, resize=get_default_icon_size()
+                )
             )
             self.button_device_connect.Enable()
         elif self.state == "connected":
             self.button_device_connect.SetBackgroundColour("#00ff00")
             self.button_device_connect.SetLabel(_("Disconnect"))
             self.button_device_connect.SetBitmap(
-                icons8_connected_50.GetBitmap(use_theme=False)
+                icons8_connected.GetBitmap(
+                    use_theme=False, resize=get_default_icon_size()
+                )
             )
             self.button_device_connect.Enable()
 
@@ -221,7 +237,7 @@ class GRBLController(MWindow):
         self.service = self.context.device
         self.SetTitle("GRBL Controller")
         _icon = wx.NullIcon
-        _icon.CopyFromBitmap(icons8_connected_50.GetBitmap())
+        _icon.CopyFromBitmap(icons8_connected.GetBitmap())
         self.SetIcon(_icon)
 
         self.serial_panel = GRBLControllerPanel(self, wx.ID_ANY, context=self.service)

meerk40t/grbl/gui/grblhardwareconfig.py

@@ -0,0 +1,153 @@
+#!/usr/bin/env python3
+# -*- coding: UTF-8 -*-
+#
+# generated by wxGlade 1.0.5 on Mon Nov 13 07:33:41 2023
+#
+
+import threading
+
+import wx
+
+from meerk40t.grbl.controller import hardware_settings
+from meerk40t.gui.icons import icons8_curly_brackets
+from meerk40t.gui.mwindow import MWindow
+from meerk40t.gui.wxutils import EditableListCtrl, ScrolledPanel, dip_size
+from meerk40t.kernel import signal_listener
+
+_ = wx.GetTranslation
+
+
+class GrblIoButtons(wx.Panel):
+    def __init__(self, *args, context=None, **kwds):
+        self.service = context
+        kwds["style"] = kwds.get("style", 0)
+        wx.Panel.__init__(self, *args, **kwds)
+
+        sizer_2 = wx.BoxSizer(wx.HORIZONTAL)
+
+        self.button_refresh = wx.Button(self, wx.ID_ANY, "Refresh")
+        sizer_2.Add(self.button_refresh, 1, 0, 0)
+        self.Bind(wx.EVT_BUTTON, self.on_button_refresh, self.button_refresh)
+
+        # self.button_write = wx.Button(self, wx.ID_ANY, "Write")
+        # sizer_2.Add(self.button_write, 1, 0, 0)
+        #
+        # self.button_export = wx.Button(self, wx.ID_ANY, "Export")
+        # sizer_2.Add(self.button_export, 1, 0, 0)
+
+        self.SetSizer(sizer_2)
+
+    def on_button_refresh(self, event):
+        self.service("gcode $$\n")
+
+
+class GrblHardwareProperties(ScrolledPanel):
+    def __init__(self, *args, context=None, **kwds):
+        self.service = context
+        kwds["style"] = kwds.get("style", 0)
+        ScrolledPanel.__init__(self, *args, **kwds)
+
+        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+
+        chart = EditableListCtrl(
+            self,
+            wx.ID_ANY,
+            style=wx.LC_HRULES | wx.LC_REPORT | wx.LC_VRULES | wx.LC_SINGLE_SEL,
+        )
+        self.chart = chart
+        self.build_columns()
+        self.fill_chart()
+
+        chart.Bind(wx.EVT_LIST_BEGIN_LABEL_EDIT, self.on_label_start_edit)
+        chart.Bind(wx.EVT_LIST_END_LABEL_EDIT, self.on_label_end_edit)
+
+        sizer_1.Add(self.chart, 8, wx.EXPAND, 0)
+
+        self.io_panel = GrblIoButtons(self, wx.ID_ANY, context=self.service)
+        sizer_1.Add(self.io_panel, 1, wx.EXPAND, 0)
+        self.SetSizer(sizer_1)
+
+    def build_columns(self):
+        chart = self.chart
+        for column, width in (
+            ("$#", 60),
+            ("Parameter", 200),
+            ("Value", 100),
+            ("Unit", 100),
+            ("Description", 1000),
+        ):
+            chart.AppendColumn(
+                column,
+                format=wx.LIST_FORMAT_LEFT,
+                width=width,
+            )
+
+    def fill_chart(self):
+        chart = self.chart
+        chart.DeleteAllItems()
+        settings = hardware_settings
+        for i in range(200):
+            d = settings(i)
+            if d is None:
+                continue
+            if i in self.service.hardware_config:
+                value = str(self.service.hardware_config[i])
+            else:
+                value = ""
+            ignore, parameter, units = d
+
+            row_id = chart.InsertItem(chart.GetItemCount(), f"${i}")
+            chart.SetItem(row_id, 1, str(parameter))
+            chart.SetItem(row_id, 2, str(value))
+            chart.SetItem(row_id, 3, str(units))
+            chart.SetItem(row_id, 4, str(parameter.upper()))
+
+    def on_label_start_edit(self, event):
+        event.Allow()
+
+    def on_label_end_edit(self, event):
+        row_id = event.GetIndex()  # Get the current row
+        col_id = event.GetColumn()  # Get the current column
+        new_data = event.GetLabel()  # Get the changed data
+        self.chart.SetItem(row_id, col_id, new_data)
+
+    @signal_listener("grbl:hwsettings")
+    def hardware_settings_changed(self, origin, *args):
+        self.fill_chart()
+
+    def pane_show(self):
+        pass
+
+    def pane_hide(self):
+        return
+
+
+# end of class GrblHardwareProperties
+
+
+class GRBLHardwareConfig(MWindow):
+    def __init__(self, *args, **kwds):
+        super().__init__(1000, 500, *args, **kwds)
+        self.service = self.context.device
+        self.SetTitle(_("GRBL Hardware Config"))
+        _icon = wx.NullIcon
+        _icon.CopyFromBitmap(icons8_curly_brackets.GetBitmap())
+        self.SetIcon(_icon)
+
+        self.hw_panel = GrblHardwareProperties(self, wx.ID_ANY, context=self.service)
+        self.Layout()
+        self._opened_port = None
+        # end wxGlade
+
+    def window_open(self):
+        self.hw_panel.pane_show()
+
+    def window_close(self):
+        self.hw_panel.pane_hide()
+
+    def delegates(self):
+        yield self.hw_panel
+
+    @staticmethod
+    def submenu():
+        return "Device-Control", "GRBL Hardware Config"

meerk40t/grbl/gui/gui.py

@@ -14,14 +14,15 @@ def plugin(service, lifecycle):
     if lifecycle == "added":
         from meerk40t.grbl.gui.grblconfiguration import GRBLConfiguration
         from meerk40t.grbl.gui.grblcontroller import GRBLController
+        from meerk40t.grbl.gui.grblhardwareconfig import GRBLHardwareConfig
         from meerk40t.gui.icons import (
-            icons8_computer_support_50,
-            icons8_connected_50,
-            icons8_emergency_stop_button_50,
-            icons8_flash_off_50,
-            icons8_info_50,
-            icons8_pause_50,
-            icons8_quick_mode_on_50,
+            icons8_computer_support,
+            icons8_connected,
+            icons8_emergency_stop_button,
+            icons8_flash_off,
+            icons8_flash_on,
+            icons8_info,
+            icons8_pause,
         )
 
         service.register("window/GRBLController", GRBLController)
@@ -30,13 +31,15 @@ def plugin(service, lifecycle):
         service.register("window/Configuration", GRBLConfiguration)
         service.register("winpath/Configuration", service)
 
+        service.register("window/GrblHardwareConfig", GRBLHardwareConfig)
+
         _ = service._
 
         service.register(
             "button/control/Controller",
             {
                 "label": _("Controller"),
-                "icon": icons8_connected_50,
+                "icon": icons8_connected,
                 "tip": _("Opens Controller Window"),
                 "action": lambda v: service("window toggle GRBLController\n"),
             },
@@ -45,7 +48,7 @@ def plugin(service, lifecycle):
             "button/device/Configuration",
             {
                 "label": _("Config"),
-                "icon": icons8_computer_support_50,
+                "icon": icons8_computer_support,
                 "tip": _("Opens device-specific configuration window"),
                 "action": lambda v: service("window toggle Configuration\n"),
             },
@@ -54,7 +57,7 @@ def plugin(service, lifecycle):
             "button/control/Pause",
             {
                 "label": _("Pause"),
-                "icon": icons8_pause_50,
+                "icon": icons8_pause,
                 "tip": _("Pause the laser"),
                 "action": lambda v: service("pause\n"),
             },
@@ -64,7 +67,7 @@ def plugin(service, lifecycle):
             "button/control/Stop",
             {
                 "label": _("Stop"),
-                "icon": icons8_emergency_stop_button_50,
+                "icon": icons8_emergency_stop_button,
                 "tip": _("Emergency stop the laser"),
                 "action": lambda v: service("estop\n"),
             },
@@ -82,13 +85,13 @@ def plugin(service, lifecycle):
             "button/control/Redlight",
             {
                 "label": _("Red Dot On"),
-                "icon": icons8_quick_mode_on_50,
+                "icon": icons8_flash_on,
                 "tip": _("Turn Redlight On"),
                 "action": lambda v: service("red on\n"),
                 "toggle": {
                     "label": _("Red Dot Off"),
                     "action": lambda v: service("red off\n"),
-                    "icon": icons8_flash_off_50,
+                    "icon": icons8_flash_off,
                     "signal": "grbl_red_dot",
                 },
                 "rule_enabled": lambda v: has_red_dot_enabled(),
@@ -99,7 +102,7 @@ def plugin(service, lifecycle):
             "button/control/ClearAlarm",
             {
                 "label": _("Clear Alarm"),
-                "icon": icons8_info_50,
+                "icon": icons8_info,
                 "tip": _("Send a GRBL Clear Alarm command"),
                 "action": lambda v: service("clear_alarm\n"),
             },

meerk40t/grbl/mock_connection.py

@@ -5,6 +5,7 @@ Mock Connection for GRBL
 The mock connection is used for debug and research purposes. And simply prints the data sent to it rather than engaging
 any hardware.
 """
+from meerk40t.grbl.emulator import GRBLEmulator
 
 
 class MockConnection:
@@ -13,48 +14,29 @@ class MockConnection:
         self.controller = controller
         self.laser = None
         self.read_buffer = bytearray()
-        self.just_connected = False
+        self.emulator = GRBLEmulator(
+            device=None, units_to_device_matrix=service.view.matrix, reply=self.add_read
+        )
 
     @property
     def connected(self):
         return self.laser is not None
 
-    @property
-    def _index_of_read_line(self):
-        try:
-            r = self.read_buffer.index(b"\r")
-        except ValueError:
-            r = -1
-        try:
-            n = self.read_buffer.index(b"\n")
-        except ValueError:
-            n = -1
-
-        if n != -1:
-            return min(n, r) if r != -1 else n
-        else:
-            return r
-
-    def read_buffer_command(self):
-        q = self._index_of_read_line
-        if q == -1:
-            raise ValueError("No forward command exists.")
-        cmd_issued = self.read_buffer[: q + 1]
-        self.read_buffer = self.read_buffer[q + 1 :]
-        return cmd_issued
+    def add_read(self, code):
+        self.read_buffer += bytes(code, encoding="raw_unicode_escape")
 
     def read(self):
-        if self.just_connected:
-            self.just_connected = False
-            return "Grbl 1.1f ['$' for help]\r\n" "[MSG:’$H’|’$X’ to unlock]\r\n"
-        try:
-            cmd = self.read_buffer_command()
-            return "ok"
-        except ValueError:
-            return ""
+        f = self.read_buffer.find(b"\n")
+        if f == -1:
+            return None
+        response = self.read_buffer[:f]
+        self.read_buffer = self.read_buffer[f + 1 :]
+        str_response = str(response, "raw_unicode_escape")
+        str_response = str_response.strip()
+        return str_response
 
     def write(self, line: str):
-        self.read_buffer += line.encode(encoding="latin-1")
+        self.emulator.write(line)
 
     def connect(self):
         if self.laser:
@@ -63,7 +45,6 @@ class MockConnection:
         try:
             self.controller.log("Attempting to Connect...", type="connection")
             self.laser = True
-            self.just_connected = True
             self.controller.log("Connected", type="connection")
             self.service.signal("grbl;status", "connected")
         except ConnectionError:

meerk40t/grbl/plugin.py

@@ -64,10 +64,6 @@ def plugin(kernel, lifecycle=None):
                         "attr": "label",
                         "default": "FluidNC",
                     },
-                    {
-                        "attr": "requires_validation",
-                        "default": False,
-                    },
                     {
                         "attr": "source",
                         "default": "generic",

meerk40t/grbl/serial_connection.py

@@ -36,7 +36,8 @@ class SerialConnection:
     def write(self, line):
         try:
             self.laser.write(bytes(line, "utf-8"))
-        except (SerialException, PermissionError) as e:
+        except (SerialException, PermissionError, TypeError) as e:
+            # Type error occurs when `pipe_abort_write_r` is none, inside serialpostix.read() (out of sequence close)
             self.controller.log(
                 f"Error when writing '{line}: {str(e)}'", type="connection"
             )

meerk40t/gui/about.py

@@ -3,9 +3,9 @@ import datetime
 import wx
 
 from ..main import APPLICATION_NAME, APPLICATION_VERSION
-from .icons import icon_meerk40t, icons8_about_50
+from .icons import icon_about, icon_meerk40t
 from .mwindow import MWindow
-from .wxutils import StaticBoxSizer
+from .wxutils import ScrolledPanel, StaticBoxSizer
 
 _ = wx.GetTranslation
 
@@ -139,11 +139,11 @@ class AboutPanel(wx.Panel):
         # end wxGlade
 
 
-class InformationPanel(wx.Panel):
+class InformationPanel(ScrolledPanel):
     def __init__(self, *args, context=None, **kwds):
         # begin wxGlade: MovePanel.__init__
         kwds["style"] = kwds.get("style", 0) | wx.TAB_TRAVERSAL
-        wx.Panel.__init__(self, *args, **kwds)
+        ScrolledPanel.__init__(self, *args, **kwds)
         self.context = context
         self.mk_version = wx.TextCtrl(self, wx.ID_ANY, "", style=wx.TE_READONLY)
         self.py_version = wx.TextCtrl(self, wx.ID_ANY, "", style=wx.TE_READONLY)
@@ -152,12 +152,14 @@ class InformationPanel(wx.Panel):
         self.os_version = wx.TextCtrl(
             self, wx.ID_ANY, "", style=wx.TE_READONLY | wx.TE_MULTILINE
         )
+        self.os_version.SetMinSize(wx.Size(-1, 5 * 25))
         self.info_btn = wx.Button(self, wx.ID_ANY, _("Copy to Clipboard"))
         self.Bind(wx.EVT_BUTTON, self.copy_debug_info, self.info_btn)
         self.update_btn = wx.Button(self, wx.ID_ANY, _("Check for Updates"))
         self.Bind(wx.EVT_BUTTON, self.check_for_updates, self.update_btn)
         self.__set_properties()
         self.__do_layout()
+        self.SetupScrolling()
 
     def __set_properties(self):
         # Fill the content...
@@ -181,6 +183,7 @@ class InformationPanel(wx.Panel):
         info += f"Version: {uname.version}" + "\n"
         info += f"Machine: {uname.machine}" + "\n"
         info += f"Processor: {uname.processor}" + "\n"
+        info += f"Theme: {self.context.themes.theme}, Darkmode: {self.context.themes.dark}\n"
         try:
             info += f"Ip-Address: {socket.gethostbyname(socket.gethostname())}"
         except socket.gaierror:
@@ -284,7 +287,7 @@ class About(MWindow):
         self.add_module_delegate(self.panel_about)
         self.add_module_delegate(self.panel_info)
         _icon = wx.NullIcon
-        _icon.CopyFromBitmap(icons8_about_50.GetBitmap())
+        _icon.CopyFromBitmap(icon_about.GetBitmap())
         self.SetIcon(_icon)
         self.SetTitle(_("About"))