0.99.2

Automatically generated by python-semantic-release

.gitlab-ci.yml

@@ -43,13 +43,20 @@ stages:
   - export QTWEBENGINE_DISABLE_SANDBOX=1
 
 .clone-repos: &clone-repos
+  - echo -e "\033[35;1m Using branch $BEC_CORE_BRANCH of BEC CORE \033[0;m";
   - git clone --branch $BEC_CORE_BRANCH https://gitlab.psi.ch/bec/bec.git
+  - echo -e "\033[35;1m Using branch $OPHYD_DEVICES_BRANCH of OPHYD_DEVICES \033[0;m";
   - git clone --branch $OPHYD_DEVICES_BRANCH https://gitlab.psi.ch/bec/ophyd_devices.git
   - export OHPYD_DEVICES_PATH=$PWD/ophyd_devices
 
+.install-repos: &install-repos
+  - pip install -e ./ophyd_devices
+  - pip install -e ./bec/bec_lib[dev]
+  - pip install -e ./bec/bec_ipython_client
+
 .install-os-packages: &install-os-packages
   - apt-get update
-  - apt-get install -y libgl1-mesa-glx libegl1-mesa x11-utils libxkbcommon-x11-0 libdbus-1-3
+  - apt-get install -y libgl1-mesa-glx libegl1-mesa x11-utils libxkbcommon-x11-0 libdbus-1-3 xvfb
   - *install-qt-webengine-deps
 
 before_script:
@@ -131,10 +138,9 @@ tests:
   script:
     - *clone-repos
     - *install-os-packages
-    - pip install -e ./bec/bec_lib[dev]
-    - pip install -e ./bec/bec_ipython_client
+    - *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+)?\%)$/'
@@ -169,11 +175,9 @@ test-matrix:
   script:
     - *clone-repos
     - *install-os-packages
-    - pip install -e ./bec/bec_lib[dev]
-    - pip install -e ./bec/bec_ipython_client
+    - *install-repos
     - pip install -e .[dev,$QT_PCKG]
-    - pytest -v --junitxml=report.xml --random-order ./tests/unit_tests
-  allow_failure: true
+    - pytest -v --maxfail=2 --junitxml=report.xml --random-order ./tests/unit_tests
 
 end-2-end-conda:
   stage: End2End
@@ -195,10 +199,9 @@ end-2-end-conda:
 
     - cd ./bec
     - source ./bin/install_bec_dev.sh -t
-
-    - pip install -e ./bec_lib[dev]
-    - pip install -e ./bec_ipython_client[dev]
     - cd ../
+    - pip install -e ./ophyd_devices
+
     - pip install -e .[dev,pyqt6]
     - cd ./tests/end-2-end
     - pytest -v --start-servers --flush-redis --random-order

CHANGELOG.md

@@ -1,149 +1,161 @@
 # CHANGELOG
 
-## v0.91.0 (2024-07-23)
+## v0.99.2 (2024-08-27)
 
-### Feature
+### Ci
 
-* 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))
+* ci: additional tests are not allowed to fail ([`bb385f0`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/bb385f07ca18904461a541b5cadde05398c84438))
 
 ### Fix
 
-* fix(status_item): icons changed to material design ([`1b9c55a`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/1b9c55a46a0dfd8678c8e95ff64dd6e8cfb9233e))
+* fix(widgets): fixed default theme for widgets
 
-* fix(plugins): Qt Designer plugins icons adjusted ([`f4844d2`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/f4844d2e067ce75dc64b89b230d7932b308ddfc2))
+If not theme is set, the init of the BECWidget base class sets the default theme to "dark" ([`cf28730`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/cf28730515e3c2d5914e0205768734c578711e5c))
 
-### 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))
+## v0.99.1 (2024-08-27)
 
 ### Fix
 
-* fix(axis_setting): fix compatibility for issue with horizontal line for PyQt6 ([`1cf6e32`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/1cf6e32303f82bc7c3f3391d0e96a88bc31f29fc))
+* fix(crosshair): emit all crosshair events, not just line coordinates ([`2265458`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/2265458dcc57970db18c62619f5877d542d72e81))
 
-* 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)
+## v0.99.0 (2024-08-25)
 
 ### Documentation
 
-* docs: readthedocs icon path fixed ([`2bcaa42`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/2bcaa4256d6daaefacb3ead8c72458d7b1498e29))
-
-### Fix
-
-* fix(plot_base): set_xy autorange moved to plotbase from waveform ([`a3dff7d`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/a3dff7decc16115c12dc6b4ef1572552368da309))
-
-### Refactor
-
-* refactor(toolbar): generalizations of the ToolBarAction ([`ad112d1`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/ad112d1f08157f6987edd48a0bacf9f669ef1997))
-
-## v0.88.0 (2024-07-19)
+* docs(darkmodebutton): added dark mode button docs ([`406c263`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/406c263746f0e809c1a4d98356c48f40428c23d7))
 
 ### Feature
 
-* feat(waveform_widget): designer plugin added ([`1f8ef52`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/1f8ef52b606283038052640849094f515a463403))
-
-* feat(waveform_widget): switch between drag and rectangle mode ([`2be009c`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/2be009c6477ba26c5cfb4d827534c5d5eb428999))
-
-* feat(waveform_widget): autorange button ([`8df6b00`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/8df6b003e5c6a942fa2e875d9790e492c087bf26))
-
-* feat(waveform_widget): dap parameter window ([`1e551d6`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/1e551d6e9696f79ea2e0a179d13a4fc6c2a128b2))
-
-* feat(waveform): export to matplotlib window of current scene ([`8d93405`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/8d9340539967b06b1e15f21a2106a39d5c740f31))
-
-* feat(figure): export dialog can be launched from CLI and from toolbar ([`6ff6111`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/6ff611109153b9412dce37c527b19e839d99bba7))
-
-* feat(waveform_widget): added error handle utility ([`a8ff1d4`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/a8ff1d4cd09cae5eaeb4bd0ea90fdd102e32f3a3))
-
-* feat(curve_dialog): add DAP functionality ([`e830565`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/e8305652fde384da037242cf8f7e3606f22bcfb6))
-
-* feat(curve_dialog): curves can be added ([`c926a75`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/c926a75a7927d672c044ea8f68771209ae5accc6))
-
-* feat(waveform_widget): BECWaveformWidget toolbar added import/export config ([`fa9b171`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/fa9b17191ddbb4043a658dae9aa0801e1dc22b84))
-
-* feat(waveform_widget): BECWaveformWidget added with toolbar ([`755b394`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/755b394c1c4d7c443c442d89c630d08ce5415554))
+* feat(darkmodebutton): added button to toggle between dark and light mode ([`cc8c166`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/cc8c166b5c1d37e0f64c83801b2347a54a6550b6))
 
 ### Fix
 
