WIP adjustments to be compatible with latest bec widgets and bec

fix(dock): REBASE docks can be created as temporary, when closed the dock will not return to original dock area
2026-04-12 03:30:54 +02:00 · 2024-11-11 16:41:28 +01:00 · 2024-11-11 16:31:05 +01:00
313 changed files with 654 additions and 4287 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,9 +12,6 @@ variables:
    description: ophyd_devices branch
    value: main
  CHILD_PIPELINE_BRANCH: $CI_DEFAULT_BRANCH
-  CHECK_PKG_VERSIONS:
-    description: Whether to run additional tests against min/max/random selection of dependencies. Set to 1 for running. 
-    value: 0

 workflow:
  rules:
@@ -34,9 +31,8 @@ include:
    inputs:
      stage: test
      path: "."
-      pytest_args: "-v,--random-order,tests/unit_tests"
-      ignore_dep_group: "pyqt6"
-      pip_args: ".[dev,pyside6]"
+      pytest_args: "-v --random-order tests/"
+      exclude_packages: ""

 # different stages in the pipeline
 stages:
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,148 +1,6 @@
 # CHANGELOG


-## v1.7.0 (2024-12-02)
-
-### Bug Fixes
-
- **tests**: Add test for Console widget
-  ([`da579b6`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/da579b6d213bcdf28c40c1a9e4e2535fdde824fb))
-
-### Features
-
- **console**: Add "prompt" signal to inform when shell is at prompt
-  ([`3aeb0b6`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/3aeb0b66fbeb03d3d0ee60e108cc6b98fd9aa9b9))
-
- **console**: Add 'terminate' and 'send_ctrl_c' methods to Console
-  ([`02086ae`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/02086aeae09233ec4e6ccc0e6a17f2b078d500b8))
-
-.terminate() ends the started process, sending SIGTERM signal. If process is not dead after optional
-  timeout, SIGKILL is sent. .send_ctrl_c() sends SIGINT to the child process, and waits for prompt
-  until optional timeout is reached. Timeouts raise 'TimeoutError' exception.
-
-
-## v1.6.0 (2024-11-27)
-
-### Bug Fixes
-
- Add back accidentally removed variables
-  ([`e998352`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/e9983521ed2a1c04af048a55ece70a1943a84313))
-
- Differentiate click and drag for DeviceItem, adapt tests accordingly
-  ([`cffcdf2`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/cffcdf292363249bcc7efa9d130431d0bc727fda))
-
-This fixes the blocking "QDrag.exec_()" on Linux, indeed before the drag'n'drop operation was
-  started with a simple click and it was waiting for drop forever. Now there are 2 different cases,
-  click or drag'n'drop - the drag'n'drop test actually moves the mouse and releases the button.
-
- Do not quit automatically when last window is "closed"
-  ([`96e255e`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/96e255e4ef394eb79006a66d13e06775ae235667))
-
-Qt confuses closed and hidden
-
- No need to call inspect.signature - it can fail on methods coming from C (like Qt methods)
-  ([`6029246`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/60292465e9e52d3248ae681c68c07298b9b3ce14))
-
- **rpc**: Gui hide/show also hide/show all floating docks
-  ([`c27d058`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/c27d058b01fe604eccec76454e39360122e48515))
-
- **server**: Use dock area by default
-  ([`2fe7f5e`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/2fe7f5e1510a5ea72676045e6ea3485e6b11c220))
-
- **tests**: Make use of BECDockArea with client mixin to start server and use it in tests
-  ([`da18c2c`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/da18c2ceecf9aeaf0e0ea9b78f4c867b27b9c314))
-
-Depending on the test, auto-updates are enabled or not.
-
-### Features
-
- '._auto_updates_enabled' attribute can be used to activate auto updates installation in
-  BECDockArea
-  ([`31d8703`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/31d87036c9801e639a7ca6fc003c90e0c4edb19d))
-
- Add '--hide' argument to BEC GUI server
-  ([`1f60fec`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/1f60fec7201ed252d7e49bf16f2166ee7f6bed6a))
-
- Add main window container widget
-  ([`f80ec33`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/f80ec33ae5a261dbcab901ae30f4cc802316e554))
-
- Add rpc_id member to client objects
-  ([`3ba0b1d`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/3ba0b1daf5b83da840e90fbbc063ed7b86ebe99b))
-
- Asynchronous .start() for GUI
-  ([`2047e48`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/2047e484d5a4b2f5ea494a1e49035b35b1bbde35))
-
- Do not take focus when GUI is loaded
-  ([`1f71d8e`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/1f71d8e5eded9952f9b34bfc427e2ff44cf5fc18))
-
- **client**: Add show()/hide() methods to "gui" object
-  ([`e68e2b5`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/e68e2b5978339475b97555c3e20795807932fbc9))
-
- **server**: Add main window, with proper gui_id derived from given id
-  ([`daf6ea0`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/daf6ea0159c9ffc7b53bb7ae6b9abc16a302972c))
-
-
-## v1.5.3 (2024-11-21)
-
-### Bug Fixes
-
- **alignment_1d**: Fix imports after widget module refactor
-  ([`e71e3b2`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/e71e3b2956feb3f3051e538432133f6e85bbd5a8))
-
-### Continuous Integration
-
- Fix ci syntax for package-dep-job
-  ([`6e39bdb`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/6e39bdbf53b147c8ff163527b45691835ce9a2eb))
-
-
-## v1.5.2 (2024-11-18)
-
-### Bug Fixes
-
- Support for bec v3
-  ([`746359b`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/746359b2cc07a317473907adfcabbe5fe5d1b64c))
-
-
-## v1.5.1 (2024-11-14)
-
-### Bug Fixes
-
- **plugin_utils**: Plugin utils are able to detect classes for plugin creation based on class
-  attribute rather than if it is top level widget
-  ([`7a1b874`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/7a1b8748a433f854671ac95f2eaf4604e6b8df20))
-
-### Refactoring
-
- **widgets**: Widget module structure reorganised
-  ([`aab0229`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/aab0229a4067ad626de919e38a5c8a2e9e7b03c2))
-
-
-## v1.5.0 (2024-11-12)
-
-### Bug Fixes
-
- **crosshair**: Crosshair adapted for multi waveform widget
-  ([`0cd85ed`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/0cd85ed9fa5b67a6ecce89985cd4f54b7bbe3a4b))
-
-### Documentation
-
- **multi_waveform**: Docs added
-  ([`42d4f18`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/42d4f182f790a97687ca3b6d0e72866070a89767))
-
-### Features
-
- **multi-waveform**: New widget added
-  ([`f3a39a6`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/f3a39a69e29d490b3023a508ced18028c4205772))
-
-
-## v1.4.1 (2024-11-12)
-
-### Bug Fixes
-
- **positioner_box**: Adjusted default signals
-  ([`8e5c0ad`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/8e5c0ad8c8eff5a9308169bc663d2b7230f0ebb1))
-
-
 ## v1.4.0 (2024-11-11)

 ### Bug Fixes
@@ -212,3 +70,140 @@ Depending on the test, auto-updates are enabled or not.

 - **colormap_button**: Colormap button with menu to select colormap filtered by the colormap type
  ([`b039933`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/b039933405e2fbe92bd81bd0748e79e8d443a741))
+
+
+## v1.2.0 (2024-10-25)
+
+### Features
+
+- **colors**: Evenly spaced color generation + new golden ratio calculation
+  ([`40c9fea`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/40c9fea35f869ef52e05948dd1989bcd99f602e0))
+
+### Refactoring
+
+- Add bec_lib version to statusbox
+  ([`5d4b86e`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/5d4b86e1c6e1800051afce4f991153e370767fa6))
+
+
+## v1.1.0 (2024-10-25)
+
+### Features
+
+- Add filter i/o utility class
+  ([`0350833`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/0350833f36e0a7cadce4173f9b1d1fbfdf985375))
+
+### Refactoring
+
+- Do not flush selection upon receiving config update; allow widgetIO to receive kwargs to be able
+  to use get_value to receive string instead of int for QComboBox
+  ([`91959e8`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/91959e82de8586934af3ebb5aaa0923930effc51))
+
+- Allow to set selection in DeviceInput; automatic update of selection on device config update;
+  cleanup
+  ([`5eb15b7`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/5eb15b785f12e30eb8ccbc56d4ad9e759a4cf5eb))
+
+- Cleanup, added device_signal for signal inputs
+  ([`6fb2055`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/6fb20552ff57978f4aeb79fd7f062f8d6b5581e7))
+
+### Testing
+
+- **scan_control**: Tests added for grid_scan to ensure scan_args signal validity
+  ([`acb7902`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/acb79020d4be546efc001ff47b6f5cdba2ee9375))
+
+
+## v1.0.2 (2024-10-22)
+
+### Bug Fixes
+
+- **scan_control**: Scan args signal fixed to emit list instead of hardcoded structure
+  ([`4f5448c`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/4f5448cf51a204e077af162c7f0aed1f1a60e57a))
+
+
+## v1.0.1 (2024-10-22)
+
+### Bug Fixes
+
+- **waveform**: Added support for live_data and data access
+  ([`7469c89`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/7469c892c8076fc09e61f173df6920c551241cec))
+
+
+## v1.0.0 (2024-10-18)
+
+### Bug Fixes
+
+- **crosshair**: Downsample clear markers
+  ([`f9a889f`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/f9a889fc6d380b9e587edcb465203122ea0bffc1))
+
+### Features
+
+- Ability to disable scatter from waveform & compatible crosshair with down sampling
+  ([`2ab12ed`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/2ab12ed60abb995abc381d9330fdcf399796d9e5))
+
+
+## v0.119.0 (2024-10-17)
+
+### Bug Fixes
+
+- Fix syntax due to change of api for simulated devices
+  ([`19f4e40`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/19f4e407e00ee242973ca4c3f90e4e41a4d3e315))
+
+- Remove wrongly scoped test
+  ([`a23841b`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/a23841b2553dc7162da943715d58275c7dc39ed9))
+
+- Rename 'compact' property -> 'compact_view'
+  ([`6982711`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/6982711fea5fb8a73845ed7c0692e3ec53ef7871))
+
+- Alignment 1D update, make app window a main window (in .ui file)
+  ([`0015f0e`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/0015f0e2d62adc02d3ef334e1f6dbb2d0288fec6))
+
+- Set (Minimum, Fixed) size policy on Stop button
+  ([`523cc43`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/523cc435725b10b7d59a4477a1aaa24a1f3e37a2))
+
+### Features
+
+- New PositionerGroup widget
+  ([`af9655d`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/af9655de0c541092437accfbaa779628a2f48ccb))
+
+- Add 'expand_popup' property to CompactPopupWidget
+  ([`e4121a0`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/e4121a01cb6b8d496e630cd43bc642b994b8f310))
+
+This property tells if expand should show a popup (by default), or if the widget should expand
+  in-place
+
+- Positionerbox with a popup view
+  ([`2615787`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/261578796f1de8ca9cab9b91659bc1484f7aa89d))
+
+- Emit 'device_selected' and 'scan_axis' from scan control widget
+  ([`0b9b1a3`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/0b9b1a3c89a98505079f7d4078915b7bbfaa1e23))
+
+- New 'device_selected' signals to ScanControl, ScanGroupBox, DeviceLineEdit
+  ([`9801d27`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/9801d2769eb0ee95c94ec0c011e1dac1407142ae))
+
+### Refactoring
+
+- Redesign of scan selection and scan control boxes
+  ([`a69d287`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/a69d2870e2b3539739781d741b27b8599c0f4abd))
+
+- Move add/remove bundle to scan group box
+  ([`e3d0a7b`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/e3d0a7bbf9918dc16eb7227a178c310256ce570d))
+
+
+## v0.118.0 (2024-10-13)
+
+### Documentation
+
+- **sphinx-build**: Adjusted pyside verion
+  ([`b236951`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/b23695167ab969f754a058ffdccca2b40f00a008))
+
+### Features
+
+- **image**: Image widget can take data from monitor_1d endpoint
+  ([`9ef1d1c`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/9ef1d1c9ac2178d9fa2e655942208f8abbdf5c1b))
+
+
+## v0.117.1 (2024-10-11)
+
+### Bug Fixes
+
+- **FPS**: Qtimer cleanup leaking
+  ([`3a22392`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/3a2239278075de7489ad10a58c31d7d89715e221))
--- a/bec_widgets/applications/alignment/alignment_1d/alignment_1d.py
+++ b/bec_widgets/applications/alignment/alignment_1d/alignment_1d.py
@@ -5,25 +5,36 @@ It is a preliminary version of the GUI, which will be added to the main branch a
 import os
 from typing import Optional

+from bec_lib.device import Positioner as BECPositioner
 from bec_lib.device import Signal as BECSignal
 from bec_lib.endpoints import MessageEndpoints
 from bec_lib.logger import bec_logger
-from qtpy.QtCore import QSize
+from qtpy.QtCore import QSize, Signal
 from qtpy.QtGui import QIcon
-from qtpy.QtWidgets import QApplication
+from qtpy.QtWidgets import (
+    QApplication,
+    QCheckBox,
+    QDoubleSpinBox,
+    QMainWindow,
+    QPushButton,
+    QSpinBox,
+)

 import bec_widgets
 from bec_widgets.qt_utils.error_popups import SafeSlot as Slot
+from bec_widgets.qt_utils.toolbar import WidgetAction
 from bec_widgets.utils import UILoader
 from bec_widgets.utils.bec_dispatcher import BECDispatcher
+from bec_widgets.utils.bec_widget import BECWidget
 from bec_widgets.utils.colors import get_accent_colors
-from bec_widgets.widgets.control.buttons.stop_button.stop_button import StopButton
-from bec_widgets.widgets.control.device_control.positioner_group.positioner_group import (
-    PositionerGroup,
-)
-from bec_widgets.widgets.dap.lmfit_dialog.lmfit_dialog import LMFitDialog
-from bec_widgets.widgets.plots.waveform.waveform_widget import BECWaveformWidget
-from bec_widgets.widgets.progress.bec_progressbar.bec_progressbar import BECProgressBar
+from bec_widgets.widgets.bec_progressbar.bec_progressbar import BECProgressBar
+from bec_widgets.widgets.device_line_edit.device_line_edit import DeviceLineEdit
+from bec_widgets.widgets.lmfit_dialog.lmfit_dialog import LMFitDialog
+from bec_widgets.widgets.positioner_box.positioner_box import PositionerBox
+from bec_widgets.widgets.positioner_group.positioner_group import PositionerGroup
+from bec_widgets.widgets.stop_button.stop_button import StopButton
+from bec_widgets.widgets.toggle.toggle import ToggleSwitch
+from bec_widgets.widgets.waveform.waveform_widget import BECWaveformWidget

 MODULE_PATH = os.path.dirname(bec_widgets.__file__)
 logger = bec_logger.logger
