Feat/add new form to dm view

bec_widgets/__init__.py

@@ -1,8 +1,7 @@
 import os
 import sys
 
-import PySide6QtAds as QtAds
-
+import bec_widgets.widgets.containers.qt_ads as QtAds
 from bec_widgets.utils.bec_widget import BECWidget
 from bec_widgets.utils.error_popups import SafeProperty, SafeSlot
 

bec_widgets/applications/main_app.py

@@ -47,7 +47,10 @@ def __init__(
 
     def _add_views(self):
         self.add_section("BEC Applications", "bec_apps")
-        self.ads = AdvancedDockArea(self)
+        self.ads = AdvancedDockArea(
+            self, profile_namespace="main_workspace", auto_profile_namespace=False
+        )
+        self.ads.setObjectName("MainWorkspace")
         self.device_manager = DeviceManagerWidget(self)
         self.developer_view = DeveloperView(self)
 

bec_widgets/applications/views/developer_view/developer_view.py

@@ -21,9 +21,6 @@ def __init__(
         self.developer_widget = DeveloperWidget(parent=self)
         self.set_content(self.developer_widget)
 
-        # Apply stretch after the layout is done
-        self.set_default_view([2, 5, 3], [7, 3])
-
 
 if __name__ == "__main__":
     import sys

bec_widgets/applications/views/developer_view/developer_widget.py

@@ -5,17 +5,14 @@
 from bec_lib.script_executor import upload_script
 from bec_qthemes import material_icon
 from qtpy.QtGui import QKeySequence, QShortcut
-from qtpy.QtWidgets import QTextEdit, QVBoxLayout, QWidget
-from shiboken6 import isValid
+from qtpy.QtWidgets import QTextEdit
 
-import bec_widgets.widgets.containers.ads as QtAds
-from bec_widgets 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.containers.ads import CDockManager, CDockWidget
 from bec_widgets.widgets.containers.advanced_dock_area.advanced_dock_area import AdvancedDockArea
+from bec_widgets.widgets.containers.advanced_dock_area.basic_dock_area import DockAreaWidget
 from bec_widgets.widgets.editors.monaco.monaco_dock import MonacoDock
 from bec_widgets.widgets.editors.web_console.web_console import WebConsole
 from bec_widgets.widgets.utility.ide_explorer.ide_explorer import IDEExplorer
@@ -77,31 +74,38 @@ def replace_python_examples(match):
     return css + html
 
 
-class DeveloperWidget(BECWidget, QWidget):
+class DeveloperWidget(DockAreaWidget):
 
     def __init__(self, parent=None, **kwargs):
-        super().__init__(parent=parent, **kwargs)
+        super().__init__(parent=parent, variant="compact", **kwargs)
 
-        # Top-level layout hosting a toolbar and the dock manager
-        self._root_layout = QVBoxLayout(self)
-        self._root_layout.setContentsMargins(0, 0, 0, 0)
-        self._root_layout.setSpacing(0)
+        # Promote toolbar above the dock manager provided by the base class
         self.toolbar = ModularToolBar(self)
         self.init_developer_toolbar()
-        self._root_layout.addWidget(self.toolbar)
-
-        self.dock_manager = CDockManager(self)
-        self.dock_manager.setStyleSheet("")
-        self._root_layout.addWidget(self.dock_manager)
+        self._root_layout.insertWidget(0, self.toolbar)
 
         # Initialize the widgets
         self.explorer = IDEExplorer(self)
+        self.explorer.setObjectName("Explorer")
         self.console = WebConsole(self)
+        self.console.setObjectName("Console")
         self.terminal = WebConsole(self, startup_cmd="")
+        self.terminal.setObjectName("Terminal")
         self.monaco = MonacoDock(self)
+        self.monaco.setObjectName("MonacoEditor")
         self.monaco.save_enabled.connect(self._on_save_enabled_update)
-        self.plotting_ads = AdvancedDockArea(self, mode="plot", default_add_direction="bottom")
+        self.plotting_ads = AdvancedDockArea(
+            self,
+            mode="plot",
+            default_add_direction="bottom",
+            profile_namespace="developer_plotting",
+            auto_profile_namespace=False,
+            enable_profile_management=False,
+            variant="compact",
+        )
+        self.plotting_ads.setObjectName("PlottingArea")
         self.signature_help = QTextEdit(self)
+        self.signature_help.setObjectName("Signature Help")
         self.signature_help.setAcceptRichText(True)
         self.signature_help.setReadOnly(True)
         self.signature_help.setLineWrapMode(QTextEdit.LineWrapMode.WidgetWidth)
@@ -113,56 +117,83 @@ def __init__(self, parent=None, **kwargs):
         )
         self._current_script_id: str | None = None
 
-        # Create the dock widgets
-        self.explorer_dock = QtAds.CDockWidget("Explorer", self)
-        self.explorer_dock.setWidget(self.explorer)
-
-        self.console_dock = QtAds.CDockWidget("Console", self)
-        self.console_dock.setWidget(self.console)
+        self._initialize_layout()
 
-        self.monaco_dock = QtAds.CDockWidget("Monaco Editor", self)
-        self.monaco_dock.setWidget(self.monaco)
-
-        self.terminal_dock = QtAds.CDockWidget("Terminal", self)
-        self.terminal_dock.setWidget(self.terminal)
+        # Connect editor signals
+        self.explorer.file_open_requested.connect(self._open_new_file)
+        self.monaco.macro_file_updated.connect(self.explorer.refresh_macro_file)
 
-        # Monaco will be central widget
-        self.dock_manager.setCentralWidget(self.monaco_dock)
+        self.toolbar.show_bundles(["save", "execution", "settings"])
 
-        # Add the dock widgets to the dock manager
-        area_bottom = self.dock_manager.addDockWidget(
-            QtAds.DockWidgetArea.BottomDockWidgetArea, self.console_dock
+    def _initialize_layout(self) -> None:
+        """Create the default dock arrangement for the developer workspace."""
+
+        # Monaco editor as the central dock
+        self.monaco_dock = self.new(
+            self.monaco,
+            closable=False,
+            floatable=False,
+            movable=False,
+            return_dock=True,
+            show_title_bar=False,
+            show_settings_action=False,
+            title_buttons={"float": False, "close": False, "menu": False},
+            # promote_central=True,
         )
-        self.dock_manager.addDockWidgetTabToArea(self.terminal_dock, area_bottom)
 
-        area_left = self.dock_manager.addDockWidget(
-            QtAds.DockWidgetArea.LeftDockWidgetArea, self.explorer_dock
+        # Explorer on the left without a title bar
+        self.explorer_dock = self.new(
+            self.explorer,
+            where="left",
+            closable=False,
+            floatable=False,
+            movable=False,
+            return_dock=True,
+            show_title_bar=False,
         )
-        area_left.titleBar().setVisible(False)
-
-        for dock in self.dock_manager.dockWidgets():
-            # dock.setFeature(CDockWidget.DockWidgetDeleteOnClose, True)#TODO implement according to MonacoDock or AdvancedDockArea
-            # dock.setFeature(CDockWidget.CustomCloseHandling, True) #TODO same
-            dock.setFeature(CDockWidget.DockWidgetFeature.DockWidgetClosable, False)
-            dock.setFeature(CDockWidget.DockWidgetFeature.DockWidgetFloatable, False)
-            dock.setFeature(CDockWidget.DockWidgetFeature.DockWidgetMovable, False)
-
-        self.plotting_ads_dock = QtAds.CDockWidget("Plotting Area", self)
-        self.plotting_ads_dock.setWidget(self.plotting_ads)
 
-        self.signature_dock = QtAds.CDockWidget("Signature Help", self)
-        self.signature_dock.setWidget(self.signature_help)
-
-        area_right = self.dock_manager.addDockWidget(
-            QtAds.DockWidgetArea.RightDockWidgetArea, self.plotting_ads_dock
+        # Console and terminal tabbed along the bottom
+        self.console_dock = self.new(
+            self.console,
+            relative_to=self.monaco_dock,
+            where="bottom",
+            closable=False,
+            floatable=False,
+            movable=False,
+            return_dock=True,
+            title_buttons={"float": True, "close": False},
+        )
+        self.terminal_dock = self.new(
+            self.terminal,
+            closable=False,
+            floatable=False,
+            movable=False,
+            tab_with=self.console_dock,
+            return_dock=True,
+            title_buttons={"float": False, "close": False},
         )
-        self.dock_manager.addDockWidgetTabToArea(self.signature_dock, area_right)
 
-        # Connect editor signals
-        self.explorer.file_open_requested.connect(self._open_new_file)
-        self.monaco.macro_file_updated.connect(self.explorer.refresh_macro_file)
+        # Plotting area on the right with signature help tabbed alongside
+        self.plotting_ads_dock = self.new(
+            self.plotting_ads,
+            where="right",
+            closable=False,
+            floatable=False,
+            movable=False,
+            return_dock=True,
+            title_buttons={"float": True},
+        )
+        self.signature_dock = self.new(
+            self.signature_help,
+            closable=False,
+            floatable=False,
+            movable=False,
+            tab_with=self.plotting_ads_dock,
+            return_dock=True,
+            title_buttons={"float": False, "close": False},
+        )
 
-        self.toolbar.show_bundles(["save", "execution", "settings"])
+        self.set_layout_ratios(horizontal=[2, 5, 3], vertical=[7, 3])
 
     def init_developer_toolbar(self):
         """Initialize the developer toolbar with necessary actions and widgets."""
@@ -313,19 +344,9 @@ def on_script_execution_info(self, content: dict, metadata: dict):
         self.script_editor_tab.widget().set_highlighted_lines(line_number, line_number)
 
     def cleanup(self):
-        for dock in self.dock_manager.dockWidgets():
-            self._delete_dock(dock)
+        self.delete_all()
         return super().cleanup()
 
-    def _delete_dock(self, dock: CDockWidget) -> None:
-        w = dock.widget()
-        if w and isValid(w):
-            w.close()
-            w.deleteLater()
-        if isValid(dock):
-            dock.closeDockWidget()
-            dock.deleteDockWidget()
-
 
 if __name__ == "__main__":
     import sys

bec_widgets/applications/views/device_manager_view/device_manager_dialogs/__init__.py

@@ -0,0 +1,2 @@
+from .config_choice_dialog import ConfigChoiceDialog
+from .device_form_dialog import DeviceFormDialog

bec_widgets/applications/views/device_manager_view/device_manager_dialogs/config_choice_dialog.py

@@ -0,0 +1,49 @@
+"""Dialog to chgoose config loading method: replace, add or cancel."""
+
+from enum import IntEnum
+
+from qtpy.QtWidgets import QDialog, QDialogButtonBox, QLabel, QSizePolicy, QVBoxLayout
+
+
+class ConfigChoiceDialog(QDialog):
+    class Result(IntEnum):
+        CANCEL = QDialog.Rejected
+        ADD = 2
+        REPLACE = 3
+
+    def __init__(
+        self,
+        parent=None,
+        custom_label: str = "Do you want to replace the current config or add to it?",
+    ):
+        super().__init__(parent)
+        self.setWindowTitle("Load Config")
+
+        layout = QVBoxLayout(self)
+
+        label = QLabel(custom_label)
+        label.setWordWrap(True)
+        layout.addWidget(label)
+
+        # Use QDialogButtonBox for native layout
+        self.button_box = QDialogButtonBox(self)
+        self.cancel_btn = self.button_box.addButton(
+            "Cancel", QDialogButtonBox.ButtonRole.ActionRole  # RejectRole will be next to Accept...
+        )
+        self.replace_btn = self.button_box.addButton(
+            "Replace", QDialogButtonBox.ButtonRole.AcceptRole
+        )
+        self.add_btn = self.button_box.addButton("Add", QDialogButtonBox.ButtonRole.AcceptRole)
+
+        layout.addWidget(self.button_box)
+
+        for btn in [self.replace_btn, self.add_btn, self.cancel_btn]:
+            btn.setMinimumWidth(80)
+            btn.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Preferred)
+
+        # Connections using native done(int)
+        self.replace_btn.clicked.connect(lambda: self.done(self.Result.REPLACE))
+        self.add_btn.clicked.connect(lambda: self.done(self.Result.ADD))
+        self.cancel_btn.clicked.connect(lambda: self.done(self.Result.CANCEL))
+
+        self.replace_btn.setFocus()