-* fix(waveform_widget): plot API unified with BECFigure ([`2c8764a`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/2c8764a27de89b39b717032b58465e120ec57fbc))
-
-* fix(colormap_selector): compatibility for PyQt6 when using designer fixed ([`50135b5`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/50135b5fe90a88618291e9357f180cb19251dace))
-
-* fix(waveform_widget): adapted for BECWidget base class ([`6eb313f`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/6eb313fa76e559d62ecd8fa8849142b83817e47c))
-
-* fix(waveform_widget): temporary disabled save/load config ([`7089cf3`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/7089cf356a43d805241d5621952e544d690e65e0))
-
-* fix(waveform_widget): use @SafeSlot decorator for automatic error message ([`8e588d7`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/8e588d79c86e950f6915e89c08fa9415c4bd8033))
-
-* fix(waveform): colormaps of curves can be changed and normalised
-
-feat(waveform): colormap can be changed from curve dialog
-
-fix(curve_dialog): default dialog parameters fixed
-
-curve Dialog colormap WIP ([`33495cf`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/33495cfe03b363f18db61d8af2983f49027b7a43))
-
-* fix(waveform_widget): adapted for changes from improved scan logic from waveform widget ([`8ac35d7`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/8ac35d7280b1ff007c10612228d163cc0c5d1a99))
+* fix(toggle): emit state change ([`c4f3308`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/c4f3308dc0c3e4b2064760ccd7372d71b3e49f96))
 
 ### Refactor
 
-* refactor(icons): icons moved to the assets directory ([`a8b6ef2`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/a8b6ef20cccae87515b10f054d0ed5b10e152769))
-
-* refactor(waveform_widget): removed PYSIDE6 check ([`47fcb9e`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/47fcb9ebfe35ae600cced95a1edc68f6f6e37a04))
+* refactor(darkmodebutton): renamed set_dark_mode_enabled to toggle_dark_mode ([`c70724a`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/c70724a456900bcb06b040407a2c5d497e49ce77))
 
 ### Test
 
-* test(waveform_widget): test added ([`8d764e2`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/8d764e2d46a1e017dadc3c4630648c1ca708afc2))
+* test(dark_mode_button): added tests for dark mode button ([`df35aab`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/df35aabff30c5d00b1c441132bd370446653741e))
 
-## v0.87.1 (2024-07-18)
+## v0.98.0 (2024-08-25)
+
+### Feature
+
+* feat(themes): added set_theme method ([`2b4449a`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/2b4449afebdda0a97f95712a1353cf40ec55c283))
 
 ### Fix
 
-* fix(dock): added hasattr to cleanup method for widgets ([`d75c55b`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/d75c55b2b1ccf156fb789c7813f1c5bdf256f860))
+* fix(toolbar): removed hardcoded color values ([`afdf4e8`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/afdf4e8782a22566932180224fa1c924d24c810f))
 
-* fix: add missing close() call, ensure jupyter console client.shutdown() is called in closeEvent ([`e52ee26`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/e52ee2604cb35096f1bd833ca9516d8a34197d35))
+* 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: BECWidget is a mixin based on BECConnector, for each QWidget in BEC
+* refactor(waveform): use set theme for demo ([`44cfda1`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/44cfda1c07306669c9a4e09706d95e6b91dee370))
 
-Handles closeEvent() and RPC registering/unregistering ([`c7feb69`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/c7feb6952d590b569f7b0cba3b019a9af0ce0c93))
+## 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))
+
+### 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: added test for device browser ([`e870e5b`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/e870e5ba083c61df581c9c0305adabe72967f997))

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,12 @@ class Widgets(str, enum.Enum):
     BECQueue = "BECQueue"
     BECStatusBox = "BECStatusBox"
     BECWaveformWidget = "BECWaveformWidget"
-    DeviceBox = "DeviceBox"
+    DarkModeButton = "DarkModeButton"
+    DeviceBrowser = "DeviceBrowser"
     DeviceComboBox = "DeviceComboBox"
     DeviceLineEdit = "DeviceLineEdit"
+    PositionerBox = "PositionerBox"
+    PositionerControlLine = "PositionerControlLine"
     RingProgressBar = "RingProgressBar"
     ScanControl = "ScanControl"
     StopButton = "StopButton"