--- a/bec_widgets/cli/client.py
+++ b/bec_widgets/cli/client.py
@@ -17,10 +17,11 @@ class Widgets(str, enum.Enum):

    AbortButton = "AbortButton"
    BECColorMapWidget = "BECColorMapWidget"
+    BECDock = "BECDock"
    BECDockArea = "BECDockArea"
+    BECFigure = "BECFigure"
    BECImageWidget = "BECImageWidget"
    BECMotorMapWidget = "BECMotorMapWidget"
-    BECMultiWaveformWidget = "BECMultiWaveformWidget"
    BECProgressBar = "BECProgressBar"
    BECQueue = "BECQueue"
    BECStatusBox = "BECStatusBox"
@@ -34,6 +35,7 @@ class Widgets(str, enum.Enum):
    PositionIndicator = "PositionIndicator"
    PositionerBox = "PositionerBox"
    PositionerControlLine = "PositionerControlLine"
+    PositionerGroup = "PositionerGroup"
    ResetButton = "ResetButton"
    ResumeButton = "ResumeButton"
    RingProgressBar = "RingProgressBar"
@@ -42,7 +44,6 @@ class Widgets(str, enum.Enum):
    SignalLineEdit = "SignalLineEdit"
    StopButton = "StopButton"
    TextBox = "TextBox"
-    UserScriptWidget = "UserScriptWidget"
    VSCodeEditor = "VSCodeEditor"
    WebsiteWidget = "WebsiteWidget"

@@ -64,13 +65,6 @@ class AbortButton(RPCBase):
        Get all registered RPC objects.
        """

-    @property
-    @rpc_call
-    def _rpc_id(self) -> "str":
-        """
-        Get the RPC ID of the widget.
-        """
-

 class BECColorMapWidget(RPCBase):
    @property
@@ -342,6 +336,13 @@ class BECDock(RPCBase):
        Detach the dock from the parent dock area.
        """

+    @rpc_call
+    def close(self):
+        """
+        Close the dock area and cleanup.
+        Has to be implemented to overwrite pyqtgraph event accept in Container close.
+        """
+

 class BECDockArea(RPCBase, BECGuiClientMixin):
    @property
@@ -400,6 +401,7 @@ class BECDockArea(RPCBase, BECGuiClientMixin):
        name: "str" = None,
        position: "Literal['bottom', 'top', 'left', 'right', 'above', 'below']" = None,
        relative_to: "BECDock | None" = None,
+        temporary: "bool" = False,
        closable: "bool" = True,
        floating: "bool" = False,
        prefix: "str" = "dock",
@@ -416,6 +418,7 @@ class BECDockArea(RPCBase, BECGuiClientMixin):
            name(str): The name of the dock to be displayed and for further references. Has to be unique.
            position(Literal["bottom", "top", "left", "right", "above", "below"]): The position of the dock.
            relative_to(BECDock): The dock to which the new dock should be added relative to.
+            temp(bool): Whether the dock is temporary. Upon closing the dock is not returned to the parent dock area.
            closable(bool): Whether the dock is closable.
            floating(bool): Whether the dock is detached after creating.
            prefix(str): The prefix for the dock name if no name is provided.
@@ -469,18 +472,6 @@ class BECDockArea(RPCBase, BECGuiClientMixin):
            list: The temporary areas in the dock area.
        """

-    @rpc_call
-    def show(self):
-        """
-        Show all windows including floating docks.
-        """
-
-    @rpc_call
-    def hide(self):
-        """
-        Hide all windows including floating docks.
-        """
-

 class BECFigure(RPCBase):
    @property
@@ -1393,31 +1384,6 @@ class BECImageWidget(RPCBase):
        """


-class BECMainWindow(RPCBase):
-    @property
-    @rpc_call
-    def _config_dict(self) -> "dict":
-        """
-        Get the configuration of the widget.
-
-        Returns:
-            dict: The configuration of the widget.
-        """
-
-    @rpc_call
-    def _get_all_rpc(self) -> "dict":
-        """
-        Get all registered RPC objects.
-        """
-
-    @property
-    @rpc_call
-    def _rpc_id(self) -> "str":
-        """
-        Get the RPC ID of the widget.
-        """
-
-
 class BECMotorMap(RPCBase):
    @property
    @rpc_call
@@ -1617,436 +1583,6 @@ class BECMotorMapWidget(RPCBase):
        """


-class BECMultiWaveform(RPCBase):
-    @property
-    @rpc_call
-    def _rpc_id(self) -> "str":
-        """
-        Get the RPC ID of the widget.
-        """
-
-    @property
-    @rpc_call
-    def _config_dict(self) -> "dict":
-        """
-        Get the configuration of the widget.
-
-        Returns:
-            dict: The configuration of the widget.
-        """
-
-    @property
-    @rpc_call
-    def curves(self) -> collections.deque:
-        """
-        Get the curves of the plot widget as a deque.
-        Returns:
-            deque: Deque of curves.
-        """
-
-    @rpc_call
-    def set_monitor(self, monitor: str):
-        """
-        Set the monitor for the plot widget.
-        Args:
-            monitor (str): The monitor to set.
-        """
-
-    @rpc_call
-    def set_opacity(self, opacity: int):
-        """
-        Set the opacity of the curve on the plot.
-
-        Args:
-            opacity(int): The opacity of the curve. 0-100.
-        """
-
-    @rpc_call
-    def set_curve_limit(self, max_trace: int, flush_buffer: bool = False):
-        """
-        Set the maximum number of traces to display on the plot.
-
-        Args:
-            max_trace (int): The maximum number of traces to display.
-            flush_buffer (bool): Flush the buffer.
-        """
-
-    @rpc_call
-    def set_curve_highlight(self, index: int):
-        """
-        Set the curve highlight based on visible curves.
-
-        Args:
-            index (int): The index of the curve to highlight among visible curves.
-        """
-
-    @rpc_call
-    def set_colormap(self, colormap: str):
-        """
-        Set the colormap for the curves.
-
-        Args:
-            colormap(str): Colormap for the curves.
-        """
-
-    @rpc_call
-    def set(self, **kwargs) -> "None":
-        """
-        Set the properties of the plot widget.
-
-        Args:
-            **kwargs: Keyword arguments for the properties to be set.
-
-        Possible properties:
-            - title: str
-            - x_label: str
-            - y_label: str
-            - x_scale: Literal["linear", "log"]
-            - y_scale: Literal["linear", "log"]
-            - x_lim: tuple
-            - y_lim: tuple
-            - legend_label_size: int
-        """
-
-    @rpc_call
-    def set_title(self, title: "str", size: "int" = None):
-        """
-        Set the title of the plot widget.
-
-        Args:
-            title(str): Title of the plot widget.
-            size(int): Font size of the title.
-        """
-
-    @rpc_call
-    def set_x_label(self, label: "str", size: "int" = None):
-        """
-        Set the label of the x-axis.
-
-        Args:
-            label(str): Label of the x-axis.
-            size(int): Font size of the label.
-        """
-
-    @rpc_call
-    def set_y_label(self, label: "str", size: "int" = None):
-        """
-        Set the label of the y-axis.
-
-        Args:
-            label(str): Label of the y-axis.
-            size(int): Font size of the label.
-        """
-
-    @rpc_call
-    def set_x_scale(self, scale: "Literal['linear', 'log']" = "linear"):
-        """
-        Set the scale of the x-axis.
-
-        Args:
-            scale(Literal["linear", "log"]): Scale of the x-axis.
-        """
-
-    @rpc_call
-    def set_y_scale(self, scale: "Literal['linear', 'log']" = "linear"):
-        """
-        Set the scale of the y-axis.
-
-        Args:
-            scale(Literal["linear", "log"]): Scale of the y-axis.
-        """
-
-    @rpc_call
-    def set_x_lim(self, *args) -> "None":
-        """
-        Set the limits of the x-axis. This method can accept either two separate arguments
-        for the minimum and maximum x-axis values, or a single tuple containing both limits.
-
-        Usage:
-            set_x_lim(x_min, x_max)
-            set_x_lim((x_min, x_max))
-
-        Args:
-            *args: A variable number of arguments. Can be two integers (x_min and x_max)
-                   or a single tuple with two integers.
-        """
-
-    @rpc_call
-    def set_y_lim(self, *args) -> "None":
-        """
-        Set the limits of the y-axis. This method can accept either two separate arguments
-        for the minimum and maximum y-axis values, or a single tuple containing both limits.
-
-        Usage:
-            set_y_lim(y_min, y_max)
-            set_y_lim((y_min, y_max))
-
-        Args:
-            *args: A variable number of arguments. Can be two integers (y_min and y_max)
-                   or a single tuple with two integers.
-        """
-
-    @rpc_call
-    def set_grid(self, x: "bool" = False, y: "bool" = False):
-        """
-        Set the grid of the plot widget.
-
-        Args:
-            x(bool): Show grid on the x-axis.
-            y(bool): Show grid on the y-axis.
-        """
-
-    @rpc_call
-    def set_colormap(self, colormap: str):
-        """
-        Set the colormap for the curves.
-
-        Args:
-            colormap(str): Colormap for the curves.
-        """
-
-    @rpc_call
-    def enable_fps_monitor(self, enable: "bool" = True):
-        """
-        Enable the FPS monitor.
-
-        Args:
-            enable(bool): True to enable, False to disable.
-        """
-
-    @rpc_call
-    def lock_aspect_ratio(self, lock):
-        """
-        Lock aspect ratio.
-
-        Args:
-            lock(bool): True to lock, False to unlock.
-        """
-
-    @rpc_call
-    def export(self):
-        """
-        Show the Export Dialog of the plot widget.
-        """
-
-    @rpc_call
-    def get_all_data(self, output: Literal["dict", "pandas"] = "dict") -> dict:
-        """
-        Extract all curve data into a dictionary or a pandas DataFrame.
-
-        Args:
-            output (Literal["dict", "pandas"]): Format of the output data.
-
-        Returns:
-            dict | pd.DataFrame: Data of all curves in the specified format.
-        """
-
-    @rpc_call
-    def remove(self):
-        """
-        Remove the plot widget from the figure.
-        """
-
-
-class BECMultiWaveformWidget(RPCBase):
-    @property
-    @rpc_call
-    def curves(self) -> list[pyqtgraph.graphicsItems.PlotDataItem.PlotDataItem]:
-        """
-        Get the curves of the plot widget as a list
-        Returns:
-            list: List of curves.
-        """
-
-    @rpc_call
-    def set_monitor(self, monitor: str) -> None:
-        """
-        Set the monitor of the plot widget.
-
-        Args:
-            monitor(str): The monitor to set.
-        """
-
-    @rpc_call
-    def set_curve_highlight(self, index: int) -> None:
-        """
-        Set the curve highlight of the plot widget by index
-
-        Args:
-            index(int): The index of the curve to highlight.
-        """
-
-    @rpc_call
-    def set_opacity(self, opacity: int) -> None:
-        """
-        Set the opacity of the plot widget.
-
-        Args:
-            opacity(int): The opacity to set.
-        """
-
-    @rpc_call
-    def set_curve_limit(self, curve_limit: int) -> None:
-        """
-        Set the maximum number of traces to display on the plot widget.
-
-        Args:
-            curve_limit(int): The maximum number of traces to display.
-        """
-
-    @rpc_call
-    def set_buffer_flush(self, flush_buffer: bool) -> None:
-        """
-        Set the buffer flush property of the plot widget.
-
-        Args:
-            flush_buffer(bool): True to flush the buffer, False to not flush the buffer.
-        """
-
-    @rpc_call
-    def set_highlight_last_curve(self, enable: bool) -> None:
-        """
-        Enable or disable highlighting of the last curve.
-
-        Args:
-            enable(bool): True to enable highlighting of the last curve, False to disable.
-        """
-
-    @rpc_call
-    def set_colormap(self, colormap: str) -> None:
-        """
-        Set the colormap of the plot widget.
-
-        Args:
-            colormap(str): The colormap to set.
-        """
-
-    @rpc_call
-    def set(self, **kwargs):
-        """
-        Set the properties of the plot widget.
-
-        Args:
-            **kwargs: Keyword arguments for the properties to be set.
-
-        Possible properties:
-            - title: str
-            - x_label: str
-            - y_label: str
-            - x_scale: Literal["linear", "log"]
-            - y_scale: Literal["linear", "log"]
-            - x_lim: tuple
-            - y_lim: tuple
-            - legend_label_size: int
-        """
-
-    @rpc_call
-    def set_title(self, title: str):
-        """
-        Set the title of the plot widget.
-
-        Args:
-            title(str): The title to set.
-        """
-
-    @rpc_call
-    def set_x_label(self, x_label: str):
-        """
-        Set the x-axis label of the plot widget.
-
-        Args:
-            x_label(str): The x-axis label to set.
-        """
-
-    @rpc_call
-    def set_y_label(self, y_label: str):
-        """
-        Set the y-axis label of the plot widget.
-
-        Args:
-            y_label(str): The y-axis label to set.
-        """
-
-    @rpc_call
-    def set_x_scale(self, x_scale: Literal["linear", "log"]):
-        """
-        Set the x-axis scale of the plot widget.
-
-        Args:
-            x_scale(str): The x-axis scale to set.
-        """
-
-    @rpc_call
-    def set_y_scale(self, y_scale: Literal["linear", "log"]):
-        """
-        Set the y-axis scale of the plot widget.
-
-        Args:
-            y_scale(str): The y-axis scale to set.
-        """
-
-    @rpc_call
-    def set_x_lim(self, x_lim: tuple):
-        """
-        Set x-axis limits of the plot widget.
-
-        Args:
-            x_lim(tuple): The x-axis limits to set.
-        """
-
-    @rpc_call
-    def set_y_lim(self, y_lim: tuple):
-        """
-        Set y-axis limits of the plot widget.
-
-        Args:
-            y_lim(tuple): The y-axis limits to set.
-        """
-
-    @rpc_call
-    def set_grid(self, x_grid: bool, y_grid: bool):
-        """
-        Set the grid of the plot widget.
-
-        Args:
-            x_grid(bool): True to enable the x-grid, False to disable.
-            y_grid(bool): True to enable the y-grid, False to disable.
-        """
-
-    @rpc_call
-    def set_colormap(self, colormap: str) -> None:
-        """
-        Set the colormap of the plot widget.
-
-        Args:
-            colormap(str): The colormap to set.
-        """
-
-    @rpc_call
-    def enable_fps_monitor(self, enabled: bool):
-        """
-        Enable or disable the FPS monitor
-
-        Args:
-            enabled(bool): True to enable the FPS monitor, False to disable.
-        """
-
-    @rpc_call
-    def lock_aspect_ratio(self, lock: bool):
-        """
-        Lock the aspect ratio of the plot widget.
-
-        Args:
-            lock(bool): True to lock the aspect ratio, False to unlock.
-        """
-
-    @rpc_call
-    def export(self):
-        """
-        Export the plot widget.
-        """
-
-
 class BECPlotBase(RPCBase):
    @property
    @rpc_call
@@ -2282,13 +1818,6 @@ class BECQueue(RPCBase):
        Get all registered RPC objects.
        """

