fix(monaco): forward text changed signal

CHANGELOG.md

@@ -1,189 +1,6 @@
 # CHANGELOG
 
 
-## v2.31.1 (2025-07-29)
-
-### Bug Fixes
-
-- **image_base**: Fix cleanup of uninitialized image layer
-  ([`c1bdc50`](https://github.com/bec-project/bec_widgets/commit/c1bdc506e8099f178acdccbe0e1109deeeaaca38))
-
-
-## v2.31.0 (2025-07-29)
-
-### Bug Fixes
-
-- **bec_main_window**: Main window have unified status bar on macOS
-  ([`1d0490f`](https://github.com/bec-project/bec_widgets/commit/1d0490fff428d51f2cdb7d35a954a7cd62cbb65c))
-
-- **color_button_native**: Removed BECWidget inheritance
-  ([`e42ffd7`](https://github.com/bec-project/bec_widgets/commit/e42ffd7c015a026d8e0967ac6b5866cbbea7bfed))
-
-- **decimal_spinbox**: Removed BECWidget inheritance
-  ([`2bd6d00`](https://github.com/bec-project/bec_widgets/commit/2bd6d0089955172134afb4d39939890026ed43f0))
-
-- **launch_window**: Logic for custom main window apps adjusted
-  ([`e090ac4`](https://github.com/bec-project/bec_widgets/commit/e090ac49b72fa15ebf1c09164ff3c6de577cb939))
-
-- **plugin_utils**: Plugins can be created from QWidgets, no need for BECWidget base class for
-  plugin creation
-  ([`c2a918e`](https://github.com/bec-project/bec_widgets/commit/c2a918ef4b77ccd7fa43d1bc0b907d55a17a6c95))
-
-- **scan_progressbar**: Added kwargs to init
-  ([`7073e75`](https://github.com/bec-project/bec_widgets/commit/7073e75adf0eeb81f4f8e27eb99fc1b7a395c751))
-
-- **utils**: Plugin template createWidget do not initialise widgets by default
-  ([`728d4ef`](https://github.com/bec-project/bec_widgets/commit/728d4efd9646ffcecd7d1a2f70988a7d7c799124))
-
-- **widgets**: Added missing __init__ files
-  ([`6bbf512`](https://github.com/bec-project/bec_widgets/commit/6bbf5126cf586063ed08d6cd489d6a9af28eac35))
-
-### Features
-
-- **bec_main_window**: Plugin and rpc created
-  ([`e4521d9`](https://github.com/bec-project/bec_widgets/commit/e4521d95286bbc598c3c05f357d247d950477b71))
-
-### Refactoring
-
-- **widgets**: All plugins regenerated
-  ([`10cbb9a`](https://github.com/bec-project/bec_widgets/commit/10cbb9a05cb96a791448caff4ffc4115b76146d7))
-
-### Testing
-
-- **launch_window**: Mainwindow raise test removed, features is supported now
-  ([`0854175`](https://github.com/bec-project/bec_widgets/commit/0854175acbda1d4de71358aec028539552a26448))
-
-
-## v2.30.6 (2025-07-26)
-
-### Bug Fixes
-
-- **waveform**: Autorange is applied with 150ms delay after curve is added
-  ([`61e5bde`](https://github.com/bec-project/bec_widgets/commit/61e5bde15f0e1ebe185ddbe81cd71ad581ae6009))
-
-
-## v2.30.5 (2025-07-25)
-
-### Bug Fixes
-
-- **positioner-box**: Test to fix handling of none integer values for precision
-  ([`b718b43`](https://github.com/bec-project/bec_widgets/commit/b718b438bacff6eb6cd6015f1a67dcf75c05dce4))
-
-### Refactoring
-
-- **positioner-box**: Cleanup, accept float precision
-  ([`4d5df96`](https://github.com/bec-project/bec_widgets/commit/4d5df9608a9438b9f6d7508c323eb3772e53f37d))
-
-
-## v2.30.4 (2025-07-25)
-
-### Bug Fixes
-
-- **cli**: Remove stderr from cli output when not using rpc
-  ([`b4e0664`](https://github.com/bec-project/bec_widgets/commit/b4e0664011682cae9966aa2632210a6b60e11714))
-
-
-## v2.30.3 (2025-07-23)
-
-### Bug Fixes
-
-- Cleanup subscriptions in device browser
-  ([`0d81bdd`](https://github.com/bec-project/bec_widgets/commit/0d81bdd4ddb4ec474a414b107cbc7fc865253934))
-
-
-## v2.30.2 (2025-07-23)
-
-### Bug Fixes
-
-- Factor out device name function and add test
-  ([`8eb8225`](https://github.com/bec-project/bec_widgets/commit/8eb8225a7f56014d6093aa142b3a5d071837982e))
-
-- **rpc_base**: Rpc_call wrapper passes full_name for Devices indeed of name
-  ([`491d044`](https://github.com/bec-project/bec_widgets/commit/491d04467c8ce4e116d61e614895d1dcc6b4b201))
-
-### Testing
-
-- **test_plotting_framework_e2e**: Added test for waveform with passing device from dev container
-  ([`3fd09fc`](https://github.com/bec-project/bec_widgets/commit/3fd09fceef2ffa7e7c3eee20176304bafb00d0db))
-
-
-## v2.30.1 (2025-07-22)
-
-### Bug Fixes
-
-- Ignore KeyError in SignalLabel
-  ([`608590c`](https://github.com/bec-project/bec_widgets/commit/608590c5421368d5bba0e4b0f5187d90cac323be))
-
-
-## v2.30.0 (2025-07-22)
-
-### Bug Fixes
-
-- **device_browser**: Display signal for signals
-  ([`3384ca0`](https://github.com/bec-project/bec_widgets/commit/3384ca02bdb5a2798ad3339ecf3e2ba7c121e28f))
-
-- **device_signal_display**: Don't read omitted
-  ([`b9af36a`](https://github.com/bec-project/bec_widgets/commit/b9af36a4f1c91e910d4fc738b17b90e92287a7e3))
-
-- **signal_label**: Rewrite reading selection logic
-  ([`cd17a4a`](https://github.com/bec-project/bec_widgets/commit/cd17a4aad905296eb0460ecc27e5920f5c2e8fe5))
-
-- **signal_label**: Show all signals by default
-  ([`22beadc`](https://github.com/bec-project/bec_widgets/commit/22beadcad061b328c986414f30fef57b64bad693))
-
-- **signal_label**: Update signal from dialog correctly
-  ([`959cedb`](https://github.com/bec-project/bec_widgets/commit/959cedbbd5a123eef5f3370287bf6476c48caab9))
-
-- **signal_label**: Use read() instead of get() for init
-  ([`f0dc992`](https://github.com/bec-project/bec_widgets/commit/f0dc99258607a5cc8af51686d01f7fd54ae2779f))
-
-### Chores
-
-- Update client.py
-  ([`fd1f994`](https://github.com/bec-project/bec_widgets/commit/fd1f9941e046b7ae1e247dde39c20bcbc37ac189))
-
-### Features
-
-- **signal_label**: Property to display array data or not
-  ([`ca4f975`](https://github.com/bec-project/bec_widgets/commit/ca4f97503bf06363e8e8a5d494a9857223da4104))
-
-
-## v2.29.0 (2025-07-22)
-
-### Features
-
-- **notification_banner**: Notification centre for alarms implemented into BECMainWindow
-  ([`cd9d22d`](https://github.com/bec-project/bec_widgets/commit/cd9d22d0b40d633af76cb1188b57feb7b6a5dbf2))
-
-### Refactoring
-
-- **notification_banner**: Becnotificationbroker done as singleton to sync all windows in the
-  session
-  ([`7cda2ed`](https://github.com/bec-project/bec_widgets/commit/7cda2ed846d3c27799f4f15f6c5c667631b1ca55))
-
-
-## v2.28.0 (2025-07-21)
-
-### Features
-
-- Disable editing while scan active
-  ([`1397655`](https://github.com/bec-project/bec_widgets/commit/13976557fbdb71a1161029521d81a655d25dd134))
-
-- Remove and readd device for config changes
-  ([`8489ef4`](https://github.com/bec-project/bec_widgets/commit/8489ef4a69d69b39648b1a9270012f14f95c6121))
-
-- Save and load config from devicebrowser
-  ([`7f0098f`](https://github.com/bec-project/bec_widgets/commit/7f0098f1533d419cc75801c4d6cbea485c7bbf94))
-
-
-## v2.27.1 (2025-07-17)
-
-### Bug Fixes
-
-- **image_roi_tree**: Rois signals are disconnected when roi tree widget is closed
-  ([`00e3713`](https://github.com/bec-project/bec_widgets/commit/00e3713181916a432e4e9dec8a0d80205914cf77))
-
-
 ## v2.27.0 (2025-07-17)
 
 ### Features

bec_widgets/applications/launch_window.py

@@ -31,7 +31,7 @@ from bec_widgets.utils.toolbars.toolbar import ModularToolBar
 from bec_widgets.utils.ui_loader import UILoader
 from bec_widgets.widgets.containers.auto_update.auto_updates import AutoUpdates
 from bec_widgets.widgets.containers.dock.dock_area import BECDockArea
-from bec_widgets.widgets.containers.main_window.main_window import BECMainWindow, BECMainWindowNoRPC
+from bec_widgets.widgets.containers.main_window.main_window import BECMainWindow, UILaunchWindow
 from bec_widgets.widgets.utility.visual.dark_mode_button.dark_mode_button import DarkModeButton
 
 if TYPE_CHECKING:  # pragma: no cover
@@ -395,24 +395,20 @@ class LaunchWindow(BECMainWindow):
             if isinstance(result_widget, BECMainWindow):
                 result_widget.show()
             else:
-                window = BECMainWindowNoRPC()
+                window = BECMainWindow()
                 window.setCentralWidget(result_widget)
                 window.setWindowTitle(f"BEC - {result_widget.objectName()}")
                 window.show()
             return result_widget
 
     def _launch_custom_ui_file(self, ui_file: str | None) -> BECMainWindow:
-        """
-        Load a custom .ui file. If the top-level widget is a MainWindow subclass,
-        instantiate it directly; otherwise, embed it in a UILaunchWindow.
-        """
+        # Load the custom UI file
         if ui_file is None:
             raise ValueError("UI file must be provided for custom UI file launch.")
         filename = os.path.basename(ui_file).split(".")[0]
 
         WidgetContainerUtils.raise_for_invalid_name(filename)
 
-        # Parse the UI to detect top-level widget class
         tree = ET.parse(ui_file)
         root = tree.getroot()
         # Check if the top-level widget is a QMainWindow
@@ -420,22 +416,19 @@ class LaunchWindow(BECMainWindow):
         if widget is None:
             raise ValueError("No widget found in the UI file.")
 
-        # Load the UI into a widget
-        loader = UILoader(None)
-        loaded = loader.loader(ui_file)
-
-        # Display the UI in a BECMainWindow
-        if isinstance(loaded, BECMainWindow):
-            window = loaded
-            window.object_name = filename
-        else:
-            window = BECMainWindow(object_name=filename)
-            window.setCentralWidget(loaded)
+        if widget.attrib.get("class") == "QMainWindow":
+            raise ValueError(
+                "Loading a QMainWindow from a UI file is currently not supported. "
+                "If you need this, please contact the BEC team or create a ticket on gitlab.psi.ch/bec/bec_widgets."
+            )
 
+        window = UILaunchWindow(object_name=filename)
         QApplication.processEvents()
-        window.setWindowTitle(f"BEC - {filename}")
+        result_widget = UILoader(window).loader(ui_file)
+        window.setCentralWidget(result_widget)
+        window.setWindowTitle(f"BEC - {window.object_name}")
         window.show()
-        logger.info(f"Launched custom UI: {filename}, type: {type(window).__name__}")
+        logger.info(f"Object name of new instance: {result_widget.objectName()}, {window.gui_id}")
         return window
 
     def _launch_auto_update(self, auto_update: str) -> AutoUpdates:
@@ -458,7 +451,7 @@ class LaunchWindow(BECMainWindow):
 
         WidgetContainerUtils.raise_for_invalid_name(name)
 
-        window = BECMainWindowNoRPC()
+        window = BECMainWindow()
 
         widget_instance = widget(root_widget=True, object_name=name)
         assert isinstance(widget_instance, QWidget)

bec_widgets/cli/client.py

@@ -29,7 +29,6 @@ class _WidgetsEnumType(str, enum.Enum):
 _Widgets = {
     "AbortButton": "AbortButton",
     "BECDockArea": "BECDockArea",
-    "BECMainWindow": "BECMainWindow",
     "BECProgressBar": "BECProgressBar",
     "BECQueue": "BECQueue",
     "BECStatusBox": "BECStatusBox",
@@ -49,13 +48,11 @@ _Widgets = {
     "PositionerBox": "PositionerBox",
     "PositionerBox2D": "PositionerBox2D",
     "PositionerControlLine": "PositionerControlLine",
-    "PositionerGroup": "PositionerGroup",
     "ResetButton": "ResetButton",
     "ResumeButton": "ResumeButton",
     "RingProgressBar": "RingProgressBar",
     "SBBMonitor": "SBBMonitor",
     "ScanControl": "ScanControl",
-    "ScanProgressBar": "ScanProgressBar",
     "ScatterWaveform": "ScatterWaveform",
     "SignalComboBox": "SignalComboBox",
     "SignalLabel": "SignalLabel",
@@ -428,14 +425,6 @@ class BECDockArea(RPCBase):
         """
 
 
-class BECMainWindow(RPCBase):
-    @rpc_call
-    def remove(self):
-        """
-        Cleanup the BECConnector
-        """
-
-
 class BECProgressBar(RPCBase):
     """A custom progress bar with smooth transitions. The displayed text can be customized using a template."""
 
@@ -4389,62 +4378,6 @@ class SignalLabel(RPCBase):
         Show the button to select the signal to display
         """
 
-    @property
-    @rpc_call
-    def show_hinted_signals(self) -> "bool":
-        """
-        In the signal selection menu, show hinted signals
-        """
-
-    @show_hinted_signals.setter
-    @rpc_call
-    def show_hinted_signals(self) -> "bool":
-        """
-        In the signal selection menu, show hinted signals
-        """
-
-    @property
-    @rpc_call
-    def show_normal_signals(self) -> "bool":
-        """
-        In the signal selection menu, show normal signals
-        """
-
-    @show_normal_signals.setter
-    @rpc_call
-    def show_normal_signals(self) -> "bool":
-        """
-        In the signal selection menu, show normal signals
-        """
-
-    @property
-    @rpc_call
-    def show_config_signals(self) -> "bool":
-        """
-        In the signal selection menu, show config signals
-        """
-
-    @show_config_signals.setter
-    @rpc_call
-    def show_config_signals(self) -> "bool":
-        """
-        In the signal selection menu, show config signals
-        """
-
-    @property
-    @rpc_call
-    def display_array_data(self) -> "bool":
-        """
-        Displays the full data from array signals if set to True.
-        """
-
-    @display_array_data.setter
-    @rpc_call
-    def display_array_data(self) -> "bool":
-        """
-        Displays the full data from array signals if set to True.
-        """
-
 
 class SignalLineEdit(RPCBase):
     """Line edit widget for device input with autocomplete for device names."""
@@ -4520,6 +4453,14 @@ class TextBox(RPCBase):
         """
 
 
+class UILaunchWindow(RPCBase):
+    @rpc_call
+    def remove(self):
+        """
+        Cleanup the BECConnector
+        """
+
+
 class VSCodeEditor(RPCBase):
     """A widget to display the VSCode editor."""
 

bec_widgets/cli/client_utils.py

@@ -51,7 +51,7 @@ def _filter_output(output: str) -> str:
 
 
 def _get_output(process, logger) -> None:
-    log_func = {process.stdout: logger.debug, process.stderr: logger.info}
+    log_func = {process.stdout: logger.debug, process.stderr: logger.error}
     stream_buffer = {process.stdout: [], process.stderr: []}
     try:
         os.set_blocking(process.stdout.fileno(), False)

bec_widgets/cli/rpc/rpc_base.py

@@ -7,7 +7,6 @@ from functools import wraps
 from typing import TYPE_CHECKING, Any, cast
 
 from bec_lib.client import BECClient
-from bec_lib.device import DeviceBaseWithConfig
 from bec_lib.endpoints import MessageEndpoints
 from bec_lib.utils.import_utils import lazy_import, lazy_import_from
 
@@ -25,20 +24,6 @@ else:
 # pylint: disable=protected-access
 
 
-def _name_arg(arg):
-    if isinstance(arg, DeviceBaseWithConfig):
-        # if dev.<device> is passed to GUI, it passes full_name
-        if hasattr(arg, "full_name"):
-            return arg.full_name
-    elif hasattr(arg, "name"):
-        return arg.name
-    return arg
-
-
-def _transform_args_kwargs(args, kwargs) -> tuple[tuple, dict]:
-    return tuple(_name_arg(arg) for arg in args), {k: _name_arg(v) for k, v in kwargs.items()}
-
-
 def rpc_call(func):
     """
     A decorator for calling a function on the server.
@@ -62,7 +47,15 @@ def rpc_call(func):
                 return None  # func(*args, **kwargs)
             caller_frame = caller_frame.f_back
 
-        args, kwargs = _transform_args_kwargs(args, kwargs)
+        out = []
+        for arg in args:
+            if hasattr(arg, "name"):
+                arg = arg.name
+            out.append(arg)
+        args = tuple(out)
+        for key, val in kwargs.items():
+            if hasattr(val, "name"):
+                kwargs[key] = val.name
         if not self._root._gui_is_alive():
             raise RuntimeError("GUI is not alive")
         return self._run_rpc(func.__name__, *args, **kwargs)

bec_widgets/examples/script_interface.py

@@ -0,0 +1,194 @@
+import sys
+import uuid
+
+import pyqtgraph as pg
+from bec_lib.endpoints import MessageEndpoints
+from bec_lib.logger import bec_logger
+from qtpy.QtCore import Qt
+from qtpy.QtWidgets import QApplication, QFileDialog, QFrame, QSplitter, QVBoxLayout, QWidget
+
+from bec_widgets.utils.bec_widget import BECWidget
+from bec_widgets.utils.error_popups import SafeSlot
+from bec_widgets.utils.toolbars.actions import MaterialIconAction
+from bec_widgets.utils.toolbars.bundles import ToolbarBundle
+from bec_widgets.utils.toolbars.toolbar import ModularToolBar
+from bec_widgets.widgets.editors.monaco.monaco_widget import MonacoWidget
+from bec_widgets.widgets.editors.web_console.web_console import WebConsole
+
+logger = bec_logger.logger
+
+
+class ScriptInterface(BECWidget, QWidget):
+    """
+    A simple script interface widget that allows interaction with Monaco editor and Web Console.
+    """
+
+    PLUGIN = True
+    ICON_NAME = "terminal"
+
+    def __init__(self, parent=None, config=None, client=None, gui_id=None, **kwargs):
+        super().__init__(
+            parent=parent, client=client, gui_id=gui_id, config=config, theme_update=True, **kwargs
+        )
+        self.current_script_id = ""
+        layout = QVBoxLayout()
+        layout.setContentsMargins(0, 0, 0, 0)
+        self.toolbar = ModularToolBar(parent=self, orientation="horizontal")
+
+        self.splitter = QSplitter(self)
+        self.splitter.setObjectName("splitter")
+        self.splitter.setFrameShape(QFrame.Shape.NoFrame)
+        self.splitter.setOrientation(Qt.Orientation.Vertical)
+        self.splitter.setChildrenCollapsible(True)
+
+        self.monaco_editor = MonacoWidget(self)
+        self.splitter.addWidget(self.monaco_editor)
+        self.web_console = WebConsole(self)
+        self.splitter.addWidget(self.web_console)
+        layout.addWidget(self.toolbar)
+
+        layout.addWidget(self.splitter)
+
+        self.setLayout(layout)
+
+        self.toolbar.components.add_safe(
+            "new_script", MaterialIconAction("add", "New Script", parent=self)
+        )
+        self.toolbar.components.add_safe(
+            "open", MaterialIconAction("folder_open", "Open Script", parent=self)
+        )
+        self.toolbar.components.add_safe(
+            "save", MaterialIconAction("save", "Save Script", parent=self)
+        )
+        self.toolbar.components.add_safe(
+            "run", MaterialIconAction("play_arrow", "Run Script", parent=self)
+        )
+        self.toolbar.components.add_safe(
+            "stop", MaterialIconAction("stop", "Stop Script", parent=self)
+        )
+
+        bundle = ToolbarBundle("file_io", self.toolbar.components)
+        bundle.add_action("new_script")
+        bundle.add_action("open")
+        bundle.add_action("save")
+        self.toolbar.add_bundle(bundle)
+
+        bundle = ToolbarBundle("script_execution", self.toolbar.components)
+        bundle.add_action("run")
+        bundle.add_action("stop")
+        self.toolbar.add_bundle(bundle)
+
+        self.toolbar.components.get_action("open").action.triggered.connect(self.open_file_dialog)
+        self.toolbar.components.get_action("run").action.triggered.connect(self.run_script)
+        self.toolbar.components.get_action("stop").action.triggered.connect(
+            self.web_console.send_ctrl_c
+        )
+
+        self.set_save_button_enabled(False)
+
+        self.toolbar.show_bundles(["file_io", "script_execution"])
+        self.web_console.set_readonly(True)
+        self._init_file_content = ""
+
+        self._text_changed_proxy = pg.SignalProxy(
+            self.monaco_editor.text_changed, rateLimit=1, slot=self._on_text_changed
+        )
+
+    @SafeSlot(str)
+    def _on_text_changed(self, text: str):
+        """
+        Handle text changes in the Monaco editor.
+        """
+        text = text[0]
+        if text != self._init_file_content:
+            self.set_save_button_enabled(True)
+        else:
+            self.set_save_button_enabled(False)
+
+    @property
+    def current_script_id(self):
+        return self._current_script_id
+
+    @current_script_id.setter
+    def current_script_id(self, value):
+        if not isinstance(value, str):
+            raise ValueError("Script ID must be a string.")
+        self._current_script_id = value
+        self._update_subscription()
+
+    def _update_subscription(self):
+        if self.current_script_id:
+            self.bec_dispatcher.connect_slot(
+                self.on_script_execution_info,
+                MessageEndpoints.script_execution_info(self.current_script_id),
+            )
+        else:
+            self.bec_dispatcher.disconnect_slot(
+                self.on_script_execution_info,
+                MessageEndpoints.script_execution_info(self.current_script_id),
+            )
+
+    @SafeSlot(dict, dict)
+    def on_script_execution_info(self, content: dict, metadata: dict):
+        print(f"Script execution info: {content}")
+        current_lines = content.get("current_lines")
+        if not current_lines:
+            self.monaco_editor.clear_highlighted_lines()
+            return
+        line_number = current_lines[0]
+        self.monaco_editor.clear_highlighted_lines()
+        self.monaco_editor.set_highlighted_lines(line_number, line_number)
+
+    def open_file_dialog(self):
+        """
+        Open a file dialog to select a script file.
+        """
+        start_dir = "./"
+        dialog = QFileDialog(self)
+        dialog.setDirectory(start_dir)
+        dialog.setNameFilter("Python Files (*.py);;All Files (*)")
+        dialog.setFileMode(QFileDialog.FileMode.ExistingFile)
+
+        if dialog.exec():
+            selected_files = dialog.selectedFiles()
+            if not selected_files:
+                return
+            file_path = selected_files[0]
+            with open(file_path, "r", encoding="utf-8") as file:
+                content = file.read()
+                self.monaco_editor.set_text(content)
+                self._init_file_content = content
+
+            logger.info(f"Selected files: {selected_files}")
+
+    def set_save_button_enabled(self, enabled: bool):
+        """
+        Set the save button enabled state.
+        """
+        action = self.toolbar.components.get_action("save")
+        if action:
+            action.action.setEnabled(enabled)
+
+    def run_script(self):
+        print("Running script...")
+        script_id = str(uuid.uuid4())
+        self.current_script_id = script_id
+        script_text = self.monaco_editor.get_text()
+
+        script_text = f'bec._run_script("{script_id}", """{script_text}""")'
+        script_text = script_text.replace("\n", "\\n").replace("'", "\\'").strip()
+        if not script_text.endswith("\n"):
+            script_text += "\\n"
+        self.web_console.write(script_text)
+
+
+if __name__ == "__main__":
+    import sys
+
+    from qtpy.QtWidgets import QApplication
+
+    app = QApplication(sys.argv)
+    script_interface = ScriptInterface()
+    script_interface.resize(800, 600)
+    script_interface.show()
+    sys.exit(app.exec_())

bec_widgets/utils/entry_validator.py

@@ -28,10 +28,6 @@ class EntryValidator:
         if not available_entries:
             available_entries = [name]
 
-        # edge case for if name is passed instead of full_name, should not happen
-        if entry in signals_dict:
-            entry = signals_dict[entry].get("obj_name", entry)
-
         if entry is None or entry == "":
             entry = next(iter(device._hints), name) if hasattr(device, "_hints") else name
         if entry not in available_entries:

bec_widgets/utils/generate_designer_plugin.py

@@ -7,7 +7,7 @@ from qtpy.QtCore import QObject
 
 from bec_widgets.utils.name_utils import pascal_to_snake
 
-EXCLUDED_PLUGINS = ["BECConnector", "BECDock"]
+EXCLUDED_PLUGINS = ["BECConnector", "BECDockArea", "BECDock", "BECFigure"]
 _PARENT_ARG_REGEX = r".__init__\(\s*(?:parent\)|parent=parent,?|parent,?)"
 _SELF_PARENT_ARG_REGEX = r".__init__\(\s*self,\s*(?:parent\)|parent=parent,?|parent,?)"
 SUPER_INIT_REGEX = re.compile(r"super\(\)" + _PARENT_ARG_REGEX, re.MULTILINE)

bec_widgets/utils/plugin_templates/plugin.template

@@ -2,7 +2,6 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 {widget_import}
@@ -21,8 +20,6 @@ class {plugin_name_pascal}Plugin(QDesignerCustomWidgetInterface):  # pragma: no
         self._form_editor = None
 
     def createWidget(self, parent):
-        if parent is None:
-           return QWidget()
         t = {plugin_name_pascal}(parent)
         return t
 

bec_widgets/utils/plugin_utils.py

@@ -201,7 +201,7 @@ def get_custom_classes(repo_name: str) -> BECClassContainer:
                     class_info = BECClassInfo(name=name, module=module.__name__, file=path, obj=obj)
                     if issubclass(obj, BECConnector):
                         class_info.is_connector = True
-                    if issubclass(obj, QWidget) or issubclass(obj, BECWidget):
+                    if issubclass(obj, BECWidget):
                         class_info.is_widget = True
                     if len(subs) == 1 and (
                         issubclass(obj, QWidget) or issubclass(obj, QGraphicsWidget)

bec_widgets/widgets/containers/auto_update/auto_updates.py

@@ -27,7 +27,6 @@ class AutoUpdates(BECMainWindow):
     _default_dock: BECDock
     USER_ACCESS = ["enabled", "enabled.setter", "selected_device", "selected_device.setter"]
     RPC = True
-    PLUGIN = False
 
     # enforce that subclasses have the same rpc widget class
     rpc_widget_class = "AutoUpdates"

bec_widgets/widgets/containers/dock/bec_dock_area.pyproject

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

bec_widgets/widgets/containers/dock/dock_area.pyproject

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

bec_widgets/widgets/containers/dock/dock_area_plugin.py

@@ -1,19 +1,22 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtWidgets import QWidget
 
+import bec_widgets
 from bec_widgets.utils.bec_designer import designer_material_icon
-from bec_widgets.widgets.containers.dock.dock_area import BECDockArea
+from bec_widgets.widgets.containers.dock import BECDockArea
 
 DOM_XML = """
 <ui language='c++'>
-    <widget class='BECDockArea' name='bec_dock_area'>
+    <widget class='BECDockArea' name='dock_area'>
     </widget>
 </ui>
 """
 
+MODULE_PATH = os.path.dirname(bec_widgets.__file__)
+
 
 class BECDockAreaPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
     def __init__(self):
@@ -21,8 +24,6 @@ class BECDockAreaPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
-        if parent is None:
-            return QWidget()
         t = BECDockArea(parent)
         return t
 
@@ -30,13 +31,13 @@ class BECDockAreaPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return DOM_XML
 
     def group(self):
-        return "BEC Containers"
+        return "BEC Plots"
 
     def icon(self):
         return designer_material_icon(BECDockArea.ICON_NAME)
 
     def includeFile(self):
-        return "bec_dock_area"
+        return "dock_area"
 
     def initialize(self, form_editor):
         self._form_editor = form_editor
@@ -51,7 +52,7 @@ class BECDockAreaPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "BECDockArea"
 
     def toolTip(self):
-        return ""
+        return "BECDockArea"
 
     def whatsThis(self):
         return self.toolTip()

bec_widgets/widgets/containers/dock/register_dock_area.py

@@ -6,7 +6,7 @@ def main():  # pragma: no cover
         return
     from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection
 
-    from bec_widgets.widgets.containers.dock.bec_dock_area_plugin import BECDockAreaPlugin
+    from bec_widgets.widgets.containers.dock.dock_area_plugin import BECDockAreaPlugin
 
     QPyDesignerCustomWidgetCollection.addCustomWidget(BECDockAreaPlugin())
 

bec_widgets/widgets/containers/main_window/bec_main_window.pyproject

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

bec_widgets/widgets/containers/main_window/bec_main_window_plugin.py

@@ -1,73 +0,0 @@
-# Copyright (C) 2022 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
-from qtpy.QtCore import QSize
-from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtGui import QIcon
-from qtpy.QtWidgets import QWidget
-
-from bec_widgets.utils.bec_designer import designer_material_icon
-from bec_widgets.widgets.containers.main_window.main_window import BECMainWindow
-
-DOM_XML = """
-<ui language='c++'>
-    <widget class='BECMainWindow' name='bec_main_window'>
-    </widget>
-</ui>
-"""
-
-
-class BECMainWindowPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
-    def __init__(self):
-        super().__init__()
-        self._form_editor = None
-
-    def createWidget(self, parent):
-        # We want to initialize BECMainWindow upon starting designer
-        t = BECMainWindow(parent)
-        return t
-
-    def domXml(self):
-        return DOM_XML
-
-    def group(self):
-        return "BEC Containers"
-
-    def icon(self):
-        return designer_material_icon(BECMainWindow.ICON_NAME)
-
-    def includeFile(self):
-        return "bec_main_window"
-
-    def initialize(self, form_editor):
-        import os
-
-        from qtpy.QtCore import Qt
-        from qtpy.QtWidgets import QApplication
-
-        import bec_widgets
-
-        MODULE_PATH = os.path.dirname(bec_widgets.__file__)
-        QApplication.setAttribute(Qt.AA_DontUseNativeMenuBar, True)
-        app = QApplication.instance()
-        icon = QIcon()
-        icon.addFile(
-            os.path.join(MODULE_PATH, "assets", "app_icons", "BEC-General-App.png"),
-            size=QSize(48, 48),
-        )
-        app.setWindowIcon(icon)
-        self._form_editor = form_editor
-
-    def isContainer(self):
-        return True
-
-    def isInitialized(self):
-        return self._form_editor is not None
-
-    def name(self):
-        return "BECMainWindow"
-
-    def toolTip(self):
-        return "BECMainWindow"
-
-    def whatsThis(self):
-        return self.toolTip()

bec_widgets/widgets/containers/main_window/main_window.py

@@ -19,28 +19,20 @@ from qtpy.QtWidgets import (
 import bec_widgets
 from bec_widgets.utils import UILoader
 from bec_widgets.utils.bec_widget import BECWidget
-from bec_widgets.utils.colors import apply_theme, set_theme
+from bec_widgets.utils.colors import apply_theme
 from bec_widgets.utils.error_popups import SafeSlot
 from bec_widgets.utils.widget_io import WidgetHierarchy
 from bec_widgets.widgets.containers.main_window.addons.hover_widget import HoverWidget
-from bec_widgets.widgets.containers.main_window.addons.notification_center.notification_banner import (
-    BECNotificationBroker,
-    NotificationCentre,
-    NotificationIndicator,
-)
 from bec_widgets.widgets.containers.main_window.addons.scroll_label import ScrollLabel
 from bec_widgets.widgets.containers.main_window.addons.web_links import BECWebLinksMixin
 from bec_widgets.widgets.progress.scan_progressbar.scan_progressbar import ScanProgressBar
 
 MODULE_PATH = os.path.dirname(bec_widgets.__file__)
 
-# Ensure the application does not use the native menu bar on macOS to be consistent with linux development.
-QApplication.setAttribute(Qt.AA_DontUseNativeMenuBar, True)
-
 
 class BECMainWindow(BECWidget, QMainWindow):
-    RPC = True
-    PLUGIN = True
+    RPC = False
+    PLUGIN = False
     SCAN_PROGRESS_WIDTH = 100  # px
     STATUS_BAR_WIDGETS_EXPIRE_TIME = 60_000  # milliseconds
 
@@ -58,14 +50,6 @@ class BECMainWindow(BECWidget, QMainWindow):
         self.app = QApplication.instance()
         self.status_bar = self.statusBar()
         self.setWindowTitle(window_title)
-
-        # Notification Centre overlay
-        self.notification_centre = NotificationCentre(parent=self)  # Notification layer
-        self.notification_broker = BECNotificationBroker()
-        self._nc_margin = 16
-        self._position_notification_centre()
-
-        # Init ui
         self._init_ui()
         self._connect_to_theme_change()
 
@@ -74,34 +58,6 @@ class BECMainWindow(BECWidget, QMainWindow):
             self.display_client_message, MessageEndpoints.client_info()
         )
 
-    def setCentralWidget(self, widget: QWidget, qt_default: bool = False):  # type: ignore[override]
-        """
-        Re‑implement QMainWindow.setCentralWidget so that the *main content*
-        widget always lives on the lower layer of the stacked layout that
-        hosts our notification overlays.
-
-        Args:
-            widget: The widget that should become the new central content.
-            qt_default: When *True* the call is forwarded to the base class so
-                that Qt behaves exactly as the original implementation (used
-                during __init__ when we first install ``self._full_content``).
-        """
-        super().setCentralWidget(widget)
-        self.notification_centre.raise_()
-        self.statusBar().raise_()
-
-    def resizeEvent(self, event):
-        super().resizeEvent(event)
-        self._position_notification_centre()
-
-    def _position_notification_centre(self):
-        """Keep the notification panel at a fixed margin top-right."""
-        if not hasattr(self, "notification_centre"):
-            return
-        margin = getattr(self, "_nc_margin", 16)  # px
-        nc = self.notification_centre
-        nc.move(self.width() - nc.width() - margin, margin)
-
     ################################################################################
     # MainWindow Elements Initialization
     ################################################################################
@@ -138,26 +94,6 @@ class BECMainWindow(BECWidget, QMainWindow):
         # Add scan_progress bar with display logic
         self._add_scan_progress_bar()
 
-        # Setup NotificationIndicator to bottom right of the status bar
-        self._add_notification_indicator()
-
-    ################################################################################
-    # Notification indicator and Notification Centre helpers
-
-    def _add_notification_indicator(self):
-        """
-        Add the notification indicator to the status bar and hook the signals.
-        """
-        # Add the notification indicator to the status bar
-        self.notification_indicator = NotificationIndicator(self)
-        self.status_bar.addPermanentWidget(self.notification_indicator)
-
-        # Connect the notification broker to the indicator
-        self.notification_centre.counts_updated.connect(self.notification_indicator.update_counts)
-        self.notification_indicator.filter_changed.connect(self.notification_centre.apply_filter)
-        self.notification_indicator.show_all_requested.connect(self.notification_centre.show_all)
-        self.notification_indicator.hide_all_requested.connect(self.notification_centre.hide_all)
-
     ################################################################################
     # Client message status bar widget helpers
 
@@ -443,12 +379,12 @@ class BECMainWindow(BECWidget, QMainWindow):
     @SafeSlot(str)
     def change_theme(self, theme: str):
         """
-        Change the theme of the application and propagate it to widgets.
+        Change the theme of the application.
 
         Args:
-            theme(str): Either "light" or "dark".
+            theme(str): The theme to apply, either "light" or "dark".
         """
-        set_theme(theme)  # emits theme_updated and applies palette globally
+        apply_theme(theme)
 
     def event(self, event):
         if event.type() == QEvent.Type.StatusTip:
@@ -494,16 +430,15 @@ class BECMainWindow(BECWidget, QMainWindow):
         super().cleanup()
 
 
-class BECMainWindowNoRPC(BECMainWindow):
-    RPC = False
-    PLUGIN = False
+class UILaunchWindow(BECMainWindow):
+    RPC = True
 
 
 if __name__ == "__main__":
     import sys
 
     app = QApplication(sys.argv)
-    main_window = BECMainWindow()
+    main_window = UILaunchWindow()
     main_window.show()
     main_window.resize(800, 600)
     sys.exit(app.exec())

bec_widgets/widgets/containers/main_window/register_bec_main_window.py

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

bec_widgets/widgets/control/buttons/button_abort/abort_button_plugin.py

@@ -2,7 +2,6 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.control.buttons.button_abort.button_abort import AbortButton
@@ -21,8 +20,6 @@ class AbortButtonPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
-        if parent is None:
-            return QWidget()
         t = AbortButton(parent)
         return t
 

bec_widgets/widgets/control/buttons/button_reset/reset_button_plugin.py

@@ -2,7 +2,6 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.control.buttons.button_reset.button_reset import ResetButton
@@ -21,8 +20,6 @@ class ResetButtonPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
-        if parent is None:
-            return QWidget()
         t = ResetButton(parent)
         return t
 
@@ -51,7 +48,7 @@ class ResetButtonPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "ResetButton"
 
     def toolTip(self):
-        return "A button that resets the scan queue."
+        return "A button that reset the scan queue."
 
     def whatsThis(self):
         return self.toolTip()

bec_widgets/widgets/control/buttons/button_resume/resume_button_plugin.py

@@ -2,7 +2,6 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.control.buttons.button_resume.button_resume import ResumeButton
@@ -21,8 +20,6 @@ class ResumeButtonPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
-        if parent is None:
-            return QWidget()
         t = ResumeButton(parent)
         return t
 

bec_widgets/widgets/control/buttons/stop_button/stop_button_plugin.py

@@ -1,9 +1,10 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtWidgets import QWidget
 
+import bec_widgets
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.control.buttons.stop_button.stop_button import StopButton
 
@@ -14,6 +15,8 @@ DOM_XML = """
 </ui>
 """
 
+MODULE_PATH = os.path.dirname(bec_widgets.__file__)
+
 
 class StopButtonPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
     def __init__(self):
@@ -21,8 +24,6 @@ class StopButtonPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
-        if parent is None:
-            return QWidget()
         t = StopButton(parent)
         return t
 

bec_widgets/widgets/control/device_control/position_indicator/position_indicator_plugin.py

@@ -1,9 +1,10 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtWidgets import QWidget
 
+import bec_widgets
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.control.device_control.position_indicator.position_indicator import (
     PositionIndicator,
@@ -16,6 +17,8 @@ DOM_XML = """
 </ui>
 """
 
+MODULE_PATH = os.path.dirname(bec_widgets.__file__)
+
 
 class PositionIndicatorPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
     def __init__(self):
@@ -23,8 +26,6 @@ class PositionIndicatorPlugin(QDesignerCustomWidgetInterface):  # pragma: no cov
         self._form_editor = None
 
     def createWidget(self, parent):
-        if parent is None:
-            return QWidget()
         t = PositionIndicator(parent)
         return t
 
@@ -53,7 +54,7 @@ class PositionIndicatorPlugin(QDesignerCustomWidgetInterface):  # pragma: no cov
         return "PositionIndicator"
 
     def toolTip(self):
-        return ""
+        return "PositionIndicator"
 
     def whatsThis(self):
         return self.toolTip()

bec_widgets/widgets/control/device_control/positioner_box/_base/positioner_box_base.py

@@ -138,11 +138,7 @@ class PositionerBoxBase(BECWidget, CompactPopupWidget):
         signals = msg_content.get("signals", {})
         # pylint: disable=protected-access
         hinted_signals = self.dev[device]._hints
-        precision = getattr(self.dev[device], "precision", 8)
-        try:
-            precision = int(precision)
-        except (TypeError, ValueError):
-            precision = int(8)
+        precision = self.dev[device].precision
 
         spinner = ui_components["spinner"]
         position_indicator = ui_components["position_indicator"]
@@ -182,13 +178,11 @@ class PositionerBoxBase(BECWidget, CompactPopupWidget):
             spinner.setVisible(False)
 
         if readback_val is not None:
-            text = f"{readback_val:.{precision}f}"
-            readback.setText(text)
+            readback.setText(f"{readback_val:.{precision}f}")
             position_emit(readback_val)
 
         if setpoint_val is not None:
-            text = f"{setpoint_val:.{precision}f}"
-            setpoint.setText(text)
+            setpoint.setText(f"{setpoint_val:.{precision}f}")
 
         limits = self.dev[device].limits
         limit_update(limits)
@@ -211,13 +205,10 @@ class PositionerBoxBase(BECWidget, CompactPopupWidget):
         ui["readback"].setToolTip(f"{device} readback")
         ui["setpoint"].setToolTip(f"{device} setpoint")
         ui["step_size"].setToolTip(f"Step size for {device}")
-        precision = getattr(self.dev[device], "precision", 8)
-        try:
-            precision = int(precision)
-        except (TypeError, ValueError):
-            precision = int(8)
-        ui["step_size"].setDecimals(precision)
-        ui["step_size"].setValue(10**-precision * 10)
+        precision = self.dev[device].precision
+        if precision is not None:
+            ui["step_size"].setDecimals(precision)
+            ui["step_size"].setValue(10**-precision * 10)
 
     def _swap_readback_signal_connection(self, slot, old_device, new_device):
         self.bec_dispatcher.disconnect_slot(slot, MessageEndpoints.device_readback(old_device))

bec_widgets/widgets/control/device_control/positioner_box/positioner_box/positioner_box_plugin.py

@@ -1,13 +1,12 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
+import os
+
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
-from bec_widgets.widgets.control.device_control.positioner_box.positioner_box.positioner_box import (
-    PositionerBox,
-)
+from bec_widgets.widgets.control.device_control.positioner_box import PositionerBox
 
 DOM_XML = """
 <ui language='c++'>
@@ -15,6 +14,7 @@ DOM_XML = """
     </widget>
 </ui>
 """
+MODULE_PATH = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
 
 
 class PositionerBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
@@ -23,8 +23,6 @@ class PositionerBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
-        if parent is None:
-            return QWidget()
         t = PositionerBox(parent)
         return t
 
@@ -32,7 +30,7 @@ class PositionerBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return DOM_XML
 
     def group(self):
-        return "BEC Device Control"
+        return "Device Control"
 
     def icon(self):
         return designer_material_icon(PositionerBox.ICON_NAME)

bec_widgets/widgets/control/device_control/positioner_box/positioner_box_2d/positioner_box2_d_plugin.py

@@ -2,7 +2,6 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.control.device_control.positioner_box.positioner_box_2d.positioner_box_2d import (
@@ -23,8 +22,6 @@ class PositionerBox2DPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
-        if parent is None:
-            return QWidget()
         t = PositionerBox2D(parent)
         return t
 
@@ -32,7 +29,7 @@ class PositionerBox2DPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return DOM_XML
 
     def group(self):
-        return "BEC Device Control"
+        return "Device Control"
 
     def icon(self):
         return designer_material_icon(PositionerBox2D.ICON_NAME)

bec_widgets/widgets/control/device_control/positioner_box/positioner_control_line/positioner_control_line_plugin.py

@@ -1,13 +1,12 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
+import os
+
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
-from bec_widgets.widgets.control.device_control.positioner_box.positioner_control_line.positioner_control_line import (
-    PositionerControlLine,
-)
+from bec_widgets.widgets.control.device_control.positioner_box import PositionerControlLine
 
 DOM_XML = """
 <ui language='c++'>
@@ -15,6 +14,7 @@ DOM_XML = """
     </widget>
 </ui>
 """
+MODULE_PATH = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
 
 
 class PositionerControlLinePlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
@@ -23,8 +23,6 @@ class PositionerControlLinePlugin(QDesignerCustomWidgetInterface):  # pragma: no
         self._form_editor = None
 
     def createWidget(self, parent):
-        if parent is None:
-            return QWidget()
         t = PositionerControlLine(parent)
         return t
 
@@ -32,7 +30,7 @@ class PositionerControlLinePlugin(QDesignerCustomWidgetInterface):  # pragma: no
         return DOM_XML
 
     def group(self):
-        return "BEC Device Control"
+        return "Device Control"
 
     def icon(self):
         return designer_material_icon(PositionerControlLine.ICON_NAME)
@@ -53,7 +51,7 @@ class PositionerControlLinePlugin(QDesignerCustomWidgetInterface):  # pragma: no
         return "PositionerControlLine"
 
     def toolTip(self):
-        return "A widget that controls a single device."
+        return "A widget that controls a single positioner in line form."
 
     def whatsThis(self):
         return self.toolTip()

bec_widgets/widgets/control/device_control/positioner_group/positioner_group.py

@@ -15,7 +15,7 @@ logger = bec_logger.logger
 
 
 class PositionerGroupBox(QGroupBox):
-
+    PLUGIN = True
     position_update = Signal(float)
 
     def __init__(self, parent, dev_name):
@@ -45,12 +45,7 @@ class PositionerGroupBox(QGroupBox):
 
     def _on_position_update(self, pos: float):
         self.position_update.emit(pos)
-        precision = getattr(self.widget.dev[self.widget.device], "precision", 8)
-        try:
-            precision = int(precision)
-        except (TypeError, ValueError):
-            precision = int(8)
-        self.widget.label = f"{pos:.{precision}f}"
+        self.widget.label = f"%.{self.widget.dev[self.widget.device].precision}f" % pos
 
     def close(self):
         self.widget.close()
@@ -60,7 +55,6 @@ class PositionerGroupBox(QGroupBox):
 class PositionerGroup(BECWidget, QWidget):
     """Simple Widget to control a positioner in box form"""
 
-    PLUGIN = True
     ICON_NAME = "grid_view"
     USER_ACCESS = ["set_positioners"]
 

bec_widgets/widgets/control/device_control/positioner_group/positioner_group.pyproject

@@ -1 +1 @@
-{'files': ['positioner_group.py']}
+{'files': ['positioner_group.py']}

bec_widgets/widgets/control/device_control/positioner_group/positioner_group_plugin.py

@@ -1,8 +1,9 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
+import os
+
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.control.device_control.positioner_group.positioner_group import (
@@ -15,6 +16,7 @@ DOM_XML = """
     </widget>
 </ui>
 """
+MODULE_PATH = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
 
 
 class PositionerGroupPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
@@ -23,8 +25,6 @@ class PositionerGroupPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
-        if parent is None:
-            return QWidget()
         t = PositionerGroup(parent)
         return t
 
@@ -32,7 +32,7 @@ class PositionerGroupPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return DOM_XML
 
     def group(self):
-        return "BEC Device Control"
+        return "Device Control"
 
     def icon(self):
         return designer_material_icon(PositionerGroup.ICON_NAME)
@@ -53,7 +53,7 @@ class PositionerGroupPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "PositionerGroup"
 
     def toolTip(self):
-        return "Simple Widget to control a positioner in box form"
+        return "Container Widget to control positioners in compact form, in a grid"
 
     def whatsThis(self):
         return self.toolTip()

bec_widgets/widgets/control/device_input/device_combobox/device_combo_box.pyproject

@@ -1 +1,3 @@
-{'files': ['device_combobox.py']}
+{
+    "files": ["device_combobox.py"]
+}

bec_widgets/widgets/control/device_input/device_combobox/device_combo_box_plugin.py

@@ -1,19 +1,22 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtWidgets import QWidget
 
+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
 
 DOM_XML = """
 <ui language='c++'>
-    <widget class='DeviceComboBox' name='device_combo_box'>
+    <widget class='DeviceComboBox' name='device_combobox'>
     </widget>
 </ui>
 """
 
+MODULE_PATH = os.path.dirname(bec_widgets.__file__)
+
 
 class DeviceComboBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
     def __init__(self):
@@ -21,8 +24,6 @@ class DeviceComboBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
-        if parent is None:
-            return QWidget()
         t = DeviceComboBox(parent)
         return t
 
@@ -36,7 +37,7 @@ class DeviceComboBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return designer_material_icon(DeviceComboBox.ICON_NAME)
 
     def includeFile(self):
-        return "device_combo_box"
+        return "device_combobox"
 
     def initialize(self, form_editor):
         self._form_editor = form_editor
@@ -51,7 +52,7 @@ class DeviceComboBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "DeviceComboBox"
 
     def toolTip(self):
-        return ""
+        return "Device ComboBox Example for BEC Widgets"
 
     def whatsThis(self):
         return self.toolTip()

bec_widgets/widgets/control/device_input/device_line_edit/device_line_edit.pyproject

@@ -1 +1,3 @@
-{'files': ['device_line_edit.py']}
+{
+    "files": ["device_line_edit.py"]
+}

bec_widgets/widgets/control/device_input/device_line_edit/device_line_edit_plugin.py

@@ -1,9 +1,10 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtWidgets import QWidget
 
+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,
@@ -16,6 +17,8 @@ DOM_XML = """
 </ui>
 """
 
+MODULE_PATH = os.path.dirname(bec_widgets.__file__)
+
 
 class DeviceLineEditPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
     def __init__(self):
@@ -23,8 +26,6 @@ class DeviceLineEditPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
-        if parent is None:
-            return QWidget()
         t = DeviceLineEdit(parent)
         return t
 
@@ -53,7 +54,7 @@ class DeviceLineEditPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "DeviceLineEdit"
 
     def toolTip(self):
-        return ""
+        return "Device LineEdit Example for BEC Widgets with autocomplete."
 
     def whatsThis(self):
         return self.toolTip()

bec_widgets/widgets/control/device_input/signal_combobox/signal_combo_box_plugin.py

@@ -2,7 +2,6 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.control.device_input.signal_combobox.signal_combobox import SignalComboBox
@@ -21,8 +20,6 @@ class SignalComboBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
-        if parent is None:
-            return QWidget()
         t = SignalComboBox(parent)
         return t
 
@@ -51,7 +48,7 @@ class SignalComboBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "SignalComboBox"
 
     def toolTip(self):
-        return ""
+        return "Signal ComboBox Example for BEC Widgets with autocomplete."
 
     def whatsThis(self):
         return self.toolTip()

bec_widgets/widgets/control/device_input/signal_line_edit/signal_line_edit_plugin.py

@@ -2,7 +2,6 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.control.device_input.signal_line_edit.signal_line_edit import (
@@ -23,8 +22,6 @@ class SignalLineEditPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
-        if parent is None:
-            return QWidget()
         t = SignalLineEdit(parent)
         return t
 
@@ -53,7 +50,7 @@ class SignalLineEditPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "SignalLineEdit"
 
     def toolTip(self):
-        return ""
+        return "Signal LineEdit Example for BEC Widgets with autocomplete."
 
     def whatsThis(self):
         return self.toolTip()

bec_widgets/widgets/control/scan_control/scan_control_plugin.py

@@ -2,7 +2,6 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.control.scan_control.scan_control import ScanControl
@@ -21,8 +20,6 @@ class ScanControlPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
-        if parent is None:
-            return QWidget()
         t = ScanControl(parent)
         return t
 
@@ -30,7 +27,7 @@ class ScanControlPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return DOM_XML
 
     def group(self):
-        return "BEC Device Control"
+        return "Device Control"
 
     def icon(self):
         return designer_material_icon(ScanControl.ICON_NAME)
@@ -51,7 +48,7 @@ class ScanControlPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "ScanControl"
 
     def toolTip(self):
-        return ""
+        return "ScanControl"
 
     def whatsThis(self):
         return self.toolTip()

bec_widgets/widgets/dap/dap_combo_box/dap_combo_box_plugin.py

@@ -2,7 +2,6 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.dap.dap_combo_box.dap_combo_box import DapComboBox
@@ -21,8 +20,6 @@ class DapComboBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
-        if parent is None:
-            return QWidget()
         t = DapComboBox(parent)
         return t
 

bec_widgets/widgets/dap/lmfit_dialog/lm_fit_dialog_plugin.py

@@ -2,7 +2,6 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.dap.lmfit_dialog.lmfit_dialog import LMFitDialog
@@ -21,8 +20,6 @@ class LMFitDialogPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
-        if parent is None:
-            return QWidget()
         t = LMFitDialog(parent)
         return t
 
@@ -51,7 +48,7 @@ class LMFitDialogPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "LMFitDialog"
 
     def toolTip(self):
-        return "Dialog for displaying the fit summary and params for LMFit DAP processes"
+        return "LMFitDialog"
 
     def whatsThis(self):
         return self.toolTip()

bec_widgets/widgets/editors/monaco/monaco_widget.py

@@ -1,6 +1,7 @@
 from typing import Literal
 
 import qtmonaco
+from qtpy.QtCore import Signal
 from qtpy.QtWidgets import QApplication, QVBoxLayout, QWidget
 
 from bec_widgets.utils.bec_widget import BECWidget
@@ -12,6 +13,7 @@ class MonacoWidget(BECWidget, QWidget):
     A simple Monaco editor widget
     """
 
+    text_changed = Signal(str)
     PLUGIN = True
     ICON_NAME = "code"
     USER_ACCESS = [
@@ -36,6 +38,7 @@ class MonacoWidget(BECWidget, QWidget):
         self.editor = qtmonaco.Monaco(self)
         layout.addWidget(self.editor)
         self.setLayout(layout)
+        self.editor.text_changed.connect(self.text_changed.emit)
         self.editor.initialized.connect(self.apply_theme)
 
     def apply_theme(self, theme: str | None = None) -> None:

bec_widgets/widgets/editors/monaco/monaco_widget_plugin.py

@@ -2,7 +2,6 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.editors.monaco.monaco_widget import MonacoWidget
@@ -21,8 +20,6 @@ class MonacoWidgetPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
-        if parent is None:
-            return QWidget()
         t = MonacoWidget(parent)
         return t
 

bec_widgets/widgets/editors/sbb_monitor/sbb_monitor_plugin.py

@@ -2,7 +2,6 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.editors.sbb_monitor.sbb_monitor import SBBMonitor
@@ -21,8 +20,6 @@ class SBBMonitorPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
-        if parent is None:
-            return QWidget()
         t = SBBMonitor(parent)
         return t
 
@@ -30,7 +27,7 @@ class SBBMonitorPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return DOM_XML
 
     def group(self):
-        return "BEC Utils"
+        return ""
 
     def icon(self):
         return designer_material_icon(SBBMonitor.ICON_NAME)

bec_widgets/widgets/editors/scan_metadata/scan_metadata_plugin.py

@@ -2,7 +2,6 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.editors.scan_metadata.scan_metadata import ScanMetadata
@@ -21,8 +20,6 @@ class ScanMetadataPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
-        if parent is None:
-            return QWidget()
         t = ScanMetadata(parent)
         return t
 
@@ -30,7 +27,7 @@ class ScanMetadataPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return DOM_XML
 
     def group(self):
-        return "BEC Input Widgets"
+        return ""
 
     def icon(self):
         return designer_material_icon(ScanMetadata.ICON_NAME)
@@ -51,7 +48,7 @@ class ScanMetadataPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "ScanMetadata"
 
     def toolTip(self):
-        return "ScanMetadata"
+        return "Dynamically generates a form for inclusion of metadata for a scan."
 
     def whatsThis(self):
         return self.toolTip()

bec_widgets/widgets/editors/text_box/text_box_plugin.py

@@ -1,9 +1,10 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtWidgets import QWidget
 
+import bec_widgets
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.editors.text_box.text_box import TextBox
 
@@ -13,6 +14,7 @@ DOM_XML = """
     </widget>
 </ui>
 """
+MODULE_PATH = os.path.dirname(bec_widgets.__file__)
 
 
 class TextBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
@@ -21,8 +23,6 @@ class TextBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
-        if parent is None:
-            return QWidget()
         t = TextBox(parent)
         return t
 
@@ -51,7 +51,7 @@ class TextBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "TextBox"
 
     def toolTip(self):
-        return "A widget that displays text in plain and HTML format"
+        return "TextBox"
 
     def whatsThis(self):
         return self.toolTip()

bec_widgets/widgets/editors/vscode/vs_code_editor_plugin.py

@@ -1,9 +1,10 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtWidgets import QWidget
 
+import bec_widgets
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.editors.vscode.vscode import VSCodeEditor
 
@@ -14,6 +15,8 @@ DOM_XML = """
 </ui>
 """
 
+MODULE_PATH = os.path.dirname(bec_widgets.__file__)
+
 
 class VSCodeEditorPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
     def __init__(self):
@@ -21,8 +24,6 @@ class VSCodeEditorPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
-        if parent is None:
-            return QWidget()
         t = VSCodeEditor(parent)
         return t
 

bec_widgets/widgets/editors/web_console/web_console.py

@@ -6,11 +6,12 @@ import time
 
 from bec_lib.logger import bec_logger
 from louie.saferef import safe_ref
-from qtpy.QtCore import QUrl, qInstallMessageHandler
+from qtpy.QtCore import QTimer, QUrl, Signal, qInstallMessageHandler
 from qtpy.QtWebEngineWidgets import QWebEnginePage, QWebEngineView
 from qtpy.QtWidgets import QApplication, QVBoxLayout, QWidget
 
 from bec_widgets.utils.bec_widget import BECWidget
+from bec_widgets.utils.error_popups import SafeProperty
 
 logger = bec_logger.logger
 
@@ -165,11 +166,16 @@ class WebConsole(BECWidget, QWidget):
     A simple widget to display a website
     """
 
+    _js_callback = Signal(bool)
+    initialized = Signal()
+
     PLUGIN = True
     ICON_NAME = "terminal"
 
     def __init__(self, parent=None, config=None, client=None, gui_id=None, **kwargs):
         super().__init__(parent=parent, client=client, gui_id=gui_id, config=config, **kwargs)
+        self._startup_cmd = "bec --nogui"
+        self._is_initialized = False
         _web_console_registry.register(self)
         self._token = _web_console_registry._token
         layout = QVBoxLayout()
@@ -181,6 +187,48 @@ class WebConsole(BECWidget, QWidget):
         layout.addWidget(self.browser)
         self.setLayout(layout)
         self.page.setUrl(QUrl(f"http://localhost:{_web_console_registry._server_port}"))
+        self._startup_timer = QTimer()
+        self._startup_timer.setInterval(1000)
+        self._startup_timer.timeout.connect(self._check_page_ready)
+        self._startup_timer.start()
+        self._js_callback.connect(self._on_js_callback)
+
+    def _check_page_ready(self):
+        """
+        Check if the page is ready and stop the timer if it is.
+        """
+        if self.page.isLoading():
+            return
+
+        self.page.runJavaScript("window.term !== undefined", self._js_callback.emit)
+
+    def _on_js_callback(self, ready: bool):
+        """
+        Callback for when the JavaScript is ready.
+        """
+        if not ready:
+            return
+        self._is_initialized = True
+        self._startup_timer.stop()
+        if self._startup_cmd:
+            self.write(self._startup_cmd)
+        self.initialized.emit()
+
+    @SafeProperty(str)
+    def startup_cmd(self):
+        """
+        Get the startup command for the web console.
+        """
+        return self._startup_cmd
+
+    @startup_cmd.setter
+    def startup_cmd(self, cmd: str):
+        """
+        Set the startup command for the web console.
+        """
+        if not isinstance(cmd, str):
+            raise ValueError("Startup command must be a string.")
+        self._startup_cmd = cmd
 
     def write(self, data: str, send_return: bool = True):
         """
@@ -213,10 +261,19 @@ class WebConsole(BECWidget, QWidget):
             "document.querySelector('textarea.xterm-helper-textarea').dispatchEvent(new KeyboardEvent('keypress', {charCode: 3}))"
         )
 
+    def set_readonly(self, readonly: bool):
+        """
+        Set the web console to read-only mode.
+        """
+        if not isinstance(readonly, bool):
+            raise ValueError("Readonly must be a boolean.")
+        self.setEnabled(not readonly)
+
     def cleanup(self):
         """
         Clean up the registry by removing any instances that are no longer valid.
         """
+        self._startup_timer.stop()
         _web_console_registry.unregister(self)
         super().cleanup()
 

bec_widgets/widgets/editors/web_console/web_console_plugin.py

@@ -2,7 +2,6 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.editors.web_console.web_console import WebConsole
@@ -21,8 +20,6 @@ class WebConsolePlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
-        if parent is None:
-            return QWidget()
         t = WebConsole(parent)
         return t
 
@@ -30,7 +27,7 @@ class WebConsolePlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return DOM_XML
 
     def group(self):
-        return "BEC Developer"
+        return "BEC Console"
 
     def icon(self):
         return designer_material_icon(WebConsole.ICON_NAME)

bec_widgets/widgets/editors/website/website_widget_plugin.py

@@ -1,9 +1,10 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtWidgets import QWidget
 
+import bec_widgets
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.editors.website.website import WebsiteWidget
 
@@ -13,6 +14,7 @@ DOM_XML = """
     </widget>
 </ui>
 """
+MODULE_PATH = os.path.dirname(bec_widgets.__file__)
 
 
 class WebsiteWidgetPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
@@ -21,8 +23,6 @@ class WebsiteWidgetPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
-        if parent is None:
-            return QWidget()
         t = WebsiteWidget(parent)
         return t
 

bec_widgets/widgets/games/minesweeper_plugin.py

@@ -2,7 +2,6 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.games.minesweeper import Minesweeper
@@ -21,8 +20,6 @@ class MinesweeperPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
-        if parent is None:
-            return QWidget()
         t = Minesweeper(parent)
         return t
 

bec_widgets/widgets/plots/heatmap/heatmap_plugin.py

@@ -2,7 +2,6 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.plots.heatmap.heatmap import Heatmap
@@ -21,8 +20,6 @@ class HeatmapPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
-        if parent is None:
-            return QWidget()
         t = Heatmap(parent)
         return t
 
@@ -30,7 +27,7 @@ class HeatmapPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return DOM_XML
 
     def group(self):
-        return "BEC Plots"
+        return "Plot Widgets"
 
     def icon(self):
         return designer_material_icon(Heatmap.ICON_NAME)

bec_widgets/widgets/plots/image/image_base.py

@@ -1034,8 +1034,7 @@ class ImageBase(PlotBase):
         if self.y_roi is not None:
             self.y_roi.cleanup_pyqtgraph()
 
-        if self.layer_manager is not None:
-            self.layer_manager.clear()
-            self.layer_manager = None
+        self.layer_manager.clear()
+        self.layer_manager = None
 
         super().cleanup()

bec_widgets/widgets/plots/image/image_plugin.py

@@ -2,7 +2,6 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.plots.image.image import Image
@@ -21,8 +20,6 @@ class ImagePlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
-        if parent is None:
-            return QWidget()
         t = Image(parent)
         return t
 
@@ -30,7 +27,7 @@ class ImagePlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return DOM_XML
 
     def group(self):
-        return "BEC Plots"
+        return "Plot Widgets"
 
     def icon(self):
         return designer_material_icon(Image.ICON_NAME)

bec_widgets/widgets/plots/image/setting_widgets/image_roi_tree.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 import math
 from typing import TYPE_CHECKING
 
-from bec_lib import bec_logger
 from bec_qthemes import material_icon
 from qtpy.QtCore import QEvent, Qt
 from qtpy.QtGui import QColor
@@ -40,9 +39,6 @@ if TYPE_CHECKING:
     from bec_widgets.widgets.plots.image.image import Image
 
 
-logger = bec_logger.logger
-
-
 class ROILockButton(QToolButton):
     """Keeps its icon and checked state in sync with a single ROI."""
 
@@ -451,18 +447,6 @@ class ROIPropertyTree(BECWidget, QWidget):
     def cleanup(self):
         self.cmap.close()
         self.cmap.deleteLater()
-        if self.controller and hasattr(self.controller, "rois"):
-            for roi in self.controller.rois:  # disconnect all signals from ROIs
-                try:
-                    if isinstance(roi, RectangularROI):
-                        roi.edgesChanged.disconnect()
-                    else:
-                        roi.centerChanged.disconnect()
-                    roi.penChanged.disconnect()
-                    roi.nameChanged.disconnect()
-                except (RuntimeError, TypeError) as e:
-                    logger.error(f"Failed to disconnect roi qt signal: {e}")
-
         super().cleanup()
 
 

bec_widgets/widgets/plots/motor_map/motor_map_plugin.py

@@ -2,7 +2,6 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.plots.motor_map.motor_map import MotorMap
@@ -21,8 +20,6 @@ class MotorMapPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
-        if parent is None:
-            return QWidget()
         t = MotorMap(parent)
         return t
 
@@ -30,7 +27,7 @@ class MotorMapPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return DOM_XML
 
     def group(self):
-        return "BEC Plots"
+        return "Plot Widgets"
 
     def icon(self):
         return designer_material_icon(MotorMap.ICON_NAME)

bec_widgets/widgets/plots/multi_waveform/multi_waveform_plugin.py

@@ -2,7 +2,6 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.plots.multi_waveform.multi_waveform import MultiWaveform
@@ -21,8 +20,6 @@ class MultiWaveformPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
-        if parent is None:
-            return QWidget()
         t = MultiWaveform(parent)
         return t
 
@@ -30,7 +27,7 @@ class MultiWaveformPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return DOM_XML
 
     def group(self):
-        return "BEC Plots"
+        return "Plot Widgets"
 
     def icon(self):
         return designer_material_icon(MultiWaveform.ICON_NAME)

bec_widgets/widgets/plots/scatter_waveform/scatter_waveform_plugin.py

@@ -2,7 +2,6 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.plots.scatter_waveform.scatter_waveform import ScatterWaveform
@@ -21,8 +20,6 @@ class ScatterWaveformPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
-        if parent is None:
-            return QWidget()
         t = ScatterWaveform(parent)
         return t
 
@@ -30,7 +27,7 @@ class ScatterWaveformPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return DOM_XML
 
     def group(self):
-        return "BEC Plots"
+        return "Plot Widgets"
 
     def icon(self):
         return designer_material_icon(ScatterWaveform.ICON_NAME)

bec_widgets/widgets/plots/waveform/waveform.py

@@ -908,10 +908,6 @@ class Waveform(PlotBase):
             self.roi_enable.emit(True)  # Enable the ROI toolbar action
             self.request_dap()  # Request DAP update directly without blocking proxy
 
-        QTimer.singleShot(
-            150, self.auto_range
-        )  # autorange with a delay to ensure the plot is updated
-
         return curve
 
     def _add_curve_object(self, name: str, config: CurveConfig) -> Curve:

bec_widgets/widgets/plots/waveform/waveform_plugin.py

@@ -2,7 +2,6 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.plots.waveform.waveform import Waveform
@@ -21,8 +20,6 @@ class WaveformPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
-        if parent is None:
-            return QWidget()
         t = Waveform(parent)
         return t
 
@@ -30,7 +27,7 @@ class WaveformPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return DOM_XML
 
     def group(self):
-        return "BEC Plots"
+        return "Plot Widgets"
 
     def icon(self):
         return designer_material_icon(Waveform.ICON_NAME)

bec_widgets/widgets/progress/bec_progressbar/bec_progress_bar_plugin.py

@@ -2,7 +2,6 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.progress.bec_progressbar.bec_progressbar import BECProgressBar
@@ -21,8 +20,6 @@ class BECProgressBarPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
-        if parent is None:
-            return QWidget()
         t = BECProgressBar(parent)
         return t
 

bec_widgets/widgets/progress/ring_progress_bar/ring_progress_bar_plugin.py

@@ -1,9 +1,10 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtWidgets import QWidget
 
+import bec_widgets
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.progress.ring_progress_bar.ring_progress_bar import RingProgressBar
 
@@ -13,6 +14,7 @@ DOM_XML = """
     </widget>
 </ui>
 """
+MODULE_PATH = os.path.dirname(bec_widgets.__file__)
 
 
 class RingProgressBarPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
@@ -21,8 +23,6 @@ class RingProgressBarPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
-        if parent is None:
-            return QWidget()
         t = RingProgressBar(parent)
         return t
 
@@ -51,7 +51,7 @@ class RingProgressBarPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "RingProgressBar"
 
     def toolTip(self):
-        return ""
+        return "RingProgressBar"
 
     def whatsThis(self):
         return self.toolTip()

bec_widgets/widgets/progress/scan_progressbar/scan_progress_bar_plugin.py

@@ -2,7 +2,6 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.progress.scan_progressbar.scan_progressbar import ScanProgressBar
@@ -21,8 +20,6 @@ class ScanProgressBarPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
-        if parent is None:
-            return QWidget()
         t = ScanProgressBar(parent)
         return t
 
@@ -51,7 +48,7 @@ class ScanProgressBarPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "ScanProgressBar"
 
     def toolTip(self):
-        return ""
+        return "A progress bar that is hooked up to the scan progress of a scan."
 
     def whatsThis(self):
         return self.toolTip()

bec_widgets/widgets/progress/scan_progressbar/scan_progressbar.py

@@ -124,14 +124,11 @@ class ScanProgressBar(BECWidget, QWidget):
     """
 
     ICON_NAME = "timelapse"
-    PLUGIN = True
     progress_started = Signal()
     progress_finished = Signal()
 
-    def __init__(
-        self, parent=None, client=None, config=None, gui_id=None, one_line_design=False, **kwargs
-    ):
-        super().__init__(parent=parent, client=client, config=config, gui_id=gui_id, **kwargs)
+    def __init__(self, parent=None, client=None, config=None, gui_id=None, one_line_design=False):
+        super().__init__(parent=parent, client=client, config=config, gui_id=gui_id)
 
         self.get_bec_shortcuts()
         ui_file = os.path.join(

bec_widgets/widgets/services/bec_queue/bec_queue_plugin.py

@@ -1,9 +1,10 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtWidgets import QWidget
 
+import bec_widgets
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.services.bec_queue.bec_queue import BECQueue
 
@@ -14,6 +15,8 @@ DOM_XML = """
 </ui>
 """
 
+MODULE_PATH = os.path.dirname(bec_widgets.__file__)
+
 
 class BECQueuePlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
     def __init__(self):
@@ -21,8 +24,6 @@ class BECQueuePlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
-        if parent is None:
-            return QWidget()
         t = BECQueue(parent)
         return t
 

bec_widgets/widgets/services/bec_status_box/bec_status_box_plugin.py

@@ -1,9 +1,10 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtWidgets import QWidget
 
+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
 
@@ -14,6 +15,8 @@ DOM_XML = """
 </ui>
 """
 
+MODULE_PATH = os.path.dirname(bec_widgets.__file__)
+
 
 class BECStatusBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
     def __init__(self):
@@ -21,8 +24,6 @@ class BECStatusBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
-        if parent is None:
-            return QWidget()
         t = BECStatusBox(parent)
         return t
 

bec_widgets/widgets/services/device_browser/device_browser.py

@@ -1,25 +1,15 @@
 import os
 import re
 from functools import partial
-from typing import Callable
 
-import bec_lib
 from bec_lib.callback_handler import EventType
 from bec_lib.config_helper import ConfigHelper
-from bec_lib.endpoints import MessageEndpoints
 from bec_lib.logger import bec_logger
-from bec_lib.messages import ConfigAction, ScanStatusMessage
+from bec_lib.messages import ConfigAction
 from bec_qthemes import material_icon
 from pyqtgraph import SignalProxy
 from qtpy.QtCore import QSize, QThreadPool, Signal
-from qtpy.QtWidgets import (
-    QFileDialog,
-    QListWidget,
-    QListWidgetItem,
-    QToolButton,
-    QVBoxLayout,
-    QWidget,
-)
+from qtpy.QtWidgets import QListWidget, QListWidgetItem, QVBoxLayout, QWidget
 
 from bec_widgets.cli.rpc.rpc_register import RPCRegister
 from bec_widgets.utils.bec_widget import BECWidget
@@ -40,7 +30,6 @@ class DeviceBrowser(BECWidget, QWidget):
     """
 
     devices_changed: Signal = Signal()
-    editing_enabled: Signal = Signal(bool)
     device_update: Signal = Signal(str, dict)
     PLUGIN = True
     ICON_NAME = "lists"
@@ -58,31 +47,23 @@ class DeviceBrowser(BECWidget, QWidget):
         self._config_helper = ConfigHelper(self.client.connector, self.client._service_name)
         self._q_threadpool = QThreadPool()
         self.ui = None
-        self.init_ui()
+        self.ini_ui()
         self.dev_list: QListWidget = self.ui.device_list
         self.dev_list.setVerticalScrollMode(QListWidget.ScrollMode.ScrollPerPixel)
         self.proxy_device_update = SignalProxy(
             self.ui.filter_input.textChanged, rateLimit=500, slot=self.update_device_list
         )
-        self._device_update_callback_id = self.bec_dispatcher.client.callbacks.register(
+        self.bec_dispatcher.client.callbacks.register(
             EventType.DEVICE_UPDATE, self.on_device_update
         )
-        self._scan_status_callback_id = self.bec_dispatcher.client.callbacks.register(
-            EventType.SCAN_STATUS, self.scan_status_changed
-        )
-        self._default_config_dir = os.path.abspath(
-            os.path.join(os.path.dirname(bec_lib.__file__), "./configs/")
-        )
-
         self.devices_changed.connect(self.update_device_list)
-
-        self.init_warning_label()
-        self.init_tool_buttons()
+        self.ui.add_button.clicked.connect(self._create_add_dialog)
+        self.ui.add_button.setIcon(material_icon("add", size=(20, 20), convert_to_pixmap=False))
 
         self.init_device_list()
         self.update_device_list()
 
-    def init_ui(self) -> None:
+    def ini_ui(self) -> None:
         """
         Initialize the UI by loading the UI file and setting the layout.
         """
@@ -92,27 +73,6 @@ class DeviceBrowser(BECWidget, QWidget):
         layout.addWidget(self.ui)
         self.setLayout(layout)
 
-    def init_warning_label(self):
-        self.ui.scan_running_warning.setText("Warning: editing diabled while scan is running!")
-        self.ui.scan_running_warning.setStyleSheet(
-            "background-color: #fcba03; color: rgb(0, 0, 0);"
-        )
-        scan_status = self.bec_dispatcher.client.connector.get(MessageEndpoints.scan_status())
-        initial_status = scan_status.status if scan_status is not None else "closed"
-        self.set_editing_mode(initial_status not in ["open", "paused"])
-
-    def init_tool_buttons(self):
-        def _setup_button(button: QToolButton, icon: str, slot: Callable, tooltip: str = ""):
-            button.clicked.connect(slot)
-            button.setIcon(material_icon(icon, size=(20, 20), convert_to_pixmap=False))
-            button.setToolTip(tooltip)
-
-        _setup_button(self.ui.add_button, "add", self._create_add_dialog, "add new device")
-        _setup_button(self.ui.save_button, "save", self._save_to_file, "save config to file")
-        _setup_button(
-            self.ui.import_button, "input", self._load_from_file, "append/merge config from file"
-        )
-
     def _create_add_dialog(self):
         dialog = DeviceConfigDialog(parent=self, device=None, action="add")
         dialog.open()
@@ -160,7 +120,6 @@ class DeviceBrowser(BECWidget, QWidget):
         )
         device_item.expansion_state_changed.connect(partial(_updatesize, item, device_item))
         device_item.imminent_deletion.connect(partial(_remove_item, item))
-        self.editing_enabled.connect(device_item.set_editable)
         self.device_update.connect(device_item.config_update)
         tooltip = self.dev[device]._config.get("description", "")
         device_item.setToolTip(tooltip)
@@ -171,17 +130,6 @@ class DeviceBrowser(BECWidget, QWidget):
         self.dev_list.addItem(item)
         self._device_items[device] = item
 
-    @SafeSlot(dict, dict)
-    def scan_status_changed(self, scan_info: dict, _: dict):
-        """disable editing when scans are running and enable editing when they are finished"""
-        msg = ScanStatusMessage.model_validate(scan_info)
-        self.set_editing_mode(msg.status not in ["open", "paused"])
-
-    def set_editing_mode(self, enabled: bool):
-        self.ui.add_button.setEnabled(enabled)
-        self.ui.scan_running_warning.setHidden(enabled)
-        self.editing_enabled.emit(enabled)
-
     @SafeSlot()
     def reset_device_list(self) -> None:
         self.init_device_list()
@@ -213,27 +161,6 @@ class DeviceBrowser(BECWidget, QWidget):
         for device in self.dev:
             self._device_items[device].setHidden(not self.regex.search(device))
 
-    @SafeSlot()
-    def _load_from_file(self):
-        file_path, _ = QFileDialog.getOpenFileName(
-            self, "Update config from file", self._default_config_dir, "Config files (*.yml *.yaml)"
-        )
-        if file_path:
-            self._config_helper.update_session_with_file(file_path)
-
-    @SafeSlot()
-    def _save_to_file(self):
-        file_path, _ = QFileDialog.getSaveFileName(
-            self, "Save config to file", self._default_config_dir, "Config files (*.yml *.yaml)"
-        )
-        if file_path:
-            self._config_helper.save_current_session(file_path)
-
-    def cleanup(self):
-        super().cleanup()
-        self.bec_dispatcher.client.callbacks.remove(self._scan_status_callback_id)
-        self.bec_dispatcher.client.callbacks.remove(self._device_update_callback_id)
-
 
 if __name__ == "__main__":  # pragma: no cover
     import sys

bec_widgets/widgets/services/device_browser/device_browser.ui

@@ -51,35 +51,11 @@
              </property>
             </widget>
            </item>
-           <item>
-            <widget class="QToolButton" name="save_button">
-             <property name="text">
-              <string>...</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QToolButton" name="import_button">
-             <property name="text">
-              <string>...</string>
-             </property>
-            </widget>
-           </item>
           </layout>
          </widget>
         </item>
        </layout>
       </item>
-      <item>
-       <widget class="QLabel" name="scan_running_warning">
-        <property name="styleSheet">
-         <string notr="true"/>
-        </property>
-        <property name="text">
-         <string>warning</string>
-        </property>
-       </widget>
-      </item>
       <item>
        <widget class="QListWidget" name="device_list"/>
       </item>

bec_widgets/widgets/services/device_browser/device_browser_plugin.py

@@ -2,7 +2,6 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.services.device_browser.device_browser import DeviceBrowser
@@ -21,8 +20,6 @@ class DeviceBrowserPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
-        if parent is None:
-            return QWidget()
         t = DeviceBrowser(parent)
         return t
 

bec_widgets/widgets/services/device_browser/device_item/config_communicator.py

@@ -24,10 +24,8 @@ class CommunicateConfigAction(QRunnable):
     ) -> None:
         super().__init__()
         self.config_helper = config_helper
-        if action in ["add", "update"] and config is None:
-            raise ValueError("Must supply config to add or update a device")
         self.device = device
-        self.config = config or {}
+        self.config = config
         self.action = action
         self.signals = _CommSignals()
 
@@ -39,35 +37,24 @@ class CommunicateConfigAction(QRunnable):
                     raise ValueError(
                         "Must be updating a device or be supplied a name for a new device"
                     )
-                if "deviceConfig" not in self.config or self.action in ["add", "remove"]:
-                    self.process_simple_action(dev_name)
-                else:
-                    # updating an existing device, but need to recreate it for this change
-                    self.process_remove_readd(dev_name)
+                req_args = {
+                    "action": self.action,
+                    "config": {dev_name: self.config},
+                    "wait_for_response": False,
+                }
+                timeout = (
+                    self.config_helper.suggested_timeout_s(self.config)
+                    if self.config is not None
+                    else 20
+                )
+                RID = self.config_helper.send_config_request(**req_args)
+                logger.info("Waiting for config reply")
+                reply = self.config_helper.wait_for_config_reply(RID, timeout=timeout)
+                self.config_helper.handle_update_reply(reply, RID, timeout)
+                logger.info("Done updating config!")
             else:
                 raise ValueError(f"action {self.action} is not supported")
         except Exception as e:
             self.signals.error.emit(e)
         else:
             self.signals.done.emit()
-
-    def process_simple_action(self, dev_name: str, action: ConfigAction | None = None):
-        req_args = {
-            "action": action or self.action,
-            "config": {dev_name: self.config},
-            "wait_for_response": False,
-        }
-        timeout = (
-            self.config_helper.suggested_timeout_s(self.config) if self.config is not None else 20
-        )
-        RID = self.config_helper.send_config_request(**req_args)
-        logger.info("Waiting for config reply")
-        reply = self.config_helper.wait_for_config_reply(RID, timeout=timeout)
-        self.config_helper.handle_update_reply(reply, RID, timeout)
-        logger.info("Done updating config!")
-
-    def process_remove_readd(self, dev_name: str):
-        logger.info(f"Removing and readding device: {dev_name}")
-        self.process_simple_action(dev_name, "remove")
-        self.process_simple_action(dev_name, "add")
-        logger.info(f"Reinstated {dev_name} successfully!")

bec_widgets/widgets/services/device_browser/device_item/device_config_dialog.py

@@ -68,7 +68,7 @@ class DeviceConfigDialog(BECWidget, QDialog):
             self.client.connector, self.client._service_name
         )
         self._device = device
-        self._action: Literal["update", "add"] = action
+        self._action = action
         self._q_threadpool = threadpool or QThreadPool()
         self.setWindowTitle(f"Edit config for: {device}")
         self._container = QStackedLayout()
@@ -168,10 +168,6 @@ class DeviceConfigDialog(BECWidget, QDialog):
         diff = {
             k: v for k, v in new_config.items() if self._initial_config.get(k) != new_config.get(k)
         }
-        if self._initial_config.get("deviceConfig") in [{}, None] and new_config.get(
-            "deviceConfig"
-        ) in [{}, None]:
-            diff.pop("deviceConfig", None)
         if diff.get("deviceConfig") is not None:
             # TODO: special cased in some parts of device manager but not others, should
             # be removed in config update as with below issue
@@ -180,11 +176,6 @@ class DeviceConfigDialog(BECWidget, QDialog):
             diff["deviceConfig"] = {
                 k: _try_literal_eval(str(v)) for k, v in diff["deviceConfig"].items() if k != ""
             }
-
-        # Due to above issues, if deviceConfig changes we must remove and recreate the device - so we need the whole config
-        if "deviceConfig" in diff:
-            new_config["deviceConfig"] = diff["deviceConfig"]
-            return new_config
         return diff
 
     @SafeSlot(bool)
@@ -221,7 +212,7 @@ class DeviceConfigDialog(BECWidget, QDialog):
             self._proc_device_config_change(updated_config)
 
     def _proc_device_config_change(self, config: dict):
-        logger.info(f"Sending request to {self._action} device config: {config}")
+        logger.info(f"Sending request to update device config: {config}")
 
         self._start_waiting_display()
         communicate_update = CommunicateConfigAction(

bec_widgets/widgets/services/device_browser/device_item/device_item.py

@@ -140,11 +140,6 @@ class DeviceItem(ExpandableGroupFrame):
         self.adjustSize()
         self.broadcast_size_hint.emit(self.sizeHint())
 
-    @SafeSlot(bool)
-    def set_editable(self, enabled: bool):
-        self.edit_button.setEnabled(enabled)
-        self.delete_button.setEnabled(enabled)
-
     @SafeSlot(str, dict)
     def config_update(self, action: ConfigAction, content: dict) -> None:
         if self.device in content:

bec_widgets/widgets/services/device_browser/device_item/device_signal_display.py

@@ -1,4 +1,3 @@
-from bec_lib.device import Device
 from bec_qthemes import material_icon
 from qtpy.QtCore import Qt
 from qtpy.QtWidgets import QHBoxLayout, QLabel, QToolButton, QVBoxLayout, QWidget
@@ -6,7 +5,6 @@ from qtpy.QtWidgets import QHBoxLayout, QLabel, QToolButton, QVBoxLayout, QWidge
 from bec_widgets.utils.bec_connector import ConnectionConfig
 from bec_widgets.utils.bec_widget import BECWidget
 from bec_widgets.utils.error_popups import SafeProperty, SafeSlot
-from bec_widgets.utils.ophyd_kind_util import Kind
 from bec_widgets.widgets.containers.dock.dock import BECDock
 from bec_widgets.widgets.utility.signal_label.signal_label import SignalLabel
 
@@ -37,9 +35,9 @@ class SignalDisplay(BECWidget, QWidget):
 
     @SafeSlot()
     def _refresh(self):
-        if (dev := self.dev.get(self.device)) is not None:
-            dev.read()
-            dev.read_configuration()
+        if self.device in self.dev:
+            self.dev.get(self.device).read(cached=False)
+            self.dev.get(self.device).read_configuration(cached=False)
 
     def _add_refresh_button(self):
         button_holder = QWidget()
@@ -65,26 +63,11 @@ class SignalDisplay(BECWidget, QWidget):
         self._add_refresh_button()
 
         if self._device in self.dev:
-            if isinstance(self.dev[self.device], Device):
-                for sig, info in self.dev[self.device]._info.get("signals", {}).items():
-                    if info.get("kind_str") in [
-                        Kind.hinted.name,
-                        Kind.normal.name,
-                        Kind.config.name,
-                    ]:
-                        self._content_layout.addWidget(
-                            SignalLabel(
-                                device=self._device,
-                                signal=sig,
-                                show_select_button=False,
-                                show_default_units=True,
-                            )
-                        )
-            else:
+            for sig in self.dev[self.device]._info.get("signals", {}).keys():
                 self._content_layout.addWidget(
                     SignalLabel(
                         device=self._device,
-                        signal=self._device,
+                        signal=sig,
                         show_select_button=False,
                         show_default_units=True,
                     )

bec_widgets/widgets/utility/logpanel/log_panel_plugin.py

@@ -2,7 +2,6 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.utility.logpanel.logpanel import LogPanel
@@ -21,8 +20,6 @@ class LogPanelPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
-        if parent is None:
-            return QWidget()
         t = LogPanel(parent)
         return t
 
@@ -30,7 +27,7 @@ class LogPanelPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return DOM_XML
 
     def group(self):
-        return "BEC Services"
+        return "BEC Utils"
 
     def icon(self):
         return designer_material_icon(LogPanel.ICON_NAME)

bec_widgets/widgets/utility/signal_label/signal_label.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import sys
 import traceback
-from typing import TYPE_CHECKING, Any
+from typing import TYPE_CHECKING
 
 from bec_lib.device import Device, Signal
 from bec_lib.endpoints import MessageEndpoints
@@ -143,14 +143,6 @@ class SignalLabel(BECWidget, QWidget):
         "show_default_units.setter",
         "show_select_button",
         "show_select_button.setter",
-        "show_hinted_signals",
-        "show_hinted_signals.setter",
-        "show_normal_signals",
-        "show_normal_signals.setter",
-        "show_config_signals",
-        "show_config_signals.setter",
-        "display_array_data",
-        "display_array_data.setter",
     ]
 
     def __init__(
@@ -191,9 +183,8 @@ class SignalLabel(BECWidget, QWidget):
         self._dtype = None
 
         self._show_hinted_signals: bool = True
-        self._show_normal_signals: bool = True
-        self._show_config_signals: bool = True
-        self._display_array_data: bool = False
+        self._show_normal_signals: bool = False
+        self._show_config_signals: bool = False
 
         self._outer_layout = QHBoxLayout()
         self._layout = QHBoxLayout()
@@ -206,7 +197,7 @@ class SignalLabel(BECWidget, QWidget):
         self._update_label()
         self._label.setLayout(self._layout)
 
-        self._value: Any = ""
+        self._value: str = ""
         self._display = QLabel()
         self._layout.addWidget(self._display)
 
@@ -219,8 +210,6 @@ class SignalLabel(BECWidget, QWidget):
 
         self._select_button.clicked.connect(self.show_choice_dialog)
         self.get_bec_shortcuts()
-        self._device_obj = self.dev.get(self._device)
-        self._signal_key, self._signal_info = "", {}
 
         self._connected: bool = False
         self.connect_device()
@@ -237,7 +226,6 @@ class SignalLabel(BECWidget, QWidget):
 
     @SafeSlot()
     def _process_dialog(self, device: str, signal: str):
-        signal = signal or device
         self.disconnect_device()
         self.device = device
         self.signal = signal
@@ -253,34 +241,45 @@ class SignalLabel(BECWidget, QWidget):
     def connect_device(self):
         """Subscribe to the Redis topic for the device to display"""
         if not self._connected and self._device and self._device in self.dev:
-            self._signal_key, self._signal_info = self._signal_key_and_info()
-            self._manual_read()
-            self._read_endpoint = MessageEndpoints.device_readback(self._device)
+            self._connected = True
+            self._read_endpoint = MessageEndpoints.device_read(self._device)
             self._read_config_endpoint = MessageEndpoints.device_read_configuration(self._device)
             self.bec_dispatcher.connect_slot(self.on_device_readback, self._read_endpoint)
             self.bec_dispatcher.connect_slot(self.on_device_readback, self._read_config_endpoint)
-            self._connected = True
+            self._manual_read()
             self.set_display_value(self._value)
 
     def disconnect_device(self):
         """Unsubscribe from the Redis topic for the device to display"""
         if self._connected:
+            self._connected = False
             self.bec_dispatcher.disconnect_slot(self.on_device_readback, self._read_endpoint)
             self.bec_dispatcher.disconnect_slot(self.on_device_readback, self._read_config_endpoint)
-            self._connected = False
 
     def _manual_read(self):
-        if not isinstance(self._device_obj, Device | Signal):
-            self._value, self._units = "__", ""
+        if self._device is None or not isinstance(
+            (device := self.dev.get(self._device)), Device | Signal
+        ):
+            self._units = ""
+            self._value = "__"
             return
-        reading = (self._device_obj.read() or {}) | (self._device_obj.read_configuration() or {})
-        value = reading.get(self._signal_key, {}).get("value")
-        if value is None:
-            self._value, self._units = "__", ""
+        signal, info = (
+            (
+                getattr(device, self.signal, None),
+                device._info.get("signals", {}).get(self._signal, {}).get("describe", {}),
+            )
+            if isinstance(device, Device)
+            else (device, device.describe().get(self._device))
+        )
+        if not isinstance(signal, Signal):  # Avoid getting other attributes of device, e.g. methods
+            signal = None
+        if signal is None:
+            self._units = ""
+            self._value = "__"
             return
-        self._value = value
-        self._units = self._signal_info.get("egu", "")
-        self._dtype = self._signal_info.get("dtype", "float")
+        self._value = signal.get()
+        self._units = info.get("egu", "")
+        self._dtype = info.get("dtype", "float")
 
     @SafeSlot(dict, dict)
     def on_device_readback(self, msg: dict, metadata: dict) -> None:
@@ -288,7 +287,8 @@ class SignalLabel(BECWidget, QWidget):
         Update the display with the new value.
         """
         try:
-            _value = msg["signals"].get(self._signal_key, {}).get("value")
+            signal_to_read = self._patch_hinted_signal()
+            _value = msg["signals"].get(signal_to_read, {}).get("value")
             if _value is not None:
                 self._value = _value
                 self.set_display_value(self._value)
@@ -298,19 +298,13 @@ class SignalLabel(BECWidget, QWidget):
                 f"Error processing incoming reading: {msg}, handled with exception: {''.join(traceback.format_exception(e))}"
             )
 
-    def _signal_key_and_info(self) -> tuple[str, dict]:
-        if isinstance(self._device_obj, Device):
-            try:
-                signal_info = self._device_obj._info["signals"][self._signal]
-            except KeyError:
-                return "", {}
-            if signal_info["kind_str"] == Kind.hinted.name:
-                return signal_info["obj_name"], signal_info
-            else:
-                return f"{self._device}_{self._signal}", signal_info
-        elif isinstance(self._device_obj, Signal):
-            return self._device, self._device_obj._info["describe_configuration"]
-        return "", {}
+    def _patch_hinted_signal(self):
+        if self.dev[self._device]._info["signals"] == {}:
+            return self._signal
+        signal_info = self.dev[self._device]._info["signals"][self._signal]
+        return (
+            signal_info["obj_name"] if signal_info["kind_str"] == Kind.hinted.name else self._signal
+        )
 
     @SafeProperty(str)
     def device(self) -> str:
@@ -321,7 +315,6 @@ class SignalLabel(BECWidget, QWidget):
     def device(self, value: str) -> None:
         self.disconnect_device()
         self._device = value
-        self._device_obj = self.dev.get(self._device)
         self._config.device = value
         self.connect_device()
         self._update_label()
@@ -389,16 +382,6 @@ class SignalLabel(BECWidget, QWidget):
         self._decimal_places = value
         self._update_label()
 
-    @SafeProperty(bool)
-    def display_array_data(self) -> bool:
-        """Displays the full data from array signals if set to True."""
-        return self._display_array_data
-
-    @display_array_data.setter
-    def display_array_data(self, value: bool) -> None:
-        self._display_array_data = value
-        self.set_display_value(self._value)
-
     @SafeProperty(bool)
     def show_hinted_signals(self) -> bool:
         """In the signal selection menu, show hinted signals"""
@@ -426,9 +409,7 @@ class SignalLabel(BECWidget, QWidget):
     def show_normal_signals(self, value: bool) -> None:
         self._show_normal_signals = value
 
-    def _format_value(self, value: Any):
-        if self._dtype == "array" and not self.display_array_data:
-            return "ARRAY DATA"
+    def _format_value(self, value: str):
         if self._decimal_places == 0:
             return value
         try:

bec_widgets/widgets/utility/signal_label/signal_label_plugin.py

@@ -2,7 +2,6 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.utility.signal_label.signal_label import SignalLabel
@@ -21,8 +20,6 @@ class SignalLabelPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
-        if parent is None:
-            return QWidget()
         t = SignalLabel(parent)
         return t
 

bec_widgets/widgets/utility/spinbox/bec_spin_box_plugin.py

@@ -2,7 +2,6 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.utility.spinbox.decimal_spinbox import BECSpinBox
@@ -21,8 +20,6 @@ class BECSpinBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
-        if parent is None:
-            return QWidget()
         t = BECSpinBox(parent)
         return t
 
@@ -30,7 +27,7 @@ class BECSpinBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return DOM_XML
 
     def group(self):
-        return "BEC Utils"
+        return ""
 
     def icon(self):
         return designer_material_icon(BECSpinBox.ICON_NAME)

bec_widgets/widgets/utility/spinbox/decimal_spinbox.py

@@ -13,13 +13,26 @@ from qtpy.QtWidgets import (
     QWidget,
 )
 
+from bec_widgets.utils import ConnectionConfig
+from bec_widgets.utils.bec_widget import BECWidget
 
-class BECSpinBox(QDoubleSpinBox):
+
+class BECSpinBox(BECWidget, QDoubleSpinBox):
     PLUGIN = True
+    RPC = False
     ICON_NAME = "123"
 
-    def __init__(self, parent: QWidget | None = None, **kwargs) -> None:
-        super().__init__(parent=parent, **kwargs)
+    def __init__(
+        self,
+        parent: QWidget | None = None,
+        config: ConnectionConfig | None = None,
+        client=None,
+        gui_id: str | None = None,
+        **kwargs,
+    ) -> None:
+        if config is None:
+            config = ConnectionConfig(widget_class=self.__class__.__name__)
+        super().__init__(parent=parent, client=client, gui_id=gui_id, config=config, **kwargs)
 
         # Make the widget as compact as possible horizontally.
         self.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Fixed)

bec_widgets/widgets/utility/spinner/spinner_widget_plugin.py

@@ -1,9 +1,10 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtWidgets import QWidget
 
+import bec_widgets
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.utility.spinner.spinner import SpinnerWidget
 
@@ -14,6 +15,8 @@ DOM_XML = """
 </ui>
 """
 
+MODULE_PATH = os.path.dirname(bec_widgets.__file__)
+
 
 class SpinnerWidgetPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
     def __init__(self):
@@ -21,8 +24,6 @@ class SpinnerWidgetPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
-        if parent is None:
-            return QWidget()
         t = SpinnerWidget(parent)
         return t
 

bec_widgets/widgets/utility/toggle/toggle_switch_plugin.py

@@ -1,9 +1,10 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtWidgets import QWidget
 
+import bec_widgets
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.utility.toggle.toggle import ToggleSwitch
 
@@ -14,6 +15,8 @@ DOM_XML = """
 </ui>
 """
 
+MODULE_PATH = os.path.dirname(bec_widgets.__file__)
+
 
 class ToggleSwitchPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
     def __init__(self):
@@ -21,8 +24,6 @@ class ToggleSwitchPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
-        if parent is None:
-            return QWidget()
         t = ToggleSwitch(parent)
         return t
 
@@ -51,7 +52,7 @@ class ToggleSwitchPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "ToggleSwitch"
 
     def toolTip(self):
-        return ""
+        return "ToggleSwitch"
 
     def whatsThis(self):
         return self.toolTip()

bec_widgets/widgets/utility/visual/color_button/color_button.py

@@ -20,8 +20,8 @@ class ColorButton(QWidget):
     PLUGIN = True
     ICON_NAME = "colors"
 
-    def __init__(self, parent=None, *args, **kwargs):
-        super().__init__(parent=parent, *args, **kwargs)
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
 
         self.layout = QHBoxLayout(self)
         self.layout.setSpacing(0)

bec_widgets/widgets/utility/visual/color_button/color_button_plugin.py

@@ -1,9 +1,8 @@
-# Copyright (C) 2022 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtWidgets import QWidget
 
+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
 
@@ -13,6 +12,7 @@ DOM_XML = """
     </widget>
 </ui>
 """
+MODULE_PATH = os.path.dirname(bec_widgets.__file__)
 
 
 class ColorButtonPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
@@ -21,8 +21,6 @@ class ColorButtonPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
-        if parent is None:
-            return QWidget()
         t = ColorButton(parent)
         return t
 
@@ -30,7 +28,7 @@ class ColorButtonPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return DOM_XML
 
     def group(self):
-        return "BEC Visual Utils"
+        return "BEC Buttons"
 
     def icon(self):
         return designer_material_icon(ColorButton.ICON_NAME)
@@ -51,7 +49,7 @@ class ColorButtonPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "ColorButton"
 
     def toolTip(self):
-        return ""
+        return "ColorButton which opens a color dialog."
 
     def whatsThis(self):
         return self.toolTip()

bec_widgets/widgets/utility/visual/color_button_native/color_button_native.py

@@ -7,7 +7,7 @@ from qtpy.QtWidgets import QColorDialog, QPushButton
 from bec_widgets import BECWidget, SafeProperty, SafeSlot
 
 
-class ColorButtonNative(QPushButton):
+class ColorButtonNative(BECWidget, QPushButton):
     """A QPushButton subclass that displays a color.
 
     The background is set to the given color and the button text is the hex code.

bec_widgets/widgets/utility/visual/color_button_native/color_button_native_plugin.py

@@ -2,7 +2,6 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.utility.visual.color_button_native.color_button_native import (
@@ -23,8 +22,6 @@ class ColorButtonNativePlugin(QDesignerCustomWidgetInterface):  # pragma: no cov
         self._form_editor = None
 
     def createWidget(self, parent):
-        if parent is None:
-            return QWidget()
         t = ColorButtonNative(parent)
         return t
 
@@ -32,7 +29,7 @@ class ColorButtonNativePlugin(QDesignerCustomWidgetInterface):  # pragma: no cov
         return DOM_XML
 
     def group(self):
-        return "BEC Visual Utils"
+        return "BEC Buttons"
 
     def icon(self):
         return designer_material_icon(ColorButtonNative.ICON_NAME)

bec_widgets/widgets/utility/visual/colormap_selector/colormap_selector_plugin.py

@@ -1,9 +1,10 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtWidgets import QWidget
 
+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
 
@@ -14,6 +15,8 @@ DOM_XML = """
 </ui>
 """
 
+MODULE_PATH = os.path.dirname(bec_widgets.__file__)
+
 
 class ColormapSelectorPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
     def __init__(self):
@@ -21,8 +24,6 @@ class ColormapSelectorPlugin(QDesignerCustomWidgetInterface):  # pragma: no cove
         self._form_editor = None
 
     def createWidget(self, parent):
-        if parent is None:
-            return QWidget()
         t = ColormapSelector(parent)
         return t
 
@@ -30,7 +31,7 @@ class ColormapSelectorPlugin(QDesignerCustomWidgetInterface):  # pragma: no cove
         return DOM_XML
 
     def group(self):
-        return "BEC Visual Utils"
+        return "BEC Buttons"
 
     def icon(self):
         return designer_material_icon(ColormapSelector.ICON_NAME)

bec_widgets/widgets/utility/visual/colormap_widget/bec_color_map_widget_plugin.py

@@ -2,7 +2,6 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.utility.visual.colormap_widget.colormap_widget import BECColorMapWidget
@@ -21,8 +20,6 @@ class BECColorMapWidgetPlugin(QDesignerCustomWidgetInterface):  # pragma: no cov
         self._form_editor = None
 
     def createWidget(self, parent):
-        if parent is None:
-            return QWidget()
         t = BECColorMapWidget(parent)
         return t
 
@@ -30,7 +27,7 @@ class BECColorMapWidgetPlugin(QDesignerCustomWidgetInterface):  # pragma: no cov
         return DOM_XML
 
     def group(self):
-        return "BEC Visual Utils"
+        return "BEC Buttons"
 
     def icon(self):
         return designer_material_icon(BECColorMapWidget.ICON_NAME)

bec_widgets/widgets/utility/visual/colormap_widget/colormap_widget.py

@@ -24,7 +24,7 @@ class RoundedColorMapButton(ColorMapButton):
         painter.end()
 
 
-class BECColorMapWidget(QWidget):
+class BECColorMapWidget(BECWidget, QWidget):
     colormap_changed_signal = Signal(str)
     ICON_NAME = "palette"
     PLUGIN = True

bec_widgets/widgets/utility/visual/dark_mode_button/dark_mode_button_plugin.py

@@ -2,7 +2,6 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
 from bec_widgets.widgets.utility.visual.dark_mode_button.dark_mode_button import DarkModeButton
@@ -21,8 +20,6 @@ class DarkModeButtonPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         self._form_editor = None
 
     def createWidget(self, parent):
-        if parent is None:
-            return QWidget()
         t = DarkModeButton(parent)
         return t
 
@@ -30,7 +27,7 @@ class DarkModeButtonPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return DOM_XML
 
     def group(self):
-        return "BEC Visual Utils"
+        return "BEC Buttons"
 
     def icon(self):
         return designer_material_icon(DarkModeButton.ICON_NAME)
@@ -51,7 +48,7 @@ class DarkModeButtonPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "DarkModeButton"
 
     def toolTip(self):
-        return "DarkModeButton"
+        return "Button to toggle between dark and light mode."
 
     def whatsThis(self):
         return self.toolTip()

bec_widgets/widgets/utility/widget_finder/register_widget_finder_combo_box.py

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

bec_widgets/widgets/utility/widget_finder/widget_finder.py

@@ -17,14 +17,12 @@ from qtpy.QtWidgets import (
 
 from bec_widgets import SafeProperty
 from bec_widgets.utils.widget_io import WidgetIO
-from bec_widgets.widgets.containers.main_window.main_window import BECMainWindowNoRPC
+from bec_widgets.widgets.containers.main_window.main_window import BECMainWindow
 from bec_widgets.widgets.plots.image.image import Image
 from bec_widgets.widgets.plots.waveform.waveform import Waveform
 
 
 class WidgetFinderComboBox(QComboBox):
-    ICON_NAME = "frame_inspect"
-    PLUGIN = True
 
     def __init__(self, parent=None, widget_class: type[QWidget] | str | None = None):
         super().__init__(parent)
@@ -179,7 +177,7 @@ class WidgetFinderComboBox(QComboBox):
         event.accept()
 
 
-class InspectorMainWindow(BECMainWindowNoRPC):  # pragma: no cover
+class InspectorMainWindow(BECMainWindow):  # pragma: no cover
     """
     A main window that includes a widget finder combobox to inspect widgets.
     """

bec_widgets/widgets/utility/widget_finder/widget_finder_combo_box.pyproject

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

bec_widgets/widgets/utility/widget_finder/widget_finder_combo_box_plugin.py

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

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "bec_widgets"
-version = "2.31.1"
+version = "2.27.0"
 description = "BEC Widgets"
 requires-python = ">=3.10"
 classifiers = [

tests/end-2-end/test_plotting_framework_e2e.py

@@ -254,35 +254,3 @@ def test_dap_rpc(qtbot, bec_client_lib, connected_client_gui_obj):
     res.wait()
 
     qtbot.waitUntil(wait_for_fit, timeout=10000)
-
-
-def test_waveform_passing_device(qtbot, bec_client_lib, connected_client_gui_obj):
-    gui = connected_client_gui_obj
-    client = bec_client_lib
-    dev = client.device_manager.devices
-    scans = client.scans
-
-    dock = gui.bec
-    wf = dock.new("wf_dock").new("Waveform")
-    c1 = wf.plot(
-        y_name=dev.samx, y_entry=dev.samx.setpoint
-    )  # using setpoint to not use readback signal
-
-    assert c1.object_name == "samx_samx_setpoint"
-
-    status = scans.line_scan(dev.samx, -5, 5, steps=5, exp_time=0.05, relative=False)
-    status.wait()
-
-    # Wait for the scan to finish and the data to be available in history
-    # Wait until scan_id is in history
-    def _wait_for_scan_in_history():
-        if len(client.history) == 0:
-            return False
-        # Once items appear in storage, the last one hast to be the one we just scanned
-        return client.history[-1].metadata.bec["scan_id"] == status.scan.scan_id
-
-    qtbot.waitUntil(_wait_for_scan_in_history, timeout=10000)
-    last_scan_data = client.history[-1]
-    # check plotted data
-    x_data, y_data = c1.get_data()
-    assert np.array_equal(y_data, last_scan_data.devices.samx.samx_setpoint.read().get("value"))

tests/unit_tests/test_config_communicator.py

@@ -1,6 +1,5 @@
-from unittest.mock import ANY, MagicMock, call
+from unittest.mock import ANY, MagicMock
 
-import pytest
 from bec_lib.config_helper import ConfigHelper
 
 from bec_widgets.widgets.services.device_browser.device_item.config_communicator import (
@@ -21,41 +20,9 @@ def test_must_have_a_name(qtbot):
     qtbot.waitUntil(lambda: error_occurred, timeout=100)
 
 
-@pytest.mark.parametrize(
-    ["action", "config", "error"],
-    [("update", None, True), ("remove", None, False), ("add", {}, False)],
-)
-def test_action_config_match(action, config, error):
-    def init():
-        return CommunicateConfigAction(
-            ConfigHelper(MagicMock()), device="test", config=config, action=action
-        )
-
-    if error:
-        with pytest.raises(ValueError):
-            init()
-    else:
-        assert init()
-
-
 def test_wait_for_reply_on_RID():
     ch = MagicMock(spec=ConfigHelper)
     ch.send_config_request.return_value = "abcde"
     cca = CommunicateConfigAction(config_helper=ch, device="samx", config={}, action="update")
     cca.run()
-    ch.wait_for_config_reply.assert_called_once_with("abcde", timeout=ANY)
-
-
-def test_remove_readd_with_device_config(qtbot):
-    ch = MagicMock(spec=ConfigHelper)
-    ch.send_config_request.return_value = "abcde"
-    cca = CommunicateConfigAction(
-        config_helper=ch, device="samx", config={"deviceConfig": {"arg": "val"}}, action="update"
-    )
-    cca.run()
-    ch.send_config_request.assert_has_calls(
-        [
-            call(action="remove", config=ANY, wait_for_response=False),
-            call(action="add", config=ANY, wait_for_response=False),
-        ]
-    )
+    ch.wait_for_config_reply.assert_called_with("abcde", timeout=ANY)

tests/unit_tests/test_device_browser.py

@@ -2,7 +2,6 @@ from typing import TYPE_CHECKING
 from unittest import mock
 
 import pytest
-from bec_lib.device import Device
 from qtpy.QtCore import QPoint, Qt
 from qtpy.QtWidgets import QTabWidget
 
@@ -10,9 +9,6 @@ from bec_widgets.widgets.services.device_browser.device_browser import DeviceBro
 from bec_widgets.widgets.services.device_browser.device_item.device_config_form import (
     DeviceConfigForm,
 )
-from bec_widgets.widgets.services.device_browser.device_item.device_signal_display import (
-    SignalDisplay,
-)
 
 from .client_mocks import mocked_client
 
@@ -146,39 +142,3 @@ def test_device_deletion(device_browser, qtbot):
     assert widget.device in device_browser._device_items
     qtbot.mouseClick(widget.delete_button, Qt.LeftButton)
     qtbot.waitUntil(lambda: widget.device not in device_browser._device_items, timeout=10000)
-
-
-def test_signal_display(mocked_client, qtbot):
-    signal_display = SignalDisplay(client=mocked_client, device="test_device")
-    qtbot.addWidget(signal_display)
-    device_mock = mock.MagicMock()
-    signal_display.dev = {"test_device": device_mock}
-    signal_display._refresh()
-    device_mock.read.assert_called()
-    device_mock.read_configuration.assert_called()
-
-
-def test_signal_display_no_device(mocked_client, qtbot):
-    device_mock = mock.MagicMock()
-    mocked_client.client.device_manager.devices = {"test_device_1": device_mock}
-    signal_display = SignalDisplay(client=mocked_client, device="test_device_2")
-    qtbot.addWidget(signal_display)
-    assert (
-        signal_display._content_layout.itemAt(1).widget().text()
-        == "Device test_device_2 not found in device manager!"
-    )
-    signal_display._refresh()
-    device_mock.read.assert_not_called()
-    device_mock.read_configuration.assert_not_called()
-
-
-def test_signal_display_omitted_not_added(mocked_client, qtbot):
-    device_mock = mock.MagicMock(spec=Device)
-    device_mock._info = {"signals": {"signal_1": {"kind_str": "omitted"}}}
-
-    signal_display = SignalDisplay(client=mocked_client, device="test_device_1")
-    signal_display.dev = {"test_device_1": device_mock}
-    signal_display._populate()
-
-    qtbot.addWidget(signal_display)
-    assert signal_display._content_layout.itemAt(1).widget() is None