@@ -2287,7 +2290,16 @@ class BECWaveformWidget(RPCBase):
         """
 
 
-class DeviceBox(RPCBase):
+class DarkModeButton(RPCBase):
+    @rpc_call
+    def toggle_dark_mode(self) -> None:
+        """
+        Toggle the dark mode state. This will change the theme of the entire
+        application to dark or light mode.
+        """
+
+
+class DeviceBrowser(RPCBase):
     @property
     @rpc_call
     def _config_dict(self) -> "dict":
@@ -2359,6 +2371,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/general_app/general_app.py

@@ -0,0 +1,92 @@
+import os
+import sys
+
+from qtpy.QtCore import QSize
+from qtpy.QtGui import QActionGroup, QIcon
+from qtpy.QtWidgets import QApplication, QMainWindow, QStyle
+
+import bec_widgets
+from bec_widgets.examples.general_app.web_links import BECWebLinksMixin
+from bec_widgets.utils.colors import apply_theme
+from bec_widgets.utils.ui_loader import UILoader
+
+MODULE_PATH = os.path.dirname(bec_widgets.__file__)
+
+
+class BECGeneralApp(QMainWindow):
+    def __init__(self, parent=None):
+        super(BECGeneralApp, self).__init__(parent)
+        ui_file_path = os.path.join(os.path.dirname(__file__), "general_app.ui")
+        self.load_ui(ui_file_path)
+
+        self.resize(1280, 720)
+
+        self.ini_ui()
+
+    def ini_ui(self):
+        self._setup_icons()
+        self._hook_menubar_docs()
+        self._hook_theme_bar()
+
+    def load_ui(self, ui_file):
+        loader = UILoader(self)
+        self.ui = loader.loader(ui_file)
+        self.setCentralWidget(self.ui)
+
+    def _hook_menubar_docs(self):
+        # BEC Docs
+        self.ui.action_BEC_docs.triggered.connect(BECWebLinksMixin.open_bec_docs)
+        # BEC Widgets Docs
+        self.ui.action_BEC_widgets_docs.triggered.connect(BECWebLinksMixin.open_bec_widgets_docs)
+        # Bug report
+        self.ui.action_bug_report.triggered.connect(BECWebLinksMixin.open_bec_bug_report)
+
+    def change_theme(self, theme):
+        apply_theme(theme)
+
+    def _setup_icons(self):
+        help_icon = QApplication.style().standardIcon(QStyle.SP_MessageBoxQuestion)
+        bug_icon = QApplication.style().standardIcon(QStyle.SP_MessageBoxInformation)
+        computer_icon = QIcon.fromTheme("computer")
+        widget_icon = QIcon(os.path.join(MODULE_PATH, "assets", "designer_icons", "dock_area.png"))
+
+        self.ui.action_BEC_docs.setIcon(help_icon)
+        self.ui.action_BEC_widgets_docs.setIcon(help_icon)
+        self.ui.action_bug_report.setIcon(bug_icon)
+
+        self.ui.central_tab.setTabIcon(0, widget_icon)
+        self.ui.central_tab.setTabIcon(1, computer_icon)
+
+    def _hook_theme_bar(self):
+        self.ui.action_light.setCheckable(True)
+        self.ui.action_dark.setCheckable(True)
+
+        # Create an action group to make sure only one can be checked at a time
+        theme_group = QActionGroup(self)
+        theme_group.addAction(self.ui.action_light)
+        theme_group.addAction(self.ui.action_dark)
+        theme_group.setExclusive(True)
+
+        # Connect the actions to the theme change method
+
+        self.ui.action_light.triggered.connect(lambda: self.change_theme("light"))
+        self.ui.action_dark.triggered.connect(lambda: self.change_theme("dark"))
+
+        self.ui.action_dark.trigger()
+
+
+def main():  # pragma: no cover
+
+    app = QApplication(sys.argv)
+    icon = QIcon()
+    icon.addFile(
+        os.path.join(MODULE_PATH, "assets", "app_icons", "BEC-Dark.png"), size=QSize(48, 48)
+    )
+    app.setWindowIcon(icon)
+    main_window = BECGeneralApp()
+    main_window.show()
+    sys.exit(app.exec_())
+
+
+if __name__ == "__main__":  # pragma: no cover
+    main()

bec_widgets/examples/general_app/general_app.ui

@@ -0,0 +1,262 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+    <class>MainWindow</class>
+    <widget class="QMainWindow" name="MainWindow">
+        <property name="geometry">
+            <rect>
+                <x>0</x>
+                <y>0</y>
+                <width>1718</width>
+                <height>1139</height>
+            </rect>
+        </property>
+        <property name="windowTitle">
+            <string>MainWindow</string>
+        </property>
+        <property name="tabShape">
+            <enum>QTabWidget::TabShape::Rounded</enum>
+        </property>
+        <widget class="QWidget" name="centralwidget">
+            <layout class="QVBoxLayout" name="verticalLayout_3">
+                <item>
+                    <widget class="QTabWidget" name="central_tab">
+                        <property name="currentIndex">
+                            <number>0</number>
+                        </property>
+                        <widget class="QWidget" name="dock_area_tab">
+                            <attribute name="title">
+                                <string>Dock Area</string>
+                            </attribute>
+                            <layout class="QVBoxLayout" name="verticalLayout">
+                                <property name="leftMargin">
+                                    <number>2</number>
+                                </property>
+                                <property name="topMargin">
+                                    <number>1</number>
+                                </property>
+                                <property name="rightMargin">
+                                    <number>2</number>
+                                </property>
+                                <property name="bottomMargin">
+                                    <number>2</number>
+                                </property>
+                                <item>
+                                    <widget class="BECDockArea" name="dock_area"/>
+                                </item>
+                            </layout>
+                        </widget>
+                        <widget class="QWidget" name="vscode_tab">
+                            <attribute name="icon">
+                                <iconset theme="QIcon::ThemeIcon::Computer"/>
+                            </attribute>
+                            <attribute name="title">
+                                <string>Visual Studio Code</string>
+                            </attribute>
+                            <layout class="QVBoxLayout" name="verticalLayout_2">
+                                <property name="leftMargin">
+                                    <number>2</number>
+                                </property>
+                                <property name="topMargin">
+                                    <number>1</number>
+                                </property>
+                                <property name="rightMargin">
+                                    <number>2</number>
+                                </property>
+                                <property name="bottomMargin">
+                                    <number>2</number>
+                                </property>
+                                <item>
+                                    <widget class="VSCodeEditor" name="vscode"/>
+                                </item>
+                            </layout>
+                        </widget>
+                    </widget>
+                </item>
+            </layout>
+        </widget>
+        <widget class="QMenuBar" name="menubar">
+            <property name="geometry">
+                <rect>
+                    <x>0</x>
+                    <y>0</y>
+                    <width>1718</width>
+                    <height>31</height>
+                </rect>
+            </property>
+            <widget class="QMenu" name="menuHelp">
+                <property name="title">
+                    <string>Help</string>
+                </property>
+                <addaction name="action_BEC_docs"/>
+                <addaction name="action_BEC_widgets_docs"/>
+                <addaction name="action_bug_report"/>
+            </widget>
+            <widget class="QMenu" name="menuTheme">
+                <property name="title">
+                    <string>Theme</string>
+                </property>
+                <addaction name="action_light"/>
+                <addaction name="action_dark"/>
+            </widget>
+            <addaction name="menuTheme"/>
+            <addaction name="menuHelp"/>
+        </widget>
+        <widget class="QStatusBar" name="statusbar"/>
+        <widget class="QDockWidget" name="dock_scan_control">
+            <property name="windowTitle">
+                <string>Scan Control</string>
+            </property>
+            <attribute name="dockWidgetArea">
+                <number>2</number>
+            </attribute>
+            <widget class="QWidget" name="dockWidgetContents_2">
+                <layout class="QVBoxLayout" name="verticalLayout_4">
+                    <item>
+                        <widget class="ScanControl" name="scan_control"/>
+                    </item>
+                </layout>
+            </widget>
+        </widget>
+        <widget class="QDockWidget" name="dock_status_2">
+            <property name="windowTitle">
+                <string>BEC Service Status</string>
+            </property>
+            <attribute name="dockWidgetArea">
+                <number>2</number>
+            </attribute>
+            <widget class="QWidget" name="dockWidgetContents_3">
+                <layout class="QVBoxLayout" name="verticalLayout_5">
+                    <property name="leftMargin">
+                        <number>0</number>
+                    </property>
+                    <property name="topMargin">
+                        <number>0</number>
+                    </property>
+                    <property name="rightMargin">
+                        <number>0</number>
+                    </property>
+                    <property name="bottomMargin">
+                        <number>0</number>
+                    </property>
+                    <item>
+                        <widget class="BECStatusBox" name="bec_status_box_2"/>
+                    </item>
+                </layout>
+            </widget>
+        </widget>
+        <widget class="QDockWidget" name="dock_queue">
+            <property name="windowTitle">
+                <string>Scan Queue</string>
+            </property>
+            <attribute name="dockWidgetArea">
+                <number>2</number>
+            </attribute>
+            <widget class="QWidget" name="dockWidgetContents_4">
+                <layout class="QVBoxLayout" name="verticalLayout_6">
+                    <property name="leftMargin">
+                        <number>0</number>
+                    </property>
+                    <property name="topMargin">
+                        <number>0</number>
+                    </property>
+                    <property name="rightMargin">
+                        <number>0</number>
+                    </property>
+                    <property name="bottomMargin">
+                        <number>0</number>
+                    </property>
+                    <item>
+                        <widget class="BECQueue" name="bec_queue">
+                            <row/>
+                            <column/>
+                            <column/>
+                            <column/>
+                            <item row="0" column="0"/>
+                            <item row="0" column="1"/>
+                            <item row="0" column="2"/>
+                        </widget>
+                    </item>
+                </layout>
+            </widget>
+        </widget>
+        <action name="action_BEC_docs">
+            <property name="icon">
+                <iconset theme="QIcon::ThemeIcon::DialogQuestion"/>
+            </property>
+            <property name="text">
+                <string>BEC Docs</string>
+            </property>
+        </action>
+        <action name="action_BEC_widgets_docs">
+            <property name="icon">
+                <iconset theme="QIcon::ThemeIcon::DialogQuestion"/>
+            </property>
+            <property name="text">
+                <string>BEC Widgets Docs</string>
+            </property>
+        </action>
+        <action name="action_bug_report">
+            <property name="icon">
+                <iconset theme="QIcon::ThemeIcon::DialogError"/>
+            </property>
+            <property name="text">
+                <string>Bug Report</string>
+            </property>
+        </action>
+        <action name="action_light">
+            <property name="checkable">
+                <bool>true</bool>
+            </property>
+            <property name="text">
+                <string>Light</string>
+            </property>
+        </action>
+        <action name="action_dark">
+            <property name="checkable">
+                <bool>true</bool>
+            </property>
+            <property name="text">
+                <string>Dark</string>
+            </property>
+        </action>
+    </widget>
+    <customwidgets>
+        <customwidget>
+            <class>WebsiteWidget</class>
+            <extends>QWebEngineView</extends>
+            <header>website_widget</header>
+        </customwidget>
+        <customwidget>
+            <class>BECQueue</class>
+            <extends>QTableWidget</extends>
+            <header>bec_queue</header>
+        </customwidget>
+        <customwidget>
+            <class>ScanControl</class>
+            <extends>QWidget</extends>
+            <header>scan_control</header>
+        </customwidget>
+        <customwidget>
+            <class>VSCodeEditor</class>
+            <extends>WebsiteWidget</extends>
+            <header>vs_code_editor</header>
+        </customwidget>
+        <customwidget>
+            <class>BECStatusBox</class>
+            <extends>QWidget</extends>
+            <header>bec_status_box</header>
+        </customwidget>
+        <customwidget>
+            <class>BECDockArea</class>
+            <extends>QWidget</extends>
+            <header>dock_area</header>
+        </customwidget>
+        <customwidget>
+            <class>QWebEngineView</class>
+            <extends></extends>
+            <header location="global">QtWebEngineWidgets/QWebEngineView</header>
+        </customwidget>
+    </customwidgets>
+    <resources/>
+    <connections/>
+</ui>

bec_widgets/examples/general_app/web_links.py

@@ -0,0 +1,15 @@
+import webbrowser
+
+
+class BECWebLinksMixin:
+    @staticmethod
+    def open_bec_docs():
+        webbrowser.open("https://beamline-experiment-control.readthedocs.io/en/latest/")
+
+    @staticmethod
+    def open_bec_widgets_docs():
+        webbrowser.open("https://bec.readthedocs.io/projects/bec-widgets/en/latest/")
+
+    @staticmethod
+    def open_bec_bug_report():
+        webbrowser.open("https://gitlab.psi.ch/groups/bec/-/issues/")

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/main.py

@@ -7,7 +7,8 @@ import sys
 
 from bec_ipython_client.main import BECIPythonClient
 from qtpy.QtWidgets import QApplication
-from tictactoe import TicTacToe
+
+from bec_widgets.examples.plugin_example_pyside.tictactoe import TicTacToe
 
 if __name__ == "__main__":  # pragma: no cover
     app = QApplication(sys.argv)

bec_widgets/examples/plugin_example_pyside/registertictactoe.py

@@ -2,8 +2,9 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QPyDesignerCustomWidgetCollection
-from tictactoe import TicTacToe
-from tictactoeplugin import TicTacToePlugin
+
+from bec_widgets.examples.plugin_example_pyside.tictactoe import TicTacToe
+from bec_widgets.examples.plugin_example_pyside.tictactoeplugin import TicTacToePlugin
 
 # Set PYSIDE_DESIGNER_PLUGINS to point to this directory and load the plugin
 

bec_widgets/examples/plugin_example_pyside/tictactoeplugin.py

@@ -3,11 +3,11 @@
 import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtGui import QIcon
-from tictactoe import TicTacToe
-from tictactoetaskmenu import TicTacToeTaskMenuFactory
 
 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/examples/plugin_example_pyside/tictactoetaskmenu.py

@@ -1,11 +1,12 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
-from qtpy.QtCore import Slot
 from qtpy.QtDesigner import QExtensionFactory, QPyDesignerTaskMenuExtension
 from qtpy.QtGui import QAction
 from qtpy.QtWidgets import QDialog, QDialogButtonBox, QVBoxLayout
-from tictactoe import TicTacToe
+
+from bec_widgets.examples.plugin_example_pyside.tictactoe import TicTacToe
+from bec_widgets.qt_utils.error_popups import SafeSlot as Slot
 
 
 class TicTacToeDialog(QDialog):  # pragma: no cover

bec_widgets/qt_utils/error_popups.py

@@ -6,7 +6,7 @@ from qtpy.QtCore import QObject, Qt, Signal, Slot
 from qtpy.QtWidgets import QApplication, QMessageBox, QPushButton, QVBoxLayout, QWidget
 
 
-def SafeSlot(*slot_args, **slot_kwargs):
+def SafeSlot(*slot_args, **slot_kwargs):  # pylint: disable=invalid-name
     """Function with args, acting like a decorator, applying "error_managed" decorator + Qt Slot
     to the passed function, to display errors instead of potentially raising an exception
 
