From 5d148babe569e026b9c4e048a44287cc8a393393 Mon Sep 17 00:00:00 2001
From: David Perl <david.perl@psi.ch>
Date: Mon, 8 Sep 2025 08:43:50 +0200
Subject: [PATCH] fix: don't use deprecated api for CDockWidget

---
 .../device_manager_view.py                    | 24 ++++++++++---------
 .../available_device_resources_ui.py          |  2 +-
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/bec_widgets/examples/device_manager_view/device_manager_view.py b/bec_widgets/examples/device_manager_view/device_manager_view.py
index 980a46dd..43776845 100644
--- a/bec_widgets/examples/device_manager_view/device_manager_view.py
+++ b/bec_widgets/examples/device_manager_view/device_manager_view.py
@@ -91,29 +91,31 @@ class DeviceManagerView(BECWidget, QWidget):
         self.available_devices = AvailableDeviceResources(
             self, shared_selection_signal=self._shared_selection
         )
-        self.available_devices_dock = QtAds.CDockWidget("Available Devices", self)
+        self.available_devices_dock = QtAds.CDockWidget(
+            self.dock_manager, "Available Devices", self
+        )
         self.available_devices_dock.setWidget(self.available_devices)
 
         # Device Table View widget
         self.device_table_view = DeviceTableView(
             self, shared_selection_signal=self._shared_selection
         )
-        self.device_table_view_dock = QtAds.CDockWidget("Device Table", self)
+        self.device_table_view_dock = QtAds.CDockWidget(self.dock_manager, "Device Table", self)
         self.device_table_view_dock.setWidget(self.device_table_view)
 
         # Device Config View widget
         self.dm_config_view = DMConfigView(self)
-        self.dm_config_view_dock = QtAds.CDockWidget("Device Config View", self)
+        self.dm_config_view_dock = QtAds.CDockWidget(self.dock_manager, "Device Config View", self)
         self.dm_config_view_dock.setWidget(self.dm_config_view)
 
         # Docstring View
         self.dm_docs_view = DocstringView(self)
-        self.dm_docs_view_dock = QtAds.CDockWidget("Docstring View", self)
+        self.dm_docs_view_dock = QtAds.CDockWidget(self.dock_manager, "Docstring View", self)
         self.dm_docs_view_dock.setWidget(self.dm_docs_view)
 
         # Ophyd Test view
         self.ophyd_test_view = DMOphydTest(self)
-        self.ophyd_test_dock_view = QtAds.CDockWidget("Ophyd Test View", self)
+        self.ophyd_test_dock_view = QtAds.CDockWidget(self.dock_manager, "Ophyd Test View", self)
         self.ophyd_test_dock_view.setWidget(self.ophyd_test_view)
 
         # Arrange widgets within the QtAds dock manager
@@ -203,9 +205,6 @@ class DeviceManagerView(BECWidget, QWidget):
         # Create IO bundle
         io_bundle = ToolbarBundle("IO", self.toolbar.components)
 
-        # Add load config from plugin dir
-        self.toolbar.add_bundle(io_bundle)
-
         load = MaterialIconAction(
             icon_name="file_open", parent=self, tooltip="Load configuration file from disk"
         )
@@ -237,14 +236,14 @@ class DeviceManagerView(BECWidget, QWidget):
         self.toolbar.components.add_safe("update_config_redis", update_config_redis)
         io_bundle.add_action("update_config_redis")
 
+        # Add load config from plugin dir
+        self.toolbar.add_bundle(io_bundle)
+
     # Table actions
 
     def _add_table_actions(self) -> None:
         table_bundle = ToolbarBundle("Table", self.toolbar.components)
 
-        # Add load config from plugin dir
-        self.toolbar.add_bundle(table_bundle)
-
         # Reset composed view
         reset_composed = MaterialIconAction(
             icon_name="delete_sweep", parent=self, tooltip="Reset current composed config view"
@@ -273,6 +272,9 @@ class DeviceManagerView(BECWidget, QWidget):
         self.toolbar.components.add_safe("rerun_validation", rerun_validation)
         table_bundle.add_action("rerun_validation")
 
+        # Add load config from plugin dir
+        self.toolbar.add_bundle(table_bundle)
+
         # Most likly, no actions on available devices
         # Actions (vielleicht bundle fuer available devices )
         # - reset composed view
diff --git a/bec_widgets/widgets/control/device_manager/components/available_device_resources/available_device_resources_ui.py b/bec_widgets/widgets/control/device_manager/components/available_device_resources/available_device_resources_ui.py
index 4cba0bf5..7f485ba7 100644
--- a/bec_widgets/widgets/control/device_manager/components/available_device_resources/available_device_resources_ui.py
+++ b/bec_widgets/widgets/control/device_manager/components/available_device_resources/available_device_resources_ui.py
@@ -104,7 +104,6 @@ class Ui_availableDeviceResources(object):
     def _add_toolbar(self):
         self.toolbar = ModularToolBar(self)
         io_bundle = ToolbarBundle("IO", self.toolbar.components)
-        self.toolbar.add_bundle(io_bundle)
 
         self.tb_add_selected = MaterialIconAction(
             icon_name="add_box", parent=self, tooltip="Add selected devices to composition"
@@ -119,4 +118,5 @@ class Ui_availableDeviceResources(object):
         io_bundle.add_action("del_selected")
 
         self.verticalLayout.addWidget(self.toolbar)
+        self.toolbar.add_bundle(io_bundle)
         self.toolbar.show_bundles(["IO"])