0.98.0

Automatically generated by python-semantic-release

.gitlab-ci.yml

@@ -140,7 +140,7 @@ tests:
     - *install-os-packages
     - *install-repos
     - pip install -e .[dev,pyqt6]
-    - coverage run --source=./bec_widgets -m pytest -v --junitxml=report.xml --random-order --full-trace ./tests/unit_tests
+    - coverage run --source=./bec_widgets -m pytest -v --junitxml=report.xml --maxfail=2 --random-order --full-trace ./tests/unit_tests
     - coverage report
     - coverage xml
   coverage: '/(?i)total.*? (100(?:\.0+)?\%|[1-9]?\d(?:\.\d+)?\%)$/'
@@ -177,7 +177,7 @@ test-matrix:
     - *install-os-packages
     - *install-repos
     - pip install -e .[dev,$QT_PCKG]
-    - pytest -v --junitxml=report.xml --random-order ./tests/unit_tests
+    - pytest -v --maxfail=2 --junitxml=report.xml --random-order ./tests/unit_tests
   allow_failure: true
 
 end-2-end-conda:

CHANGELOG.md

@@ -1,151 +1,153 @@
 # CHANGELOG
 
-## v0.93.0 (2024-08-05)
+## v0.98.0 (2024-08-25)
 
 ### Feature
 
-* feat(themes): moved themes to bec_qthemes
-
-This reverts commit fd6ae91993a23a7b8dbb2cf3c4b7c3eda6d2b0f6 ([`5aad401`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/5aad401ef8774c7330784f72cd3b9d8c253e2b6a))
-
-## v0.92.5 (2024-08-05)
+* feat(themes): added set_theme method ([`2b4449a`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/2b4449afebdda0a97f95712a1353cf40ec55c283))
 
 ### Fix
 
-* fix(spinner): stop timer on close event ([`30fef92`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/30fef929cf6fb4b73f48151c92a0ee54c734031d))
+* fix(toolbar): removed hardcoded color values ([`afdf4e8`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/afdf4e8782a22566932180224fa1c924d24c810f))
 
-* fix(status_box): fix cleanup of status box ([`1f30dd7`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/1f30dd73a9c1e3135087a5eef92c7329f54a604e))
+* fix: transitioning to material icons ([`2a82032`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/2a82032644a84e38df04e2035a6aa63f4a046360))
+
+* fix(dock_area): transitioned to MaterialIconAction ([`88a2f66`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/88a2f667588e9aeb34ae556fa327898824052bc3))
+
+* fix: fix color palette if qtheme was not called ([`3f3b207`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/3f3b207295ebd406ebaeecee465c774965161b8b))
+
+* fix(figure): removed theme from figure init ([`e42b84c`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/e42b84c63650297d67feffccc02a2c2ba111ca79))
+
+* fix: use globally set theme instead of the internal bec widgets theme ([`77c5aa7`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/77c5aa741cf1f5b969a42aa878aa2965176dbf41))
+
+* fix(waveform): fixed icon appearance ([`36ad464`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/36ad4641594b67c9b789515c28f7db78a12757ee))
 
 ### Refactor
 
-* refactor(queue): refactored bec queue to inherit only from qwidget ([`7616ca0`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/7616ca0e145e233ccb48029a8c0b54b54b5b4194))
+* refactor(waveform): use set theme for demo ([`44cfda1`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/44cfda1c07306669c9a4e09706d95e6b91dee370))
+
+## v0.97.0 (2024-08-23)
+
+### Feature
+
+* feat(designer): added designer icon factory ([`82a55dd`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/82a55ddf3eafb589cb63408db1c0e7e5c9d629da))
+
+### Fix
+
+* fix(toolbar icon): fixed material icon toolbar for theme changes ([`3ecbd60`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/3ecbd60627994417c9175364e5909710dbcdceb2))
+
+## v0.96.3 (2024-08-23)
+
+### Documentation
+
+* docs(dispatcher): docs added ([`dd7c71b`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/dd7c71bb1e0b7ef5398b1e1a05fc1147c772420a))
+
+### Fix
+
+* fix: minor fixes for type annotations ([`8c2e7c8`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/8c2e7c82592ace50e4e1f47e392a0ddc988f57ae))
+
+## v0.96.2 (2024-08-22)
+
+### Fix
+
+* fix(waveform): validation of custom curves removed ([`af28574`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/af28574bd58457a05f1269f121db01ad627b5769))
+
+* fix(waveform): skip validation for curves that are not BECCurve instances ([`617db36`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/617db36ed4932c8a0633724079b695bc67d5c77b))
+
+## v0.96.1 (2024-08-22)
+
+### Ci
+
+* ci: fail pytest after 2 failed tests ([`f0203d9`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/f0203d9bf60c4975ba5ab93a057d9091762454d5))
+
+### Fix
+
+* fix(crosshair): update markers if necessary ([`4473805`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/44738057a36f5de2bbb55affdd309f92286d4a0f))
+
+* fix(waveform_widget): fixed icon appearance ([`f98a9f9`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/f98a9f9771b93226d47830aa52f45739624f51b4))
+
+* fix: bubble-up signals ([`2fe72c9`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/2fe72c9ccb71bcb196a1b78197b73acf9aa3f506))
+
+* fix(crosshair): fixed crosshair for image and waveforms ([`37835cb`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/37835cbf76ca3ba1081f514ee7793244ac500e7f))
+
+## v0.96.0 (2024-08-22)
+
+### Documentation
+
+* docs(scan_control): added designer options ([`9d7718c`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/9d7718c3d9badf14150174410b9958a3134a1e23))
+
+### Feature
+
+* feat(scan_control): added the ability to configure the scan control widget from designer ([`9d8fb0b`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/9d8fb0b761efa92972399bcd9aea28e956074380))
+
+## v0.95.1 (2024-08-22)
+
+### Documentation
+
+* docs: links section added ([`2bf5c70`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/2bf5c7096e7d822713e1b50bde89f072e6356e17))
+
+### Fix
+
+* fix(docs): changed link to scan gui config in main docs ([`640464a`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/640464a6543b2111bdb58d0174f2ce86c5836cbe))
+
+### Refactor
+
+* refactor: removed designer pngs ([`84abe46`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/84abe460502d838aac41bb8ff63d93c9fcec9214))
+
+* refactor: moved to dynamically loaded material design icons ([`1d2afaa`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/1d2afaa09e64b7f714d72796e87e2cb49b2a75a7))
+
+## v0.95.0 (2024-08-21)
+
+### Documentation
+
+* docs(device_browser): added user docs ([`2c31cc9`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/2c31cc90ae751f14a653cbbdd6c353d6359aaafe))
+
+* docs(user): widget gallery with documentation added ([`7357f3d`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/7357f3d2a189f9f04954a027f39ce07c394d57ec))
+
+* docs: added sphinx-inline-tabs as sphinx dependency ([`e9ecd26`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/e9ecd268c602ea9572df0e8d508e49ee62d0c170))
+
+* docs(cards): changed index cards to custom css class instead of overwriting the default sd-card theme ([`91ba30e`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/91ba30e8d054a9c7f6c6d98b21113a5d0b1bbbbb))
+
+### Feature
+
+* feat(cli): added device_browser to cli ([`196504b`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/196504b533367a899c19b88af4ccd5b39dc46aac))
+
+* feat(widgets): added device_browser widget ([`73f5a2f`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/73f5a2f085b289ac18fa8a918b6ad7cfed595fb4))
+
+### Fix
+
+* fix(device_browser): fixed plugin assignment for designer ([`6500393`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/650039303aae9bbec62c676285938416fff146ce))
+
+### Refactor
+
+* refactor(docs): review response ([`4790afd`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/4790afde3d61fc9beb073c2775c339d4f80779e3))
 
 ### Test
 
-* test: register all widgets with qtbot and close them ([`73cd11e`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/73cd11e47277e4437554b785a9551b28a572094f))
+* test: added test for device browser ([`e870e5b`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/e870e5ba083c61df581c9c0305adabe72967f997))
 
-## v0.92.4 (2024-07-31)
+## v0.94.7 (2024-08-20)
 
 ### Fix
 
-* fix: fix missmatch of signal/slot in image and motormap ([`dcc5fd7`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/dcc5fd71ee9f51767a7b2b1ed6200e89d1ef754c))
+* fix: formatting of stdout, stderr captured text for logger ([`939f834`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/939f834a26ddbac0bdead0b60b1cdf52014f182f))
 
-## v0.92.3 (2024-07-28)
+## v0.94.6 (2024-08-14)
 
 ### Fix
 
-* fix(docs): moved to pyside6 ([`71873dd`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/71873ddf359516ded8f74f4d2f73df4156aa1368))
+* fix(server): emit heartbeat with state ([`bc2abe9`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/bc2abe945fb5adeec89ed5ac45e966db86ce6ffc))
 
-## v0.92.2 (2024-07-28)
-
-### Fix
-
-* fix(widgets): fixed import for tictactoe example ([`995a795`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/995a795060bebe25c17108d80ae0fa30463f03b1))
-
-## v0.92.1 (2024-07-28)
+## v0.94.5 (2024-08-14)
 
 ### Build
 
-* build(ci): install ophyd_devices in editable mode for pipelines ([`06205e0`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/06205e07903d93accf40abab153f440059f236ed))
+* build: increased min version of bec to 2.21.4
+
+Since we now rely on reusing the BECClient singleton, we need the fix introduced with 2.21.4 in BEC. ([`4f96d0e`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/4f96d0e4a14edc4b2839c1dddeda384737dc7a8a))
 
 ### Fix
 
-* fix: use SafeSlot instead of Slot ([`bc1e239`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/bc1e23944cc0e5a861e3d0b4dc5b4ac6292d5269))
+* fix(rpc): use client singleton instead of dispatcher ([`ea9240d`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/ea9240d2f71931082f33fb6b68231469875c3d63))
 
-* fix: linting ([`a3fe205`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/a3fe20500ae2ac03dcde07432f7e21ce5262ce46))
-
-* fix: always add a QApplication for tests ([`61a4e32`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/61a4e32deb337ed27f2f43358b88b7266413b58e))
-
-* fix: add xvfb to draw offscreen ([`3d681f7`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/3d681f77e144e74138fc5fa65630004d7c166878))
-
-* fix: reset ErrorPopup singleton between tests ([`5a9ccfd`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/5a9ccfd1f6d2aacd5d86c1a34f74163b272d1ae4))
-
-* fix: metaclass + QObject segfaults PyQt(cpp bindings) ([`fc57b7a`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/fc57b7a1262031a2df9e6a99493db87e766b779a))
-
-### Refactor
-
-* refactor: renamed DeviceMonitor2DMessage ([`4be6fd6`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/4be6fd6b83ea1048f16310f7d2bbe777b13b245e))
-
-* refactor: rename device_monitor to device_monitor_2d ([`714e1e1`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/714e1e139e0033d2725fefb636c419ca137a68c6))
-
-## v0.92.0 (2024-07-24)
-
-### Feature
-
-* feat(dock): dock style sheets updated ([`8ca60d5`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/8ca60d54b3cfa621172ce097fc1ba514c47ebac7))
-
-* feat(general_gui): general gui added ([`5696c99`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/5696c993dc1c0da40ff3e99f754c246cc017ea32))
-
-### Fix
-
-* fix(dock): custom label can be created closable ([`4457ef2`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/4457ef2147e21b856c9dcaf63c81ba98002dcaf1))
-
-* fix(device_combobox): set minimum size to 125px ([`1206e15`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/1206e153094cd8505badf69a1461572a76b4c5ad))
-
-## v0.91.0 (2024-07-23)
-
-### Feature
-
-* feat(dock_area): plugin added ([`a16b87a`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/a16b87ac28d164230dd2e8020f50ff3a63cd407e))
-
-* feat(dock_area): Added toolbar to dock area to add widgets without CLI interactions ([`cce1367`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/cce1367a72fca7206d351894bd1831b7bbfa7ec6))
-
-* feat(toolbar): expandable menu actions ([`28f26e9`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/28f26e92a46063db1a194be552156a5d3b2c43e7))
-
-### Fix
-
-* fix(status_item): icons changed to material design ([`1b9c55a`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/1b9c55a46a0dfd8678c8e95ff64dd6e8cfb9233e))
-
-* fix(plugins): Qt Designer plugins icons adjusted ([`f4844d2`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/f4844d2e067ce75dc64b89b230d7932b308ddfc2))
-
-### Test
-
-* test(dock_area): tests extended ([`06fab0e`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/06fab0eab926cef5677d4988fd1fce09da342dd8))
-
-## v0.90.0 (2024-07-23)
-
-### Feature
-
-* feat(image_widget): plugin added ([`4371168`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/43711680ba253f81fb0ffe764bcaae701b02bb49))
-
-* feat(image_widget): all toolbar actions added ([`501eb92`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/501eb923f12fa6aaa93f5428ca78e57694edfbc0))
-
-* feat(image_widget): image_widget added ([`6a9317f`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/6a9317facda896ee784c7fc1db0cd3d68cdfcf73))
-
-### Fix
-
-* fix(axis_setting): fix compatibility for issue with horizontal line for PyQt6 ([`1cf6e32`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/1cf6e32303f82bc7c3f3391d0e96a88bc31f29fc))
-
-* fix(image_widget): image_widget autorange fixed ([`7f49893`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/7f49893d2ce3b9d02efa764f7f10442ed6ab8f3c))
-
-* fix(image_widget): image widget adjusted ([`3d2ca48`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/3d2ca4855c36fe0af59a4b540caa3c8023a81773))
-
-* fix(image): only single monitor image is allowed ([`fe7e542`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/fe7e542b19dc5b401523501acb74ac03edf62ad4))
-
-* fix(image): raw data are saved in image item to always have precise processing ([`c15035b`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/c15035b6b769a96780a16da9e7f75af3b823654c))
-
-### Refactor
-
-* refactor(jupyter_console_example): added examples of standalone widgets ([`ba0d1ea`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/ba0d1ea9031b4ae2e2e73bf269fbfad973b924a5))
-
-### Test
-
-* test(image_widget): tests added ([`70fb276`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/70fb276fdf31dffc105435d3dfe7c5caea0b10ce))
-
-## v0.89.0 (2024-07-22)
-
-### Feature
-
-* feat(themes): moved themes to bec_qthemes ([`3798714`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/3798714369adf4023f833b7749d2f46a0ec74eee))
-
-### Unknown
-
-* Revert "feat(themes): moved themes to bec_qthemes"
-
-This reverts commit 3798714369adf4023f833b7749d2f46a0ec74eee ([`fd6ae91`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/fd6ae91993a23a7b8dbb2cf3c4b7c3eda6d2b0f6))
-
-## v0.88.1 (2024-07-22)
-
-### Refactor
-
-* refactor(toolbar): generalizations of the ToolBarAction ([`ad112d1`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/ad112d1f08157f6987edd48a0bacf9f669ef1997))
+* fix: removed qcoreapplication for polling events ([`4d02b42`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/4d02b42f11e9882b843317255a4975565c8a536f))

bec_widgets/assets/toolbar_icons/device_line_edit.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="48px" viewBox="0 -960 960 960" width="48px" fill="#FFFFFF">
+    <path d="M180-404.87v-50.26h289.75v50.26H180Zm0-162.57v-50.25h454.62v50.25H180Zm0-162.3V-780h454.62v50.26H180ZM524.62-180v-105.69l217.15-216.16q7.46-7.07 16.11-10.3 8.65-3.23 17.3-3.23 9.43 0 18.25 3.53 8.82 3.54 16.03 10.62l37 37.38q6.87 7.47 10.21 16.16Q860-439 860-430.31t-3.37 17.69q-3.37 9-10.52 16.46L630.31-180H524.62Zm250.69-211.69 37-38.62-37-37.38-38 38 38 38Z"/>
+</svg>

bec_widgets/cli/auto_updates.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+import threading
+from queue import Queue
 from typing import TYPE_CHECKING
 
 from pydantic import BaseModel
@@ -25,6 +27,17 @@ class AutoUpdates:
 
     def __init__(self, gui: BECDockArea):
         self.gui = gui
+        self.msg_queue = Queue()
+        self.auto_update_thread = None
+        self._shutdown_sentinel = object()
+        self.start()
+
+    def start(self):
+        """
+        Start the auto update thread.
+        """
+        self.auto_update_thread = threading.Thread(target=self.process_queue)
+        self.auto_update_thread.start()
 
     def start_default_dock(self):
         """
@@ -79,6 +92,16 @@ class AutoUpdates:
         info = self.get_scan_info(msg)
         self.handler(info)
 
+    def process_queue(self):
+        """
+        Process the message queue.
+        """
+        while True:
+            msg = self.msg_queue.get()
+            if msg is self._shutdown_sentinel:
+                break
+            self.run(msg)
+
     @staticmethod
     def get_selected_device(monitored_devices, selected_device):
         """
@@ -151,3 +174,11 @@ class AutoUpdates:
         fig.clear_all()
         plt = fig.plot(x_name=dev_x, y_name=dev_y, label=f"Scan {info.scan_number} - {dev_y}")
         plt.set(title=f"Scan {info.scan_number}", x_label=dev_x, y_label=dev_y)
+
+    def shutdown(self):
+        """
+        Shutdown the auto update thread.
+        """
+        self.msg_queue.put(self._shutdown_sentinel)
+        if self.auto_update_thread:
+            self.auto_update_thread.join()

bec_widgets/cli/client.py

@@ -21,9 +21,11 @@ class Widgets(str, enum.Enum):
     BECQueue = "BECQueue"
     BECStatusBox = "BECStatusBox"
     BECWaveformWidget = "BECWaveformWidget"
-    DeviceBox = "DeviceBox"
+    DeviceBrowser = "DeviceBrowser"
     DeviceComboBox = "DeviceComboBox"
     DeviceLineEdit = "DeviceLineEdit"
+    PositionerBox = "PositionerBox"
+    PositionerControlLine = "PositionerControlLine"
     RingProgressBar = "RingProgressBar"
     ScanControl = "ScanControl"
     StopButton = "StopButton"