@@ -34,10 +34,7 @@ class WarningPopupUtility(QObject):
     Utility class to show warning popups in the application.
     """
 
-    def __init__(self, parent=None):
-        super().__init__(parent)
-
-    @Slot(str, str, str, QWidget)
+    @SafeSlot(str, str, str, QWidget)
     def show_warning_message(self, title, message, detailed_text, widget):
         msg = QMessageBox(widget)
         msg.setIcon(QMessageBox.Warning)
@@ -60,7 +57,10 @@ class WarningPopupUtility(QObject):
         self.show_warning_message(title, message, detailed_text, widget)
 
 
-class ErrorPopupUtility(QObject):
+_popup_utility_instance = None
+
+
+class _ErrorPopupUtility(QObject):
     """
     Utility class to manage error popups in the application to show error messages to the users.
     This class is singleton and the error popup can be enabled or disabled globally or attach to widget methods with decorator @error_managed.
@@ -68,24 +68,14 @@ class ErrorPopupUtility(QObject):
 
     error_occurred = Signal(str, str, QWidget)
 
-    _instance = None
-    _initialized = False
-
-    def __new__(cls, *args, **kwargs):
-        if cls._instance is None:
-            cls._instance = super(ErrorPopupUtility, cls).__new__(cls)
-            cls._instance._initialized = False
-        return cls._instance
-
     def __init__(self, parent=None):
-        if not self._initialized:
-            super().__init__(parent=parent)
-            self.error_occurred.connect(self.show_error_message)
-            self.enable_error_popup = False
-            self._initialized = True
-            sys.excepthook = self.custom_exception_hook
+        super().__init__(parent=parent)
+        self.error_occurred.connect(self.show_error_message)
+        self.enable_error_popup = False
+        self._initialized = True
+        sys.excepthook = self.custom_exception_hook
 
-    @Slot(str, str, QWidget)
+    @SafeSlot(str, str, QWidget)
     def show_error_message(self, title, message, widget):
         detailed_text = self.format_traceback(message)
         error_message = self.parse_error_message(detailed_text)
@@ -157,13 +147,12 @@ class ErrorPopupUtility(QObject):
         """
         self.enable_error_popup = bool(state)
 
-    @classmethod
-    def reset_singleton(cls):
-        """
-        Reset the singleton instance.
-        """
-        cls._instance = None
-        cls._initialized = False
+
+def ErrorPopupUtility():
+    global _popup_utility_instance
+    if not _popup_utility_instance:
+        _popup_utility_instance = _ErrorPopupUtility()
+    return _popup_utility_instance
 
 
 class ExampleWidget(QWidget):  # pragma: no cover

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

@@ -1,6 +1,7 @@
-from qtpy.QtCore import Slot
 from qtpy.QtWidgets import QDialog, QDialogButtonBox, QHBoxLayout, QPushButton, QVBoxLayout, QWidget
 
+from bec_widgets.qt_utils.error_popups import SafeSlot as Slot
+
 
 class SettingWidget(QWidget):
     """