-    @property
-    @rpc_call
-    def _rpc_id(self) -> "str":
-        """
-        Get the RPC ID of the widget.
-        """
-

 class BECStatusBox(RPCBase):
    @property
@@ -2307,13 +1836,6 @@ class BECStatusBox(RPCBase):
        Get all registered RPC objects.
        """

-    @property
-    @rpc_call
-    def _rpc_id(self) -> "str":
-        """
-        Get the RPC ID of the widget.
-        """
-

 class BECWaveform(RPCBase):
    @property
@@ -3036,13 +2558,6 @@ class DeviceBrowser(RPCBase):
        Get all registered RPC objects.
        """

-    @property
-    @rpc_call
-    def _rpc_id(self) -> "str":
-        """
-        Get the RPC ID of the widget.
-        """
-

 class DeviceComboBox(RPCBase):
    @property
@@ -3061,13 +2576,6 @@ class DeviceComboBox(RPCBase):
        Get all registered RPC objects.
        """

-    @property
-    @rpc_call
-    def _rpc_id(self) -> "str":
-        """
-        Get the RPC ID of the widget.
-        """
-

 class DeviceInputBase(RPCBase):
    @property
@@ -3086,13 +2594,6 @@ class DeviceInputBase(RPCBase):
        Get all registered RPC objects.
        """

-    @property
-    @rpc_call
-    def _rpc_id(self) -> "str":
-        """
-        Get the RPC ID of the widget.
-        """
-

 class DeviceLineEdit(RPCBase):
    @property
@@ -3111,13 +2612,6 @@ class DeviceLineEdit(RPCBase):
        Get all registered RPC objects.
        """

-    @property
-    @rpc_call
-    def _rpc_id(self) -> "str":
-        """
-        Get the RPC ID of the widget.
-        """
-

 class DeviceSignalInputBase(RPCBase):
    @property
@@ -3136,13 +2630,6 @@ class DeviceSignalInputBase(RPCBase):
        Get all registered RPC objects.
        """

-    @property
-    @rpc_call
-    def _rpc_id(self) -> "str":
-        """
-        Get the RPC ID of the widget.
-        """
-

 class LMFitDialog(RPCBase):
    @property
@@ -3161,13 +2648,6 @@ class LMFitDialog(RPCBase):
        Get all registered RPC objects.
        """

-    @property
-    @rpc_call
-    def _rpc_id(self) -> "str":
-        """
-        Get the RPC ID of the widget.
-        """
-

 class PositionIndicator(RPCBase):
    @rpc_call
@@ -3257,13 +2737,6 @@ class ResetButton(RPCBase):
        Get all registered RPC objects.
        """

-    @property
-    @rpc_call
-    def _rpc_id(self) -> "str":
-        """
-        Get the RPC ID of the widget.
-        """
-

 class ResumeButton(RPCBase):
    @property
@@ -3282,13 +2755,6 @@ class ResumeButton(RPCBase):
        Get all registered RPC objects.
        """

-    @property
-    @rpc_call
-    def _rpc_id(self) -> "str":
-        """
-        Get the RPC ID of the widget.
-        """
-

 class Ring(RPCBase):
    @rpc_call
@@ -3586,13 +3052,6 @@ class ScanControl(RPCBase):
        Get all registered RPC objects.
        """

-    @property
-    @rpc_call
-    def _rpc_id(self) -> "str":
-        """
-        Get the RPC ID of the widget.
-        """
-

 class SignalComboBox(RPCBase):
    @property
@@ -3611,13 +3070,6 @@ class SignalComboBox(RPCBase):
        Get all registered RPC objects.
        """

-    @property
-    @rpc_call
-    def _rpc_id(self) -> "str":
-        """
-        Get the RPC ID of the widget.
-        """
-

 class SignalLineEdit(RPCBase):
    @property
@@ -3636,13 +3088,6 @@ class SignalLineEdit(RPCBase):
        Get all registered RPC objects.
        """

-    @property
-    @rpc_call
-    def _rpc_id(self) -> "str":
-        """
-        Get the RPC ID of the widget.
-        """
-

 class StopButton(RPCBase):
    @property
@@ -3661,13 +3106,6 @@ class StopButton(RPCBase):
        Get all registered RPC objects.
        """

-    @property
-    @rpc_call
-    def _rpc_id(self) -> "str":
-        """
-        Get the RPC ID of the widget.
-        """
-

 class TextBox(RPCBase):
    @rpc_call
@@ -3689,9 +3127,6 @@ class TextBox(RPCBase):
        """


-class UserScriptWidget(RPCBase): ...
-
-
 class VSCodeEditor(RPCBase): ...