@@ -2287,7 +2289,7 @@ class BECWaveformWidget(RPCBase):
         """
 
 
-class DeviceBox(RPCBase):
+class DeviceBrowser(RPCBase):
     @property
     @rpc_call
     def _config_dict(self) -> "dict":
@@ -2359,6 +2361,28 @@ class DeviceLineEdit(RPCBase):
         """
 
 
+class PositionerBox(RPCBase):
+    @rpc_call
+    def set_positioner(self, positioner: str):
+        """
+        Set the device
+
+        Args:
+            positioner (Positioner | str) : Positioner to set, accepts str or the device
+        """
+
+
+class PositionerControlLine(RPCBase):
+    @rpc_call
+    def set_positioner(self, positioner: str):
+        """
+        Set the device
+
+        Args:
+            positioner (Positioner | str) : Positioner to set, accepts str or the device
+        """
+
+
 class Ring(RPCBase):
     @rpc_call
     def _get_all_rpc(self) -> "dict":

bec_widgets/cli/client_utils.py

@@ -6,17 +6,16 @@ import json
 import os
 import select
 import subprocess
-import sys
 import threading
 import time
 import uuid
 from functools import wraps
 from typing import TYPE_CHECKING
 
+from bec_lib.client import BECClient
 from bec_lib.endpoints import MessageEndpoints
 from bec_lib.logger import bec_logger
 from bec_lib.utils.import_utils import isinstance_based_on_class_name, lazy_import, lazy_import_from
-from qtpy.QtCore import QEventLoop, QSocketNotifier, QTimer
 
 import bec_widgets.cli.client as client
 from bec_widgets.cli.auto_updates import AutoUpdates
@@ -24,10 +23,6 @@ from bec_widgets.cli.auto_updates import AutoUpdates
 if TYPE_CHECKING:
     from bec_lib.device import DeviceBase
 
-    from bec_widgets.cli.client import BECDockArea, BECFigure
-
-from bec_lib.serialization import MsgpackSerialization
-
 messages = lazy_import("bec_lib.messages")
 # from bec_lib.connector import MessageObject
 MessageObject = lazy_import_from("bec_lib.connector", ("MessageObject",))
@@ -105,6 +100,7 @@ def _start_plot_process(gui_id: str, gui_class: type, config: dict | str, logger
 
     env_dict = os.environ.copy()
     env_dict["PYTHONUNBUFFERED"] = "1"
+
     if logger is None:
         stdout_redirect = subprocess.DEVNULL
         stderr_redirect = subprocess.DEVNULL
@@ -184,7 +180,7 @@ class BECGuiClientMixin:
         if isinstance(msg, messages.ScanStatusMessage):
             if not self.gui_is_alive():
                 return
-            self.auto_updates.run(msg)
+            self.auto_updates.msg_queue.put(msg)
 
     def show(self) -> None:
         """
@@ -213,6 +209,8 @@ class BECGuiClientMixin:
                 self._process_output_processing_thread.join()
             self._process.wait()
             self._process = None
+        if self.auto_updates is not None:
+            self.auto_updates.shutdown()
 
 
 class RPCResponseTimeoutError(Exception):
@@ -224,54 +222,14 @@ class RPCResponseTimeoutError(Exception):
         )
 
 
-class QtRedisMessageWaiter:
-    def __init__(self, redis_connector, message_to_wait):
-        self.ev_loop = QEventLoop()
-        self.response = None
-        self.connector = redis_connector
-        self.message_to_wait = message_to_wait
-        self.pubsub = redis_connector._redis_conn.pubsub()
-        self.pubsub.subscribe(self.message_to_wait.endpoint)
-        fd = self.pubsub.connection._sock.fileno()
-        self.notifier = QSocketNotifier(fd, QSocketNotifier.Read)
-        self.notifier.activated.connect(self._pubsub_readable)
-
-    def _msg_received(self, msg_obj):
-        self.response = msg_obj.value
-        self.ev_loop.quit()
-
-    def wait(self, timeout=1):
-        timer = QTimer()
-        timer.singleShot(timeout * 1000, self.ev_loop.quit)
-        self.ev_loop.exec_()
-        timer.stop()
-        self.notifier.setEnabled(False)
-        self.pubsub.close()
-        return self.response
-
-    def _pubsub_readable(self, fd):
-        while True:
-            msg = self.pubsub.get_message()
-            if msg:
-                if msg["type"] == "subscribe":
-                    # get_message buffers, so we may already have the answer
-                    # let's check...
-                    continue
-                else:
-                    break
-            else:
-                return
-        channel = msg["channel"].decode()
-        msg = MessageObject(topic=channel, value=MsgpackSerialization.loads(msg["data"]))
-        self.connector._execute_callback(self._msg_received, msg, {})
-
-
 class RPCBase:
     def __init__(self, gui_id: str = None, config: dict = None, parent=None) -> None:
-        self._client = BECDispatcher().client
+        self._client = BECClient()  # BECClient is a singleton; here, we simply get the instance
         self._config = config if config is not None else {}
         self._gui_id = gui_id if gui_id is not None else str(uuid.uuid4())
         self._parent = parent
+        self._msg_wait_event = threading.Event()
+        self._rpc_response = None
         super().__init__()
         # print(f"RPCBase: {self._gui_id}")
 
@@ -315,24 +273,39 @@ class RPCBase:
         # pylint: disable=protected-access
         receiver = self._root._gui_id
         if wait_for_rpc_response:
-            redis_msg = QtRedisMessageWaiter(
-                self._client.connector, MessageEndpoints.gui_instruction_response(request_id)
+            self._rpc_response = None
+            self._msg_wait_event.clear()
+            self._client.connector.register(
+                MessageEndpoints.gui_instruction_response(request_id),
+                cb=self._on_rpc_response,
+                parent=self,
             )
 
         self._client.connector.set_and_publish(MessageEndpoints.gui_instructions(receiver), rpc_msg)
 
         if wait_for_rpc_response:
-            response = redis_msg.wait(timeout)
-
-            if response is None:
-                raise RPCResponseTimeoutError(request_id, timeout)
-
+            try:
+                finished = self._msg_wait_event.wait(10)
+                if not finished:
+                    raise RPCResponseTimeoutError(request_id, timeout)
+            finally:
+                self._msg_wait_event.clear()
+                self._client.connector.unregister(
+                    MessageEndpoints.gui_instruction_response(request_id), cb=self._on_rpc_response
+                )
             # get class name
-            if not response.accepted:
-                raise ValueError(response.message["error"])
-            msg_result = response.message.get("result")
+            if not self._rpc_response.accepted:
+                raise ValueError(self._rpc_response.message["error"])
+            msg_result = self._rpc_response.message.get("result")
+            self._rpc_response = None
             return self._create_widget_from_msg_result(msg_result)
 
+    @staticmethod
+    def _on_rpc_response(msg: MessageObject, parent: RPCBase) -> None:
+        msg = msg.value
+        parent._msg_wait_event.set()
+        parent._rpc_response = msg
+
     def _create_widget_from_msg_result(self, msg_result):
         if msg_result is None:
             return None
@@ -359,4 +332,8 @@ class RPCBase:
         Check if the GUI is alive.
         """
         heart = self._client.connector.get(MessageEndpoints.gui_heartbeat(self._root._gui_id))
-        return heart is not None
+        if heart is None:
+            return False
+        if heart.status == messages.BECStatus.RUNNING:
+            return True
+        return False

bec_widgets/cli/server.py

@@ -28,12 +28,13 @@ class BECWidgetsCLIServer:
 
     def __init__(
         self,
-        gui_id: str = None,
+        gui_id: str,
         dispatcher: BECDispatcher = None,
         client=None,
         config=None,
         gui_class: Union[BECFigure, BECDockArea] = BECFigure,
     ) -> None:
+        self.status = messages.BECStatus.BUSY
         self.dispatcher = BECDispatcher(config=config) if dispatcher is None else dispatcher
         self.client = self.dispatcher.client if client is None else client
         self.client.start()
@@ -47,11 +48,12 @@ class BECWidgetsCLIServer:
         )
 
         # Setup QTimer for heartbeat
-        self._shutdown_event = False
         self._heartbeat_timer = QTimer()
         self._heartbeat_timer.timeout.connect(self.emit_heartbeat)
         self._heartbeat_timer.start(200)
 
+        self.status = messages.BECStatus.RUNNING
+
     def on_rpc_update(self, msg: dict, metadata: dict):
         request_id = metadata.get("request_id")
         try:
@@ -111,16 +113,16 @@ class BECWidgetsCLIServer:
         return obj
 
     def emit_heartbeat(self):
-        if self._shutdown_event is False:
-            self.client.connector.set(
-                MessageEndpoints.gui_heartbeat(self.gui_id),
-                messages.StatusMessage(name=self.gui_id, status=1, info={}),
-                expire=1,
-            )
+        self.client.connector.set(
+            MessageEndpoints.gui_heartbeat(self.gui_id),
+            messages.StatusMessage(name=self.gui_id, status=self.status, info={}),
+            expire=10,
+        )
 
     def shutdown(self):  # TODO not sure if needed when cleanup is done at level of BECConnector
-        self._shutdown_event = True
+        self.status = messages.BECStatus.IDLE
         self._heartbeat_timer.stop()
+        self.emit_heartbeat()
         self.gui.close()
         self.client.shutdown()
 
@@ -128,15 +130,15 @@ class BECWidgetsCLIServer:
 class SimpleFileLikeFromLogOutputFunc:
     def __init__(self, log_func):
         self._log_func = log_func
+        self._buffer = []
 
     def write(self, buffer):
-        for line in buffer.rstrip().splitlines():
-            line = line.rstrip()
-            if line:
-                self._log_func(line)
+        self._buffer.append(buffer)
 
     def flush(self):
-        return
+        lines, _, remaining = "".join(self._buffer).rpartition("\n")
+        self._log_func(lines)
+        self._buffer = [remaining]
 
     def close(self):
         return
@@ -231,4 +233,5 @@ def main():
 
 
 if __name__ == "__main__":  # pragma: no cover
+    sys.argv = ["bec_widgets.cli.server", "--id", "test", "--gui_class", "BECDockArea"]
     main()

bec_widgets/examples/jupyter_console/jupyter_console_window.py

@@ -46,6 +46,7 @@ class JupyterConsoleWindow(QWidget):  # pragma: no cover:
                     "w7": self.w7,
                     "w8": self.w8,
                     "w9": self.w9,
+                    "w10": self.w10,
                     "d0": self.d0,
                     "d1": self.d1,
                     "d2": self.d2,

bec_widgets/examples/plugin_example_pyside/tictactoeplugin.py

@@ -3,11 +3,11 @@
 import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtGui import QIcon
 
 import bec_widgets
 from bec_widgets.examples.plugin_example_pyside.tictactoe import TicTacToe
 from bec_widgets.examples.plugin_example_pyside.tictactoetaskmenu import TicTacToeTaskMenuFactory
+from bec_widgets.utils.bec_designer import designer_material_icon
 
 DOM_XML = """
 <ui language='c++'>
@@ -46,8 +46,7 @@ class TicTacToePlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "Games"
 
     def icon(self):
-        icon_path = os.path.join(MODULE_PATH, "assets", "designer_icons", "games.png")
-        return QIcon(icon_path)
+        return designer_material_icon("sports_esports")
 
     def includeFile(self):
         return "tictactoe"

bec_widgets/qt_utils/redis_message_waiter.py

@@ -0,0 +1,47 @@
+from bec_lib.serialization import MsgpackSerialization
+from bec_lib.utils import lazy_import_from
+from qtpy.QtCore import QEventLoop, QSocketNotifier, QTimer
+
+MessageObject = lazy_import_from("bec_lib.connector", ("MessageObject",))
+
+
+class QtRedisMessageWaiter:
+    def __init__(self, redis_connector, message_to_wait):
+        self.ev_loop = QEventLoop()
+        self.response = None
+        self.connector = redis_connector
+        self.message_to_wait = message_to_wait
+        self.pubsub = redis_connector._redis_conn.pubsub()
+        self.pubsub.subscribe(self.message_to_wait.endpoint)
+        fd = self.pubsub.connection._sock.fileno()
+        self.notifier = QSocketNotifier(fd, QSocketNotifier.Read)
+        self.notifier.activated.connect(self._pubsub_readable)
+
+    def _msg_received(self, msg_obj):
+        self.response = msg_obj.value
+        self.ev_loop.quit()
+
+    def wait(self, timeout=1):
+        timer = QTimer()
+        timer.singleShot(timeout * 1000, self.ev_loop.quit)
+        self.ev_loop.exec_()
+        timer.stop()
+        self.notifier.setEnabled(False)
+        self.pubsub.close()
+        return self.response
+
+    def _pubsub_readable(self, fd):
+        while True:
+            msg = self.pubsub.get_message()
+            if msg:
+                if msg["type"] == "subscribe":
+                    # get_message buffers, so we may already have the answer
+                    # let's check...
+                    continue
+                else:
+                    break
+            else:
+                return
+        channel = msg["channel"].decode()
+        msg = MessageObject(topic=channel, value=MsgpackSerialization.loads(msg["data"]))
+        self.connector._execute_callback(self._msg_received, msg, {})

bec_widgets/qt_utils/settings_dialog.py

@@ -106,3 +106,14 @@ class SettingsDialog(QDialog):
         Apply the changes made in the settings widget without closing the dialog.
         """
         self.widget.accept_changes()
+
+    def cleanup(self):
+        """
+        Cleanup the dialog.
+        """
+        self.button_box.close()
+        self.button_box.deleteLater()
+
+    def closeEvent(self, event):
+        self.cleanup()
+        super().closeEvent(event)

bec_widgets/qt_utils/toolbar.py

@@ -3,6 +3,7 @@ import os
 from abc import ABC, abstractmethod
 from collections import defaultdict
 
+from bec_qthemes._icon.material_icons import material_icon
 from qtpy.QtCore import QSize
 from qtpy.QtGui import QAction, QIcon
 from qtpy.QtWidgets import QHBoxLayout, QLabel, QMenu, QToolBar, QToolButton, QWidget
@@ -70,6 +71,44 @@ class IconAction(ToolBarAction):
         toolbar.addAction(self.action)
 
 
+class MaterialIconAction:
+    """
+    Action with a Material icon for the toolbar.
+
+    Args:
+        icon_path (str, optional): The name of the Material icon. Defaults to None.
+        tooltip (bool, optional): The tooltip for the action. Defaults to None.
+        checkable (bool, optional): Whether the action is checkable. Defaults to False.
+        filled (bool, optional): Whether the icon is filled. Defaults to False.
+    """
+
+    def __init__(
+        self,
+        icon_name: str = None,
+        tooltip: str = None,
+        checkable: bool = False,
+        filled: bool = False,
+    ):
+        self.icon_name = icon_name
+        self.tooltip = tooltip
+        self.checkable = checkable
+        self.action = None
+        self.filled = filled
+
+    def add_to_toolbar(self, toolbar: QToolBar, target: QWidget):
+        icon = self.get_icon()
+        self.action = QAction(icon, self.tooltip, target)
+        self.action.setCheckable(self.checkable)
+        toolbar.addAction(self.action)
+
+    def get_icon(self):
+
+        icon = material_icon(
+            self.icon_name, size=(20, 20), convert_to_pixmap=False, filled=self.filled
+        )
+        return icon
+
+
 class DeviceSelectionAction(ToolBarAction):
     """
     Action for selecting a device in a combobox.
@@ -133,10 +172,12 @@ class ExpandableMenuAction(ToolBarAction):
         menu = QMenu(button)
         for action_id, action in self.actions.items():
             sub_action = QAction(action.tooltip, target)
-            if action.icon_path:
+            if hasattr(action, "icon_path"):
                 icon = QIcon()
                 icon.addFile(action.icon_path, size=QSize(20, 20))
                 sub_action.setIcon(icon)
+            elif hasattr(action, "get_icon"):
+                sub_action.setIcon(action.get_icon())
             sub_action.setCheckable(action.checkable)
             menu.addAction(sub_action)
             self.widgets[action_id] = sub_action
@@ -150,20 +191,13 @@ class ModularToolBar(QToolBar):
         parent (QWidget, optional): The parent widget of the toolbar. Defaults to None.
         actions (list[ToolBarAction], optional): A list of action creators to populate the toolbar. Defaults to None.
         target_widget (QWidget, optional): The widget that the actions will target. Defaults to None.
-        color (str, optional): The background color of the toolbar. Defaults to "black".
     """
 
-    def __init__(
-        self,
-        parent=None,
-        actions: dict | None = None,
-        target_widget=None,
-        color: str = "rgba(255, 255, 255, 0)",
-    ):
+    def __init__(self, parent=None, actions: dict | None = None, target_widget=None):
         super().__init__(parent)
 
         self.widgets = defaultdict(dict)
-        self.set_background_color(color)
+        self.set_background_color()
 
         if actions is not None and target_widget is not None:
             self.populate_toolbar(actions, target_widget)
@@ -180,8 +214,7 @@ class ModularToolBar(QToolBar):
             action.add_to_toolbar(self, target_widget)
             self.widgets[action_id] = action
 
-    def set_background_color(self, color: str):
-        self.setStyleSheet(f"QToolBar {{ background: {color}; }}")
+    def set_background_color(self):
         self.setIconSize(QSize(20, 20))
         self.setMovable(False)
         self.setFloatable(False)

bec_widgets/utils/bec_designer.py

@@ -6,7 +6,9 @@ import sys
 import sysconfig
 from pathlib import Path
 
+from bec_qthemes import material_icon
 from qtpy import PYSIDE6