@@ -105,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_connector.py

@@ -10,11 +10,11 @@ import yaml
 from bec_lib.utils.import_utils import lazy_import_from
 from pydantic import BaseModel, Field, field_validator
 from qtpy.QtCore import QObject, QRunnable, QThreadPool, Signal
-from qtpy.QtCore import Slot as pyqtSlot
 from qtpy.QtWidgets import QApplication
 
 from bec_widgets.cli.rpc_register import RPCRegister
 from bec_widgets.qt_utils.error_popups import ErrorPopupUtility
+from bec_widgets.qt_utils.error_popups import SafeSlot as pyqtSlot
 from bec_widgets.utils.yaml_dialog import load_yaml, load_yaml_gui, save_yaml, save_yaml_gui
 
 BECDispatcher = lazy_import_from("bec_widgets.utils.bec_dispatcher", ("BECDispatcher",))

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/bec_widget.py

@@ -1,6 +1,7 @@
-from qtpy.QtWidgets import QWidget
+from qtpy.QtWidgets import QApplication, QWidget
 
 from bec_widgets.utils.bec_connector import BECConnector, ConnectionConfig
+from bec_widgets.utils.colors import set_theme
 
 
 class BECWidget(BECConnector):
@@ -11,9 +12,13 @@ class BECWidget(BECConnector):
             raise RuntimeError(f"{repr(self)} is not a subclass of QWidget")
         super().__init__(client, config, gui_id)
 
+        # Set the theme to auto if it is not set yet
+        app = QApplication.instance()
+        if not hasattr(app, "theme"):
+            set_theme("dark")
+
     def cleanup(self):
         """Cleanup the widget."""
-        pass
 
     def closeEvent(self, event):
         self.rpc_register.remove_rpc(self)

bec_widgets/utils/colors.py

@@ -2,25 +2,48 @@ import itertools
 import re
 from typing import Literal
 
+import bec_qthemes
 import numpy as np
 import pyqtgraph as pg
-import qdarkstyle
+from bec_qthemes._os_appearance.listener import OSThemeSwitchListener
 from pydantic_core import PydanticCustomError
-from qdarkstyle import DarkPalette, LightPalette
 from qtpy.QtGui import QColor
 from qtpy.QtWidgets import QApplication
 
-CURRENT_THEME = "dark"
-
 
 def get_theme_palette():