--- a/bec_widgets/cli/client_utils.py
+++ b/bec_widgets/cli/client_utils.py
@@ -92,11 +92,11 @@ def _start_plot_process(gui_id: str, gui_class: type, config: dict | str, logger
    process will not be captured.
    """
    # pylint: disable=subprocess-run-check
-    command = ["bec-gui-server", "--id", gui_id, "--gui_class", gui_class.__name__, "--hide"]
+    command = ["bec-gui-server", "--id", gui_id, "--gui_class", gui_class.__name__]
    if config:
        if isinstance(config, dict):
            config = json.dumps(config)
-        command.extend(["--config", str(config)])
+        command.extend(["--config", config])

    env_dict = os.environ.copy()
    env_dict["PYTHONUNBUFFERED"] = "1"
@@ -126,36 +126,15 @@ def _start_plot_process(gui_id: str, gui_class: type, config: dict | str, logger
    return process, process_output_processing_thread


-class RepeatTimer(threading.Timer):
-    def run(self):
-        while not self.finished.wait(self.interval):
-            self.function(*self.args, **self.kwargs)
-
-
 class BECGuiClientMixin:
    def __init__(self, **kwargs) -> None:
        super().__init__(**kwargs)
-        self._auto_updates_enabled = True
-        self._auto_updates = None
-        self._gui_started_timer = None
-        self._gui_started_event = threading.Event()
        self._process = None
        self._process_output_processing_thread = None
+        self.auto_updates = self._get_update_script()
        self._target_endpoint = MessageEndpoints.scan_status()
        self._selected_device = None

-    @property
-    def auto_updates(self):
-        if self._auto_updates_enabled:
-            self._gui_started_event.wait()
-        return self._auto_updates
-
-    def shutdown_auto_updates(self):
-        if self._auto_updates_enabled:
-            if self._auto_updates is not None:
-                self._auto_updates.shutdown()
-                self._auto_updates = None
-
    def _get_update_script(self) -> AutoUpdates | None:
        eps = imd.entry_points(group="bec.widgets.auto_updates")
        for ep in eps:
@@ -201,80 +180,38 @@ class BECGuiClientMixin:
        if isinstance(msg, messages.ScanStatusMessage):
            if not self.gui_is_alive():
                return
-            if self._auto_updates_enabled:
-                self.auto_updates.msg_queue.put(msg)
+            self.auto_updates.msg_queue.put(msg)

-    def _gui_post_startup(self):
-        if self._auto_updates_enabled:
-            if self._auto_updates is None:
-                auto_updates = self._get_update_script()
-                if auto_updates is None:
-                    AutoUpdates.create_default_dock = True
-                    AutoUpdates.enabled = True
-                    auto_updates = AutoUpdates(gui=self)
-                if auto_updates.create_default_dock:
-                    auto_updates.start_default_dock()
-                    # fig = auto_updates.get_default_figure()
-                self._auto_updates = auto_updates
-        self._gui_started_event.set()
-        self.show_all()
-
-    def start_server(self, wait=False) -> None:
+    def show(self) -> None:
        """
-        Start the GUI server, and execute callback when it is launched
+        Show the figure.
        """
        if self._process is None or self._process.poll() is not None:
-            logger.success("GUI starting...")
-            self._gui_started_event.clear()
            self._start_update_script()
            self._process, self._process_output_processing_thread = _start_plot_process(
                self._gui_id, self.__class__, self._client._service_config.config, logger=logger
            )
-
-            def gui_started_callback(callback):
-                try:
-                    if callable(callback):
-                        callback()
-                finally:
-                    threading.current_thread().cancel()
-
-            self._gui_started_timer = RepeatTimer(
-                1, lambda: self.gui_is_alive() and gui_started_callback(self._gui_post_startup)
-            )
-            self._gui_started_timer.start()
-
-        if wait:
-            self._gui_started_event.wait()
-
-    def show_all(self):
-        self._gui_started_event.wait()
-        rpc_client = RPCBase(gui_id=f"{self._gui_id}:window", parent=self)
-        rpc_client._run_rpc("show")
-
-    def hide_all(self):
-        self._gui_started_event.wait()
-        rpc_client = RPCBase(gui_id=f"{self._gui_id}:window", parent=self)
-        rpc_client._run_rpc("hide")
+        while not self.gui_is_alive():
+            print("Waiting for GUI to start...")
+            time.sleep(1)
+        logger.success(f"GUI started with id: {self._gui_id}")

    def close(self) -> None:
        """
        Close the gui window.
        """
-        if self._gui_started_timer is not None:
-            self._gui_started_timer.cancel()
-            self._gui_started_timer.join()
-
        if self._process is None:
            return

+        self._client.shutdown()
        if self._process:
-            logger.success("Stopping GUI...")
            self._process.terminate()
            if self._process_output_processing_thread:
                self._process_output_processing_thread.join()
            self._process.wait()
            self._process = None
-        self.shutdown_auto_updates()
+        if self.auto_updates is not None:
+            self.auto_updates.shutdown()


 class RPCResponseTimeoutError(Exception):
--- a/bec_widgets/cli/generate_cli.py
+++ b/bec_widgets/cli/generate_cli.py
@@ -11,7 +11,7 @@ import isort
 from qtpy.QtCore import Property as QtProperty

 from bec_widgets.utils.generate_designer_plugin import DesignerPluginGenerator
-from bec_widgets.utils.plugin_utils import BECClassContainer, get_custom_classes
+from bec_widgets.utils.plugin_utils import BECClassContainer, get_rpc_classes

 if sys.version_info >= (3, 11):
    from typing import get_overloads
@@ -175,7 +175,7 @@ def main():
        current_path = os.path.dirname(__file__)
        client_path = os.path.join(current_path, "client.py")

-        rpc_classes = get_custom_classes("bec_widgets")
+        rpc_classes = get_rpc_classes("bec_widgets")

        generator = ClientGenerator()
        generator.generate_client(rpc_classes)
--- a/bec_widgets/cli/rpc_register.py
+++ b/bec_widgets/cli/rpc_register.py
@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from threading import Lock
 from weakref import WeakValueDictionary

--- a/bec_widgets/cli/rpc_wigdet_handler.py
+++ b/bec_widgets/cli/rpc_wigdet_handler.py
@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from bec_widgets.utils import BECConnector


@@ -28,10 +26,10 @@ class RPCWidgetHandler:
        Returns:
            None
        """
-        from bec_widgets.utils.plugin_utils import get_custom_classes
+        from bec_widgets.utils.plugin_utils import get_rpc_classes

-        clss = get_custom_classes("bec_widgets")
-        self._widget_classes = {cls.__name__: cls for cls in clss.widgets}
+        clss = get_rpc_classes("bec_widgets")
+        self._widget_classes = {cls.__name__: cls for cls in clss.top_level_classes}

    def create_widget(self, widget_type, **kwargs) -> BECConnector:
        """
--- a/bec_widgets/cli/server.py
+++ b/bec_widgets/cli/server.py
@@ -1,5 +1,6 @@
 from __future__ import annotations

+import inspect
 import json
 import signal
 import sys
@@ -10,14 +11,14 @@ from bec_lib.endpoints import MessageEndpoints
 from bec_lib.logger import bec_logger
 from bec_lib.service_config import ServiceConfig
 from bec_lib.utils.import_utils import lazy_import
-from qtpy.QtCore import Qt, QTimer
+from qtpy.QtCore import QTimer

 from bec_widgets.cli.rpc_register import RPCRegister
 from bec_widgets.utils import BECDispatcher
 from bec_widgets.utils.bec_connector import BECConnector
-from bec_widgets.widgets.containers.dock import BECDockArea
-from bec_widgets.widgets.containers.figure import BECFigure
-from bec_widgets.widgets.containers.main_window.main_window import BECMainWindow
+from bec_widgets.utils.bec_dispatcher import QtRedisConnector
+from bec_widgets.widgets.dock.dock_area import BECDockArea
+from bec_widgets.widgets.figure import BECFigure

 messages = lazy_import("bec_lib.messages")
 logger = bec_logger.logger
@@ -95,7 +96,11 @@ class BECWidgetsCLIServer:
                setattr(obj, method, args[0])
                res = None
        else:
-            res = method_obj(*args, **kwargs)
+            sig = inspect.signature(method_obj)
+            if sig.parameters:
+                res = method_obj(*args, **kwargs)
+            else:
+                res = method_obj()

        if isinstance(res, list):
            res = [self.serialize_object(obj) for obj in res]
@@ -177,7 +182,7 @@ def main():

    from qtpy.QtCore import QSize
    from qtpy.QtGui import QIcon
-    from qtpy.QtWidgets import QApplication
+    from qtpy.QtWidgets import QApplication, QMainWindow

    import bec_widgets

@@ -195,7 +200,6 @@ def main():
        help="Name of the gui class to be rendered. Possible values: \n- BECFigure\n- BECDockArea",
    )
    parser.add_argument("--config", type=str, help="Config file or config string.")
-    parser.add_argument("--hide", action="store_true", help="Hide on startup")

    args = parser.parse_args()

@@ -208,12 +212,11 @@ def main():
            "Please specify a valid gui_class to run. Use -h for help."
            "\n Starting with default gui_class BECFigure."
        )
-        gui_class = BECDockArea
+        gui_class = BECFigure

    with redirect_stdout(SimpleFileLikeFromLogOutputFunc(logger.info)):
        with redirect_stderr(SimpleFileLikeFromLogOutputFunc(logger.error)):
            app = QApplication(sys.argv)
-            app.setQuitOnLastWindowClosed(False)
            app.setApplicationName("BEC Figure")
            module_path = os.path.dirname(bec_widgets.__file__)
            icon = QIcon()
@@ -223,19 +226,15 @@ def main():
            )
            app.setWindowIcon(icon)

-            server = _start_server(args.id, gui_class, args.config)
-
-            win = BECMainWindow(gui_id=f"{server.gui_id}:window")
-            win.setAttribute(Qt.WA_ShowWithoutActivating)
+            win = QMainWindow()
            win.setWindowTitle("BEC Widgets")

-            RPCRegister().add_rpc(win)
+            server = _start_server(args.id, gui_class, args.config)

            gui = server.gui
            win.setCentralWidget(gui)
            win.resize(800, 600)
-            if not args.hide:
-                win.show()
+            win.show()

            app.aboutToQuit.connect(server.shutdown)

--- a/bec_widgets/examples/jupyter_console/jupyter_console_window.py
+++ b/bec_widgets/examples/jupyter_console/jupyter_console_window.py
@@ -3,6 +3,8 @@ import os
 import numpy as np
 import pyqtgraph as pg
 from bec_qthemes import material_icon
+from qtpy.QtCore import QSize
+from qtpy.QtGui import QIcon
 from qtpy.QtWidgets import (
    QApplication,
    QGroupBox,
@@ -15,9 +17,9 @@ from qtpy.QtWidgets import (

 from bec_widgets.utils import BECDispatcher
 from bec_widgets.utils.colors import apply_theme
-from bec_widgets.widgets.containers.dock import BECDockArea
-from bec_widgets.widgets.containers.figure import BECFigure
-from bec_widgets.widgets.editors.jupyter_console.jupyter_console import BECJupyterConsole
+from bec_widgets.widgets.dock.dock_area import BECDockArea
+from bec_widgets.widgets.figure import BECFigure
+from bec_widgets.widgets.jupyter_console.jupyter_console import BECJupyterConsole


 class JupyterConsoleWindow(QWidget):  # pragma: no cover:
@@ -54,7 +56,6 @@ class JupyterConsoleWindow(QWidget):  # pragma: no cover:
                    # "cm": self.colormap,
                    "im": self.im,
                    "mm": self.mm,
-                    "mw": self.mw,
                }
            )

@@ -166,11 +167,9 @@ class JupyterConsoleWindow(QWidget):  # pragma: no cover:
        self.im.image("waveform", "1d")

        self.d2 = self.dock.add_dock(name="dock_2", position="bottom")
-        self.wf = self.d2.add_widget("BECFigure", row=0, col=0)
-
-        self.mw = self.wf.multi_waveform(monitor="waveform")  # , config=config)
-        # self.wf.plot(x_name="samx", y_name="bpm3a")
-        # self.wf.plot(x_name="samx", y_name="bpm4i", dap="GaussianModel")
+        self.wf = self.d2.add_widget("BECWaveformWidget", row=0, col=0)
+        self.wf.plot(x_name="samx", y_name="bpm3a")
+        self.wf.plot(x_name="samx", y_name="bpm4i", dap="GaussianModel")
        # self.bar = self.d2.add_widget("RingProgressBar", row=0, col=1)
        # self.bar.set_diameter(200)

@@ -211,7 +210,6 @@ if __name__ == "__main__":  # pragma: no cover

    win = JupyterConsoleWindow()
    win.show()
-    win.resize(1200, 800)

    app.aboutToQuit.connect(win.close)
    sys.exit(app.exec_())
--- a/bec_widgets/qt_utils/palette_viewer.py
+++ b/bec_widgets/qt_utils/palette_viewer.py
@@ -13,7 +13,7 @@ from qtpy.QtWidgets import (

 from bec_widgets.utils.bec_widget import BECWidget
 from bec_widgets.utils.colors import get_accent_colors, get_theme_palette
-from bec_widgets.widgets.utility.visual.dark_mode_button.dark_mode_button import DarkModeButton
+from bec_widgets.widgets.dark_mode_button.dark_mode_button import DarkModeButton


 class PaletteViewer(BECWidget, QWidget):
--- a/bec_widgets/utils/bec_connector.py
+++ b/bec_widgets/utils/bec_connector.py
@@ -69,7 +69,7 @@ class Worker(QRunnable):
 class BECConnector:
    """Connection mixin class to handle BEC client and device manager"""

-    USER_ACCESS = ["_config_dict", "_get_all_rpc", "_rpc_id"]
+    USER_ACCESS = ["_config_dict", "_get_all_rpc"]
    EXIT_HANDLERS = {}

    def __init__(self, client=None, config: ConnectionConfig = None, gui_id: str = None):
--- a/bec_widgets/utils/crosshair.py
+++ b/bec_widgets/utils/crosshair.py
@@ -6,16 +6,13 @@ from qtpy.QtCore import QObject, Qt, Signal, Slot
 from qtpy.QtWidgets import QApplication


-class CrosshairScatterItem(pg.ScatterPlotItem):
+class NonDownsamplingScatterPlotItem(pg.ScatterPlotItem):
    def setDownsampling(self, ds=None, auto=None, method=None):
        pass

    def setClipToView(self, state):
        pass

-    def setAlpha(self, *args, **kwargs):
-        pass
-

 class Crosshair(QObject):
    # QT Position of mouse cursor
@@ -50,15 +47,9 @@ class Crosshair(QObject):
        self.v_line.skip_auto_range = True
        self.h_line = pg.InfiniteLine(angle=0, movable=False)
        self.h_line.skip_auto_range = True
-        # Add custom attribute to identify crosshair lines
-        self.v_line.is_crosshair = True
-        self.h_line.is_crosshair = True
        self.plot_item.addItem(self.v_line, ignoreBounds=True)
        self.plot_item.addItem(self.h_line, ignoreBounds=True)

-        # Initialize highlighted curve in a case of multiple curves
-        self.highlighted_curve_index = None
-
        # Add TextItem to display coordinates
        self.coord_label = pg.TextItem("", anchor=(1, 1), fill=(0, 0, 0, 100))
        self.coord_label.setVisible(False)  # Hide initially
@@ -79,7 +70,6 @@ class Crosshair(QObject):
        self.plot_item.ctrl.downsampleSpin.valueChanged.connect(self.clear_markers)

        # Initialize markers
-        self.items = []
        self.marker_moved_1d = {}
        self.marker_clicked_1d = {}
        self.marker_2d = None
@@ -123,74 +113,34 @@ class Crosshair(QObject):
        self.coord_label.fill = pg.mkBrush(label_bg_color)
        self.coord_label.border = pg.mkPen(None)

-    @Slot(int)
-    def update_highlighted_curve(self, curve_index: int):
-        """
-        Update the highlighted curve in the case of multiple curves in a plot item.
-
-        Args:
-            curve_index(int): The index of curve to highlight
-        """
-        self.highlighted_curve_index = curve_index
-        self.clear_markers()
-        self.update_markers()
-
    def update_markers(self):
        """Update the markers for the crosshair, creating new ones if necessary."""

-        if self.highlighted_curve_index is not None and hasattr(self.plot_item, "visible_curves"):
-            # Focus on the highlighted curve only
-            self.items = [self.plot_item.visible_curves[self.highlighted_curve_index]]
-        else:
-            # Handle all curves
-            self.items = self.plot_item.items
-
-        # Create or update markers
-        for item in self.items:
+        # Create new markers
+        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)
-                name = item.name() or str(id(item))
-                if name in self.marker_moved_1d:
-                    # Update existing markers
-                    marker_moved = self.marker_moved_1d[name]
-                    marker_moved.setPen(pg.mkPen(color))
-                    # Update clicked markers' brushes
-                    for marker_clicked in self.marker_clicked_1d[name]:
-                        alpha = marker_clicked.opts["brush"].color().alpha()
-                        marker_clicked.setBrush(
-                            pg.mkBrush(color.red(), color.green(), color.blue(), alpha)
-                        )
-                    # Update z-values
-                    marker_moved.setZValue(item.zValue() + 1)
-                    for marker_clicked in self.marker_clicked_1d[name]:
-                        marker_clicked.setZValue(item.zValue() + 1)
-                else:
-                    # Create new markers
-                    marker_moved = CrosshairScatterItem(
-                        size=10, pen=pg.mkPen(color), brush=pg.mkBrush(None)
-                    )
-                    marker_moved.skip_auto_range = True
-                    marker_moved.is_crosshair = True
-                    self.marker_moved_1d[name] = marker_moved
-                    self.plot_item.addItem(marker_moved)
-                    # Set marker z-value higher than the curve
-                    marker_moved.setZValue(item.zValue() + 1)
+                marker_moved = NonDownsamplingScatterPlotItem(
+                    size=10, pen=pg.mkPen(color), brush=pg.mkBrush(None)
+                )
+                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
+                for size, alpha in [(18, 64), (14, 128), (10, 255)]:
+                    marker_clicked = NonDownsamplingScatterPlotItem(
+                        size=size,
+                        pen=pg.mkPen(None),
+                        brush=pg.mkBrush(color.red(), color.green(), color.blue(), alpha),
+                    )
+                    marker_clicked.skip_auto_range = True
+                    self.marker_clicked_1d[item.name()] = marker_clicked
+                    self.plot_item.addItem(marker_clicked)

-                    # Create glowing effect markers for clicked events
-                    marker_clicked_list = []
-                    for size, alpha in [(18, 64), (14, 128), (10, 255)]:
-                        marker_clicked = CrosshairScatterItem(
-                            size=size,
-                            pen=pg.mkPen(None),
-                            brush=pg.mkBrush(color.red(), color.green(), color.blue(), alpha),
-                        )
-                        marker_clicked.skip_auto_range = True
-                        marker_clicked.is_crosshair = True
-                        self.plot_item.addItem(marker_clicked)
-                        marker_clicked.setZValue(item.zValue() + 1)
-                        marker_clicked_list.append(marker_clicked)
-                    self.marker_clicked_1d[name] = marker_clicked_list
            elif isinstance(item, pg.ImageItem):  # 2D plot
                if self.marker_2d is not None:
                    continue
@@ -212,11 +162,12 @@ class Crosshair(QObject):
        """
        y_values = defaultdict(list)
        x_values = defaultdict(list)
+        image_2d = None

        # Iterate through items in the plot
-        for item in self.items:
+        for item in self.plot_item.items:
            if isinstance(item, pg.PlotDataItem):  # 1D plot
-                name = item.name() or str(id(item))
+                name = item.name()
                plot_data = item._getDisplayDataset()
                if plot_data is None:
                    continue
@@ -237,7 +188,7 @@ class Crosshair(QObject):
            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
+                # 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))

@@ -305,9 +256,9 @@ class Crosshair(QObject):
                # not sure how we got here, but just to be safe...
                return

-            for item in self.items:
+            for item in self.plot_item.items:
                if isinstance(item, pg.PlotDataItem):
-                    name = item.name() or str(id(item))
+                    name = item.name()
                    x, y = x_snap_values[name], y_snap_values[name]
                    if x is None or y is None:
                        continue
@@ -358,14 +309,13 @@ class Crosshair(QObject):
                # not sure how we got here, but just to be safe...
                return

-            for item in self.items:
+            for item in self.plot_item.items:
                if isinstance(item, pg.PlotDataItem):
-                    name = item.name() or str(id(item))
+                    name = item.name()
                    x, y = x_snap_values[name], y_snap_values[name]
                    if x is None or y is None:
                        continue
-                    for marker_clicked in self.marker_clicked_1d[name]:
-                        marker_clicked.setData([x], [y])
+                    self.marker_clicked_1d[name].setData([x], [y])
                    x_snapped_scaled, y_snapped_scaled = self.scale_emitted_coordinates(x, y)
                    coordinate_to_emit = (
                        name,
@@ -387,12 +337,9 @@ class Crosshair(QObject):
    def clear_markers(self):
        """Clears the markers from the plot."""
        for marker in self.marker_moved_1d.values():
-            self.plot_item.removeItem(marker)
-        for markers in self.marker_clicked_1d.values():
-            for marker in markers:
-                self.plot_item.removeItem(marker)
-        self.marker_moved_1d.clear()
-        self.marker_clicked_1d.clear()
+            marker.clear()
+        for marker in self.marker_clicked_1d.values():
+            marker.clear()

    def scale_emitted_coordinates(self, x, y):
        """Scales the emitted coordinates if the axes are in log scale.
@@ -419,7 +366,7 @@ class Crosshair(QObject):
        x, y = pos
        x_scaled, y_scaled = self.scale_emitted_coordinates(x, y)

-        # Update coordinate label
+        # # Update coordinate label
        self.coord_label.setText(f"({x_scaled:.{self.precision}g}, {y_scaled:.{self.precision}g})")
        self.coord_label.setPos(x, y)
        self.coord_label.setVisible(True)
--- a/bec_widgets/utils/generate_designer_plugin.py
+++ b/bec_widgets/utils/generate_designer_plugin.py
@@ -143,7 +143,7 @@ class DesignerPluginGenerator:

 if __name__ == "__main__":  # pragma: no cover
    # from bec_widgets.widgets.bec_queue.bec_queue import BECQueue
-    from bec_widgets.widgets.utility.spinner import SpinnerWidget
+    from bec_widgets.widgets.spinner.spinner import SpinnerWidget

    generator = DesignerPluginGenerator(SpinnerWidget)
    generator.run(validate=False)
--- a/bec_widgets/utils/plugin_utils.py
+++ b/bec_widgets/utils/plugin_utils.py
@@ -53,7 +53,7 @@ class BECClassInfo:
    obj: type
    is_connector: bool = False
    is_widget: bool = False
-    is_plugin: bool = False
+    is_top_level: bool = False


 class BECClassContainer:
@@ -88,14 +88,14 @@ class BECClassContainer:
        """
        Get all top-level classes.
        """
-        return [info.obj for info in self.collection if info.is_plugin]
+        return [info.obj for info in self.collection if info.is_top_level]

    @property
    def plugins(self):
        """
        Get all plugins. These are all classes that are on the top level and are widgets.
        """
-        return [info.obj for info in self.collection if info.is_widget and info.is_plugin]
+        return [info.obj for info in self.collection if info.is_widget and info.is_top_level]

    @property
    def widgets(self):
@@ -109,17 +109,10 @@ class BECClassContainer:
        """
        Get all top-level classes that are RPC-enabled. These are all classes that users can choose from.
        """
-        return [info.obj for info in self.collection if info.is_plugin and info.is_connector]
-
-    @property
-    def classes(self):
-        """
-        Get all classes.
-        """
-        return [info.obj for info in self.collection]
+        return [info.obj for info in self.collection if info.is_top_level and info.is_connector]


-def get_custom_classes(repo_name: str) -> BECClassContainer:
+def get_rpc_classes(repo_name: str) -> BECClassContainer:
    """
    Get all RPC-enabled classes in the specified repository.

@@ -160,8 +153,6 @@ def get_custom_classes(repo_name: str) -> BECClassContainer:
                        issubclass(obj, QWidget) or issubclass(obj, QGraphicsWidget)
                    ):
                        class_info.is_top_level = True
-                    if hasattr(obj, "PLUGIN") and obj.PLUGIN:
-                        class_info.is_plugin = True
                    collection.add_class(class_info)

    return collection
--- a/bec_widgets/utils/ui_loader.py
+++ b/bec_widgets/utils/ui_loader.py
@@ -4,7 +4,7 @@ from qtpy import PYQT6, PYSIDE6, QT_VERSION
 from qtpy.QtCore import QFile, QIODevice

 from bec_widgets.utils.generate_designer_plugin import DesignerPluginInfo
-from bec_widgets.utils.plugin_utils import get_custom_classes
+from bec_widgets.utils.plugin_utils import get_rpc_classes

 if PYSIDE6:
    from PySide6.QtUiTools import QUiLoader
@@ -30,7 +30,7 @@ class UILoader:
    def __init__(self, parent=None):
        self.parent = parent

-        widgets = get_custom_classes("bec_widgets").classes
+        widgets = get_rpc_classes("bec_widgets").top_level_classes

        self.custom_widgets = {widget.__name__: widget for widget in widgets}

--- a/bec_widgets/widgets/base_classes/init.py
+++ b/bec_widgets/widgets/base_classes/init.py
--- a/bec_widgets/widgets/control/device_input/base_classes/device_input_base.py
+++ b/bec_widgets/widgets/control/device_input/base_classes/device_input_base.py
--- a/bec_widgets/widgets/control/device_input/base_classes/device_signal_input_base.py
+++ b/bec_widgets/widgets/control/device_input/base_classes/device_signal_input_base.py
--- a/bec_widgets/widgets/containers/figure/plots/init.py
+++ b/bec_widgets/widgets/containers/figure/plots/init.py
--- a/bec_widgets/widgets/progress/bec_progressbar/bec_progress_bar.pyproject
+++ b/bec_widgets/widgets/progress/bec_progressbar/bec_progress_bar.pyproject
--- a/bec_widgets/widgets/progress/bec_progressbar/bec_progress_bar_plugin.py
+++ b/bec_widgets/widgets/progress/bec_progressbar/bec_progress_bar_plugin.py
@@ -4,7 +4,7 @@
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface

 from bec_widgets.utils.bec_designer import designer_material_icon
-from bec_widgets.widgets.progress.bec_progressbar.bec_progressbar import BECProgressBar
+from bec_widgets.widgets.bec_progressbar.bec_progressbar import BECProgressBar

 DOM_XML = """
 <ui language='c++'>
--- a/bec_widgets/widgets/progress/bec_progressbar/bec_progressbar.py
+++ b/bec_widgets/widgets/progress/bec_progressbar/bec_progressbar.py
@@ -14,7 +14,6 @@ class BECProgressBar(BECWidget, QWidget):
    A custom progress bar with smooth transitions. The displayed text can be customized using a template.
    """

-    PLUGIN = True
    USER_ACCESS = [
        "set_value",
        "set_maximum",
--- a/bec_widgets/widgets/progress/bec_progressbar/register_bec_progress_bar.py
+++ b/bec_widgets/widgets/progress/bec_progressbar/register_bec_progress_bar.py
@@ -6,9 +6,7 @@ def main():  # pragma: no cover
        return
    from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection

-    from bec_widgets.widgets.progress.bec_progressbar.bec_progress_bar_plugin import (
-        BECProgressBarPlugin,
-    )
+    from bec_widgets.widgets.bec_progressbar.bec_progress_bar_plugin import BECProgressBarPlugin

    QPyDesignerCustomWidgetCollection.addCustomWidget(BECProgressBarPlugin())

--- a/bec_widgets/widgets/containers/figure/plots/image/init.py
+++ b/bec_widgets/widgets/containers/figure/plots/image/init.py
--- a/bec_widgets/widgets/services/bec_queue/bec_queue.py
+++ b/bec_widgets/widgets/services/bec_queue/bec_queue.py
@@ -10,10 +10,10 @@ from bec_widgets.qt_utils.compact_popup import CompactPopupWidget
 from bec_widgets.qt_utils.toolbar import ModularToolBar, SeparatorAction, WidgetAction
 from bec_widgets.utils.bec_connector import ConnectionConfig
 from bec_widgets.utils.bec_widget import BECWidget
-from bec_widgets.widgets.control.buttons.button_abort.button_abort import AbortButton
-from bec_widgets.widgets.control.buttons.button_reset.button_reset import ResetButton
-from bec_widgets.widgets.control.buttons.button_resume.button_resume import ResumeButton
-from bec_widgets.widgets.control.buttons.stop_button.stop_button import StopButton
+from bec_widgets.widgets.button_abort.button_abort import AbortButton
+from bec_widgets.widgets.button_reset.button_reset import ResetButton
+from bec_widgets.widgets.button_resume.button_resume import ResumeButton
+from bec_widgets.widgets.stop_button.stop_button import StopButton


 class BECQueue(BECWidget, CompactPopupWidget):
@@ -21,7 +21,6 @@ class BECQueue(BECWidget, CompactPopupWidget):
    Widget to display the BEC queue.
    """

-    PLUGIN = True
    ICON_NAME = "edit_note"
    status_colors = {
        "STOPPED": "red",
--- a/bec_widgets/widgets/services/bec_queue/bec_queue.pyproject
+++ b/bec_widgets/widgets/services/bec_queue/bec_queue.pyproject
--- a/bec_widgets/widgets/services/bec_queue/bec_queue_plugin.py
+++ b/bec_widgets/widgets/services/bec_queue/bec_queue_plugin.py
@@ -6,7 +6,7 @@ from qtpy.QtDesigner import QDesignerCustomWidgetInterface

 import bec_widgets
 from bec_widgets.utils.bec_designer import designer_material_icon
-from bec_widgets.widgets.services.bec_queue.bec_queue import BECQueue
+from bec_widgets.widgets.bec_queue.bec_queue import BECQueue

 DOM_XML = """
 <ui language='c++'>
--- a/bec_widgets/widgets/services/bec_queue/register_bec_queue.py
+++ b/bec_widgets/widgets/services/bec_queue/register_bec_queue.py
@@ -6,7 +6,7 @@ def main():  # pragma: no cover
        return
    from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection

-    from bec_widgets.widgets.services.bec_queue.bec_queue_plugin import BECQueuePlugin
+    from bec_widgets.widgets.bec_queue.bec_queue_plugin import BECQueuePlugin

    QPyDesignerCustomWidgetCollection.addCustomWidget(BECQueuePlugin())

--- a/bec_widgets/widgets/containers/figure/plots/motor_map/init.py
+++ b/bec_widgets/widgets/containers/figure/plots/motor_map/init.py
--- a/bec_widgets/widgets/services/bec_status_box/bec_status_box.py
+++ b/bec_widgets/widgets/services/bec_status_box/bec_status_box.py
@@ -4,17 +4,18 @@ The widget automatically updates the status of all running BEC services, and dis

 from __future__ import annotations

+import sys
 from collections import defaultdict
 from dataclasses import dataclass
 from typing import TYPE_CHECKING

 from bec_lib.utils.import_utils import lazy_import_from
 from qtpy.QtCore import QObject, QTimer, Signal, Slot
-from qtpy.QtWidgets import QHBoxLayout, QTreeWidget, QTreeWidgetItem
+from qtpy.QtWidgets import QHBoxLayout, QTreeWidget, QTreeWidgetItem, QWidget

 from bec_widgets.qt_utils.compact_popup import CompactPopupWidget
 from bec_widgets.utils.bec_widget import BECWidget
-from bec_widgets.widgets.services.bec_status_box.status_item import StatusItem
+from bec_widgets.widgets.bec_status_box.status_item import StatusItem

 if TYPE_CHECKING:
    from bec_lib.client import BECClient
@@ -74,7 +75,6 @@ class BECStatusBox(BECWidget, CompactPopupWidget):
        gui_id Optional(str): The unique id for the widget. Defaults to None.
    """

-    PLUGIN = True
    CORE_SERVICES = ["DeviceServer", "ScanServer", "SciHub", "ScanBundler", "FileWriterManager"]

    service_update = Signal(BECServiceInfoContainer)
@@ -124,41 +124,16 @@ class BECStatusBox(BECWidget, CompactPopupWidget):
        self.tree = QTreeWidget(self)
        self.tree.setHeaderHidden(True)
        # TODO probably here is a problem still with setting the stylesheet
-        # self.tree.setStyleSheet(
-        #     "QTreeWidget::item:!selected "
-        #     "{ "
-        #     "border: 1px solid gainsboro; "
-        #     "border-left: none; "
-        #     "border-top: none; "
-        #     "}"
-        #     "QTreeWidget::item:selected {}"
-        # )
        self.tree.setStyleSheet(
-            "QTreeWidget::item:!selected { "
+            "QTreeWidget::item:!selected "
+            "{ "
            "border: 1px solid gainsboro; "
            "border-left: none; "
            "border-top: none; "
-            "} "
-            "QTreeWidget::item:selected {} "
-            "QTreeView::branch { "
-            "border-image: none; "
-            "background: transparent; "
-            "} "
-            "QTreeView::branch:has-siblings:!adjoins-item { "
-            "border-image: none; "
-            "} "
-            "QTreeView::branch:has-children:!has-siblings:closed, "
-            "QTreeView::branch:closed:has-children:has-siblings { "
-            "border-image: none; "
-            "} "
-            "QTreeView::branch:open:has-children:!has-siblings, "
-            "QTreeView::branch:open:has-children:has-siblings { "
-            "border-image: none; "
            "}"
+            "QTreeWidget::item:selected {}"
        )

-        # self.tree.setRootIsDecorated(False)
-
    def _create_status_widget(
        self, service_name: str, status=BECStatus, info: dict = None, metrics: dict = None
    ) -> StatusItem:
--- a/bec_widgets/widgets/services/bec_status_box/bec_status_box.pyproject
+++ b/bec_widgets/widgets/services/bec_status_box/bec_status_box.pyproject
--- a/bec_widgets/widgets/services/bec_status_box/bec_status_box_plugin.py
+++ b/bec_widgets/widgets/services/bec_status_box/bec_status_box_plugin.py
@@ -6,7 +6,7 @@ from qtpy.QtDesigner import QDesignerCustomWidgetInterface

 import bec_widgets
 from bec_widgets.utils.bec_designer import designer_material_icon
-from bec_widgets.widgets.services.bec_status_box.bec_status_box import BECStatusBox
+from bec_widgets.widgets.bec_status_box.bec_status_box import BECStatusBox

 DOM_XML = """
 <ui language='c++'>
--- a/bec_widgets/widgets/services/bec_status_box/register_bec_status_box.py
+++ b/bec_widgets/widgets/services/bec_status_box/register_bec_status_box.py
@@ -6,7 +6,7 @@ def main():  # pragma: no cover
        return
    from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection

-    from bec_widgets.widgets.services.bec_status_box.bec_status_box_plugin import BECStatusBoxPlugin
+    from bec_widgets.widgets.bec_status_box.bec_status_box_plugin import BECStatusBoxPlugin

    QPyDesignerCustomWidgetCollection.addCustomWidget(BECStatusBoxPlugin())

--- a/bec_widgets/widgets/services/bec_status_box/status_item.py
+++ b/bec_widgets/widgets/services/bec_status_box/status_item.py
@@ -23,7 +23,7 @@ MODULE_PATH = os.path.dirname(bec_widgets.__file__)
 class IconsEnum(enum.Enum):
    """Enum class for icons in the status item widget."""

-    RUNNING = "check_circle"
+    RUNNING = "done_outline"
    BUSY = "progress_activity"
    IDLE = "progress_activity"
    ERROR = "emergency_home"
--- a/bec_widgets/widgets/containers/figure/plots/multi_waveform/init.py
+++ b/bec_widgets/widgets/containers/figure/plots/multi_waveform/init.py
--- a/bec_widgets/widgets/control/buttons/button_abort/abort_button.pyproject
+++ b/bec_widgets/widgets/control/buttons/button_abort/abort_button.pyproject
--- a/bec_widgets/widgets/control/buttons/button_abort/abort_button_plugin.py
+++ b/bec_widgets/widgets/control/buttons/button_abort/abort_button_plugin.py
@@ -4,7 +4,7 @@
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface

 from bec_widgets.utils.bec_designer import designer_material_icon
-from bec_widgets.widgets.control.buttons.button_abort.button_abort import AbortButton
+from bec_widgets.widgets.button_abort.button_abort import AbortButton

 DOM_XML = """
 <ui language='c++'>
--- a/bec_widgets/widgets/control/buttons/button_abort/button_abort.py
+++ b/bec_widgets/widgets/control/buttons/button_abort/button_abort.py
@@ -9,7 +9,6 @@ from bec_widgets.utils.bec_widget import BECWidget
 class AbortButton(BECWidget, QWidget):
    """A button that abort the scan."""

-    PLUGIN = True
    ICON_NAME = "cancel"

    def __init__(
--- a/bec_widgets/widgets/control/buttons/button_abort/register_abort_button.py
+++ b/bec_widgets/widgets/control/buttons/button_abort/register_abort_button.py
@@ -6,9 +6,7 @@ def main():  # pragma: no cover
        return
    from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection

-    from bec_widgets.widgets.control.buttons.button_abort.abort_button_plugin import (
-        AbortButtonPlugin,
-    )
+    from bec_widgets.widgets.button_abort.abort_button_plugin import AbortButtonPlugin

    QPyDesignerCustomWidgetCollection.addCustomWidget(AbortButtonPlugin())

--- a/bec_widgets/widgets/containers/figure/plots/waveform/init.py
+++ b/bec_widgets/widgets/containers/figure/plots/waveform/init.py
--- a/bec_widgets/widgets/control/buttons/button_reset/button_reset.py
+++ b/bec_widgets/widgets/control/buttons/button_reset/button_reset.py
@@ -9,7 +9,6 @@ from bec_widgets.utils.bec_widget import BECWidget
 class ResetButton(BECWidget, QWidget):
    """A button that resets the scan queue."""

-    PLUGIN = True
    ICON_NAME = "restart_alt"

    def __init__(self, parent=None, client=None, config=None, gui_id=None, toolbar=False):
--- a/bec_widgets/widgets/control/buttons/button_reset/register_reset_button.py
+++ b/bec_widgets/widgets/control/buttons/button_reset/register_reset_button.py
@@ -6,9 +6,7 @@ def main():  # pragma: no cover
        return
    from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection

-    from bec_widgets.widgets.control.buttons.button_reset.reset_button_plugin import (
-        ResetButtonPlugin,
-    )
+    from bec_widgets.widgets.button_reset.reset_button_plugin import ResetButtonPlugin

    QPyDesignerCustomWidgetCollection.addCustomWidget(ResetButtonPlugin())

--- a/bec_widgets/widgets/control/buttons/button_reset/reset_button.pyproject
+++ b/bec_widgets/widgets/control/buttons/button_reset/reset_button.pyproject
--- a/bec_widgets/widgets/control/buttons/button_reset/reset_button_plugin.py
+++ b/bec_widgets/widgets/control/buttons/button_reset/reset_button_plugin.py
@@ -4,7 +4,7 @@
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface

 from bec_widgets.utils.bec_designer import designer_material_icon
-from bec_widgets.widgets.control.buttons.button_reset.button_reset import ResetButton
+from bec_widgets.widgets.button_reset.button_reset import ResetButton

 DOM_XML = """
 <ui language='c++'>
--- a/bec_widgets/widgets/containers/main_window/init.py
+++ b/bec_widgets/widgets/containers/main_window/init.py
--- a/bec_widgets/widgets/control/buttons/button_resume/button_resume.py
+++ b/bec_widgets/widgets/control/buttons/button_resume/button_resume.py
@@ -9,7 +9,6 @@ from bec_widgets.utils.bec_widget import BECWidget
 class ResumeButton(BECWidget, QWidget):
    """A button that continue scan queue."""

-    PLUGIN = True
    ICON_NAME = "resume"

    def __init__(self, parent=None, client=None, config=None, gui_id=None, toolbar=False):
--- a/bec_widgets/widgets/control/buttons/button_resume/register_resume_button.py
+++ b/bec_widgets/widgets/control/buttons/button_resume/register_resume_button.py
@@ -6,9 +6,7 @@ def main():  # pragma: no cover
        return
    from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection

-    from bec_widgets.widgets.control.buttons.button_resume.resume_button_plugin import (
-        ResumeButtonPlugin,
-    )
+    from bec_widgets.widgets.button_resume.resume_button_plugin import ResumeButtonPlugin

    QPyDesignerCustomWidgetCollection.addCustomWidget(ResumeButtonPlugin())

--- a/bec_widgets/widgets/control/buttons/button_resume/resume_button.pyproject
+++ b/bec_widgets/widgets/control/buttons/button_resume/resume_button.pyproject
--- a/bec_widgets/widgets/control/buttons/button_resume/resume_button_plugin.py
+++ b/bec_widgets/widgets/control/buttons/button_resume/resume_button_plugin.py
@@ -4,7 +4,7 @@
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface

 from bec_widgets.utils.bec_designer import designer_material_icon
-from bec_widgets.widgets.control.buttons.button_resume.button_resume import ResumeButton
+from bec_widgets.widgets.button_resume.button_resume import ResumeButton

 DOM_XML = """
 <ui language='c++'>
--- a/bec_widgets/widgets/color_button/init.py
+++ b/bec_widgets/widgets/color_button/init.py
--- a/bec_widgets/widgets/utility/visual/color_button/color_button.py
+++ b/bec_widgets/widgets/utility/visual/color_button/color_button.py
@@ -17,7 +17,6 @@ class ColorButton(QWidget):

    color_selected = Signal(str)

-    PLUGIN = True
    ICON_NAME = "colors"

    def __init__(self, *args, **kwargs):
--- a/bec_widgets/widgets/utility/visual/color_button/color_button.pyproject
+++ b/bec_widgets/widgets/utility/visual/color_button/color_button.pyproject
--- a/bec_widgets/widgets/utility/visual/color_button/color_button_plugin.py
+++ b/bec_widgets/widgets/utility/visual/color_button/color_button_plugin.py
@@ -4,7 +4,7 @@ from qtpy.QtDesigner import QDesignerCustomWidgetInterface

 import bec_widgets
 from bec_widgets.utils.bec_designer import designer_material_icon
-from bec_widgets.widgets.utility.visual.color_button.color_button import ColorButton
+from bec_widgets.widgets.color_button.color_button import ColorButton

 DOM_XML = """
 <ui language='c++'>
--- a/bec_widgets/widgets/utility/visual/color_button/register_color_button.py
+++ b/bec_widgets/widgets/utility/visual/color_button/register_color_button.py
@@ -6,9 +6,7 @@ def main():  # pragma: no cover
        return
    from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection

-    from bec_widgets.widgets.utility.visual.color_button.color_button_plugin import (
-        ColorButtonPlugin,
-    )
+    from bec_widgets.widgets.color_button.color_button_plugin import ColorButtonPlugin

    QPyDesignerCustomWidgetCollection.addCustomWidget(ColorButtonPlugin())

--- a/bec_widgets/widgets/colormap_selector/init.py
+++ b/bec_widgets/widgets/colormap_selector/init.py
--- a/bec_widgets/widgets/utility/visual/colormap_selector/colormap_selector.py
+++ b/bec_widgets/widgets/utility/visual/colormap_selector/colormap_selector.py
@@ -47,7 +47,6 @@ class ColormapSelector(QWidget):

    colormap_changed_signal = Signal(str)
    ICON_NAME = "palette"
-    PLUGIN = True

    def __init__(self, parent=None, default_colormaps=None):
        super().__init__(parent=parent)
--- a/bec_widgets/widgets/utility/visual/colormap_selector/colormap_selector.pyproject
+++ b/bec_widgets/widgets/utility/visual/colormap_selector/colormap_selector.pyproject
--- a/bec_widgets/widgets/utility/visual/colormap_selector/colormap_selector_plugin.py
+++ b/bec_widgets/widgets/utility/visual/colormap_selector/colormap_selector_plugin.py
@@ -6,7 +6,7 @@ from qtpy.QtDesigner import QDesignerCustomWidgetInterface

 import bec_widgets
 from bec_widgets.utils.bec_designer import designer_material_icon
-from bec_widgets.widgets.utility.visual.colormap_selector.colormap_selector import ColormapSelector
+from bec_widgets.widgets.colormap_selector.colormap_selector import ColormapSelector

 DOM_XML = """
 <ui language='c++'>
--- a/bec_widgets/widgets/utility/visual/colormap_selector/register_colormap_selector.py
+++ b/bec_widgets/widgets/utility/visual/colormap_selector/register_colormap_selector.py
@@ -6,7 +6,7 @@ def main():  # pragma: no cover
        return
    from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection

-    from bec_widgets.widgets.utility.visual.colormap_selector.colormap_selector_plugin import (
+    from bec_widgets.widgets.colormap_selector.colormap_selector_plugin import (
        ColormapSelectorPlugin,
    )

--- a/bec_widgets/widgets/control/buttons/button_abort/init.py
+++ b/bec_widgets/widgets/control/buttons/button_abort/init.py
--- a/bec_widgets/widgets/utility/visual/colormap_widget/bec_color_map_widget.pyproject
+++ b/bec_widgets/widgets/utility/visual/colormap_widget/bec_color_map_widget.pyproject
--- a/bec_widgets/widgets/utility/visual/colormap_widget/bec_color_map_widget_plugin.py
+++ b/bec_widgets/widgets/utility/visual/colormap_widget/bec_color_map_widget_plugin.py
@@ -4,7 +4,7 @@
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface

 from bec_widgets.utils.bec_designer import designer_material_icon
-from bec_widgets.widgets.utility.visual.colormap_widget.colormap_widget import BECColorMapWidget
+from bec_widgets.widgets.colormap_widget.colormap_widget import BECColorMapWidget

 DOM_XML = """
 <ui language='c++'>
--- a/bec_widgets/widgets/utility/visual/colormap_widget/colormap_widget.py
+++ b/bec_widgets/widgets/utility/visual/colormap_widget/colormap_widget.py
@@ -10,7 +10,6 @@ class BECColorMapWidget(BECWidget, QWidget):
    colormap_changed_signal = Signal(str)
    ICON_NAME = "palette"
    USER_ACCESS = ["colormap"]
-    PLUGIN = True

    def __init__(self, parent=None, cmap: str = "magma"):
        super().__init__()
--- a/bec_widgets/widgets/utility/visual/colormap_widget/register_bec_color_map_widget.py
+++ b/bec_widgets/widgets/utility/visual/colormap_widget/register_bec_color_map_widget.py
@@ -6,7 +6,7 @@ def main():  # pragma: no cover
        return
    from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection

-    from bec_widgets.widgets.utility.visual.colormap_widget.bec_color_map_widget_plugin import (
+    from bec_widgets.widgets.colormap_widget.bec_color_map_widget_plugin import (
        BECColorMapWidgetPlugin,
    )

--- a/bec_widgets/widgets/editors/console/console.py
+++ b/bec_widgets/widgets/editors/console/console.py
@@ -10,14 +10,9 @@ import fcntl
 import html
 import os
 import pty
-import re
-import signal
 import sys
-import time

 import pyte
-from bec_lib.logger import bec_logger
-from pygments.token import Token
 from pyte.screens import History
 from qtpy import QtCore, QtGui, QtWidgets
 from qtpy.QtCore import Property as pyqtProperty
@@ -28,8 +23,6 @@ from qtpy.QtWidgets import QApplication, QHBoxLayout, QScrollBar, QSizePolicy

 from bec_widgets.qt_utils.error_popups import SafeSlot as Slot

-logger = bec_logger.logger
-
 ansi_colors = {
    "black": "#000000",
    "red": "#CD0000",
@@ -239,17 +232,12 @@ class Backend(QtCore.QObject):
 class BECConsole(QtWidgets.QWidget):
    """Container widget for the terminal text area"""

-    PLUGIN = True
    ICON_NAME = "terminal"

-    prompt = pyqtSignal(bool)
-
    def __init__(self, parent=None, cols=132):
        super().__init__(parent)

        self.term = _TerminalWidget(self, cols, rows=43)
-        self.term.prompt.connect(self.prompt)  # forward signal from term to this widget
-
        self.scroll_bar = QScrollBar(Qt.Vertical, self)
        # self.scroll_bar.hide()
        layout = QHBoxLayout(self)
@@ -331,56 +319,9 @@ class BECConsole(QtWidgets.QWidget):
    def start(self, deactivate_ctrl_d=True):
        self.term.start(deactivate_ctrl_d=deactivate_ctrl_d)

-    def push(self, text, hit_return=False):
+    def push(self, text):
        """Push some text to the terminal"""
-        return self.term.push(text, hit_return=hit_return)
-
-    def execute_command(self, command):
-        self.push(command, hit_return=True)
-
-    def set_prompt_tokens(self, *tokens):
-        """Prepare regexp to identify prompt, based on tokens
-
-        Tokens are returned from get_ipython().prompts.in_prompt_tokens()
-        """
-        regex_parts = []
-        for token_type, token_value in tokens:
-            if token_type == Token.PromptNum:  # Handle dynamic prompt number
-                regex_parts.append(r"[\d\?]+")  # Match one or more digits or '?'
-            else:
-                # Escape other prompt parts (e.g., "In [", "]: ")
-                if not token_value:
-                    regex_parts.append(".+?")  # arbitrary string
-                else:
-                    regex_parts.append(re.escape(token_value))
-
-        # Combine into a single regex
-        prompt_pattern = "".join(regex_parts)
-        self.term._prompt_re = re.compile(prompt_pattern + r"\s*$")
-
-    def terminate(self, timeout=10):
-        self.term.stop(timeout=timeout)
-
-    def send_ctrl_c(self, timeout=None):
-        self.term.send_ctrl_c(timeout)
-
-    def cleanup(self):
-        """Cleanup the terminal"""
-        self.execute_command("\x03")  # Ctrl-C
-        self.execute_command("exit()")
-        timeout = 5
-        interval = 0.1
-        timer = 0
-        # os.close(self.term.fd)
-        while self.term.fd is not None:
-            time.sleep(interval)
-            timer += interval
-            if timer > 0.8 * timeout:
-                logger.warning(f"Terminal still cleaning up after {timer:.1f} seconds")
-            if timer > timeout:
-                logger.error(f"Terminal cleanup timed out after {timeout} seconds")
-                break
-        self.deleteLater()
+        return self.term.push(text)

    cols = pyqtProperty(int, get_cols, set_cols)
    rows = pyqtProperty(int, get_rows, set_rows)
@@ -394,15 +335,7 @@ class _TerminalWidget(QtWidgets.QPlainTextEdit):
    Start ``Backend`` process and render Pyte output as text.
    """

-    prompt = pyqtSignal(bool)
-
    def __init__(self, parent, cols=125, rows=50, **kwargs):
-        # regexp to match prompt
-        self._prompt_re = None
-        # last prompt
-        self._prompt_str = None
-        # process pid
-        self.pid = None
        # file descriptor to communicate with the subprocess
        self.fd = None
        self.backend = None
@@ -499,7 +432,7 @@ class _TerminalWidget(QtWidgets.QPlainTextEdit):
        self.update_term_size()

        # Start the Bash process
-        self.pid, self.fd = self.fork_shell()
+        self.fd = self.fork_shell()

        if self.fd:
            # Create the ``Backend`` object
@@ -515,62 +448,6 @@ class _TerminalWidget(QtWidgets.QPlainTextEdit):
        self.appendHtml(f"<br><h2>{repr(self._cmd)} - Process exited.</h2>")
        self.setReadOnly(True)

-    def send_ctrl_c(self, wait_prompt=True, timeout=None):
-        """Send CTRL-C to the process
-
-        If wait_prompt=True (default), wait for a new prompt after CTRL-C
-        If no prompt is displayed after 'timeout' seconds, TimeoutError is raised
-        """
-        os.kill(self.pid, signal.SIGINT)
-        if wait_prompt:
-            timeout_error = False
-            if timeout:
-
-                def set_timeout_error():
-                    nonlocal timeout_error
-                    timeout_error = True
-
-                timeout_timer = QTimer()
-                timeout_timer.singleShot(timeout * 1000, set_timeout_error)
-            while self._prompt_str is None:
-                QApplication.instance().process_events()
-                if timeout_error:
-                    raise TimeoutError(
-                        f"CTRL-C: could not get back to prompt after {timeout} seconds."
-                    )
-
-    def _is_running(self):
-        if os.waitpid(self.pid, os.WNOHANG) == (0, 0):
-            return True
-        return False
-
-    def stop(self, kill=True, timeout=None):
-        """Stop the running process
-
-        SIGTERM is the default signal for terminating processes.
-
-        If kill=True (default), SIGKILL will be sent if the process does not exit after timeout
-        """
-        # try to exit gracefully
-        os.kill(self.pid, signal.SIGTERM)
-
-        # wait until process is truly dead
-        t0 = time.perf_counter()
-        while self._is_running():
-            time.sleep(1)
-            if timeout is not None and time.perf_counter() - t0 > timeout:
-                # still alive after 'timeout' seconds
-                if kill:
-                    # send SIGKILL and make a last check in loop
-                    os.kill(self.pid, signal.SIGKILL)
-                    kill = False
-                else:
-                    # still running after timeout...
-                    raise TimeoutError(
-                        f"Could not terminate process with pid: {self.pid} within timeout"
-                    )
-        self.process_exited()
-
    def data_ready(self, screen):
        """Handle new screen: redraw, set scroll bar max and slider, move cursor to its position

@@ -662,13 +539,11 @@ class _TerminalWidget(QtWidgets.QPlainTextEdit):
        elif code is not None:
            self.write(code)

-    def push(self, text, hit_return=False):
+    def push(self, text):
        """
        Write 'text' to terminal
        """
        self.write(text.encode("utf-8"))
-        if hit_return:
-            self.write(b"\n")

    def contextMenuEvent(self, event):
        if self.fd is None:
@@ -774,20 +649,6 @@ class _TerminalWidget(QtWidgets.QPlainTextEdit):
                self.output[line_no] = line
            # fill the text area with HTML contents in one go
            self.appendHtml(f"<pre>{chr(10).join(self.output)}</pre>")
-
-            if self._prompt_re is not None:
-                text_buf = self.toPlainText()
-                prompt = self._prompt_re.search(text_buf)
-                if prompt is None:
-                    if self._prompt_str:
-                        self.prompt.emit(False)
-                    self._prompt_str = None
-                else:
-                    prompt_str = prompt.string.rstrip()
-                    if prompt_str != self._prompt_str:
-                        self._prompt_str = prompt_str
-                        self.prompt.emit(True)
-
            # did updates, all clean
            screen.dirty.clear()

@@ -849,7 +710,7 @@ class _TerminalWidget(QtWidgets.QPlainTextEdit):
            # We are in the parent process.
            # Set file control
            fcntl.fcntl(fd, fcntl.F_SETFL, os.O_NONBLOCK)
-            return pid, fd
+            return fd


 if __name__ == "__main__":
@@ -866,24 +727,6 @@ if __name__ == "__main__":

    console = BECConsole(mainwin)
    mainwin.setCentralWidget(console)
-
-    def check_prompt(at_prompt):
-        if at_prompt:
-            print("NEW PROMPT")
-        else:
-            print("EXECUTING SOMETHING...")
-
-    console.set_prompt_tokens(
-        (Token.OutPromptNum, "•"),
-        (Token.Prompt, ""),  # will match arbitrary string,
-        (Token.Prompt, " ["),
-        (Token.PromptNum, "3"),
-        (Token.Prompt, "/"),
-        (Token.PromptNum, "1"),
-        (Token.Prompt, "] "),
-        (Token.Prompt, "❯❯"),
-    )
-    console.prompt.connect(check_prompt)
    console.start()

    # Show widget and launch Qt's event loop.
--- a/bec_widgets/widgets/editors/console/console.pyproject
+++ b/bec_widgets/widgets/editors/console/console.pyproject
--- a/bec_widgets/widgets/editors/console/console_plugin.py
+++ b/bec_widgets/widgets/editors/console/console_plugin.py
@@ -6,7 +6,7 @@ from qtpy.QtDesigner import QDesignerCustomWidgetInterface

 import bec_widgets
 from bec_widgets.utils.bec_designer import designer_material_icon
-from bec_widgets.widgets.editors.console.console import BECConsole
+from bec_widgets.widgets.console.console import BECConsole

 DOM_XML = """
 <ui language='c++'>
--- a/bec_widgets/widgets/editors/console/register_console.py
+++ b/bec_widgets/widgets/editors/console/register_console.py
@@ -6,7 +6,7 @@ def main():  # pragma: no cover
        return
    from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection

-    from bec_widgets.widgets.editors.console.console_plugin import BECConsolePlugin
+    from bec_widgets.widgets.console.console_plugin import BECConsolePlugin

    QPyDesignerCustomWidgetCollection.addCustomWidget(BECConsolePlugin())

--- a/bec_widgets/widgets/containers/figure/plots/multi_waveform/multi_waveform.py
+++ b/bec_widgets/widgets/containers/figure/plots/multi_waveform/multi_waveform.py
@@ -1,353 +0,0 @@
-from collections import deque
-from typing import Literal, Optional
-
-import pyqtgraph as pg
-from bec_lib.endpoints import MessageEndpoints
-from bec_lib.logger import bec_logger
-from pydantic import Field, field_validator
-from pyqtgraph.exporters import MatplotlibExporter
-from qtpy.QtCore import Signal, Slot
-from qtpy.QtWidgets import QWidget
-
-from bec_widgets.utils import Colors
-from bec_widgets.widgets.containers.figure.plots.plot_base import BECPlotBase, SubplotConfig
-
-logger = bec_logger.logger
-
-
-class BECMultiWaveformConfig(SubplotConfig):
-    color_palette: Optional[str] = Field(
-        "magma", description="The color palette of the figure widget.", validate_default=True
-    )
-    curve_limit: Optional[int] = Field(
-        200, description="The maximum number of curves to display on the plot."
-    )
-    flush_buffer: Optional[bool] = Field(
-        False, description="Flush the buffer of the plot widget when the curve limit is reached."
-    )
-    monitor: Optional[str] = Field(
-        None, description="The monitor to set for the plot widget."
-    )  # TODO validate monitor in bec -> maybe make it as SignalData class for validation purpose
-    curve_width: Optional[int] = Field(1, description="The width of the curve on the plot.")
-    opacity: Optional[int] = Field(50, description="The opacity of the curve on the plot.")
-    highlight_last_curve: Optional[bool] = Field(
-        True, description="Highlight the last curve on the plot."
-    )
-
-    model_config: dict = {"validate_assignment": True}
-    _validate_color_map_z = field_validator("color_palette")(Colors.validate_color_map)
-
-
-class BECMultiWaveform(BECPlotBase):
-    monitor_signal_updated = Signal()
-    highlighted_curve_index_changed = Signal(int)
-    USER_ACCESS = [
-        "_rpc_id",
-        "_config_dict",
-        "curves",
-        "set_monitor",
-        "set_opacity",
-        "set_curve_limit",
-        "set_curve_highlight",
-        "set_colormap",
-        "set",
-        "set_title",
-        "set_x_label",
-        "set_y_label",
-        "set_x_scale",
-        "set_y_scale",
-        "set_x_lim",
-        "set_y_lim",
-        "set_grid",
-        "set_colormap",
-        "enable_fps_monitor",
-        "lock_aspect_ratio",
-        "export",
-        "get_all_data",
-        "remove",
-    ]
-
-    def __init__(
-        self,
-        parent: Optional[QWidget] = None,
-        parent_figure=None,
-        config: Optional[BECMultiWaveformConfig] = None,
-        client=None,
-        gui_id: Optional[str] = None,
-    ):
-        if config is None:
-            config = BECMultiWaveformConfig(widget_class=self.__class__.__name__)
-        super().__init__(
-            parent=parent, parent_figure=parent_figure, config=config, client=client, gui_id=gui_id
-        )
-        self.old_scan_id = None
-        self.scan_id = None
-        self.monitor = None
-        self.connected = False
-        self.current_highlight_index = 0
-        self._curves = deque()
-        self.visible_curves = []
-        self.number_of_visible_curves = 0
-
-        # Get bec shortcuts dev, scans, queue, scan_storage, dap
-        self.get_bec_shortcuts()
-
-    @property
-    def curves(self) -> deque:
-        """
-        Get the curves of the plot widget as a deque.
-        Returns:
-            deque: Deque of curves.
-        """
-        return self._curves
-
-    @curves.setter
-    def curves(self, value: deque):
-        self._curves = value
-
-    @property
-    def highlight_last_curve(self) -> bool:
-        """
-        Get the highlight_last_curve property.
-        Returns:
-            bool: The highlight_last_curve property.
-        """
-        return self.config.highlight_last_curve
-
-    @highlight_last_curve.setter
-    def highlight_last_curve(self, value: bool):
-        self.config.highlight_last_curve = value
-
-    def set_monitor(self, monitor: str):
-        """
-        Set the monitor for the plot widget.
-        Args:
-            monitor (str): The monitor to set.
-        """
-        self.config.monitor = monitor
-        self._connect_monitor()
-
-    def _connect_monitor(self):
-        """
-        Connect the monitor to the plot widget.
-        """
-        try:
-            previous_monitor = self.monitor
-        except AttributeError:
-            previous_monitor = None
-
-        if previous_monitor and self.connected is True:
-            self.bec_dispatcher.disconnect_slot(
-                self.on_monitor_1d_update, MessageEndpoints.device_monitor_1d(previous_monitor)
-            )
-        if self.config.monitor and self.connected is False:
-            self.bec_dispatcher.connect_slot(
-                self.on_monitor_1d_update, MessageEndpoints.device_monitor_1d(self.config.monitor)
-            )
-            self.connected = True
-            self.monitor = self.config.monitor
-
-    @Slot(dict, dict)
-    def on_monitor_1d_update(self, msg: dict, metadata: dict):
-        """
-        Update the plot widget with the monitor data.
-
-        Args:
-            msg(dict): The message data.
-            metadata(dict): The metadata of the message.
-        """
-        data = msg.get("data", None)
-        current_scan_id = metadata.get("scan_id", None)
-
-        if current_scan_id != self.scan_id:
-            self.scan_id = current_scan_id
-            self.clear_curves()
-            self.curves.clear()
-            if self.crosshair:
-                self.crosshair.clear_markers()
-
-        # Always create a new curve and add it
-        curve = pg.PlotDataItem()
-        curve.setData(data)
-        self.plot_item.addItem(curve)
-        self.curves.append(curve)
-
-        # Max Trace and scale colors
-        self.set_curve_limit(self.config.curve_limit, self.config.flush_buffer)
-
-        self.monitor_signal_updated.emit()
-
-    @Slot(int)
-    def set_curve_highlight(self, index: int):
-        """
-        Set the curve highlight based on visible curves.
-
-        Args:
-            index (int): The index of the curve to highlight among visible curves.
-        """
-        self.plot_item.visible_curves = [curve for curve in self.curves if curve.isVisible()]
-        num_visible_curves = len(self.plot_item.visible_curves)
-        self.number_of_visible_curves = num_visible_curves
-
-        if num_visible_curves == 0:
-            return  # No curves to highlight
-
-        if index >= num_visible_curves:
-            index = num_visible_curves - 1
-        elif index < 0:
-            index = num_visible_curves + index
-        self.current_highlight_index = index
-        num_colors = num_visible_curves
-        colors = Colors.evenly_spaced_colors(
-            colormap=self.config.color_palette, num=num_colors, format="HEX"
-        )
-        for i, curve in enumerate(self.plot_item.visible_curves):
-            curve.setPen()
-            if i == self.current_highlight_index:
-                curve.setPen(pg.mkPen(color=colors[i], width=5))
-                curve.setAlpha(alpha=1, auto=False)
-                curve.setZValue(1)
-            else:
-                curve.setPen(pg.mkPen(color=colors[i], width=1))
-                curve.setAlpha(alpha=self.config.opacity / 100, auto=False)
-                curve.setZValue(0)
-
-        self.highlighted_curve_index_changed.emit(self.current_highlight_index)
-
-    @Slot(int)
-    def set_opacity(self, opacity: int):
-        """
-        Set the opacity of the curve on the plot.
-
-        Args:
-            opacity(int): The opacity of the curve. 0-100.
-        """
-        self.config.opacity = max(0, min(100, opacity))
-        self.set_curve_highlight(self.current_highlight_index)
-
-    @Slot(int, bool)
-    def set_curve_limit(self, max_trace: int, flush_buffer: bool = False):
-        """
-        Set the maximum number of traces to display on the plot.
-
-        Args:
-            max_trace (int): The maximum number of traces to display.
-            flush_buffer (bool): Flush the buffer.
-        """
-        self.config.curve_limit = max_trace
-        self.config.flush_buffer = flush_buffer
-
-        if self.config.curve_limit is None:
-            self.scale_colors()
-            return
-
-        if self.config.flush_buffer:
-            # Remove excess curves from the plot and the deque
-            while len(self.curves) > self.config.curve_limit:
-                curve = self.curves.popleft()
-                self.plot_item.removeItem(curve)
-        else:
-            # Hide or show curves based on the new max_trace
-            num_curves_to_show = min(self.config.curve_limit, len(self.curves))
-            for i, curve in enumerate(self.curves):
-                if i < len(self.curves) - num_curves_to_show:
-                    curve.hide()
-                else:
-                    curve.show()
-        self.scale_colors()
-
-    def scale_colors(self):
-        """
-        Scale the colors of the curves based on the current colormap.
-        """
-        if self.config.highlight_last_curve:
-            self.set_curve_highlight(-1)  # Use -1 to highlight the last visible curve
-        else:
-            self.set_curve_highlight(self.current_highlight_index)
-
-    def set_colormap(self, colormap: str):
-        """
-        Set the colormap for the curves.
-
-        Args:
-            colormap(str): Colormap for the curves.
-        """
-        self.config.color_palette = colormap
-        self.set_curve_highlight(self.current_highlight_index)
-
-    def hook_crosshair(self) -> None:
-        super().hook_crosshair()
-        if self.crosshair:
-            self.highlighted_curve_index_changed.connect(self.crosshair.update_highlighted_curve)
-            if self.curves:
-                self.crosshair.update_highlighted_curve(self.current_highlight_index)
-
-    def get_all_data(self, output: Literal["dict", "pandas"] = "dict") -> dict:
-        """
-        Extract all curve data into a dictionary or a pandas DataFrame.
-
-        Args:
-            output (Literal["dict", "pandas"]): Format of the output data.
-
-        Returns:
-            dict | pd.DataFrame: Data of all curves in the specified format.
-        """
-        data = {}
-        try:
-            import pandas as pd
-        except ImportError:
-            pd = None
-            if output == "pandas":
-                logger.warning(
-                    "Pandas is not installed. "
-                    "Please install pandas using 'pip install pandas'."
-                    "Output will be dictionary instead."
-                )
-                output = "dict"
-
-        curve_keys = []
-        curves_list = list(self.curves)
-        for i, curve in enumerate(curves_list):
-            x_data, y_data = curve.getData()
-            if x_data is not None or y_data is not None:
-                key = f"curve_{i}"
-                curve_keys.append(key)
-                if output == "dict":
-                    data[key] = {"x": x_data.tolist(), "y": y_data.tolist()}
-                elif output == "pandas" and pd is not None:
-                    data[key] = pd.DataFrame({"x": x_data, "y": y_data})
-
-        if output == "pandas" and pd is not None:
-            combined_data = pd.concat([data[key] for key in curve_keys], axis=1, keys=curve_keys)
-            return combined_data
-        return data
-
-    def clear_curves(self):
-        """
-        Remove all curves from the plot, excluding crosshair items.
-        """
-        items_to_remove = []
-        for item in self.plot_item.items:
-            if not getattr(item, "is_crosshair", False) and isinstance(item, pg.PlotDataItem):
-                items_to_remove.append(item)
-        for item in items_to_remove:
-            self.plot_item.removeItem(item)
-
-    def export_to_matplotlib(self):
-        """
-        Export current waveform to matplotlib GUI. Available only if matplotlib is installed in the environment.
-        """
-        MatplotlibExporter(self.plot_item).export()
-
-
-if __name__ == "__main__":
-    import sys
-
-    from qtpy.QtWidgets import QApplication
-
-    from bec_widgets.widgets.containers.figure import BECFigure
-
-    app = QApplication(sys.argv)
-    widget = BECFigure()
-    widget.show()
-    sys.exit(app.exec_())
--- a/bec_widgets/widgets/containers/main_window/main_window.py
+++ b/bec_widgets/widgets/containers/main_window/main_window.py
@@ -1,9 +0,0 @@
-from qtpy.QtWidgets import QMainWindow
-
-from bec_widgets.utils import BECConnector
-
-
-class BECMainWindow(QMainWindow, BECConnector):
-    def __init__(self, *args, **kwargs):
-        BECConnector.__init__(self, **kwargs)
-        QMainWindow.__init__(self, *args, **kwargs)
--- a/bec_widgets/widgets/control/buttons/button_reset/init.py
+++ b/bec_widgets/widgets/control/buttons/button_reset/init.py
--- a/bec_widgets/widgets/dap/dap_combo_box/dap_combo_box.py
+++ b/bec_widgets/widgets/dap/dap_combo_box/dap_combo_box.py
@@ -21,7 +21,7 @@ class DapComboBox(BECWidget, QWidget):
    """

    ICON_NAME = "data_exploration"
-    PLUGIN = True
+
    USER_ACCESS = ["select_y_axis", "select_x_axis", "select_fit_model"]

    ### Signals ###
--- a/bec_widgets/widgets/dap/dap_combo_box/dap_combo_box.pyproject
+++ b/bec_widgets/widgets/dap/dap_combo_box/dap_combo_box.pyproject
--- a/bec_widgets/widgets/dap/dap_combo_box/dap_combo_box_plugin.py
+++ b/bec_widgets/widgets/dap/dap_combo_box/dap_combo_box_plugin.py
@@ -4,7 +4,7 @@
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface

 from bec_widgets.utils.bec_designer import designer_material_icon
-from bec_widgets.widgets.dap.dap_combo_box.dap_combo_box import DapComboBox
+from bec_widgets.widgets.dap_combo_box.dap_combo_box import DapComboBox

 DOM_XML = """
 <ui language='c++'>
--- a/bec_widgets/widgets/dap/dap_combo_box/register_dap_combo_box.py
+++ b/bec_widgets/widgets/dap/dap_combo_box/register_dap_combo_box.py
@@ -6,7 +6,7 @@ def main():  # pragma: no cover
        return
    from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection

-    from bec_widgets.widgets.dap.dap_combo_box.dap_combo_box_plugin import DapComboBoxPlugin
+    from bec_widgets.widgets.dap_combo_box.dap_combo_box_plugin import DapComboBoxPlugin

    QPyDesignerCustomWidgetCollection.addCustomWidget(DapComboBoxPlugin())

--- a/bec_widgets/widgets/control/buttons/button_resume/init.py
+++ b/bec_widgets/widgets/control/buttons/button_resume/init.py
--- a/bec_widgets/widgets/utility/visual/dark_mode_button/dark_mode_button.py
+++ b/bec_widgets/widgets/utility/visual/dark_mode_button/dark_mode_button.py
@@ -12,7 +12,6 @@ class DarkModeButton(BECWidget, QWidget):
    USER_ACCESS = ["toggle_dark_mode"]

    ICON_NAME = "dark_mode"
-    PLUGIN = True

    def __init__(
        self,
--- a/bec_widgets/widgets/utility/visual/dark_mode_button/dark_mode_button.pyproject
+++ b/bec_widgets/widgets/utility/visual/dark_mode_button/dark_mode_button.pyproject
--- a/bec_widgets/widgets/utility/visual/dark_mode_button/dark_mode_button_plugin.py
+++ b/bec_widgets/widgets/utility/visual/dark_mode_button/dark_mode_button_plugin.py
@@ -4,7 +4,7 @@
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface

 from bec_widgets.utils.bec_designer import designer_material_icon
-from bec_widgets.widgets.utility.visual.dark_mode_button.dark_mode_button import DarkModeButton
+from bec_widgets.widgets.dark_mode_button.dark_mode_button import DarkModeButton

 DOM_XML = """
 <ui language='c++'>
--- a/bec_widgets/widgets/utility/visual/dark_mode_button/register_dark_mode_button.py
+++ b/bec_widgets/widgets/utility/visual/dark_mode_button/register_dark_mode_button.py
@@ -6,9 +6,7 @@ def main():  # pragma: no cover
        return
    from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection

-    from bec_widgets.widgets.utility.visual.dark_mode_button.dark_mode_button_plugin import (
-        DarkModeButtonPlugin,
-    )
+    from bec_widgets.widgets.dark_mode_button.dark_mode_button_plugin import DarkModeButtonPlugin

    QPyDesignerCustomWidgetCollection.addCustomWidget(DarkModeButtonPlugin())

--- a/bec_widgets/widgets/control/buttons/stop_button/init.py
+++ b/bec_widgets/widgets/control/buttons/stop_button/init.py
--- a/bec_widgets/widgets/services/device_browser/device_browser.py
+++ b/bec_widgets/widgets/services/device_browser/device_browser.py
@@ -5,16 +5,16 @@ 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 QListWidgetItem, QVBoxLayout, QWidget
+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.services.device_browser.device_item import DeviceItem
+from bec_widgets.widgets.device_browser.device_item import DeviceItem


 class DeviceBrowser(BECWidget, QWidget):
    device_update: Signal = Signal()
-    PLUGIN = True
+
    ICON_NAME = "lists"

    def __init__(
--- a/bec_widgets/widgets/services/device_browser/device_browser.pyproject
+++ b/bec_widgets/widgets/services/device_browser/device_browser.pyproject
--- a/bec_widgets/widgets/services/device_browser/device_browser.ui
+++ b/bec_widgets/widgets/services/device_browser/device_browser.ui
--- a/bec_widgets/widgets/services/device_browser/device_browser_plugin.py
+++ b/bec_widgets/widgets/services/device_browser/device_browser_plugin.py
@@ -4,7 +4,7 @@
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface

 from bec_widgets.utils.bec_designer import designer_material_icon
-from bec_widgets.widgets.services.device_browser.device_browser import DeviceBrowser
+from bec_widgets.widgets.device_browser.device_browser import DeviceBrowser

 DOM_XML = """
 <ui language='c++'>
--- a/bec_widgets/widgets/services/device_browser/device_item/init.py
+++ b/bec_widgets/widgets/services/device_browser/device_item/init.py
--- a/bec_widgets/widgets/services/device_browser/device_item/device_item.py
+++ b/bec_widgets/widgets/services/device_browser/device_item/device_item.py
@@ -5,7 +5,7 @@ from typing import TYPE_CHECKING
 from bec_lib.logger import bec_logger
 from qtpy.QtCore import QMimeData, Qt
 from qtpy.QtGui import QDrag
-from qtpy.QtWidgets import QApplication, QHBoxLayout, QLabel, QWidget
+from qtpy.QtWidgets import QHBoxLayout, QLabel, QWidget

 if TYPE_CHECKING:
    from qtpy.QtGui import QMouseEvent
@@ -16,9 +16,6 @@ logger = bec_logger.logger
 class DeviceItem(QWidget):
    def __init__(self, device: str) -> None:
        super().__init__()
-
-        self._drag_pos = None
-
        self.device = device
        layout = QHBoxLayout()
        layout.setContentsMargins(10, 2, 10, 2)
@@ -35,21 +32,12 @@ class DeviceItem(QWidget):
        )

    def mousePressEvent(self, event: QMouseEvent) -> None:
-        super().mousePressEvent(event)
        if event.button() == Qt.LeftButton:
-            self._drag_pos = event.pos()
-
-    def mouseMoveEvent(self, event: QMouseEvent) -> None:
-        if not (event.buttons() and Qt.LeftButton):
-            return
-        if (event.pos() - self._drag_pos).manhattanLength() < QApplication.startDragDistance():
-            return
-
-        drag = QDrag(self)
-        mime_data = QMimeData()
-        mime_data.setText(self.device)
-        drag.setMimeData(mime_data)
-        drag.exec_(Qt.MoveAction)
+            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:
        logger.debug("Double Clicked")
--- a/bec_widgets/widgets/services/device_browser/register_device_browser.py
+++ b/bec_widgets/widgets/services/device_browser/register_device_browser.py
@@ -6,9 +6,7 @@ def main():  # pragma: no cover
        return
    from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection

-    from bec_widgets.widgets.services.device_browser.device_browser_plugin import (
-        DeviceBrowserPlugin,
-    )
+    from bec_widgets.widgets.device_browser.device_browser_plugin import DeviceBrowserPlugin

    QPyDesignerCustomWidgetCollection.addCustomWidget(DeviceBrowserPlugin())

--- a/bec_widgets/widgets/control/device_control/init.py
+++ b/bec_widgets/widgets/control/device_control/init.py
--- a/bec_widgets/widgets/control/device_input/device_combobox/device_combo_box.pyproject
+++ b/bec_widgets/widgets/control/device_input/device_combobox/device_combo_box.pyproject
--- a/bec_widgets/widgets/control/device_input/device_combobox/device_combo_box_plugin.py
+++ b/bec_widgets/widgets/control/device_input/device_combobox/device_combo_box_plugin.py
@@ -6,7 +6,7 @@ from qtpy.QtDesigner import QDesignerCustomWidgetInterface

 import bec_widgets
 from bec_widgets.utils.bec_designer import designer_material_icon
-from bec_widgets.widgets.control.device_input.device_combobox.device_combobox import DeviceComboBox
+from bec_widgets.widgets.device_combobox.device_combobox import DeviceComboBox

 DOM_XML = """
 <ui language='c++'>
--- a/bec_widgets/widgets/control/device_input/device_combobox/device_combobox.py
+++ b/bec_widgets/widgets/control/device_input/device_combobox/device_combobox.py
@@ -5,7 +5,7 @@ from qtpy.QtGui import QPainter, QPaintEvent, QPen
 from qtpy.QtWidgets import QComboBox, QSizePolicy

 from bec_widgets.utils.colors import get_accent_colors
-from bec_widgets.widgets.control.device_input.base_classes.device_input_base import (
+from bec_widgets.widgets.base_classes.device_input_base import (
    BECDeviceFilter,
    DeviceInputBase,
    DeviceInputConfig,
@@ -27,7 +27,6 @@ class DeviceComboBox(DeviceInputBase, QComboBox):
    """

    ICON_NAME = "list_alt"
-    PLUGIN = True

    device_selected = Signal(str)
    device_config_update = Signal()
--- a/bec_widgets/widgets/control/device_input/device_combobox/register_device_combo_box.py
+++ b/bec_widgets/widgets/control/device_input/device_combobox/register_device_combo_box.py
@@ -6,9 +6,7 @@ def main():  # pragma: no cover
        return
    from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection

-    from bec_widgets.widgets.control.device_input.device_combobox.device_combo_box_plugin import (
-        DeviceComboBoxPlugin,
-    )
+    from bec_widgets.widgets.device_combobox.device_combo_box_plugin import DeviceComboBoxPlugin

    QPyDesignerCustomWidgetCollection.addCustomWidget(DeviceComboBoxPlugin())

--- a/bec_widgets/widgets/control/device_control/position_indicator/init.py
+++ b/bec_widgets/widgets/control/device_control/position_indicator/init.py
--- a/bec_widgets/widgets/control/device_input/device_line_edit/device_line_edit.py
+++ b/bec_widgets/widgets/control/device_input/device_line_edit/device_line_edit.py
@@ -6,7 +6,7 @@ from qtpy.QtGui import QPainter, QPaintEvent, QPen
 from qtpy.QtWidgets import QApplication, QCompleter, QLineEdit, QSizePolicy

 from bec_widgets.utils.colors import get_accent_colors
-from bec_widgets.widgets.control.device_input.base_classes.device_input_base import (
+from bec_widgets.widgets.base_classes.device_input_base import (
    BECDeviceFilter,
    DeviceInputBase,
    DeviceInputConfig,
@@ -32,7 +32,6 @@ class DeviceLineEdit(DeviceInputBase, QLineEdit):
    device_selected = Signal(str)
    device_config_update = Signal()

-    PLUGIN = True
    ICON_NAME = "edit_note"

    def __init__(
@@ -157,9 +156,7 @@ if __name__ == "__main__":  # pragma: no cover
    from qtpy.QtWidgets import QVBoxLayout, QWidget

    from bec_widgets.utils.colors import set_theme
-    from bec_widgets.widgets.control.device_input.signal_combobox.signal_combobox import (
-        SignalComboBox,
-    )
+    from bec_widgets.widgets.signal_combobox.signal_combobox import SignalComboBox

    app = QApplication([])
    set_theme("dark")
--- a/bec_widgets/widgets/control/device_input/device_line_edit/device_line_edit.pyproject
+++ b/bec_widgets/widgets/control/device_input/device_line_edit/device_line_edit.pyproject
--- a/bec_widgets/widgets/control/device_input/device_line_edit/device_line_edit_plugin.py
+++ b/bec_widgets/widgets/control/device_input/device_line_edit/device_line_edit_plugin.py
@@ -6,9 +6,7 @@ from qtpy.QtDesigner import QDesignerCustomWidgetInterface

 import bec_widgets
 from bec_widgets.utils.bec_designer import designer_material_icon
-from bec_widgets.widgets.control.device_input.device_line_edit.device_line_edit import (
-    DeviceLineEdit,
-)
+from bec_widgets.widgets.device_line_edit.device_line_edit import DeviceLineEdit

 DOM_XML = """
 <ui language='c++'>
--- a/bec_widgets/widgets/control/device_input/device_line_edit/register_device_line_edit.py
+++ b/bec_widgets/widgets/control/device_input/device_line_edit/register_device_line_edit.py
@@ -6,9 +6,7 @@ def main():  # pragma: no cover
        return
    from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection

-    from bec_widgets.widgets.control.device_input.device_line_edit.device_line_edit_plugin import (
-        DeviceLineEditPlugin,
-    )
+    from bec_widgets.widgets.device_line_edit.device_line_edit_plugin import DeviceLineEditPlugin

    QPyDesignerCustomWidgetCollection.addCustomWidget(DeviceLineEditPlugin())

--- a/bec_widgets/widgets/containers/dock/init.py
+++ b/bec_widgets/widgets/containers/dock/init.py
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
wyzula-jan	65dceead0c	WIP adjustments to be compatible with latest bec widgets and bec	2024-11-11 16:41:28 +01:00
wyzula-jan	20125139f0	fix(dock): REBASE docks can be created as temporary, when closed the dock will not return to original dock area	2024-11-11 16:31:05 +01:00