+from qtpy.QtGui import QIcon
 
 if PYSIDE6:
     from PySide6.scripts.pyside_tool import (
@@ -21,6 +23,19 @@ if PYSIDE6:
 import bec_widgets
 
 
+def designer_material_icon(icon_name: str) -> QIcon:
+    """
+    Create a QIcon for the BECDesigner with the given material icon name.
+
+    Args:
+        icon_name (str): The name of the material icon.
+
+    Returns:
+        QIcon: The QIcon for the material icon.
+    """
+    return QIcon(material_icon(icon_name, filled=True, convert_to_pixmap=True))
+
+
 def list_editable_packages() -> set[str]:
     """
     List all editable packages in the environment.

bec_widgets/utils/bec_dispatcher.py

@@ -8,7 +8,7 @@ import redis
 from bec_lib.client import BECClient
 from bec_lib.redis_connector import MessageObject, RedisConnector
 from bec_lib.service_config import ServiceConfig
-from qtpy.QtCore import PYQT6, PYSIDE6, QCoreApplication, QObject
+from qtpy.QtCore import QObject
 from qtpy.QtCore import Signal as pyqtSignal
 
 if TYPE_CHECKING:
@@ -75,7 +75,6 @@ class BECDispatcher:
 
     _instance = None
     _initialized = False
-    qapp = None
 
     def __new__(cls, client=None, config: str = None, *args, **kwargs):
         if cls._instance is None:
@@ -87,9 +86,6 @@ class BECDispatcher:
         if self._initialized:
             return
 
-        if not QCoreApplication.instance():
-            BECDispatcher.qapp = QCoreApplication([])
-
         self._slots = collections.defaultdict(set)
         self.client = client
 
@@ -123,23 +119,13 @@ class BECDispatcher:
         cls._instance = None
         cls._initialized = False
 
-        if not cls.qapp:
-            return
-
-        # shutdown QCoreApp if it exists
-        if PYQT6:
-            cls.qapp.exit()
-        elif PYSIDE6:
-            cls.qapp.shutdown()
-        cls.qapp = None
-
     def connect_slot(
         self,
         slot: Callable,
         topics: Union[EndpointInfo, str, list[Union[EndpointInfo, str]]],
         **kwargs,
     ) -> None:
-        """Connect widget's pyqt slot, so that it is called on new pub/sub topic message.
+        """Connect widget's qt slot, so that it is called on new pub/sub topic message.
 
         Args:
             slot (Callable): A slot method/function that accepts two inputs: content and metadata of
@@ -152,6 +138,13 @@ class BECDispatcher:
         self._slots[slot].update(set(topics_str))
 
     def disconnect_slot(self, slot: Callable, topics: Union[str, list]):
+        """
+        Disconnect a slot from a topic.
+
+        Args:
+            slot(Callable): The slot to disconnect
+            topics(Union[str, list]): The topic(s) to disconnect from
+        """
         # find the right slot to disconnect from ;
         # slot callbacks are wrapped in QtThreadSafeCallback objects,
         # but the slot we receive here is the original callable
@@ -162,11 +155,17 @@ class BECDispatcher:
             return
         self.client.connector.unregister(topics, cb=connected_slot)
         topics_str, _ = self.client.connector._convert_endpointinfo(topics)
-        self._slots[slot].difference_update(set(topics_str))
-        if not self._slots[slot]:
-            del self._slots[slot]
+        self._slots[connected_slot].difference_update(set(topics_str))
+        if not self._slots[connected_slot]:
+            del self._slots[connected_slot]
 
     def disconnect_topics(self, topics: Union[str, list]):
+        """
+        Disconnect all slots from a topic.
+
+        Args:
+            topics(Union[str, list]): The topic(s) to disconnect from
+        """
         self.client.connector.unregister(topics)
         topics_str, _ = self.client.connector._convert_endpointinfo(topics)
         for slot in list(self._slots.keys()):
@@ -176,4 +175,11 @@ class BECDispatcher:
                 del self._slots[slot]
 
     def disconnect_all(self, *args, **kwargs):
+        """
+        Disconnect all slots from all topics.
+
+        Args:
+            *args: Arbitrary positional arguments
+            **kwargs: Arbitrary keyword arguments
+        """
         self.disconnect_topics(self.client.connector._topics_cb)

bec_widgets/utils/colors.py

@@ -5,21 +5,45 @@ from typing import Literal
 import bec_qthemes
 import numpy as np
 import pyqtgraph as pg
+from bec_qthemes._os_appearance.listener import OSThemeSwitchListener
 from pydantic_core import PydanticCustomError
 from qtpy.QtGui import QColor
 from qtpy.QtWidgets import QApplication
 
-CURRENT_THEME = "dark"
-
 
 def get_theme_palette():
-    return bec_qthemes.load_palette(CURRENT_THEME)
+    if QApplication.instance() is None or not hasattr(QApplication.instance(), "theme"):
+        theme = "dark"
+    else:
+        theme = QApplication.instance().theme["theme"]
+    return bec_qthemes.load_palette(theme)
+
+
+def set_theme(theme: Literal["dark", "light", "auto"]):
+    """
+    Set the theme for the application.
+
+    Args:
+        theme (Literal["dark", "light", "auto"]): The theme to set. "auto" will automatically switch between dark and light themes based on the system theme.
+    """
+    app = QApplication.instance()
+    bec_qthemes.setup_theme(theme)
+    pg.setConfigOption("background", "w" if app.theme["theme"] == "light" else "k")
+
+    # pylint: disable=protected-access
+    if theme != "auto":
+        return
+
+    def callback():
+        app.theme["theme"] = listener._theme.lower()
+        apply_theme(listener._theme.lower())
+
+    listener = OSThemeSwitchListener(callback)
+
+    app.installEventFilter(listener)
 
 
 def apply_theme(theme: Literal["dark", "light"]):
-    global CURRENT_THEME
-    CURRENT_THEME = theme
-
     app = QApplication.instance()
     # go through all pyqtgraph widgets and set background
     children = itertools.chain.from_iterable(

bec_widgets/utils/container_utils.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import itertools
 from typing import Type
 

bec_widgets/utils/crosshair.py

@@ -1,8 +1,10 @@
+from collections import defaultdict
+
 import numpy as np
 import pyqtgraph as pg
 
 # from qtpy.QtCore import QObject, pyqtSignal
-from qtpy.QtCore import QObject
+from qtpy.QtCore import QObject, Qt
 from qtpy.QtCore import Signal as pyqtSignal
 
 
@@ -26,10 +28,13 @@ class Crosshair(QObject):
         super().__init__(parent)
         self.is_log_y = None
         self.is_log_x = None
+        self.is_derivative = None
         self.plot_item = plot_item
         self.precision = precision
         self.v_line = pg.InfiniteLine(angle=90, movable=False)
+        self.v_line.skip_auto_range = True
         self.h_line = pg.InfiniteLine(angle=0, movable=False)
+        self.h_line.skip_auto_range = True
         self.plot_item.addItem(self.v_line, ignoreBounds=True)
         self.plot_item.addItem(self.h_line, ignoreBounds=True)
         self.proxy = pg.SignalProxy(
@@ -37,74 +42,75 @@ class Crosshair(QObject):
         )
         self.plot_item.scene().sigMouseClicked.connect(self.mouse_clicked)
 
+        self.plot_item.ctrl.derivativeCheck.checkStateChanged.connect(self.check_derivatives)
+        self.plot_item.ctrl.logXCheck.checkStateChanged.connect(self.check_log)
+        self.plot_item.ctrl.logYCheck.checkStateChanged.connect(self.check_log)
+
         # Initialize markers
-        self.marker_moved_1d = []
-        self.marker_clicked_1d = []
+        self.marker_moved_1d = {}
+        self.marker_clicked_1d = {}
         self.marker_2d = None
         self.update_markers()
 
     def update_markers(self):
         """Update the markers for the crosshair, creating new ones if necessary."""
 
-        # Clear existing markers
-        for marker in self.marker_moved_1d + self.marker_clicked_1d:
-            self.plot_item.removeItem(marker)
-        if self.marker_2d:
-            self.plot_item.removeItem(self.marker_2d)
-
         # Create new markers
-        self.marker_moved_1d = []
-        self.marker_clicked_1d = []
-        self.marker_2d = None
         for item in self.plot_item.items:
             if isinstance(item, pg.PlotDataItem):  # 1D plot
+                if item.name() in self.marker_moved_1d:
+                    continue
                 pen = item.opts["pen"]
                 color = pen.color() if hasattr(pen, "color") else pg.mkColor(pen)
                 marker_moved = pg.ScatterPlotItem(
                     size=10, pen=pg.mkPen(color), brush=pg.mkBrush(None)
                 )
-                marker_clicked = pg.ScatterPlotItem(
-                    size=10, pen=pg.mkPen(None), brush=pg.mkBrush(color)
-                )
-                self.marker_moved_1d.append(marker_moved)
+                marker_moved.skip_auto_range = True
+                self.marker_moved_1d[item.name()] = marker_moved
                 self.plot_item.addItem(marker_moved)
+
                 # Create glowing effect markers for clicked events
-                marker_clicked_list = []
                 for size, alpha in [(18, 64), (14, 128), (10, 255)]:
                     marker_clicked = pg.ScatterPlotItem(
                         size=size,
                         pen=pg.mkPen(None),
                         brush=pg.mkBrush(color.red(), color.green(), color.blue(), alpha),
                     )
-                    marker_clicked_list.append(marker_clicked)
+                    marker_clicked.skip_auto_range = True
+                    self.marker_clicked_1d[item.name()] = marker_clicked
                     self.plot_item.addItem(marker_clicked)
 
-                self.marker_clicked_1d.append(marker_clicked_list)
             elif isinstance(item, pg.ImageItem):  # 2D plot
+                if self.marker_2d is not None:
+                    continue
                 self.marker_2d = pg.ROI(
                     [0, 0], size=[1, 1], pen=pg.mkPen("r", width=2), movable=False
                 )
                 self.plot_item.addItem(self.marker_2d)
 
-    def snap_to_data(self, x, y) -> tuple:
+    def snap_to_data(self, x, y) -> tuple[defaultdict[list], defaultdict[list]]:
         """
         Finds the nearest data points to the given x and y coordinates.
 
         Args:
-            x: The x-coordinate
-            y: The y-coordinate
+            x: The x-coordinate of the mouse cursor
+            y: The y-coordinate of the mouse cursor
 
         Returns:
-            tuple: The nearest x and y values
+            tuple: x and y values snapped to the nearest data
         """
-        y_values_1d = []
-        x_values_1d = []
+        y_values = defaultdict(list)
+        x_values = defaultdict(list)
         image_2d = None
 
         # Iterate through items in the plot
         for item in self.plot_item.items:
             if isinstance(item, pg.PlotDataItem):  # 1D plot
-                x_data, y_data = item.xData, item.yData
+                name = item.name()
+                plot_data = item._getDisplayDataset()
+                if plot_data is None:
+                    continue
+                x_data, y_data = plot_data.x, plot_data.y
                 if x_data is not None and y_data is not None:
                     if self.is_log_x:
                         min_x_data = np.min(x_data[x_data > 0])
@@ -112,25 +118,25 @@ class Crosshair(QObject):
                         min_x_data = np.min(x_data)
                     max_x_data = np.max(x_data)
                     if x < min_x_data or x > max_x_data:
-                        return None, None
+                        y_values[name] = None
+                        x_values[name] = None
+                        continue
                     closest_x, closest_y = self.closest_x_y_value(x, x_data, y_data)
-                    y_values_1d.append(closest_y)
-                    x_values_1d.append(closest_x)
+                    y_values[name] = closest_y
+                    x_values[name] = closest_x
             elif isinstance(item, pg.ImageItem):  # 2D plot
+                name = item.config.monitor
                 image_2d = item.image
+                # clip the x and y values to the image dimensions to avoid out of bounds errors
+                y_values[name] = int(np.clip(y, 0, image_2d.shape[1] - 1))
+                x_values[name] = int(np.clip(x, 0, image_2d.shape[0] - 1))
 
-        # Handle 1D plot
-        if y_values_1d:
-            if all(v is None for v in x_values_1d) or all(v is None for v in y_values_1d):
+        if x_values and y_values:
+            if all(v is None for v in x_values.values()) or all(
+                v is None for v in y_values.values()
+            ):
                 return None, None
-            closest_x = min(x_values_1d, key=lambda xi: abs(xi - x))  # Snap x to closest data point
-            return closest_x, y_values_1d
-
-        # Handle 2D plot
-        if image_2d is not None:
-            x_idx = int(np.clip(x, 0, image_2d.shape[0] - 1))
-            y_idx = int(np.clip(y, 0, image_2d.shape[1] - 1))
-            return x_idx, y_idx
+            return x_values, y_values
 
         return None, None
 
@@ -156,8 +162,8 @@ class Crosshair(QObject):
         Args:
             event: The mouse moved event
         """
-        self.check_log()
         pos = event[0]
+        self.update_markers()
         if self.plot_item.vb.sceneBoundingRect().contains(pos):
             mouse_point = self.plot_item.vb.mapSceneToView(pos)
             self.v_line.setPos(mouse_point.x())
@@ -168,27 +174,34 @@ class Crosshair(QObject):
                 x = 10**x
             if self.is_log_y:
                 y = 10**y
-            x, y_values = self.snap_to_data(x, y)
+            x_snap_values, y_snap_values = self.snap_to_data(x, y)
+            if x_snap_values is None or y_snap_values is None:
+                return
+            if all(v is None for v in x_snap_values.values()) or all(
+                v is None for v in y_snap_values.values()
+            ):
+                # not sure how we got here, but just to be safe...
+                return
 
             for item in self.plot_item.items:
                 if isinstance(item, pg.PlotDataItem):
-                    if x is None or all(v is None for v in y_values):
-                        return
-                    coordinate_to_emit = (
-                        round(x, self.precision),
-                        [round(y_val, self.precision) for y_val in y_values],
-                    )
+                    name = item.name()
+                    x, y = x_snap_values[name], y_snap_values[name]
+                    if x is None or y is None:
+                        continue
+                    self.marker_moved_1d[name].setData([x], [y])
+                    coordinate_to_emit = (name, round(x, self.precision), round(y, self.precision))
                     self.coordinatesChanged1D.emit(coordinate_to_emit)
-                    for i, y_val in enumerate(y_values):
-                        self.marker_moved_1d[i].setData(
-                            [x if not self.is_log_x else np.log10(x)],
-                            [y_val if not self.is_log_y else np.log10(y_val)],
-                        )
                 elif isinstance(item, pg.ImageItem):
-                    if x is None or y_values is None:
-                        return
-                    coordinate_to_emit = (x, y_values)
+                    name = item.config.monitor
+                    x, y = x_snap_values[name], y_snap_values[name]
+                    if x is None or y is None:
+                        continue
+                    self.marker_2d.setPos([x, y])
+                    coordinate_to_emit = (name, x, y)
                     self.coordinatesChanged2D.emit(coordinate_to_emit)
+                else:
+                    continue
 
     def mouse_clicked(self, event):
         """Handles the mouse clicked event, updating the crosshair position and emitting signals.
@@ -196,7 +209,11 @@ class Crosshair(QObject):
         Args:
             event: The mouse clicked event
         """
-        self.check_log()
+
+        # we only accept left mouse clicks
+        if event.button() != Qt.MouseButton.LeftButton:
+            return
+        self.update_markers()
         if self.plot_item.vb.sceneBoundingRect().contains(event._scenePos):
             mouse_point = self.plot_item.vb.mapSceneToView(event._scenePos)
             x, y = mouse_point.x(), mouse_point.y()
@@ -205,31 +222,55 @@ class Crosshair(QObject):
                 x = 10**x
             if self.is_log_y:
                 y = 10**y
-            x, y_values = self.snap_to_data(x, y)
+            x_snap_values, y_snap_values = self.snap_to_data(x, y)
+
+            if x_snap_values is None or y_snap_values is None:
+                return
+            if all(v is None for v in x_snap_values.values()) or all(
+                v is None for v in y_snap_values.values()
+            ):
+                # not sure how we got here, but just to be safe...
+                return
 
             for item in self.plot_item.items:
                 if isinstance(item, pg.PlotDataItem):
-                    if x is None or all(v is None for v in y_values):
-                        return
-                    coordinate_to_emit = (
-                        round(x, self.precision),
-                        [round(y_val, self.precision) for y_val in y_values],
-                    )
+                    name = item.name()
+                    x, y = x_snap_values[name], y_snap_values[name]
+                    if x is None or y is None:
+                        continue
+                    self.marker_clicked_1d[name].setData([x], [y])
+                    coordinate_to_emit = (name, round(x, self.precision), round(y, self.precision))
                     self.coordinatesClicked1D.emit(coordinate_to_emit)
-                    for i, y_val in enumerate(y_values):
-                        for marker in self.marker_clicked_1d[i]:
-                            marker.setData(
-                                [x if not self.is_log_x else np.log10(x)],
-                                [y_val if not self.is_log_y else np.log10(y_val)],
-                            )
                 elif isinstance(item, pg.ImageItem):
-                    if x is None or y_values is None:
-                        return
-                    coordinate_to_emit = (x, y_values)
+                    name = item.config.monitor
+                    x, y = x_snap_values[name], y_snap_values[name]
+                    if x is None or y is None:
+                        continue
+                    self.marker_2d.setPos([x, y])
+                    coordinate_to_emit = (name, x, y)
                     self.coordinatesClicked2D.emit(coordinate_to_emit)
-                    self.marker_2d.setPos([x, y_values])
+                else:
+                    continue
+
+    def clear_markers(self):
+        """Clears the markers from the plot."""
+        for marker in self.marker_moved_1d.values():
+            marker.clear()
+        for marker in self.marker_clicked_1d.values():
+            marker.clear()
 
     def check_log(self):
         """Checks if the x or y axis is in log scale and updates the internal state accordingly."""
         self.is_log_x = self.plot_item.ctrl.logXCheck.isChecked()
         self.is_log_y = self.plot_item.ctrl.logYCheck.isChecked()
+        self.clear_markers()
+
+    def check_derivatives(self):
+        """Checks if the derivatives are enabled and updates the internal state accordingly."""
+        self.is_derivative = self.plot_item.ctrl.derivativeCheck.isChecked()
+        self.clear_markers()
+
+    def cleanup(self):
+        self.v_line.deleteLater()
+        self.h_line.deleteLater()
+        self.clear_markers()

bec_widgets/widgets/bec_queue/bec_queue.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from bec_lib.endpoints import MessageEndpoints
 from qtpy.QtCore import Qt, Slot
 from qtpy.QtWidgets import QHBoxLayout, QHeaderView, QTableWidget, QTableWidgetItem, QWidget

bec_widgets/widgets/bec_queue/bec_queue_plugin.py

@@ -3,9 +3,9 @@
 import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtGui import QIcon
 
 import bec_widgets
+from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.bec_queue.bec_queue import BECQueue
 
 DOM_XML = """
@@ -34,8 +34,7 @@ class BECQueuePlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "BEC Services"
 
     def icon(self):
-        icon_path = os.path.join(MODULE_PATH, "assets", "designer_icons", "device_line_edit.png")
-        return QIcon(icon_path)
+        return designer_material_icon("edit_note")
 
     def includeFile(self):
         return "bec_queue"

bec_widgets/widgets/bec_status_box/bec_status_box_plugin.py

@@ -3,9 +3,9 @@
 import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtGui import QIcon
 
 import bec_widgets
+from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.bec_status_box.bec_status_box import BECStatusBox
 
 DOM_XML = """
@@ -34,8 +34,7 @@ class BECStatusBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "BEC Services"
 
     def icon(self):
-        icon_path = os.path.join(MODULE_PATH, "assets", "designer_icons", "status.png")
-        return QIcon(icon_path)
+        return designer_material_icon("dns")
 
     def includeFile(self):
         return "bec_status_box"

bec_widgets/widgets/color_button/color_button.py

@@ -34,3 +34,10 @@ class ColorButton(pg.ColorButton):
             return self.color().getRgb()
         if format == "HEX":
             return self.color().name()
+
+    def cleanup(self):
+        """
+        Clean up the ColorButton.
+        """
+        self.colorDialog.close()
+        self.colorDialog.deleteLater()

bec_widgets/widgets/color_button/color_button_plugin.py

@@ -1,9 +1,9 @@
 import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtGui import QIcon
 
 import bec_widgets
+from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.color_button.color_button import ColorButton
 
 DOM_XML = """
@@ -31,8 +31,7 @@ class ColorButtonPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "BEC Buttons"
 
     def icon(self):
-        icon_path = os.path.join(MODULE_PATH, "assets", "designer_icons", "color_button.png")
-        return QIcon(icon_path)
+        return designer_material_icon("colors")
 
     def includeFile(self):
         return "color_button"

bec_widgets/widgets/colormap_selector/colormap_selector_plugin.py

@@ -3,9 +3,9 @@
 import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtGui import QIcon
 
 import bec_widgets
+from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.colormap_selector.colormap_selector import ColormapSelector
 
 DOM_XML = """
@@ -34,8 +34,7 @@ class ColormapSelectorPlugin(QDesignerCustomWidgetInterface):  # pragma: no cove
         return "BEC Buttons"
 
     def icon(self):
-        icon_path = os.path.join(MODULE_PATH, "assets", "designer_icons", "colormap_selector.png")
-        return QIcon(icon_path)
+        return designer_material_icon("palette")
 
     def includeFile(self):
         return "colormap_selector"

bec_widgets/widgets/device_box/device_box.pyproject

@@ -1 +0,0 @@
-{'files': ['device_box.py']}

bec_widgets/widgets/device_browser/device_browser.py

@@ -0,0 +1,107 @@
+import os
+import re
+from typing import Optional
+
+from bec_lib.callback_handler import EventType
+from pyqtgraph import SignalProxy
+from qtpy.QtCore import Signal, Slot
+from qtpy.QtWidgets import QLineEdit, QListWidgetItem, QVBoxLayout, QWidget
+
+from bec_widgets.utils.bec_widget import BECWidget
+from bec_widgets.utils.ui_loader import UILoader
+from bec_widgets.widgets.device_browser.device_item import DeviceItem
+
+
+class DeviceBrowser(BECWidget, QWidget):
+    device_update: Signal = Signal()
+
+    def __init__(
+        self,
+        parent: Optional[QWidget] = None,
+        config=None,
+        client=None,
+        gui_id: Optional[str] = None,
+    ) -> None:
+        super().__init__(client=client, config=config, gui_id=gui_id)
+        QWidget.__init__(self, parent)
+
+        self.get_bec_shortcuts()
+        self.ui = None
+        self.ini_ui()
+
+        self.proxy_device_update = SignalProxy(
+            self.ui.filter_input.textChanged, rateLimit=500, slot=self.update_device_list
+        )
+        self.bec_dispatcher.client.callbacks.register(
+            EventType.DEVICE_UPDATE, self.on_device_update
+        )
+        self.device_update.connect(self.update_device_list)
+
+        self.update_device_list()
+
+    def ini_ui(self) -> None:
+        """
+        Initialize the UI by loading the UI file and setting the layout.
+        """
+        layout = QVBoxLayout()
+        layout.setContentsMargins(0, 0, 0, 0)
+
+        ui_file_path = os.path.join(os.path.dirname(__file__), "device_browser.ui")
+        self.ui = UILoader(self).loader(ui_file_path)
+        layout.addWidget(self.ui)
+        self.setLayout(layout)
+
+    def on_device_update(self, action: str, content: dict) -> None:
+        """
+        Callback for device update events. Triggers the device_update signal.
+
+        Args:
+            action (str): The action that triggered the event.
+            content (dict): The content of the config update.
+        """
+        if action in ["add", "remove", "reload"]:
+            self.device_update.emit()
+
+    @Slot()
+    def update_device_list(self) -> None:
+        """
+        Update the device list based on the filter input.
+        There are two ways to trigger this function:
+        1. By changing the text in the filter input.
+        2. By emitting the device_update signal.
+
+        Either way, the function will filter the devices based on the filter input text and update the device list.
+        """
+        filter_text = self.ui.filter_input.text()
+        try:
+            regex = re.compile(filter_text, re.IGNORECASE)
+        except re.error:
+            regex = None  # Invalid regex, disable filtering
+
+        dev_list = self.ui.device_list
+        dev_list.clear()
+        for device in self.dev:
+            if regex is None or regex.search(device):
+                item = QListWidgetItem(dev_list)
+                device_item = DeviceItem(device)
+
+                # pylint: disable=protected-access
+                tooltip = self.dev[device]._config.get("description", "")
+                device_item.setToolTip(tooltip)
+                item.setSizeHint(device_item.sizeHint())
+                dev_list.setItemWidget(item, device_item)
+                dev_list.addItem(item)
+
+
+if __name__ == "__main__":  # pragma: no cover
+    import sys
+
+    from qtpy.QtWidgets import QApplication
+
+    from bec_widgets.utils.colors import apply_theme
+
+    app = QApplication(sys.argv)
+    apply_theme("light")
+    widget = DeviceBrowser()
+    widget.show()
+    sys.exit(app.exec_())

bec_widgets/widgets/device_browser/device_browser.pyproject

@@ -0,0 +1 @@
+{'files': ['device_browser.py']}

bec_widgets/widgets/device_browser/device_browser.ui

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Form</class>
+ <widget class="QWidget" name="Form">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>406</width>
+    <height>500</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QGroupBox" name="browser_group_box">
+     <property name="title">
+      <string>Device Browser</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_2">
+      <item>
+       <layout class="QHBoxLayout" name="filter_layout">
+        <item>
+         <widget class="QLineEdit" name="filter_input">
+          <property name="placeholderText">
+           <string>Filter</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <widget class="QListWidget" name="device_list"/>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

bec_widgets/widgets/device_browser/device_browser_plugin.py

@@ -0,0 +1,54 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+
+from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+
+from bec_widgets.utils.bec_designer import designer_material_icon
+from bec_widgets.widgets.device_browser.device_browser import DeviceBrowser
+
+DOM_XML = """
+<ui language='c++'>
+    <widget class='DeviceBrowser' name='device_browser'>
+    </widget>
+</ui>
+"""
+
+
+class DeviceBrowserPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
+    def __init__(self):
+        super().__init__()
+        self._form_editor = None
+
+    def createWidget(self, parent):
+        t = DeviceBrowser(parent)
+        return t
+
+    def domXml(self):
+        return DOM_XML
+
+    def group(self):
+        return "BEC Services"
+
+    def icon(self):
+        return designer_material_icon("lists")
+
+    def includeFile(self):
+        return "device_browser"
+
+    def initialize(self, form_editor):
+        self._form_editor = form_editor
+
+    def isContainer(self):
+        return False
+
+    def isInitialized(self):
+        return self._form_editor is not None
+
+    def name(self):
+        return "DeviceBrowser"
+
+    def toolTip(self):
+        return "DeviceBrowser"
+
+    def whatsThis(self):
+        return self.toolTip()

bec_widgets/widgets/device_browser/device_item/__init__.py

@@ -0,0 +1 @@
+from .device_item import DeviceItem

bec_widgets/widgets/device_browser/device_item/device_item.py

@@ -0,0 +1,53 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from qtpy.QtCore import QMimeData, Qt
+from qtpy.QtGui import QDrag
+from qtpy.QtWidgets import QHBoxLayout, QLabel, QWidget
+
+if TYPE_CHECKING:
+    from qtpy.QtGui import QMouseEvent
+
+
+class DeviceItem(QWidget):
+    def __init__(self, device: str) -> None:
+        super().__init__()
+        self.device = device
+        layout = QHBoxLayout()
+        layout.setContentsMargins(10, 2, 10, 2)
+        self.label = QLabel(device)
+        layout.addWidget(self.label)
+        self.setLayout(layout)
+
+        self.setStyleSheet(
+            """
+            border: 1px solid #ddd;
+            border-radius: 5px;
+            padding: 10px;
+        """
+        )
+
+    def mousePressEvent(self, event: QMouseEvent) -> None:
+        if event.button() == Qt.LeftButton:
+            drag = QDrag(self)
+            mime_data = QMimeData()
+            mime_data.setText(self.device)
+            drag.setMimeData(mime_data)
+            drag.exec_(Qt.MoveAction)
+
+    def mouseDoubleClickEvent(self, event: QMouseEvent) -> None:
+        print("Double Clicked")
+        # TODO: Implement double click action for opening the device properties dialog
+        return super().mouseDoubleClickEvent(event)
+
+
+if __name__ == "__main__":  # pragma: no cover
+    import sys
+
+    from qtpy.QtWidgets import QApplication
+
+    app = QApplication(sys.argv)
+    widget = DeviceItem("Device")
+    widget.show()
+    sys.exit(app.exec_())

bec_widgets/widgets/device_browser/register_device_browser.py

@@ -6,9 +6,9 @@ def main():  # pragma: no cover
         return
     from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection
 
-    from bec_widgets.widgets.device_box.device_box_plugin import DeviceBoxPlugin
+    from bec_widgets.widgets.device_browser.device_browser_plugin import DeviceBrowserPlugin
 
-    QPyDesignerCustomWidgetCollection.addCustomWidget(DeviceBoxPlugin())
+    QPyDesignerCustomWidgetCollection.addCustomWidget(DeviceBrowserPlugin())
 
 
 if __name__ == "__main__":  # pragma: no cover

bec_widgets/widgets/device_combobox/device_combo_box_plugin.py

@@ -3,9 +3,9 @@
 import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtGui import QIcon
 
 import bec_widgets
+from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.device_combobox.device_combobox import DeviceComboBox
 
 DOM_XML = """
@@ -34,8 +34,7 @@ class DeviceComboBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "Device Control"
 
     def icon(self):
-        icon_path = os.path.join(MODULE_PATH, "assets", "designer_icons", "device_combo_box.png")
-        return QIcon(icon_path)
+        return designer_material_icon("list_alt")
 
     def includeFile(self):
         return "device_combobox"

bec_widgets/widgets/device_line_edit/device_line_edit_plugin.py

@@ -3,9 +3,9 @@
 import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtGui import QIcon
 
 import bec_widgets
+from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.device_line_edit.device_line_edit import DeviceLineEdit
 
 DOM_XML = """
@@ -34,8 +34,7 @@ class DeviceLineEditPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "Device Control"
 
     def icon(self):
-        icon_path = os.path.join(MODULE_PATH, "assets", "designer_icons", "device_line_edit.png")
-        return QIcon(icon_path)
+        return designer_material_icon("edit_note")
 
     def includeFile(self):
         return "device_line_edit"

bec_widgets/widgets/dock/dock.py

@@ -4,6 +4,7 @@ from typing import TYPE_CHECKING, Any, Literal, Optional
 
 from pydantic import Field
 from pyqtgraph.dockarea import Dock, DockLabel
+from qtpy import QtCore, QtGui
 
 from bec_widgets.cli.rpc_wigdet_handler import widget_handler
 from bec_widgets.utils import ConnectionConfig, GridLayoutManager
@@ -12,8 +13,6 @@ from bec_widgets.utils.bec_widget import BECWidget
 if TYPE_CHECKING:
     from qtpy.QtWidgets import QWidget
 
-    from bec_widgets.widgets.dock import BECDockArea
-
 
 class DockConfig(ConnectionConfig):
     widgets: dict[str, Any] = Field({}, description="The widgets in the dock.")
@@ -26,6 +25,23 @@ class DockConfig(ConnectionConfig):
 
 
 class CustomDockLabel(DockLabel):
+    def __init__(self, text: str, closable: bool = True):
+        super().__init__(text, closable)
+        if closable:
+            red_icon = QtGui.QIcon()
+            pixmap = QtGui.QPixmap(32, 32)
+            pixmap.fill(QtCore.Qt.GlobalColor.red)
+            painter = QtGui.QPainter(pixmap)
+            pen = QtGui.QPen(QtCore.Qt.GlobalColor.white)
+            pen.setWidth(2)
+            painter.setPen(pen)
+            painter.drawLine(8, 8, 24, 24)
+            painter.drawLine(24, 8, 8, 24)
+            painter.end()
+            red_icon.addPixmap(pixmap)
+
+            self.closeButton.setIcon(red_icon)
+
     def updateStyle(self):
         r = "3px"
         if self.dim:
@@ -137,6 +153,7 @@ class BECDock(BECWidget, Dock):
         super().dropEvent(event)
         if old_area in self.orig_area.tempAreas and old_area != self.orig_area:
             self.orig_area.removeTempArea(old_area)
+            old_area.window().deleteLater()
 
     def float(self):
         """
@@ -268,7 +285,7 @@ class BECDock(BECWidget, Dock):
         """
         Attach the dock to the parent dock area.
         """
-        self.orig_area.removeTempArea(self.area)
+        self.parent_dock_area.remove_temp_area(self.area)
 
     def detach(self):
         """
@@ -303,6 +320,8 @@ class BECDock(BECWidget, Dock):
             if hasattr(widget, "cleanup"):
                 widget.cleanup()
         self.widgets.clear()
+        self.label.close()
+        self.label.deleteLater()
         super().cleanup()
 
     def close(self):

bec_widgets/widgets/dock/dock_area.py

@@ -9,17 +9,16 @@ from qtpy.QtCore import Qt
 from qtpy.QtGui import QPainter, QPaintEvent
 from qtpy.QtWidgets import QVBoxLayout, QWidget
 
+from bec_widgets.qt_utils.error_popups import SafeSlot
 from bec_widgets.qt_utils.toolbar import (
     ExpandableMenuAction,
-    IconAction,
+    MaterialIconAction,
     ModularToolBar,
     SeparatorAction,
 )
 from bec_widgets.utils import ConnectionConfig, WidgetContainerUtils
 from bec_widgets.utils.bec_widget import BECWidget
-
-from ...qt_utils.error_popups import SafeSlot
-from .dock import BECDock, DockConfig
+from bec_widgets.widgets.dock.dock import BECDock, DockConfig
 
 
 class DockAreaConfig(ConnectionConfig):
@@ -71,20 +70,26 @@ class BECDockArea(BECWidget, QWidget):
                 "menu_plots": ExpandableMenuAction(
                     label="Add Plot ",
                     actions={
-                        "waveform": IconAction(icon_path="waveform.svg", tooltip="Add Waveform"),
-                        "image": IconAction(icon_path="image.svg", tooltip="Add Image"),
-                        "motor_map": IconAction(icon_path="motor_map.svg", tooltip="Add Motor Map"),
+                        "waveform": MaterialIconAction(
+                            icon_name="show_chart", tooltip="Add Waveform", filled=True
+                        ),
+                        "image": MaterialIconAction(
+                            icon_name="image", tooltip="Add Image", filled=True
+                        ),
+                        "motor_map": MaterialIconAction(
+                            icon_name="my_location", tooltip="Add Motor Map", filled=True
+                        ),
                     },
                 ),
                 "separator_0": SeparatorAction(),
                 "menu_devices": ExpandableMenuAction(
                     label="Add Device Control ",
                     actions={
-                        "scan_control": IconAction(
-                            icon_path="scan_control.svg", tooltip="Add Scan Control"
+                        "scan_control": MaterialIconAction(
+                            icon_name="stacked_line_chart", tooltip="Add Scan Control", filled=True
                         ),
-                        "device_box": IconAction(
-                            icon_path="device_box.svg", tooltip="Add Device Box"
+                        "positioner_box": MaterialIconAction(
+                            icon_name="switch_right", tooltip="Add Device Box", filled=True
                         ),
                     },
                 ),
@@ -92,21 +97,29 @@ class BECDockArea(BECWidget, QWidget):
                 "menu_utils": ExpandableMenuAction(
                     label="Add Utils ",
                     actions={
-                        "queue": IconAction(icon_path="queue.svg", tooltip="Add Scan Queue"),
-                        "vs_code": IconAction(icon_path="terminal.svg", tooltip="Add VS Code"),
-                        "status": IconAction(icon_path="status.svg", tooltip="Add BEC Status Box"),
-                        "progress_bar": IconAction(
-                            icon_path="ring_progress.svg", tooltip="Add Circular ProgressBar"
+                        "queue": MaterialIconAction(
+                            icon_name="edit_note", tooltip="Add Scan Queue", filled=True
+                        ),
+                        "vs_code": MaterialIconAction(
+                            icon_name="show_chart", tooltip="Add VS Code", filled=True
+                        ),
+                        "status": MaterialIconAction(
+                            icon_name="dns", tooltip="Add BEC Status Box", filled=True
+                        ),
+                        "progress_bar": MaterialIconAction(
+                            icon_name="track_changes",
+                            tooltip="Add Circular ProgressBar",
+                            filled=True,
                         ),
                     },
                 ),
                 "separator_2": SeparatorAction(),
-                "attach_all": IconAction(
-                    icon_path="attach_all.svg", tooltip="Attach all floating docks"
+                "attach_all": MaterialIconAction(
+                    icon_name="zoom_in_map", tooltip="Attach all floating docks"
                 ),
-                "save_state": IconAction(icon_path="save_state.svg", tooltip="Save Dock State"),
-                "restore_state": IconAction(
-                    icon_path="restore_state.svg", tooltip="Restore Dock State"
+                "save_state": MaterialIconAction(icon_name="bookmark", tooltip="Save Dock State"),
+                "restore_state": MaterialIconAction(
+                    icon_name="frame_reload", tooltip="Restore Dock State"
                 ),
             },
             target_widget=self,
@@ -132,8 +145,8 @@ class BECDockArea(BECWidget, QWidget):
         self.toolbar.widgets["menu_devices"].widgets["scan_control"].triggered.connect(
             lambda: self.add_dock(widget="ScanControl", prefix="scan_control")
         )
-        self.toolbar.widgets["menu_devices"].widgets["device_box"].triggered.connect(
-            lambda: self.add_dock(widget="DeviceBox", prefix="device_box")
+        self.toolbar.widgets["menu_devices"].widgets["positioner_box"].triggered.connect(
+            lambda: self.add_dock(widget="PositionerBox", prefix="positioner_box")
         )
 
         # Menu Utils
@@ -231,6 +244,7 @@ class BECDockArea(BECWidget, QWidget):
         self.config.docks.pop(name, None)
         if dock:
             dock.close()
+            dock.deleteLater()
             if len(self.dock_area.docks) <= 1:
                 for dock in self.dock_area.docks.values():
                     dock.hide_title_bar()
@@ -329,7 +343,16 @@ class BECDockArea(BECWidget, QWidget):
         """
         while self.dock_area.tempAreas:
             for temp_area in self.dock_area.tempAreas:
-                self.dock_area.removeTempArea(temp_area)
+                self.remove_temp_area(temp_area)
+
+    def remove_temp_area(self, area):
+        """
+        Remove a temporary area from the dock area.
+        This is a patched method of pyqtgraph's removeTempArea
+        """
+        self.dock_area.tempAreas.remove(area)
+        area.window().close()
+        area.window().deleteLater()
 
     def clear_all(self):
         """
@@ -345,6 +368,10 @@ class BECDockArea(BECWidget, QWidget):
         Cleanup the dock area.
         """
         self.clear_all()
+        self.toolbar.close()
+        self.toolbar.deleteLater()
+        self.dock_area.close()
+        self.dock_area.deleteLater()
         super().cleanup()
 
     def close(self):
@@ -354,3 +381,15 @@ class BECDockArea(BECWidget, QWidget):
         """
         self.cleanup()
         super().close()
+
+
+if __name__ == "__main__":
+    from qtpy.QtWidgets import QApplication
+
+    from bec_widgets.utils.colors import set_theme
+
+    app = QApplication([])
+    set_theme("auto")
+    dock_area = BECDockArea()
+    dock_area.show()
+    app.exec_()

bec_widgets/widgets/dock/dock_area_plugin.py

@@ -3,9 +3,9 @@
 import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtGui import QIcon
 
 import bec_widgets
+from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.dock import BECDockArea
 
 DOM_XML = """
@@ -34,8 +34,7 @@ class BECDockAreaPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "BEC Plots"
 
     def icon(self):
-        icon_path = os.path.join(MODULE_PATH, "assets", "designer_icons", "dock_area.png")
-        return QIcon(icon_path)
+        return designer_material_icon("widgets")
 
     def includeFile(self):
         return "dock_area"

bec_widgets/widgets/figure/figure.py

@@ -182,7 +182,6 @@ class BECFigure(BECWidget, pg.GraphicsLayoutWidget):
                 print(f"Error in applying config: {e}")
                 return
         self.config = config
-        self.change_theme(self.config.theme)
 
         # widget_config has to be reset for not have each widget config twice when added to the figure
         widget_configs = list(self.config.widgets.values())
@@ -513,6 +512,13 @@ class BECFigure(BECWidget, pg.GraphicsLayoutWidget):
         if widget_id in self._widgets:
             raise ValueError(f"Widget with ID '{widget_id}' already exists.")
 
+        # Check if position is occupied
+        if row is not None and col is not None:
+            if self.getItem(row, col):
+                raise ValueError(f"Position at row {row} and column {col} is already occupied.")
+        else:
+            row, col = self._find_next_empty_position()
+
         widget = self.widget_handler.create_widget(
             widget_type=widget_type,
             widget_id=widget_id,
@@ -525,23 +531,11 @@ class BECFigure(BECWidget, pg.GraphicsLayoutWidget):
         # used otherwise multiple times
         widget.set_gui_id(widget_id)
 
-        # Check if position is occupied
-        if row is not None and col is not None:
-            if self.getItem(row, col):
-                raise ValueError(f"Position at row {row} and column {col} is already occupied.")
+        widget.config.row = row
+        widget.config.col = col
 
-            widget.config.row = row
-            widget.config.col = col
-
-            # Add widget to the figure
-            self.addItem(widget, row=row, col=col)
-        else:
-            row, col = self._find_next_empty_position()
-            widget.config.row = row
-            widget.config.col = col
-
-            # Add widget to the figure
-            self.addItem(widget, row=row, col=col)
+        # Add widget to the figure
+        self.addItem(widget, row=row, col=col)
 
         # Update num_cols and num_rows based on the added widget
         self.config.num_rows = max(self.config.num_rows, row + 1)
@@ -620,6 +614,7 @@ class BECFigure(BECWidget, pg.GraphicsLayoutWidget):
         """
         if widget_id in self._widgets:
             widget = self._widgets.pop(widget_id)
+            widget.cleanup_pyqtgraph()
             widget.cleanup()
             self.removeItem(widget)
             self.grid[widget.config.row][widget.config.col] = None
@@ -745,3 +740,12 @@ class BECFigure(BECWidget, pg.GraphicsLayoutWidget):
         self.config = FigureConfig(
             widget_class=self.__class__.__name__, gui_id=self.gui_id, theme=theme
         )
+
+    def cleanup_pyqtgraph_all_widgets(self):
+        """Clean up the pyqtgraph widget."""
+        for widget in self.widget_list:
+            widget.cleanup_pyqtgraph()
+
+    def cleanup(self):
+        """Close the figure widget."""
+        self.cleanup_pyqtgraph_all_widgets()

bec_widgets/widgets/figure/plots/image/image.py

@@ -251,9 +251,10 @@ class BECImageShow(BECPlotBase):
 
         image_exits = self._check_image_id(monitor, self._images)
         if image_exits:
-            raise ValueError(
-                f"Monitor with ID '{monitor}' already exists in widget '{self.gui_id}'."
-            )
+            # raise ValueError(
+            #     f"Monitor with ID '{monitor}' already exists in widget '{self.gui_id}'."
+            # )
+            return
 
         # monitor = self.entry_validator.validate_monitor(monitor)
 
@@ -577,10 +578,10 @@ class BECImageShow(BECPlotBase):
         self, source: str, name: str, config: ImageItemConfig, data=None
     ) -> BECImageItem:  # TODO fix types
         config.parent_id = self.gui_id
-        image = BECImageItem(config=config, parent_image=self)
-        self.plot_item.addItem(image)
         if self.single_image is True and len(self.images) > 0:
             self.remove_image(0)
+        image = BECImageItem(config=config, parent_image=self)
+        self.plot_item.addItem(image)
         self._images[source][name] = image
         if source == "device_monitor_2d":
             self._connect_device_monitor_2d(config.monitor)
@@ -681,3 +682,17 @@ class BECImageShow(BECPlotBase):
                 self.on_image_update, MessageEndpoints.device_monitor_2d(monitor)
             )
         self.images.clear()
+
+    def cleanup_pyqtgraph(self):
+        """Cleanup pyqtgraph items."""
+        super().cleanup_pyqtgraph()
+        item = self.plot_item
+        if not item.items:
+            return
+        cbar = item.items[0].color_bar
+        cbar.vb.menu.close()
+        cbar.vb.menu.deleteLater()
+        cbar.gradient.menu.close()
+        cbar.gradient.menu.deleteLater()
+        cbar.gradient.colorDialog.close()
+        cbar.gradient.colorDialog.deleteLater()

bec_widgets/widgets/figure/plots/plot_base.py

@@ -4,9 +4,11 @@ from typing import Literal, Optional
 
 import pyqtgraph as pg
 from pydantic import BaseModel, Field
+from qtpy.QtCore import Signal, Slot
 from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils import BECConnector, ConnectionConfig
+from bec_widgets.utils.crosshair import Crosshair
 
 
 class AxisConfig(BaseModel):
@@ -41,7 +43,21 @@ class SubplotConfig(ConnectionConfig):
     )
 
 
+class BECViewBox(pg.ViewBox):
+
+    def itemBoundsChanged(self, item):
+        self._itemBoundsCache.pop(item, None)
+        if (self.state["autoRange"][0] is not False) or (self.state["autoRange"][1] is not False):
+            # check if the call is coming from a mouse-move event
+            if hasattr(item, "skip_auto_range") and item.skip_auto_range:
+                return
+            self._autoRangeNeedsUpdate = True
+            self.update()
+
+
 class BECPlotBase(BECConnector, pg.GraphicsLayout):
+    crosshair_coordinates_changed = Signal(tuple)
+    crosshair_coordinates_clicked = Signal(tuple)
     USER_ACCESS = [
         "_config_dict",
         "set",
@@ -73,9 +89,13 @@ class BECPlotBase(BECConnector, pg.GraphicsLayout):
         pg.GraphicsLayout.__init__(self, parent)
 
         self.figure = parent_figure
-        self.plot_item = self.addPlot(row=0, col=0)
+
+        # self.plot_item = self.addPlot(row=0, col=0)
+        self.plot_item = pg.PlotItem(viewBox=BECViewBox(parent=self, enableMenu=True), parent=self)
+        self.addItem(self.plot_item, row=0, col=0)
 
         self.add_legend()
+        self.crosshair = None
 
     def set(self, **kwargs) -> None:
         """
@@ -304,6 +324,40 @@ class BECPlotBase(BECConnector, pg.GraphicsLayout):
         """
         self.plot_item.enableAutoRange(axis, enabled)
 
+    def hook_crosshair(self) -> None:
+        """Hook the crosshair to all plots."""
+        if self.crosshair is None:
+            self.crosshair = Crosshair(self.plot_item, precision=3)
+            self.crosshair.coordinatesChanged1D.connect(self.crosshair_coordinates_changed)
+            self.crosshair.coordinatesClicked1D.connect(self.crosshair_coordinates_clicked)
+            self.crosshair.coordinatesChanged2D.connect(self.crosshair_coordinates_changed)
+            self.crosshair.coordinatesClicked2D.connect(self.crosshair_coordinates_clicked)
+
+    def unhook_crosshair(self) -> None:
+        """Unhook the crosshair from all plots."""
+        if self.crosshair is not None:
+            self.crosshair.coordinatesChanged1D.disconnect(self.crosshair_coordinates_changed)
+            self.crosshair.coordinatesClicked1D.disconnect(self.crosshair_coordinates_clicked)
+            self.crosshair.coordinatesChanged2D.disconnect(self.crosshair_coordinates_changed)
+            self.crosshair.coordinatesClicked2D.disconnect(self.crosshair_coordinates_clicked)
+            self.crosshair.cleanup()
+            self.crosshair.deleteLater()
+            self.crosshair = None
+
+    def toggle_crosshair(self) -> None:
+        """Toggle the crosshair on all plots."""
+        if self.crosshair is None:
+            return self.hook_crosshair()
+
+        self.unhook_crosshair()
+
+    @Slot()
+    def reset(self) -> None:
+        """Reset the plot widget."""
+        if self.crosshair is not None:
+            self.crosshair.clear_markers()
+            self.crosshair.update_markers()
+
     def export(self):
         """Show the Export Dialog of the plot widget."""
         scene = self.plot_item.scene()
@@ -314,3 +368,12 @@ class BECPlotBase(BECConnector, pg.GraphicsLayout):
         """Remove the plot widget from the figure."""
         if self.figure is not None:
             self.figure.remove(widget_id=self.gui_id)
+
+    def cleanup_pyqtgraph(self):
+        """Cleanup pyqtgraph items."""
+        self.unhook_crosshair()
+        item = self.plot_item
+        item.vb.menu.close()
+        item.vb.menu.deleteLater()
+        item.ctrlMenu.close()
+        item.ctrlMenu.deleteLater()

bec_widgets/widgets/figure/plots/waveform/waveform.py

@@ -77,6 +77,7 @@ class BECWaveform(BECPlotBase):
     dap_params_update = pyqtSignal(dict)
     dap_summary_update = pyqtSignal(dict)
     autorange_signal = pyqtSignal()
+    new_scan = pyqtSignal()
 
     def __init__(
         self,
@@ -375,6 +376,10 @@ class BECWaveform(BECPlotBase):
         if len(self.curves) > 0:
             # validate all curves
             for curve in self.curves:
+                if not isinstance(curve, BECCurve):
+                    continue
+                if curve.config.source == "custom":
+                    continue
                 self._validate_x_axis_behaviour(curve.config.signals.y.name, x_name, x_entry, False)
             self._switch_x_axis_item(
                 f"{x_name}-{x_entry}"
@@ -382,9 +387,12 @@ class BECWaveform(BECPlotBase):
                 else x_name
             )
             for curve_id, curve_config in zip(curve_ids, curve_configs):
-                if curve_config.signals.x:
-                    curve_config.signals.x.name = x_name
-                    curve_config.signals.x.entry = x_entry
+                if curve_config.signals is None:
+                    continue
+                if curve_config.signals.x is None:
+                    continue
+                curve_config.signals.x.name = x_name
+                curve_config.signals.x.entry = x_entry
                 self.remove_curve(curve_id)
                 self.add_curve_by_config(curve_config)
 
@@ -408,23 +416,6 @@ class BECWaveform(BECPlotBase):
         """
         self.plot_item.enableAutoRange(axis, enabled)
 
-    @Slot()
-    def auto_range(self):
-        self.plot_item.autoRange()
-
-    def set_auto_range(self, enabled: bool, axis: str = "xy"):
-        """
-        Set the auto range of the plot widget.
-
-        Args:
-            enabled(bool): If True, enable the auto range.
-            axis(str, optional): The axis to enable the auto range.
-                - "xy": Enable auto range for both x and y axis.
-                - "x": Enable auto range for x axis.
-                - "y": Enable auto range for y axis.
-        """
-        self.plot_item.enableAutoRange(axis, enabled)
-
     def add_curve_custom(
         self,
         x: list | np.ndarray,
@@ -935,6 +926,8 @@ class BECWaveform(BECPlotBase):
             return
 
         if current_scan_id != self.scan_id:
+            self.reset()
+            self.new_scan.emit()
             self.set_auto_range(True, "xy")
             self.old_scan_id = self.scan_id
             self.scan_id = current_scan_id
@@ -943,7 +936,9 @@ class BECWaveform(BECPlotBase):
                 self.setup_dap(self.old_scan_id, self.scan_id)
             if self._curves_data["async"]:
                 for curve_id, curve in self._curves_data["async"].items():
-                    self.setup_async(curve.config.signals.y.name)
+                    self.setup_async(
+                        name=curve.config.signals.y.name, entry=curve.config.signals.y.entry
+                    )
 
     @Slot(dict, dict)
     def on_scan_segment(self, msg: dict, metadata: dict):
@@ -1005,18 +1000,18 @@ class BECWaveform(BECPlotBase):
             )
 
     @Slot(str)
-    def setup_async(self, device: str):
+    def setup_async(self, name: str, entry: str):
         self.bec_dispatcher.disconnect_slot(
-            self.on_async_readback, MessageEndpoints.device_async_readback(self.old_scan_id, device)
+            self.on_async_readback, MessageEndpoints.device_async_readback(self.old_scan_id, name)
         )
         try:
-            self._curves_data["async"][f"{device}-{device}"].clear_data()
+            self._curves_data["async"][f"{name}-{entry}"].clear_data()
         except KeyError:
             pass
         if len(self._curves_data["async"]) > 0:
             self.bec_dispatcher.connect_slot(
                 self.on_async_readback,
-                MessageEndpoints.device_async_readback(self.scan_id, device),
+                MessageEndpoints.device_async_readback(self.scan_id, name),
                 from_start=True,
             )
 

bec_widgets/widgets/image/bec_image_widget_plugin.py

@@ -3,9 +3,9 @@
 import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtGui import QIcon
 
 import bec_widgets
+from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.image.image_widget import BECImageWidget
 
 DOM_XML = """
@@ -34,8 +34,7 @@ class BECImageWidgetPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "BEC Plots"
 
     def icon(self):
-        icon_path = os.path.join(MODULE_PATH, "assets", "designer_icons", "image.png")
-        return QIcon(icon_path)
+        return designer_material_icon("image")
 
     def includeFile(self):
         return "bec_image_widget"

bec_widgets/widgets/image/image_widget.py

@@ -10,7 +10,7 @@ from bec_widgets.qt_utils.error_popups import SafeSlot, WarningPopupUtility
 from bec_widgets.qt_utils.settings_dialog import SettingsDialog
 from bec_widgets.qt_utils.toolbar import (
     DeviceSelectionAction,
-    IconAction,
+    MaterialIconAction,
     ModularToolBar,
     SeparatorAction,
 )
@@ -66,45 +66,45 @@ class BECImageWidget(BECWidget, QWidget):
                 "monitor": DeviceSelectionAction(
                     "Monitor:", DeviceComboBox(device_filter="Device")
                 ),
-                "connect": IconAction(icon_path="connection.svg", tooltip="Connect Device"),
+                "connect": MaterialIconAction(icon_name="link", tooltip="Connect Device"),
                 "separator_0": SeparatorAction(),
-                "save": IconAction(icon_path="save.svg", tooltip="Open Export Dialog"),
+                "save": MaterialIconAction(icon_name="save", tooltip="Open Export Dialog"),
                 "separator_1": SeparatorAction(),
-                "drag_mode": IconAction(
-                    icon_path="drag_pan_mode.svg", tooltip="Drag Mouse Mode", checkable=True
+                "drag_mode": MaterialIconAction(
+                    icon_name="open_with", tooltip="Drag Mouse Mode", checkable=True
                 ),
-                "rectangle_mode": IconAction(
-                    icon_path="rectangle_mode.svg", tooltip="Rectangle Zoom Mode", checkable=True
+                "rectangle_mode": MaterialIconAction(
+                    icon_name="frame_inspect", tooltip="Rectangle Zoom Mode", checkable=True
                 ),
-                "auto_range": IconAction(icon_path="auto_range.svg", tooltip="Autorange Plot"),
-                "auto_range_image": IconAction(
-                    icon_path="image_autorange.svg",
-                    tooltip="Autorange Image Intensity",
-                    checkable=True,
+                "auto_range": MaterialIconAction(
+                    icon_name="open_in_full", tooltip="Autorange Plot"
                 ),
-                "aspect_ratio": IconAction(
-                    icon_path="lock_aspect_ratio.svg",
-                    tooltip="Lock image aspect ratio",
-                    checkable=True,
+                "auto_range_image": MaterialIconAction(
+                    icon_name="hdr_auto", tooltip="Autorange Image Intensity", checkable=True
+                ),
+                "aspect_ratio": MaterialIconAction(
+                    icon_name="aspect_ratio", tooltip="Lock image aspect ratio", checkable=True
                 ),
                 "separator_2": SeparatorAction(),
-                "FFT": IconAction(icon_path="fft.svg", tooltip="Toggle FFT", checkable=True),
-                "log": IconAction(
-                    icon_path="log_scale.png", tooltip="Toggle log scale", checkable=True
+                "FFT": MaterialIconAction(icon_name="fft", tooltip="Toggle FFT", checkable=True),
+                "log": MaterialIconAction(
+                    icon_name="log_scale", tooltip="Toggle log scale", checkable=True
                 ),
-                "transpose": IconAction(
-                    icon_path="transform.svg", tooltip="Transpose Image", checkable=True
+                "transpose": MaterialIconAction(
+                    icon_name="transform", tooltip="Transpose Image", checkable=True
                 ),
-                "rotate_right": IconAction(
-                    icon_path="rotate_right.svg", tooltip="Rotate image clockwise by 90 deg"
+                "rotate_right": MaterialIconAction(
+                    icon_name="rotate_right", tooltip="Rotate image clockwise by 90 deg"
                 ),
-                "rotate_left": IconAction(
-                    icon_path="rotate_left.svg", tooltip="Rotate image counterclockwise by 90 deg"
+                "rotate_left": MaterialIconAction(
+                    icon_name="rotate_left", tooltip="Rotate image counterclockwise by 90 deg"
+                ),
+                "reset": MaterialIconAction(
+                    icon_name="reset_settings", tooltip="Reset Image Settings"
                 ),
-                "reset": IconAction(icon_path="reset_settings.svg", tooltip="Reset Image Settings"),
                 "separator_3": SeparatorAction(),
-                "axis_settings": IconAction(
-                    icon_path="settings.svg", tooltip="Open Configuration Dialog"
+                "axis_settings": MaterialIconAction(
+                    icon_name="settings", tooltip="Open Configuration Dialog"
                 ),
             },
             target_widget=self,
@@ -457,7 +457,8 @@ class BECImageWidget(BECWidget, QWidget):
 
     def cleanup(self):
         self.fig.cleanup()
-        self.client.shutdown()
+        self.toolbar.close()
+        self.toolbar.deleteLater()
         return super().cleanup()
 
 

bec_widgets/widgets/jupyter_console/jupyter_console.py

@@ -63,8 +63,6 @@ class BECJupyterConsole(RichJupyterWidget):  # pragma: no cover:
 
     def closeEvent(self, event):
         self.shutdown_kernel()
-        if self.client:
-            self.client.shutdown()
 
 
 if __name__ == "__main__":  # pragma: no cover

bec_widgets/widgets/motor_map/bec_motor_map_widget_plugin.py

@@ -1,9 +1,9 @@
 import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtGui import QIcon
 
 import bec_widgets
+from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.motor_map.motor_map_widget import BECMotorMapWidget
 
 DOM_XML = """
@@ -32,8 +32,7 @@ class BECMotorMapWidgetPlugin(QDesignerCustomWidgetInterface):  # pragma: no cov
         return "BEC Plots"
 
     def icon(self):
-        icon_path = os.path.join(MODULE_PATH, "assets", "designer_icons", "motor_map.png")
-        return QIcon(icon_path)
+        return designer_material_icon("my_location")
 
     def includeFile(self):
         return "bec_motor_map_widget"

bec_widgets/widgets/motor_map/motor_map_dialog/motor_map_settings.py

@@ -45,3 +45,12 @@ class MotorMapSettings(SettingWidget):
             self.target_widget.set_scatter_size(scatter_size)
             self.target_widget.set_background_value(background_intensity)
             self.target_widget.set_color(color)
+
+    def cleanup(self):
+        self.ui.color.cleanup()
+        self.ui.color.close()
+        self.ui.color.deleteLater()
+
+    def closeEvent(self, event):
+        self.cleanup()
+        super().closeEvent(event)

bec_widgets/widgets/motor_map/motor_map_widget.py

@@ -5,7 +5,7 @@ import sys
 from qtpy.QtWidgets import QVBoxLayout, QWidget
 
 from bec_widgets.qt_utils.settings_dialog import SettingsDialog
-from bec_widgets.qt_utils.toolbar import DeviceSelectionAction, IconAction, ModularToolBar
+from bec_widgets.qt_utils.toolbar import DeviceSelectionAction, MaterialIconAction, ModularToolBar
 from bec_widgets.utils.bec_widget import BECWidget
 from bec_widgets.widgets.device_combobox.device_combobox import DeviceComboBox
 from bec_widgets.widgets.figure import BECFigure
@@ -54,9 +54,11 @@ class BECMotorMapWidget(BECWidget, QWidget):
                 "motor_y": DeviceSelectionAction(
                     "Motor Y:", DeviceComboBox(device_filter="Positioner")
                 ),
-                "connect": IconAction(icon_path="connection.svg", tooltip="Connect Motors"),
-                "history": IconAction(icon_path="history.svg", tooltip="Reset Trace History"),
-                "config": IconAction(icon_path="settings.svg", tooltip="Open Configuration Dialog"),
+                "connect": MaterialIconAction(icon_name="link", tooltip="Connect Motors"),
+                "history": MaterialIconAction(icon_name="history", tooltip="Reset Trace History"),
+                "config": MaterialIconAction(
+                    icon_name="settings", tooltip="Open Configuration Dialog"
+                ),
             },
             target_widget=self,
         )

bec_widgets/widgets/position_indicator/position_indicator_plugin.py

@@ -3,9 +3,9 @@
 import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtGui import QIcon
 
 import bec_widgets
+from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.position_indicator.position_indicator import PositionIndicator
 
 DOM_XML = """
@@ -34,8 +34,7 @@ class PositionIndicatorPlugin(QDesignerCustomWidgetInterface):  # pragma: no cov
         return "BEC Utils"
 
     def icon(self):
-        icon_path = os.path.join(MODULE_PATH, "assets", "designer_icons", "position_indicator.png")
-        return QIcon(icon_path)
+        return designer_material_icon("horizontal_distribute")
 
     def includeFile(self):
         return "position_indicator"

bec_widgets/widgets/positioner_box/positioner_box.py

@@ -1,22 +1,44 @@
+""" Module for a PositionerBox widget to control a positioner device."""
+
 import os
 import uuid
 
+from bec_lib.device import Positioner
 from bec_lib.endpoints import MessageEndpoints
+from bec_lib.logger import bec_logger
 from bec_lib.messages import ScanQueueMessage
+from bec_qthemes import material_icon
 from qtpy.QtCore import Property, Signal, Slot
 from qtpy.QtGui import QDoubleValidator
-from qtpy.QtWidgets import QDoubleSpinBox, QVBoxLayout, QWidget
+from qtpy.QtWidgets import QDialog, QDoubleSpinBox, QPushButton, QVBoxLayout, QWidget
 
 from bec_widgets.utils import UILoader
 from bec_widgets.utils.bec_widget import BECWidget
-from bec_widgets.utils.colors import apply_theme
+from bec_widgets.utils.colors import set_theme
+from bec_widgets.widgets.device_line_edit.device_line_edit import DeviceLineEdit
+
+logger = bec_logger.logger
+
+MODULE_PATH = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
 
 
-class DeviceBox(BECWidget, QWidget):
+class PositionerBox(BECWidget, QWidget):
+    """Simple Widget to control a positioner in box form"""
+
+    ui_file = "positioner_box.ui"
+    dimensions = (234, 224)
+
+    USER_ACCESS = ["set_positioner"]
     device_changed = Signal(str, str)
 
-    def __init__(self, parent=None, device=None, *args, **kwargs):
-        super().__init__(*args, **kwargs)
+    def __init__(self, parent=None, device: Positioner = None, *args, **kwargs):
+        """Initialize the PositionerBox widget.
+
+        Args:
+            parent: The parent widget.
+            device (Positioner): The device to control.
+        """
+        super().__init__(**kwargs)
         QWidget.__init__(self, parent=parent)
         self.get_bec_shortcuts()
         self._device = ""
@@ -29,10 +51,11 @@ class DeviceBox(BECWidget, QWidget):
             self.init_device()
 
     def init_ui(self):
+        """Init the ui"""
         self.device_changed.connect(self.on_device_change)
 
         current_path = os.path.dirname(__file__)
-        self.ui = UILoader(self).loader(os.path.join(current_path, "device_box.ui"))
+        self.ui = UILoader(self).loader(os.path.join(current_path, self.ui_file))
 
         self.layout = QVBoxLayout(self)
         self.layout.addWidget(self.ui)
@@ -41,8 +64,8 @@ class DeviceBox(BECWidget, QWidget):
 
         # fix the size of the device box
         db = self.ui.device_box
-        db.setFixedHeight(234)
-        db.setFixedWidth(224)
+        db.setFixedHeight(self.dimensions[0])
+        db.setFixedWidth(self.dimensions[1])
 
         self.ui.step_size.setStepType(QDoubleSpinBox.AdaptiveDecimalStepType)
         self.ui.stop.clicked.connect(self.on_stop)
@@ -55,30 +78,101 @@ class DeviceBox(BECWidget, QWidget):
         self.setpoint_validator = QDoubleValidator()
         self.ui.setpoint.setValidator(self.setpoint_validator)
         self.ui.spinner_widget.start()
+        self.ui.tool_button.clicked.connect(self._open_dialog_selection)
+        icon = material_icon(icon_name="edit_note", size=(16, 16), convert_to_pixmap=False)
+        self.ui.tool_button.setIcon(icon)
+
+    def _open_dialog_selection(self):
+        """Open dialog window for positioner selection"""
+        dialog = QDialog(self)
+        dialog.setWindowTitle("Positioner Selection")
+        layout = QVBoxLayout()
+        line_edit = DeviceLineEdit(self, client=self.client, device_filter="Positioner")
+        line_edit.textChanged.connect(self._positioner_changed)
+        layout.addWidget(line_edit)
+        close_button = QPushButton("Close")
+        close_button.clicked.connect(dialog.accept)
+        layout.addWidget(close_button)
+        dialog.setLayout(layout)
+        dialog.exec()
+
+    @Slot(str)
+    def _positioner_changed(self, positioner_name: str):
+        """Changed input in combobox.
+
+        Args:
+            positioner_name (str): name of the positioner
+        """
+        self.set_positioner(positioner_name)
 
     def init_device(self):
-        if self.device in self.dev:
+        """Init the device view and readback"""
+        if self._check_device_is_valid(self.device):
             data = self.dev[self.device].read()
             self.on_device_readback({"signals": data}, {})
 
+    def _toogle_enable_buttons(self, enable: bool) -> None:
+        """Toogle enable/disable on available buttons
+
+        Args:
+            enable (bool): Enable buttons
+        """
+        self.ui.tweak_left.setEnabled(enable)
+        self.ui.tweak_right.setEnabled(enable)
+        self.ui.stop.setEnabled(enable)
+        self.ui.setpoint.setEnabled(enable)
+        self.ui.step_size.setEnabled(enable)
+
     @Property(str)
     def device(self):
+        """Property to set the device"""
         return self._device
 
     @device.setter
-    def device(self, value):
+    def device(self, value: str):
+        """Setter, checks if device is a string"""
         if not value or not isinstance(value, str):
             return
         old_device = self._device
         self._device = value
         self.device_changed.emit(old_device, value)
 
+    def set_positioner(self, positioner: str):
+        """Set the device
+
+        Args:
+            positioner (Positioner | str) : Positioner to set, accepts str or the device
+        """
+        if isinstance(positioner, Positioner):
+            positioner = positioner.name
+        self.device = positioner
+
+    def _check_device_is_valid(self, device: str):
+        """Check if the device is a positioner
+
+        Args:
+            device (str): The device name
+        """
+        if device not in self.dev:
+            logger.info(f"Device {device} not found in the device list")
+            return False
+        if not isinstance(self.dev[device], Positioner):
+            logger.info(f"Device {device} is not a positioner")
+            return False
+        return True
+
     @Slot(str, str)
     def on_device_change(self, old_device: str, new_device: str):
-        if new_device not in self.dev:
-            print(f"Device {new_device} not found in the device list")
+        """Upon changing the device, a check will be performed if the device is a Positioner.
+
+        Args:
+            old_device (str): The old device name.
+            new_device (str): The new device name.
+        """
+        if not self._check_device_is_valid(new_device):
             return
-        print(f"Device changed from {old_device} to {new_device}")
+        logger.info(f"Device changed from {old_device} to {new_device}")
+        self._toogle_enable_buttons(True)
         self.init_device()
         self.bec_dispatcher.disconnect_slot(
             self.on_device_readback, MessageEndpoints.device_readback(old_device)
@@ -98,6 +192,12 @@ class DeviceBox(BECWidget, QWidget):
 
     @Slot(dict, dict)
     def on_device_readback(self, msg_content: dict, metadata: dict):
+        """Callback for device readback.
+
+        Args:
+            msg_content (dict): The message content.
+            metadata (dict): The message metadata.
+        """
         signals = msg_content.get("signals", {})
         # pylint: disable=protected-access
         hinted_signals = self.dev[self.device]._hints
@@ -134,7 +234,12 @@ class DeviceBox(BECWidget, QWidget):
             pos = (readback_val - limits[0]) / (limits[1] - limits[0])
             self.ui.position_indicator.on_position_update(pos)
 
-    def update_limits(self, limits):
+    def update_limits(self, limits: tuple):
+        """Update limits
+
+        Args:
+            limits (tuple): Limits of the positioner
+        """
         if limits == self._limits:
             return
         self._limits = limits
@@ -147,6 +252,7 @@ class DeviceBox(BECWidget, QWidget):
 
     @Slot()
     def on_stop(self):
+        """Stop call"""
         request_id = str(uuid.uuid4())
         params = {
             "device": self.device,
@@ -165,18 +271,22 @@ class DeviceBox(BECWidget, QWidget):
 
     @property
     def step_size(self):
+        """Step size for tweak"""
         return self.ui.step_size.value()
 
     @Slot()
     def on_tweak_right(self):
+        """Tweak motor right"""
         self.dev[self.device].move(self.step_size, relative=True)
 
     @Slot()
     def on_tweak_left(self):
+        """Tweak motor left"""
         self.dev[self.device].move(-self.step_size, relative=True)
 
     @Slot()
     def on_setpoint_change(self):
+        """Change the setpoint for the motor"""
         self.ui.setpoint.clearFocus()
         setpoint = self.ui.setpoint.text()
         self.dev[self.device].move(float(setpoint), relative=False)
@@ -190,8 +300,8 @@ if __name__ == "__main__":  # pragma: no cover
     from qtpy.QtWidgets import QApplication
 
     app = QApplication(sys.argv)
-    apply_theme("light")
-    widget = DeviceBox(device="samx")
+    set_theme("dark")
+    widget = PositionerBox(device="bpm4i")
 
     widget.show()
     sys.exit(app.exec_())

bec_widgets/widgets/positioner_box/positioner_box.pyproject

@@ -0,0 +1 @@
+{'files': ['positioner_box.py']}

bec_widgets/widgets/positioner_box/positioner_box.ui

@@ -29,17 +29,24 @@
    <item>
     <widget class="QGroupBox" name="device_box">
      <property name="title">
-      <string>Device Name</string>
+      <string>No positioner selected</string>
      </property>
      <layout class="QGridLayout" name="gridLayout" rowstretch="0,0,0,0,0">
       <property name="topMargin">
        <number>0</number>
       </property>
       <item row="3" column="1">
-       <widget class="QDoubleSpinBox" name="step_size"/>
+       <widget class="QDoubleSpinBox" name="step_size">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+       </widget>
       </item>
       <item row="3" column="2">
        <widget class="QToolButton" name="tweak_right">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
         <property name="minimumSize">
          <size>
           <width>50</width>
@@ -67,10 +74,20 @@
        </widget>
       </item>
       <item row="2" column="0" colspan="3">
-       <widget class="QLineEdit" name="setpoint"/>
+       <widget class="QLineEdit" name="setpoint">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignmentFlag::AlignCenter</set>
+        </property>
+       </widget>
       </item>
       <item row="3" column="0">
        <widget class="QToolButton" name="tweak_left">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
         <property name="minimumSize">
          <size>
           <width>50</width>
@@ -99,6 +116,9 @@
       </item>
       <item row="4" column="0" colspan="3">
        <widget class="QPushButton" name="stop">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
         <property name="text">
          <string>Stop</string>
         </property>
@@ -108,6 +128,13 @@
        <layout class="QVBoxLayout" name="verticalLayout_2">
         <item>
          <layout class="QHBoxLayout" name="horizontalLayout">
+          <item>
+           <widget class="QToolButton" name="tool_button">
+            <property name="text">
+             <string>...</string>
+            </property>
+           </widget>
+          </item>
           <item>
            <spacer name="horizontalSpacer">
             <property name="orientation">

bec_widgets/widgets/positioner_box/positioner_box_plugin.py

@@ -1,30 +1,29 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+
 import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtGui import QIcon
 
-import bec_widgets
-from bec_widgets.widgets.device_box.device_box import DeviceBox
+from bec_widgets.utils.bec_designer import designer_material_icon
+from bec_widgets.widgets.positioner_box.positioner_box import PositionerBox
 
 DOM_XML = """
 <ui language='c++'>
-    <widget class='DeviceBox' name='device_box'>
+    <widget class='PositionerBox' name='positioner_box'>
     </widget>
 </ui>
 """
-
-MODULE_PATH = os.path.dirname(bec_widgets.__file__)
+MODULE_PATH = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
 
 
-class DeviceBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
+class PositionerBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
     def __init__(self):
         super().__init__()
         self._form_editor = None
 
     def createWidget(self, parent):
-        t = DeviceBox(parent)
+        t = PositionerBox(parent)
         return t
 
     def domXml(self):
@@ -34,11 +33,10 @@ class DeviceBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "Device Control"
 
     def icon(self):
-        icon_path = os.path.join(MODULE_PATH, "assets", "designer_icons", "device_box.png")
-        return QIcon(icon_path)
+        return designer_material_icon("switch_right")
 
     def includeFile(self):
-        return "device_box"
+        return "positioner_box"
 
     def initialize(self, form_editor):
         self._form_editor = form_editor
@@ -50,10 +48,10 @@ class DeviceBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return self._form_editor is not None
 
     def name(self):
-        return "DeviceBox"
+        return "PositionerBox"
 
     def toolTip(self):
-        return "A widget for controlling a single positioner. "
+        return "Simple Widget to control a positioner in box form"
 
     def whatsThis(self):
         return self.toolTip()

bec_widgets/widgets/positioner_box/positioner_control_line.py

@@ -0,0 +1,33 @@
+from bec_lib.device import Positioner
+
+from bec_widgets.widgets.positioner_box.positioner_box import PositionerBox
+
+
+class PositionerControlLine(PositionerBox):
+    """A widget that controls a single device."""
+
+    ui_file = "positioner_control_line.ui"
+    dimensions = (60, 600)  # height, width
+
+    def __init__(self, parent=None, device: Positioner = None, *args, **kwargs):
+        """Initialize the DeviceControlLine.
+
+        Args:
+            parent: The parent widget.
+            device (Positioner): The device to control.
+        """
+        super().__init__(parent=parent, device=device, *args, **kwargs)
+
+
+if __name__ == "__main__":  # pragma: no cover
+    import sys
+
+    import qdarktheme
+    from qtpy.QtWidgets import QApplication
+
+    app = QApplication(sys.argv)
+    qdarktheme.setup_theme("dark")
+    widget = PositionerControlLine(device="samy")
+
+    widget.show()
+    sys.exit(app.exec_())

bec_widgets/widgets/positioner_box/positioner_control_line.pyproject

@@ -0,0 +1 @@
+{'files': ['positioner_control_line.py']}

bec_widgets/widgets/positioner_box/positioner_control_line.ui

@@ -0,0 +1,216 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Form</class>
+ <widget class="QWidget" name="Form">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>785</width>
+    <height>91</height>
+   </rect>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>0</width>
+    <height>0</height>
+   </size>
+  </property>
+  <property name="maximumSize">
+   <size>
+    <width>16777215</width>
+    <height>16777215</height>
+   </size>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QGroupBox" name="device_box">
+     <property name="title">
+      <string>Device Name</string>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <item>
+       <widget class="QToolButton" name="tool_button">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>25</width>
+          <height>25</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>25</width>
+          <height>25</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>...</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout_2">
+        <item>
+         <widget class="PositionIndicator" name="position_indicator">
+          <property name="minimumSize">
+           <size>
+            <width>80</width>
+            <height>10</height>
+           </size>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="SpinnerWidget" name="spinner_widget">
+          <property name="minimumSize">
+           <size>
+            <width>25</width>
+            <height>25</height>
+           </size>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>25</width>
+            <height>25</height>
+           </size>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="readback">
+          <property name="minimumSize">
+           <size>
+            <width>80</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>150</width>
+            <height>16777215</height>
+           </size>
+          </property>
+          <property name="text">
+           <string>Position</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignmentFlag::AlignCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLineEdit" name="setpoint">
+          <property name="minimumSize">
+           <size>
+            <width>80</width>
+            <height>24</height>
+           </size>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>150</width>
+            <height>16777215</height>
+           </size>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignmentFlag::AlignCenter</set>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <widget class="QPushButton" name="stop">
+        <property name="text">
+         <string>Stop</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QToolButton" name="tweak_left">
+        <property name="minimumSize">
+         <size>
+          <width>30</width>
+          <height>30</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>30</width>
+          <height>30</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>...</string>
+        </property>
+        <property name="iconSize">
+         <size>
+          <width>30</width>
+          <height>30</height>
+         </size>
+        </property>
+        <property name="arrowType">
+         <enum>Qt::ArrowType::LeftArrow</enum>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QDoubleSpinBox" name="step_size"/>
+      </item>
+      <item>
+       <widget class="QToolButton" name="tweak_right">
+        <property name="minimumSize">
+         <size>
+          <width>30</width>
+          <height>30</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>30</width>
+          <height>30</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>...</string>
+        </property>
+        <property name="iconSize">
+         <size>
+          <width>30</width>
+          <height>30</height>
+         </size>
+        </property>
+        <property name="arrowType">
+         <enum>Qt::ArrowType::RightArrow</enum>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>SpinnerWidget</class>
+   <extends>QWidget</extends>
+   <header>spinner_widget</header>
+  </customwidget>
+  <customwidget>
+   <class>PositionIndicator</class>
+   <extends>QWidget</extends>
+   <header>position_indicator</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>

bec_widgets/widgets/positioner_box/positioner_control_line_plugin.py

@@ -0,0 +1,57 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+
+import os
+
+from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+
+from bec_widgets.utils.bec_designer import designer_material_icon
+from bec_widgets.widgets.positioner_box.positioner_control_line import PositionerControlLine
+
+DOM_XML = """
+<ui language='c++'>
+    <widget class='PositionerControlLine' name='positioner_control_line'>
+    </widget>
+</ui>
+"""
+MODULE_PATH = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
+
+
+class PositionerControlLinePlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
+    def __init__(self):
+        super().__init__()
+        self._form_editor = None
+
+    def createWidget(self, parent):
+        t = PositionerControlLine(parent)
+        return t
+
+    def domXml(self):
+        return DOM_XML
+
+    def group(self):
+        return "Device Control"
+
+    def icon(self):
+        return designer_material_icon("switch_left")
+
+    def includeFile(self):
+        return "positioner_control_line"
+
+    def initialize(self, form_editor):
+        self._form_editor = form_editor
+
+    def isContainer(self):
+        return False
+
+    def isInitialized(self):
+        return self._form_editor is not None
+
+    def name(self):
+        return "PositionerControlLine"
+
+    def toolTip(self):
+        return "A widget that controls a single positioner in line form."
+
+    def whatsThis(self):
+        return self.toolTip()

bec_widgets/widgets/positioner_box/register_positioner_box.py

@@ -0,0 +1,15 @@
+def main():  # pragma: no cover
+    from qtpy import PYSIDE6
+
+    if not PYSIDE6:
+        print("PYSIDE6 is not available in the environment. Cannot patch designer.")
+        return
+    from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection
+
+    from bec_widgets.widgets.positioner_box.positioner_box_plugin import PositionerBoxPlugin
+
+    QPyDesignerCustomWidgetCollection.addCustomWidget(PositionerBoxPlugin())
+
+
+if __name__ == "__main__":  # pragma: no cover
+    main()

bec_widgets/widgets/positioner_box/register_positioner_control_line.py

@@ -0,0 +1,17 @@
+def main():  # pragma: no cover
+    from qtpy import PYSIDE6
+
+    if not PYSIDE6:
+        print("PYSIDE6 is not available in the environment. Cannot patch designer.")
+        return
+    from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection
+
+    from bec_widgets.widgets.positioner_box.positioner_control_line_plugin import (
+        PositionerControlLinePlugin,
+    )
+
+    QPyDesignerCustomWidgetCollection.addCustomWidget(PositionerControlLinePlugin())
+
+
+if __name__ == "__main__":  # pragma: no cover
+    main()

bec_widgets/widgets/ring_progress_bar/ring_progress_bar_plugin.py

@@ -3,9 +3,9 @@
 import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtGui import QIcon
 
 import bec_widgets
+from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.ring_progress_bar.ring_progress_bar import RingProgressBar
 
 DOM_XML = """
@@ -33,8 +33,7 @@ class RingProgressBarPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "BEC Utils"
 
     def icon(self):
-        icon_path = os.path.join(MODULE_PATH, "assets", "designer_icons", "ring_progress.png")
-        return QIcon(icon_path)
+        return designer_material_icon("track_changes")
 
     def includeFile(self):
         return "ring_progress_bar"

bec_widgets/widgets/scan_control/scan_control.py

@@ -1,9 +1,11 @@
 from bec_lib.endpoints import MessageEndpoints
+from qtpy.QtCore import Property, Signal, Slot
 from qtpy.QtWidgets import (
     QApplication,
     QComboBox,
     QGridLayout,
     QGroupBox,
+    QHBoxLayout,
     QPushButton,
     QSizePolicy,
     QVBoxLayout,
@@ -18,6 +20,9 @@ from bec_widgets.widgets.stop_button.stop_button import StopButton
 
 class ScanControl(BECWidget, QWidget):
 
+    scan_started = Signal()
+    scan_selected = Signal(str)
+
     def __init__(
         self, parent=None, client=None, gui_id: str | None = None, allowed_scans: list | None = None
     ):
@@ -50,11 +55,26 @@ class ScanControl(BECWidget, QWidget):
         self.layout.addWidget(self.scan_selection_group)
 
         # Connect signals
-        self.comboBox_scan_selection.currentIndexChanged.connect(self.on_scan_selected)
+        self.comboBox_scan_selection.currentIndexChanged.connect(self.on_scan_selection_changed)
         self.button_run_scan.clicked.connect(self.run_scan)
+
+        # Add bundle button
+        self.button_add_bundle = QPushButton("Add Bundle")
+        self.button_add_bundle.setVisible(False)
+        # Remove bundle button
+        self.button_remove_bundle = QPushButton("Remove Bundle")
+        self.button_remove_bundle.setVisible(False)
+
+        bundle_layout = QHBoxLayout()
+        bundle_layout.addWidget(self.button_add_bundle)
+        bundle_layout.addWidget(self.button_remove_bundle)
+        self.layout.addLayout(bundle_layout)
+
         self.button_add_bundle.clicked.connect(self.add_arg_bundle)
         self.button_remove_bundle.clicked.connect(self.remove_arg_bundle)
 
+        self.scan_selected.connect(self.scan_select)
+
         # Initialize scan selection
         self.populate_scans()
 
@@ -69,21 +89,16 @@ class ScanControl(BECWidget, QWidget):
         scan_selection_group = QGroupBox("Scan Selection", self)
         self.scan_selection_layout = QGridLayout(scan_selection_group)
         self.comboBox_scan_selection = QComboBox(scan_selection_group)
+
         # Run button
         self.button_run_scan = QPushButton("Start", scan_selection_group)
         self.button_run_scan.setStyleSheet("background-color:  #559900; color: white")
         # Stop button
         self.button_stop_scan = StopButton(parent=scan_selection_group)
-        # Add bundle button
-        self.button_add_bundle = QPushButton("Add Bundle", scan_selection_group)
-        # Remove bundle button
-        self.button_remove_bundle = QPushButton("Remove Bundle", scan_selection_group)
 
         self.scan_selection_layout.addWidget(self.comboBox_scan_selection, 0, 0, 1, 2)
         self.scan_selection_layout.addWidget(self.button_run_scan, 1, 0)
         self.scan_selection_layout.addWidget(self.button_stop_scan, 1, 1)
-        self.scan_selection_layout.addWidget(self.button_add_bundle, 2, 0)
-        self.scan_selection_layout.addWidget(self.button_remove_bundle, 2, 1)
 
         return scan_selection_group
 
@@ -104,23 +119,65 @@ class ScanControl(BECWidget, QWidget):
             allowed_scans = self.allowed_scans
         self.comboBox_scan_selection.addItems(allowed_scans)
 
-    def on_scan_selected(self):
+    def on_scan_selection_changed(self, index: int):
         """Callback for scan selection combo box"""
-        self.reset_layout()
         selected_scan_name = self.comboBox_scan_selection.currentText()
-        selected_scan_info = self.available_scans.get(selected_scan_name, {})
+        self.scan_selected.emit(selected_scan_name)
+
+    @Property(bool)
+    def hide_scan_control_buttons(self):
+        return not self.button_run_scan.isVisible()
+
+    @hide_scan_control_buttons.setter
+    def hide_scan_control_buttons(self, hide: bool):
+        self.show_scan_control_buttons(not hide)
+
+    @Slot(bool)
+    def show_scan_control_buttons(self, show: bool):
+        """Shows or hides the scan control buttons."""
+        self.button_run_scan.setVisible(show)
+        self.button_stop_scan.setVisible(show)
+
+        show_group = show or self.button_run_scan.isVisible()
+        self.scan_selection_group.setVisible(show_group)
+
+    @Property(bool)
+    def hide_scan_selection_combobox(self):
+        return not self.comboBox_scan_selection.isVisible()
+
+    @hide_scan_selection_combobox.setter
+    def hide_scan_selection_combobox(self, hide: bool):
+        self.show_scan_selection_combobox(not hide)
+
+    @Slot(bool)
+    def show_scan_selection_combobox(self, show: bool):
+        """Shows or hides the scan selection combobox."""
+        self.comboBox_scan_selection.setVisible(show)
+
+        show_group = show or self.button_run_scan.isVisible()
+        self.scan_selection_group.setVisible(show_group)
+
+    @Slot(str)
+    def scan_select(self, scan_name: str):
+        """
+        Slot for scan selection. Updates the scan control layout based on the selected scan.
+
+        Args:
+            scan_name(str): Name of the selected scan.
+        """
+        self.reset_layout()
+        selected_scan_info = self.available_scans.get(scan_name, {})
 
         gui_config = selected_scan_info.get("gui_config", {})
         self.arg_group = gui_config.get("arg_group", None)
         self.kwarg_groups = gui_config.get("kwarg_groups", None)
 
-        if self.arg_box is None:
-            self.button_add_bundle.setEnabled(False)
-            self.button_remove_bundle.setEnabled(False)
+        show_bundle_buttons = bool(self.arg_group["arg_inputs"])
 
-        if len(self.arg_group["arg_inputs"]) > 0:
-            self.button_add_bundle.setEnabled(True)
-            self.button_remove_bundle.setEnabled(True)
+        self.button_add_bundle.setVisible(show_bundle_buttons)
+        self.button_remove_bundle.setVisible(show_bundle_buttons)
+
+        if show_bundle_buttons:
             self.add_arg_group(self.arg_group)
         if len(self.kwarg_groups) > 0:
             self.add_kwargs_boxes(self.kwarg_groups)
@@ -151,9 +208,11 @@ class ScanControl(BECWidget, QWidget):
         self.arg_box.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Fixed)
         self.layout.addWidget(self.arg_box)
 
+    @Slot()
     def add_arg_bundle(self):
         self.arg_box.add_widget_bundle()
 
+    @Slot()
     def remove_arg_bundle(self):
         self.arg_box.remove_widget_bundle()
 
@@ -172,7 +231,9 @@ class ScanControl(BECWidget, QWidget):
             box.deleteLater()
         self.kwarg_boxes = []
 
+    @Slot()
     def run_scan(self):
+        self.scan_started.emit()
         args = []
         kwargs = {}
         if self.arg_box is not None:
@@ -199,10 +260,12 @@ class ScanControl(BECWidget, QWidget):
 
 # Application example
 if __name__ == "__main__":  # pragma: no cover
+    from bec_widgets.utils.colors import set_theme
+
     app = QApplication([])
     scan_control = ScanControl()
 
-    apply_theme("dark")
+    set_theme("auto")
     window = scan_control
     window.show()
     app.exec()

bec_widgets/widgets/scan_control/scan_control_plugin.py

@@ -3,9 +3,9 @@
 import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtGui import QIcon
 
 import bec_widgets
+from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.scan_control.scan_control import ScanControl
 
 DOM_XML = """
@@ -33,8 +33,7 @@ class ScanControlPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "Device Control"
 
     def icon(self):
-        icon_path = os.path.join(MODULE_PATH, "assets", "designer_icons", "scan_control.png")
-        return QIcon(icon_path)
+        return designer_material_icon("stacked_line_chart")
 
     def includeFile(self):
         return "scan_control"

bec_widgets/widgets/scan_control/scan_group_box.py

@@ -1,9 +1,13 @@
 from typing import Literal
 
+from qtpy.QtCore import Qt
 from qtpy.QtWidgets import (
     QCheckBox,
     QComboBox,
+    QDialog,
+    QDialogButtonBox,
     QDoubleSpinBox,
+    QFormLayout,
     QGridLayout,
     QGroupBox,
     QLabel,
@@ -25,13 +29,46 @@ class ScanArgType:
     LITERALS = "dict"
 
 
+class SettingsDialog(QDialog):
+    def __init__(self, parent=None):
+        super().__init__(parent)
+        self.setWindowTitle("Settings")
+
+        layout = QFormLayout()
+
+        self.precision_spin_box = QSpinBox()
+        self.precision_spin_box.setRange(
+            -2147483647, 2147483647
+        )  # 2147483647 is the largest int which qt allows
+
+        self.step_size_spin_box = QDoubleSpinBox()
+        self.step_size_spin_box.setRange(-float("inf"), float("inf"))
+
+        fixed_width = 80
+        self.precision_spin_box.setFixedWidth(fixed_width)
+        self.step_size_spin_box.setFixedWidth(fixed_width)
+
+        layout.addRow("Decimal Precision:", self.precision_spin_box)
+        layout.addRow("Step Size:", self.step_size_spin_box)
+
+        button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
+        button_box.accepted.connect(self.accept)
+        button_box.rejected.connect(self.reject)
+        layout.addWidget(button_box)
+
+        self.setLayout(layout)
+
+    def getValues(self):
+        return self.precision_spin_box.value(), self.step_size_spin_box.value()
+
+
 class ScanSpinBox(QSpinBox):
     def __init__(
         self, parent=None, arg_name: str = None, default: int | None = None, *args, **kwargs
     ):
         super().__init__(parent=parent, *args, **kwargs)
         self.arg_name = arg_name
-        self.setRange(-9999, 9999)
+        self.setRange(-2147483647, 2147483647)  # 2147483647 is the largest int which qt allows
         if default is not None:
             self.setValue(default)
 
@@ -42,10 +79,25 @@ class ScanDoubleSpinBox(QDoubleSpinBox):
     ):
         super().__init__(parent=parent, *args, **kwargs)
         self.arg_name = arg_name
-        self.setRange(-9999, 9999)
+        self.setRange(-float("inf"), float("inf"))
         if default is not None:
             self.setValue(default)
 
+        self.setContextMenuPolicy(Qt.CustomContextMenu)
+        self.customContextMenuRequested.connect(self.showSettingsDialog)
+
+        self.setToolTip("Right click to open settings dialog for decimal precision and step size.")
+
+    def showSettingsDialog(self):
+        dialog = SettingsDialog(self)
+        dialog.precision_spin_box.setValue(self.decimals())
+        dialog.step_size_spin_box.setValue(self.singleStep())
+
+        if dialog.exec_() == QDialog.Accepted:
+            precision, step_size = dialog.getValues()
+            self.setDecimals(precision)
+            self.setSingleStep(step_size)
+
 
 class ScanLineEdit(QLineEdit):
     def __init__(

bec_widgets/widgets/spinner/spinner_widget_plugin.py

@@ -3,9 +3,9 @@
 import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtGui import QIcon
 
 import bec_widgets
+from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.spinner.spinner import SpinnerWidget
 
 DOM_XML = """
@@ -34,8 +34,7 @@ class SpinnerWidgetPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "BEC Utils"
 
     def icon(self):
-        icon_path = os.path.join(MODULE_PATH, "assets", "designer_icons", "spinner.png")
-        return QIcon(icon_path)
+        return designer_material_icon("progress_activity")
 
     def includeFile(self):
         return "spinner_widget"

bec_widgets/widgets/stop_button/stop_button_plugin.py

@@ -3,9 +3,9 @@
 import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtGui import QIcon
 
 import bec_widgets
+from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.stop_button.stop_button import StopButton
 
 DOM_XML = """
@@ -34,8 +34,7 @@ class StopButtonPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "BEC Utils"
 
     def icon(self):
-        icon_path = os.path.join(MODULE_PATH, "assets", "designer_icons", "stop.png")
-        return QIcon(icon_path)
+        return designer_material_icon("dangerous")
 
     def includeFile(self):
         return "stop_button"

bec_widgets/widgets/text_box/text_box_plugin.py

@@ -3,9 +3,9 @@
 import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtGui import QIcon
 
 import bec_widgets
+from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.text_box.text_box import TextBox
 
 DOM_XML = """
@@ -33,8 +33,7 @@ class TextBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "BEC Utils"
 
     def icon(self):
-        icon_path = os.path.join(MODULE_PATH, "assets", "designer_icons", "text.png")
-        return QIcon(icon_path)
+        return designer_material_icon("chat")
 
     def includeFile(self):
         return "text_box"

bec_widgets/widgets/toggle/toggle_switch_plugin.py

@@ -3,9 +3,9 @@
 import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtGui import QIcon
 
 import bec_widgets
+from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.toggle.toggle import ToggleSwitch
 
 DOM_XML = """
@@ -34,8 +34,7 @@ class ToggleSwitchPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "BEC Utils"
 
     def icon(self):
-        icon_path = os.path.join(MODULE_PATH, "assets", "designer_icons", "toggle.png")
-        return QIcon(icon_path)
+        return designer_material_icon("toggle_on")
 
     def includeFile(self):
         return "toggle_switch"

bec_widgets/widgets/vscode/vs_code_editor_plugin.py

@@ -3,9 +3,9 @@
 import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtGui import QIcon
 
 import bec_widgets
+from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.vscode.vscode import VSCodeEditor
 
 DOM_XML = """
@@ -34,8 +34,7 @@ class VSCodeEditorPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "BEC Developer"
 
     def icon(self):
-        icon_path = os.path.join(MODULE_PATH, "assets", "designer_icons", "code.png")
-        return QIcon(icon_path)
+        return designer_material_icon("developer_mode_tv")
 
     def includeFile(self):
         return "vs_code_editor"

bec_widgets/widgets/waveform/bec_waveform_widget_plugin.py

@@ -3,9 +3,9 @@
 import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtGui import QIcon
 
 import bec_widgets
+from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.waveform.waveform_widget import BECWaveformWidget
 
 DOM_XML = """
@@ -34,8 +34,7 @@ class BECWaveformWidgetPlugin(QDesignerCustomWidgetInterface):  # pragma: no cov
         return "BEC Plots"
 
     def icon(self):
-        icon_path = os.path.join(MODULE_PATH, "assets", "designer_icons", "waveform.png")
-        return QIcon(icon_path)
+        return designer_material_icon("show_chart")
 
     def includeFile(self):
         return "bec_waveform_widget"

bec_widgets/widgets/waveform/waveform_popups/curve_dialog/curve_dialog.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 import os
 from typing import Literal
 
+from bec_qthemes import material_icon
 from pydantic import BaseModel
 from qtpy.QtCore import QObject, QSize, Slot
 from qtpy.QtGui import QIcon
@@ -38,10 +39,7 @@ class CurveSettings(SettingWidget):
         self.ui.normalize_colors_dap.clicked.connect(lambda: self.change_colormap("dap"))
 
     def _setup_icons(self):
-        add_icon = QIcon()
-        add_icon.addFile(
-            os.path.join(MODULE_PATH, "assets", "toolbar_icons", "add.svg"), size=QSize(20, 20)
-        )
+        add_icon = material_icon(icon_name="add", size=(20, 20), convert_to_pixmap=False)
         self.ui.add_dap.setIcon(add_icon)
         self.ui.add_dap.setToolTip("Add DAP Curve")
         self.ui.add_curve.setIcon(add_icon)
@@ -58,16 +56,17 @@ class CurveSettings(SettingWidget):
         self.ui.color_map_selector_scan.combo.setCurrentText(cm)
 
         # Scan Curve Table
-        for label, curve in config["scan_segment"].items():
-            row_count = self.ui.scan_table.rowCount()
-            self.ui.scan_table.insertRow(row_count)
-            DialogRow(
-                parent=self,
-                table_widget=self.ui.scan_table,
-                client=self.target_widget.client,
-                row=row_count,
-                config=curve.config,
-            ).add_scan_row()
+        for source in ["scan_segment", "async"]:
+            for label, curve in config[source].items():
+                row_count = self.ui.scan_table.rowCount()
+                self.ui.scan_table.insertRow(row_count)
+                DialogRow(
+                    parent=self,
+                    table_widget=self.ui.scan_table,
+                    client=self.target_widget.client,
+                    row=row_count,
+                    config=curve.config,
+                ).add_scan_row()
 
         # Add DAP Curves
         for label, curve in config["DAP"].items():
@@ -132,11 +131,12 @@ class CurveSettings(SettingWidget):
         self.accept_curve_changes()
 
     def accept_curve_changes(self):
-        old_curves_scans = list(self.target_widget.waveform._curves_data["scan_segment"].values())
-        old_curves_dap = list(self.target_widget.waveform._curves_data["DAP"].values())
-        for curve in old_curves_scans:
-            curve.remove()
-        for curve in old_curves_dap:
+        sources = ["scan_segment", "async", "DAP"]
+        old_curves = []
+
+        for source in sources:
+            old_curves += list(self.target_widget.waveform._curves_data[source].values())
+        for curve in old_curves:
             curve.remove()
         self.get_curve_params()
 
@@ -337,5 +337,5 @@ class StyleComboBox(QComboBox):
 class RemoveButton(QPushButton):
     def __init__(self, parent=None):
         super().__init__(parent)
-        icon_path = os.path.join(MODULE_PATH, "assets", "toolbar_icons", "remove.svg")
-        self.setIcon(QIcon(icon_path))
+        icon = material_icon("disabled_by_default", size=(20, 20), convert_to_pixmap=False)
+        self.setIcon(icon)

bec_widgets/widgets/waveform/waveform_widget.py

@@ -5,11 +5,12 @@ from typing import Literal
 
 import numpy as np
 import pyqtgraph as pg
+from qtpy.QtCore import Signal
 from qtpy.QtWidgets import QVBoxLayout, QWidget
 
 from bec_widgets.qt_utils.error_popups import SafeSlot, WarningPopupUtility
 from bec_widgets.qt_utils.settings_dialog import SettingsDialog
-from bec_widgets.qt_utils.toolbar import IconAction, ModularToolBar, SeparatorAction
+from bec_widgets.qt_utils.toolbar import MaterialIconAction, ModularToolBar, SeparatorAction
 from bec_widgets.utils.bec_widget import BECWidget
 from bec_widgets.widgets.figure import BECFigure
 from bec_widgets.widgets.figure.plots.axis_settings import AxisSettings
@@ -51,6 +52,14 @@ class BECWaveformWidget(BECWidget, QWidget):
         "export",
         "export_to_matplotlib",
     ]
+    scan_signal_update = Signal()
+    async_signal_update = Signal()
+    dap_params_update = Signal(dict)
+    dap_summary_update = Signal(dict)
+    autorange_signal = Signal()
+    new_scan = Signal()
+    crosshair_coordinates_changed = Signal(tuple)
+    crosshair_coordinates_clicked = Signal(tuple)
 
     def __init__(
         self,
@@ -74,27 +83,32 @@ class BECWaveformWidget(BECWidget, QWidget):
         self.fig = BECFigure()
         self.toolbar = ModularToolBar(
             actions={
-                "save": IconAction(icon_path="save.svg", tooltip="Open Export Dialog"),
-                "matplotlib": IconAction(
-                    icon_path="photo_library.svg", tooltip="Open Matplotlib Plot"
+                "save": MaterialIconAction(icon_name="save", tooltip="Open Export Dialog"),
+                "matplotlib": MaterialIconAction(
+                    icon_name="photo_library", tooltip="Open Matplotlib Plot"
                 ),
                 "separator_1": SeparatorAction(),
-                "drag_mode": IconAction(
-                    icon_path="drag_pan_mode.svg", tooltip="Drag Mouse Mode", checkable=True
+                "drag_mode": MaterialIconAction(
+                    icon_name="drag_pan", tooltip="Drag Mouse Mode", checkable=True
                 ),
-                "rectangle_mode": IconAction(
-                    icon_path="rectangle_mode.svg", tooltip="Rectangle Zoom Mode", checkable=True
+                "rectangle_mode": MaterialIconAction(
+                    icon_name="frame_inspect", tooltip="Rectangle Zoom Mode", checkable=True
+                ),
+                "auto_range": MaterialIconAction(
+                    icon_name="open_in_full", tooltip="Autorange Plot"
                 ),
-                "auto_range": IconAction(icon_path="auto_range.svg", tooltip="Autorange Plot"),
                 "separator_2": SeparatorAction(),
-                "curves": IconAction(
-                    icon_path="line_axis.svg", tooltip="Open Curves Configuration"
+                "curves": MaterialIconAction(
+                    icon_name="stacked_line_chart", tooltip="Open Curves Configuration"
                 ),
-                "fit_params": IconAction(
-                    icon_path="fitting_parameters.svg", tooltip="Open Fitting Parameters"
+                "fit_params": MaterialIconAction(
+                    icon_name="monitoring", tooltip="Open Fitting Parameters"
                 ),
-                "axis_settings": IconAction(
-                    icon_path="settings.svg", tooltip="Open Configuration Dialog"
+                "axis_settings": MaterialIconAction(
+                    icon_name="settings", tooltip="Open Configuration Dialog"
+                ),
+                "crosshair": MaterialIconAction(
+                    icon_name="point_scan", tooltip="Show Crosshair", checkable=True
                 ),
             },
             target_widget=self,
@@ -110,8 +124,19 @@ class BECWaveformWidget(BECWidget, QWidget):
 
         self.config = config
 
+        self.hook_waveform_signals()
         self._hook_actions()
 
+    def hook_waveform_signals(self):
+        self.waveform.scan_signal_update.connect(self.scan_signal_update)
+        self.waveform.async_signal_update.connect(self.async_signal_update)
+        self.waveform.dap_params_update.connect(self.dap_params_update)
+        self.waveform.dap_summary_update.connect(self.dap_summary_update)
+        self.waveform.autorange_signal.connect(self.autorange_signal)
+        self.waveform.new_scan.connect(self.new_scan)
+        self.waveform.crosshair_coordinates_changed.connect(self.crosshair_coordinates_changed)
+        self.waveform.crosshair_coordinates_clicked.connect(self.crosshair_coordinates_clicked)
+
     def _hook_actions(self):
         self.toolbar.widgets["save"].action.triggered.connect(self.export)
         self.toolbar.widgets["matplotlib"].action.triggered.connect(self.export_to_matplotlib)
@@ -123,6 +148,7 @@ class BECWaveformWidget(BECWidget, QWidget):
         self.toolbar.widgets["curves"].action.triggered.connect(self.show_curve_settings)
         self.toolbar.widgets["fit_params"].action.triggered.connect(self.show_fit_summary_dialog)
         self.toolbar.widgets["axis_settings"].action.triggered.connect(self.show_axis_settings)
+        self.toolbar.widgets["crosshair"].action.triggered.connect(self.waveform.toggle_crosshair)
         # self.toolbar.widgets["import"].action.triggered.connect(
         #     lambda: self.load_config(path=None, gui=True)
         # )
@@ -561,15 +587,16 @@ class BECWaveformWidget(BECWidget, QWidget):
 
     def cleanup(self):
         self.fig.cleanup()
-        self.client.shutdown()
         return super().cleanup()
 
 
 def main():  # pragma: no cover
-
     from qtpy.QtWidgets import QApplication
 
+    from bec_widgets.utils.colors import set_theme
+
     app = QApplication(sys.argv)
+    set_theme("auto")
     widget = BECWaveformWidget()
     widget.show()
     sys.exit(app.exec_())

bec_widgets/widgets/website/website.py

@@ -64,6 +64,12 @@ class WebsiteWidget(BECWidget, QWebEngineView):
         """
         QWebEngineView.forward(self)
 
+    def cleanup(self):
+        """
+        Cleanup the widget
+        """
+        self.page().deleteLater()
+
 
 if __name__ == "__main__":
     import sys

bec_widgets/widgets/website/website_widget_plugin.py

@@ -3,9 +3,9 @@
 import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtGui import QIcon
 
 import bec_widgets
+from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.website.website import WebsiteWidget
 
 DOM_XML = """
@@ -33,8 +33,7 @@ class WebsiteWidgetPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "BEC Utils"
 
     def icon(self):
-        icon_path = os.path.join(MODULE_PATH, "assets", "designer_icons", "web.png")
-        return QIcon(icon_path)
+        return designer_material_icon("travel_explore")
 
     def includeFile(self):
         return "website_widget"

docs/_static/custom.css

@@ -59,29 +59,29 @@
   
   /* Main index page overview cards */
   
-  .sd-card {
+  .index-card .sd-card {
     background: #fff;
     border-radius: 0;
     padding: 30px 10px 20px 10px;
     margin: 10px 0px;
   }
   
-  .sd-card .sd-card-header {
+  .index-card .sd-card-header {
     text-align: center;
   }
   
-  .sd-card .sd-card-header .sd-card-text {
+  .index-card .sd-card-header .sd-card-text {
     margin: 0px;
   }
   
-  .sd-card .sd-card-img-top {
+  .index-card .sd-card-img-top {
     height: 52px;
     width: 52px;
     margin-left: auto;
     margin-right: auto;
   }
   
-  .sd-card .sd-card-header {
+  .index-card .sd-card-header {
     border: none;
     background-color:white;
     color: #150458 !important;
@@ -91,13 +91,13 @@
     border-bottom:  none !important;
   }
   
-  .sd-card .sd-card-footer {
+  .index-card .sd-card-footer {
     border: none;
     background-color:white;
     border-top:  none !important;
   }
   
-  .sd-card .sd-card-footer .sd-card-text{
+  .index-card .sd-card-footer .sd-card-text{
     max-width: 220px;
     margin-left: auto;
     margin-right: auto;
@@ -143,7 +143,7 @@
   
   /* Main index page overview cards */
   
-  html[data-theme=dark] .sd-card {
+  html[data-theme=dark] .index-card .sd-card {
       background-color:var(--pst-color-background);
       border:  none
   }
@@ -152,12 +152,12 @@
       box-shadow: 0 .1rem 0.5rem rgba(250, 250, 250, .2) !important
   }
   
-  html[data-theme=dark] .sd-card .sd-card-header {
+  html[data-theme=dark] .index-card .sd-card-header {
       background-color:var(--pst-color-background);
       color: #150458 !important;
   }
   
-  html[data-theme=dark] .sd-card .sd-card-footer {
+  html[data-theme=dark] .index-card .sd-card-footer {
       background-color:var(--pst-color-background);
   }