-    return DarkPalette if CURRENT_THEME == "dark" else LightPalette
+    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(
@@ -30,7 +53,7 @@ def apply_theme(theme: Literal["dark", "light"]):
         pg_widget.setBackground("k" if theme == "dark" else "w")
 
     # now define stylesheet according to theme and apply it
-    style = qdarkstyle.load_stylesheet(palette=get_theme_palette())
+    style = bec_qthemes.load_stylesheet(theme)
     app.setStyleSheet(style)
 
 

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,12 +1,16 @@
+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
 
 
 class Crosshair(QObject):
+    positionChanged = pyqtSignal(tuple)
+    positionClicked = pyqtSignal(tuple)
     # Signal for 1D plot
     coordinatesChanged1D = pyqtSignal(tuple)
     coordinatesClicked1D = pyqtSignal(tuple)
@@ -26,10 +30,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 +44,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 +120,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 +164,9 @@ class Crosshair(QObject):
         Args:
             event: The mouse moved event
         """
-        self.check_log()
         pos = event[0]
+        self.update_markers()
+        self.positionChanged.emit((pos.x(), pos.y()))
         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 +177,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,40 +212,69 @@ 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()
+            self.positionClicked.emit((x, y))
 
             if self.is_log_x:
                 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,12 +1,14 @@
+from __future__ import annotations
+
 from bec_lib.endpoints import MessageEndpoints
 from qtpy.QtCore import Qt, Slot
-from qtpy.QtWidgets import QHeaderView, QTableWidget, QTableWidgetItem, QWidget
+from qtpy.QtWidgets import QHBoxLayout, QHeaderView, QTableWidget, QTableWidgetItem, QWidget
 
 from bec_widgets.utils.bec_connector import ConnectionConfig
 from bec_widgets.utils.bec_widget import BECWidget
 
 
-class BECQueue(BECWidget, QTableWidget):
+class BECQueue(BECWidget, QWidget):
     """
     Widget to display the BEC queue.
     """
@@ -19,10 +21,14 @@ class BECQueue(BECWidget, QTableWidget):
         gui_id: str = None,
     ):
         super().__init__(client, config, gui_id)
-        QTableWidget.__init__(self, parent=parent)
-        self.setColumnCount(3)
-        self.setHorizontalHeaderLabels(["Scan Number", "Type", "Status"])
-        header = self.horizontalHeader()
+        QWidget.__init__(self, parent=parent)
+        self.table = QTableWidget(self)
+        self.layout = QHBoxLayout(self)
+        self.layout.addWidget(self.table)
+
+        self.table.setColumnCount(3)
+        self.table.setHorizontalHeaderLabels(["Scan Number", "Type", "Status"])
+        header = self.table.horizontalHeader()
         header.setSectionResizeMode(QHeaderView.Stretch)
         self.bec_dispatcher.connect_slot(self.update_queue, MessageEndpoints.scan_queue_status())
         self.reset_content()
@@ -38,8 +44,8 @@ class BECQueue(BECWidget, QTableWidget):
         """
         # only show the primary queue for now
         queue_info = content.get("queue", {}).get("primary", {}).get("info", [])
-        self.setRowCount(len(queue_info))
-        self.clearContents()
+        self.table.setRowCount(len(queue_info))
+        self.table.clearContents()
 
         if not queue_info:
             self.reset_content()
@@ -73,6 +79,8 @@ class BECQueue(BECWidget, QTableWidget):
         Returns:
             QTableWidgetItem: The formatted item.
         """
+        if not content or not isinstance(content, str):
+            content = ""
         item = QTableWidgetItem(content)
         item.setTextAlignment(Qt.AlignHCenter | Qt.AlignVCenter)
         return item
@@ -88,16 +96,16 @@ class BECQueue(BECWidget, QTableWidget):
             status (str): The status.
         """
 
-        self.setItem(index, 0, self.format_item(scan_number))
-        self.setItem(index, 1, self.format_item(scan_type))
-        self.setItem(index, 2, self.format_item(status))
+        self.table.setItem(index, 0, self.format_item(scan_number))
+        self.table.setItem(index, 1, self.format_item(scan_type))
+        self.table.setItem(index, 2, self.format_item(status))
 
     def reset_content(self):
         """
         Reset the content of the table.
         """
 
-        self.setRowCount(1)
+        self.table.setRowCount(1)
         self.set_row(0, "", "", "")
 
 

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.py

@@ -56,6 +56,11 @@ class BECServiceStatusMixin(QObject):
         self.client._update_existing_services()
         self.services_update.emit(self.client._services_info, self.client._services_metric)
 
+    def cleanup(self):
+        """Cleanup the BECServiceStatusMixin."""
+        self._service_update_timer.stop()
+        self._service_update_timer.deleteLater()
+
 
 class BECStatusBox(BECWidget, QWidget):
     """An autonomous widget to display the status of BEC services.
@@ -290,6 +295,11 @@ class BECStatusBox(BECWidget, QWidget):
             if objects["item"] == item:
                 objects["widget"].show_popup()
 
+    def cleanup(self):
+        """Cleanup the BECStatusBox widget."""
+        self.bec_service_status.cleanup()
+        return super().cleanup()
+
 
 def main():
     """Main method to run the BECStatusBox widget."""

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/console/console.py

@@ -18,10 +18,11 @@ import pyte
 from qtpy import QtCore, QtGui, QtWidgets
 from qtpy.QtCore import QSize, QSocketNotifier, Qt
 from qtpy.QtCore import Signal as pyqtSignal
-from qtpy.QtCore import Slot as pyqtSlot
 from qtpy.QtGui import QClipboard, QTextCursor
 from qtpy.QtWidgets import QApplication, QHBoxLayout, QScrollBar, QSizePolicy
 
+from bec_widgets.qt_utils.error_popups import SafeSlot as Slot
+
 ansi_colors = {
     "black": "#000000",
     "red": "#CD0000",
@@ -289,7 +290,7 @@ class _TerminalWidget(QtWidgets.QPlainTextEdit):
         old["value"] = value
         self.dataReady(self.backend.screen, reset_scroll=False)
 
-    @pyqtSlot(object)
+    @Slot(object)
     def keyPressEvent(self, event):
         """
         Redirect all keystrokes to the terminal process.

bec_widgets/widgets/dark_mode_button/dark_mode_button.py

@@ -0,0 +1,71 @@
+from bec_qthemes import material_icon
+from qtpy.QtCore import Property, Qt, Slot
+from qtpy.QtWidgets import QHBoxLayout, QPushButton, QWidget
+
+from bec_widgets.utils.bec_widget import BECWidget
+from bec_widgets.utils.colors import set_theme
+
+
+class DarkModeButton(BECWidget, QWidget):
+    USER_ACCESS = ["toggle_dark_mode"]
+
+    def __init__(
+        self, parent: QWidget | None = None, client=None, gui_id: str | None = None
+    ) -> None:
+        super().__init__(client=client, gui_id=gui_id)
+        QWidget.__init__(self, parent)
+
+        self._dark_mode_enabled = False
+        self.layout = QHBoxLayout(self)
+        self.layout.setSpacing(0)
+        self.layout.setContentsMargins(0, 0, 0, 0)
+        self.layout.setAlignment(Qt.AlignmentFlag.AlignVCenter)
+
+        icon = material_icon("dark_mode", size=(20, 20), convert_to_pixmap=False)
+        self.mode_button = QPushButton(icon=icon)
+        self.update_mode_button()
+        self.mode_button.clicked.connect(self.toggle_dark_mode)
+        self.layout.addWidget(self.mode_button)
+        self.setLayout(self.layout)
+        self.setFixedSize(40, 40)
+
+    @Property(bool)
+    def dark_mode_enabled(self) -> bool:
+        """
+        The dark mode state. If True, dark mode is enabled. If False, light mode is enabled.
+        """
+        return self._dark_mode_enabled
+
+    @dark_mode_enabled.setter
+    def dark_mode_enabled(self, state: bool) -> None:
+        self._dark_mode_enabled = state
+
+    @Slot()
+    def toggle_dark_mode(self) -> None:
+        """
+        Toggle the dark mode state. This will change the theme of the entire
+        application to dark or light mode.
+        """
+        self.dark_mode_enabled = not self.dark_mode_enabled
+        self.update_mode_button()
+        set_theme("dark" if self.dark_mode_enabled else "light")
+
+    def update_mode_button(self):
+        icon = material_icon(
+            "light_mode" if self.dark_mode_enabled else "dark_mode",
+            size=(20, 20),
+            convert_to_pixmap=False,
+        )
+        self.mode_button.setIcon(icon)
+        self.mode_button.setToolTip("Set Light Mode" if self.dark_mode_enabled else "Set Dark Mode")
+
+
+if __name__ == "__main__":
+    from qtpy.QtWidgets import QApplication
+
+    app = QApplication([])
+
+    w = DarkModeButton()
+    w.show()
+
+    app.exec_()

bec_widgets/widgets/dark_mode_button/dark_mode_button.pyproject

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

bec_widgets/widgets/dark_mode_button/dark_mode_button_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.dark_mode_button.dark_mode_button import DarkModeButton
+
+DOM_XML = """
+<ui language='c++'>
+    <widget class='DarkModeButton' name='dark_mode_button'>
+    </widget>
+</ui>
+"""
+
+
+class DarkModeButtonPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
+    def __init__(self):
+        super().__init__()
+        self._form_editor = None
+
+    def createWidget(self, parent):
+        t = DarkModeButton(parent)
+        return t
+
+    def domXml(self):
+        return DOM_XML
+
+    def group(self):
+        return "BEC Buttons"
+
+    def icon(self):
+        return designer_material_icon("dark_mode")
+
+    def includeFile(self):
+        return "dark_mode_button"
+
+    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 "DarkModeButton"
+
+    def toolTip(self):
+        return "Button to toggle between dark and light mode."
+
+    def whatsThis(self):
+        return self.toolTip()

bec_widgets/widgets/dark_mode_button/register_dark_mode_button.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.dark_mode_button.dark_mode_button_plugin import DarkModeButtonPlugin
+
+    QPyDesignerCustomWidgetCollection.addCustomWidget(DarkModeButtonPlugin())
+
+
+if __name__ == "__main__":  # pragma: no cover
+    main()

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_combobox/device_combobox.py

@@ -34,7 +34,7 @@ class DeviceComboBox(DeviceInputBase, QComboBox):
     ):
         super().__init__(client=client, config=config, gui_id=gui_id)
         QComboBox.__init__(self, parent=parent)
-
+        self.setMinimumSize(125, 26)
         self.populate_combobox()
 
         if arg_name is not None:

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

@@ -3,7 +3,8 @@ from __future__ import annotations
 from typing import TYPE_CHECKING, Any, Literal, Optional
 
 from pydantic import Field
-from pyqtgraph.dockarea import Dock
+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.")
@@ -25,6 +24,81 @@ 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:
+            fg = "#aaa"
+            bg = "#44a"
+            border = "#339"
+        else:
+            fg = "#fff"
+            bg = "#3f4042"
+            border = "#3f4042"
+
+        if self.orientation == "vertical":
+            self.vStyle = """DockLabel {
+                background-color : %s;
+                color : %s;
+                border-top-right-radius: 0px;
+                border-top-left-radius: %s;
+                border-bottom-right-radius: 0px;
+                border-bottom-left-radius: %s;
+                border-width: 0px;
+                border-right: 2px solid %s;
+                padding-top: 3px;
+                padding-bottom: 3px;
+                font-size: %s;
+            }""" % (
+                bg,
+                fg,
+                r,
+                r,
+                border,
+                self.fontSize,
+            )
+            self.setStyleSheet(self.vStyle)
+        else:
+            self.hStyle = """DockLabel {
+                background-color : %s;
+                color : %s;
+                border-top-right-radius: %s;
+                border-top-left-radius: %s;
+                border-bottom-right-radius: 0px;
+                border-bottom-left-radius: 0px;
+                border-width: 0px;
+                border-bottom: 2px solid %s;
+                padding-left: 3px;
+                padding-right: 3px;
+                font-size: %s;
+            }""" % (
+                bg,
+                fg,
+                r,
+                r,
+                border,
+                self.fontSize,
+            )
+            self.setStyleSheet(self.hStyle)
+
+
 class BECDock(BECWidget, Dock):
     USER_ACCESS = [
         "_config_dict",
@@ -51,6 +125,7 @@ class BECDock(BECWidget, Dock):
         name: str | None = None,
         client=None,
         gui_id: str | None = None,
+        closable: bool = True,
         **kwargs,
     ) -> None:
         if config is None:
@@ -62,7 +137,9 @@ class BECDock(BECWidget, Dock):
                 config = DockConfig(**config)
             self.config = config
         super().__init__(client=client, config=config, gui_id=gui_id)
-        Dock.__init__(self, name=name, **kwargs)
+        label = CustomDockLabel(text=name, closable=closable)
+        Dock.__init__(self, name=name, label=label, **kwargs)
+        # Dock.__init__(self, name=name, **kwargs)
 
         self.parent_dock_area = parent_dock_area
 
@@ -76,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):
         """
@@ -207,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):
         """
@@ -242,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

@@ -164,7 +164,7 @@ class BECFigure(BECWidget, pg.GraphicsLayoutWidget):
     def __getitem__(self, key: tuple | str):
         if isinstance(key, tuple) and len(key) == 2:
             return self.axes(*key)
-        elif isinstance(key, str):
+        if isinstance(key, str):
             widget = self._widgets.get(key)
             if widget is None:
                 raise KeyError(f"No widget with ID {key}")
@@ -182,10 +182,9 @@ 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 = [config for config in self.config.widgets.values()]
+        widget_configs = list(self.config.widgets.values())
         self.config.widgets = {}
         for widget_config in widget_configs:
             getattr(self, self.widget_method_map[widget_config.widget_class])(
@@ -233,8 +232,8 @@ class BECFigure(BECWidget, pg.GraphicsLayoutWidget):
         """Export the plot widget."""
         try:
             plot_item = self.widget_list[0]
-        except:
-            raise ValueError("No plot widget available to export.")
+        except Exception as exc:
+            raise ValueError("No plot widget available to export.") from exc
 
         scene = plot_item.scene()
         scene.contextMenuItem = plot_item
@@ -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.")
-            else:
-                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
@@ -721,7 +716,7 @@ class BECFigure(BECWidget, pg.GraphicsLayoutWidget):
 
         # Populate the new grid with widgets' IDs
         current_idx = 0
-        for widget_id, widget in self._widgets.items():
+        for widget_id in self._widgets:
             row = current_idx // len(new_grid[0])
             col = current_idx % len(new_grid[0])
             new_grid[row][col] = widget_id
@@ -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/axis_settings.py

@@ -1,8 +1,8 @@
 import os
 
-from qtpy.QtCore import Slot
 from qtpy.QtWidgets import QVBoxLayout
 
+from bec_widgets.qt_utils.error_popups import SafeSlot as Slot
 from bec_widgets.qt_utils.settings_dialog import SettingWidget
 from bec_widgets.utils import UILoader
 from bec_widgets.utils.widget_io import WidgetIO

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

@@ -7,9 +7,9 @@ import numpy as np
 from bec_lib.endpoints import MessageEndpoints
 from pydantic import BaseModel, Field, ValidationError
 from qtpy.QtCore import QThread
-from qtpy.QtCore import Slot as pyqtSlot
 from qtpy.QtWidgets import QWidget
 
+from bec_widgets.qt_utils.error_popups import SafeSlot as Slot
 from bec_widgets.utils import EntryValidator
 from bec_widgets.widgets.figure.plots.image.image_item import BECImageItem, ImageItemConfig
 from bec_widgets.widgets.figure.plots.image.image_processor import (
@@ -247,13 +247,14 @@ class BECImageShow(BECPlotBase):
         Returns:
             BECImageItem: The image item.
         """
-        image_source = "device_monitor"
+        image_source = "device_monitor_2d"
 
         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)
 
@@ -287,7 +288,7 @@ class BECImageShow(BECPlotBase):
         **kwargs,
     ):
         image_source = "custom"
-        # image_source = "device_monitor"
+        # image_source = "device_monitor_2d"
 
         image_exits = self._check_image_id(name, self._images)
         if image_exits:
@@ -500,21 +501,22 @@ class BECImageShow(BECPlotBase):
             self.update_image(device, data)
             self.update_vrange(device, self.processor.config.stats)
 
-    @pyqtSlot(dict)
-    def on_image_update(self, msg: dict):
+    @Slot(dict, dict)
+    def on_image_update(self, msg: dict, metadata: dict):
         """
         Update the image of the device monitor from bec.
 
         Args:
             msg(dict): The message from bec.
+            metadata(dict): The metadata of the message.
         """
         data = msg["data"]
         device = msg["device"]
-        image = self._images["device_monitor"][device]
+        image = self._images["device_monitor_2d"][device]
         image.raw_data = data
         self.process_image(device, image, data)
 
-    @pyqtSlot(str, np.ndarray)
+    @Slot(str, np.ndarray)
     def update_image(self, device: str, data: np.ndarray):
         """
         Update the image of the device monitor.
@@ -523,10 +525,10 @@ class BECImageShow(BECPlotBase):
             device(str): The name of the device.
             data(np.ndarray): The data to be updated.
         """
-        image_to_update = self._images["device_monitor"][device]
+        image_to_update = self._images["device_monitor_2d"][device]
         image_to_update.updateImage(data, autoLevels=image_to_update.config.autorange)
 
-    @pyqtSlot(str, ImageStats)
+    @Slot(str, ImageStats)
     def update_vrange(self, device: str, stats: ImageStats):
         """
         Update the scaling of the image.
@@ -534,7 +536,7 @@ class BECImageShow(BECPlotBase):
         Args:
             stats(ImageStats): The statistics of the image.
         """
-        image_to_update = self._images["device_monitor"][device]
+        image_to_update = self._images["device_monitor_2d"][device]
         if image_to_update.config.autorange:
             image_to_update.auto_update_vrange(stats)
 
@@ -547,7 +549,7 @@ class BECImageShow(BECPlotBase):
                 data = image.raw_data
                 self.process_image(image_id, image, data)
 
-    def _connect_device_monitor(self, monitor: str):
+    def _connect_device_monitor_2d(self, monitor: str):
         """
         Connect to the device monitor.
 
@@ -561,13 +563,13 @@ class BECImageShow(BECPlotBase):
             previous_monitor = None
         if previous_monitor and image_item.connected is True:
             self.bec_dispatcher.disconnect_slot(
-                self.on_image_update, MessageEndpoints.device_monitor(previous_monitor)
+                self.on_image_update, MessageEndpoints.device_monitor_2d(previous_monitor)
             )
             image_item.connected = False
         if monitor and image_item.connected is False:
             self.entry_validator.validate_monitor(monitor)
             self.bec_dispatcher.connect_slot(
-                self.on_image_update, MessageEndpoints.device_monitor(monitor)
+                self.on_image_update, MessageEndpoints.device_monitor_2d(monitor)
             )
             image_item.set_monitor(monitor)
             image_item.connected = True
@@ -576,13 +578,13 @@ 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":
-            self._connect_device_monitor(config.monitor)
+        if source == "device_monitor_2d":
+            self._connect_device_monitor_2d(config.monitor)
         self.config.images[name] = config
         if data is not None:
             image.setImage(data)
@@ -668,15 +670,29 @@ class BECImageShow(BECPlotBase):
         image = self.find_image_by_monitor(image_id)
         if image:
             self.bec_dispatcher.disconnect_slot(
-                self.on_image_update, MessageEndpoints.device_monitor(image.config.monitor)
+                self.on_image_update, MessageEndpoints.device_monitor_2d(image.config.monitor)
             )
 
     def cleanup(self):
         """
         Clean up the widget.
         """
-        for monitor in self._images["device_monitor"]:
+        for monitor in self._images["device_monitor_2d"]:
             self.bec_dispatcher.disconnect_slot(
-                self.on_image_update, MessageEndpoints.device_monitor(monitor)
+                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/motor_map/motor_map.py

@@ -10,9 +10,9 @@ from pydantic import Field, ValidationError, field_validator
 from pydantic_core import PydanticCustomError
 from qtpy import QtCore, QtGui
 from qtpy.QtCore import Signal as pyqtSignal
-from qtpy.QtCore import Slot
 from qtpy.QtWidgets import QWidget
 
+from bec_widgets.qt_utils.error_popups import SafeSlot as Slot
 from bec_widgets.utils import Colors, EntryValidator
 from bec_widgets.widgets.figure.plots.plot_base import BECPlotBase, SubplotConfig
 from bec_widgets.widgets.figure.plots.waveform.waveform import Signal, SignalData
@@ -444,7 +444,7 @@ class BECMotorMap(BECPlotBase):
             return None
 
     @Slot()
-    def _update_plot(self):
+    def _update_plot(self, _=None):
         """Update the motor map plot."""
         # If the number of points exceeds max_points, delete the oldest points
         if len(self.database_buffer["x"]) > self.config.max_points:
@@ -493,13 +493,14 @@ class BECMotorMap(BECPlotBase):
             f"Motor position: ({round(float(current_x),precision)}, {round(float(current_y),precision)})"
         )
 
-    @Slot(dict)
-    def on_device_readback(self, msg: dict) -> None:
+    @Slot(dict, dict)
+    def on_device_readback(self, msg: dict, metadata: dict) -> None:
         """
         Update the motor map plot with the new motor position.
 
         Args:
             msg(dict): Message from the device readback.
+            metadata(dict): Metadata of the message.
         """
         if self.motor_x is None or self.motor_y is None:
             return

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,23 @@ 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_position_changed = Signal(tuple)
+    crosshair_position_clicked = Signal(tuple)
+    crosshair_coordinates_changed = Signal(tuple)
+    crosshair_coordinates_clicked = Signal(tuple)
     USER_ACCESS = [
         "_config_dict",
         "set",
@@ -73,9 +91,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 +326,44 @@ 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.positionChanged.connect(self.crosshair_position_changed)
+            self.crosshair.positionClicked.connect(self.crosshair_position_clicked)
+            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.positionChanged.disconnect(self.crosshair_position_changed)
+            self.crosshair.positionClicked.disconnect(self.crosshair_position_clicked)
+            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 +374,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

@@ -11,9 +11,9 @@ from bec_lib.endpoints import MessageEndpoints
 from pydantic import Field, ValidationError, field_validator
 from pyqtgraph.exporters import MatplotlibExporter
 from qtpy.QtCore import Signal as pyqtSignal
-from qtpy.QtCore import Slot as pyqtSlot
 from qtpy.QtWidgets import QWidget
 
+from bec_widgets.qt_utils.error_popups import SafeSlot as Slot
 from bec_widgets.utils import Colors, EntryValidator
 from bec_widgets.widgets.figure.plots.plot_base import BECPlotBase, SubplotConfig
 from bec_widgets.widgets.figure.plots.waveform.waveform_curve import (
@@ -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,33 +387,19 @@ 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)
 
             self.async_signal_update.emit()
             self.scan_signal_update.emit()
 
-    @pyqtSlot()
-    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)
-
-    @pyqtSlot()
+    @Slot()
     def auto_range(self):
         self.plot_item.autoRange()
 
@@ -642,7 +633,7 @@ class BECWaveform(BECPlotBase):
         self.refresh_dap()
         return curve
 
-    @pyqtSlot()
+    @Slot()
     def get_dap_params(self) -> dict:
         """
         Get the DAP parameters of all DAP curves.
@@ -655,7 +646,7 @@ class BECWaveform(BECPlotBase):
             params[curve_id] = curve.dap_params
         return params
 
-    @pyqtSlot()
+    @Slot()
     def get_dap_summary(self) -> dict:
         """
         Get the DAP summary of all DAP curves.
@@ -921,7 +912,7 @@ class BECWaveform(BECPlotBase):
         else:
             raise IndexError(f"Curve order {N} out of range.")
 
-    @pyqtSlot(dict)
+    @Slot(dict)
     def on_scan_status(self, msg):
         """
         Handle the scan status message.
@@ -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,9 +936,11 @@ 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
+                    )
 
-    @pyqtSlot(dict, dict)
+    @Slot(dict, dict)
     def on_scan_segment(self, msg: dict, metadata: dict):
         """
         Handle new scan segments and saves data to a dictionary. Linked through bec_dispatcher.
@@ -1004,24 +999,24 @@ class BECWaveform(BECPlotBase):
                 self.update_dap, MessageEndpoints.dap_response(f"{new_scan_id}-{self.gui_id}")
             )
 
-    @pyqtSlot(str)
-    def setup_async(self, device: str):
+    @Slot(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,
             )
 
-    @pyqtSlot()
-    def refresh_dap(self):
+    @Slot()
+    def refresh_dap(self, _=None):
         """
         Refresh the DAP curves with the latest data from the DAP model MessageEndpoints.dap_response().
         """
@@ -1069,7 +1064,7 @@ class BECWaveform(BECPlotBase):
             )
             self.client.connector.set_and_publish(MessageEndpoints.dap_request(), msg)
 
-    @pyqtSlot(dict, dict)
+    @Slot(dict, dict)
     def update_dap(self, msg, metadata):
         self.msg = msg
         scan_id, x_name, x_entry, y_name, y_entry = msg["dap_request"].content["config"]["args"]
@@ -1089,7 +1084,7 @@ class BECWaveform(BECPlotBase):
                     self.dap_summary_update.emit(curve.dap_summary)
                 break
 
-    @pyqtSlot(dict, dict)
+    @Slot(dict, dict)
     def on_async_readback(self, msg, metadata):
         """
         Get async data readback.
@@ -1127,7 +1122,7 @@ class BECWaveform(BECPlotBase):
                         else:
                             curve.setData(data_plot)
 
-    @pyqtSlot()
+    @Slot()
     def replot_async_curve(self):
         try:
             data = self.scan_item.async_data
@@ -1152,8 +1147,8 @@ class BECWaveform(BECPlotBase):
             else:
                 curve.setData(data_x, data_y)
 
-    @pyqtSlot()
-    def _update_scan_curves(self):
+    @Slot()
+    def _update_scan_curves(self, _=None):
         """
         Update the scan curves with the data from the scan segment.
         """

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

@@ -1,8 +1,8 @@
 import os
 
-from qtpy.QtCore import Slot
 from qtpy.QtWidgets import QVBoxLayout
 
+from bec_widgets.qt_utils.error_popups import SafeSlot as Slot
 from bec_widgets.qt_utils.settings_dialog import SettingWidget
 from bec_widgets.utils import UILoader
 from bec_widgets.utils.widget_io import WidgetIO
@@ -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()