bec-widgets 0.90.0__py3-none-any.whl → 0.92.0__py3-none-any.whl

bec_widgets/examples/plugin_example_pyside/tictactoeplugin.py

@@ -1,11 +1,14 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
 from qtpy.QtGui import QIcon
 from tictactoe import TicTacToe
 from tictactoetaskmenu import TicTacToeTaskMenuFactory
 
+import bec_widgets
+
 DOM_XML = """
 <ui language='c++'>
     <widget class='TicTacToe' name='ticTacToe'>
@@ -24,6 +27,8 @@ DOM_XML = """
 </ui>
 """
 
+MODULE_PATH = os.path.dirname(bec_widgets.__file__)
+
 
 class TicTacToePlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
     def __init__(self):
@@ -38,10 +43,11 @@ class TicTacToePlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return DOM_XML
 
     def group(self):
-        return ""
+        return "Games"
 
     def icon(self):
-        return QIcon()
+        icon_path = os.path.join(MODULE_PATH, "assets", "designer_icons", "games.png")
+        return QIcon(icon_path)
 
     def includeFile(self):
         return "tictactoe"

bec_widgets/qt_utils/toolbar.py

@@ -5,7 +5,7 @@ from collections import defaultdict
 
 from qtpy.QtCore import QSize
 from qtpy.QtGui import QAction, QIcon
-from qtpy.QtWidgets import QHBoxLayout, QLabel, QToolBar, QToolButton, QWidget
+from qtpy.QtWidgets import QHBoxLayout, QLabel, QMenu, QToolBar, QToolButton, QWidget
 
 import bec_widgets
 
@@ -98,6 +98,52 @@ class DeviceSelectionAction(ToolBarAction):
         self.device_combobox.setStyleSheet(f"QComboBox {{ background-color: {color}; }}")
 
 
+class ExpandableMenuAction(ToolBarAction):
+    """
+    Action for an expandable menu in the toolbar.
+
+    Args:
+        label (str): The label for the menu.
+        actions (dict): A dictionary of actions to populate the menu.
+        icon_path (str, optional): The path to the icon file. Defaults to None.
+
+    """
+
+    def __init__(self, label: str, actions: dict, icon_path: str = None):
+        super().__init__(icon_path, label)
+        self.actions = actions
+        self.widgets = defaultdict(dict)
+
+    def add_to_toolbar(self, toolbar: QToolBar, target: QWidget):
+        button = QToolButton(toolbar)
+        if self.icon_path:
+            button.setIcon(QIcon(self.icon_path))
+        button.setText(self.tooltip)
+        button.setPopupMode(QToolButton.InstantPopup)
+        button.setStyleSheet(
+            """
+                   QToolButton {
+                       font-size: 14px;
+                   }
+                   QMenu {
+                       font-size: 14px;
+                   }
+               """
+        )
+        menu = QMenu(button)
+        for action_id, action in self.actions.items():
+            sub_action = QAction(action.tooltip, target)
+            if action.icon_path:
+                icon = QIcon()
+                icon.addFile(action.icon_path, size=QSize(20, 20))
+                sub_action.setIcon(icon)
+            sub_action.setCheckable(action.checkable)
+            menu.addAction(sub_action)
+            self.widgets[action_id] = sub_action
+        button.setMenu(menu)
+        toolbar.addWidget(button)
+
+
 class ModularToolBar(QToolBar):
     """Modular toolbar with optional automatic initialization.
     Args:
@@ -108,7 +154,11 @@ class ModularToolBar(QToolBar):
     """
 
     def __init__(
-        self, parent=None, actions=None, target_widget=None, color: str = "rgba(255, 255, 255, 0)"
+        self,
+        parent=None,
+        actions: dict | None = None,
+        target_widget=None,
+        color: str = "rgba(255, 255, 255, 0)",
     ):
         super().__init__(parent)
 

bec_widgets/utils/generate_designer_plugin.py

@@ -4,7 +4,7 @@ import re
 
 from qtpy.QtCore import QObject
 
-EXCLUDED_PLUGINS = ["BECConnector", "BECDockArea", "BECDock"]
+EXCLUDED_PLUGINS = ["BECConnector", "BECDockArea", "BECDock", "BECFigure"]
 
 
 class DesignerPluginInfo:

bec_widgets/widgets/bec_queue/bec_queue_plugin.py

@@ -1,9 +1,11 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
 from qtpy.QtGui import QIcon
 
+import bec_widgets
 from bec_widgets.widgets.bec_queue.bec_queue import BECQueue
 
 DOM_XML = """
@@ -13,6 +15,8 @@ DOM_XML = """
 </ui>
 """
 
+MODULE_PATH = os.path.dirname(bec_widgets.__file__)
+
 
 class BECQueuePlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
     def __init__(self):
@@ -27,10 +31,11 @@ class BECQueuePlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return DOM_XML
 
     def group(self):
-        return ""
+        return "BEC Services"
 
     def icon(self):
-        return QIcon()
+        icon_path = os.path.join(MODULE_PATH, "assets", "designer_icons", "device_line_edit.png")
+        return QIcon(icon_path)
 
     def includeFile(self):
         return "bec_queue"

bec_widgets/widgets/bec_status_box/bec_status_box_plugin.py

@@ -1,9 +1,11 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
 from qtpy.QtGui import QIcon
 
+import bec_widgets
 from bec_widgets.widgets.bec_status_box.bec_status_box import BECStatusBox
 
 DOM_XML = """
@@ -13,6 +15,8 @@ DOM_XML = """
 </ui>
 """
 
+MODULE_PATH = os.path.dirname(bec_widgets.__file__)
+
 
 class BECStatusBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
     def __init__(self):
@@ -27,10 +31,11 @@ class BECStatusBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return DOM_XML
 
     def group(self):
-        return ""
+        return "BEC Services"
 
     def icon(self):
-        return QIcon()
+        icon_path = os.path.join(MODULE_PATH, "assets", "designer_icons", "status.png")
+        return QIcon(icon_path)
 
     def includeFile(self):
         return "bec_status_box"

bec_widgets/widgets/bec_status_box/status_item.py

@@ -2,24 +2,30 @@
 The widget is bound to be used with the BECStatusBox widget."""
 
 import enum
+import os
 from datetime import datetime
 
 from bec_lib.utils.import_utils import lazy_import_from
 from qtpy.QtCore import Qt, Slot
-from qtpy.QtWidgets import QDialog, QHBoxLayout, QLabel, QStyle, QVBoxLayout, QWidget
+from qtpy.QtGui import QIcon
+from qtpy.QtWidgets import QDialog, QHBoxLayout, QLabel, QVBoxLayout, QWidget
+
+import bec_widgets
 
 # TODO : Put normal imports back when Pydantic gets faster
 BECStatus = lazy_import_from("bec_lib.messages", ("BECStatus",))
 
+MODULE_PATH = os.path.dirname(bec_widgets.__file__)
+
 
 class IconsEnum(enum.Enum):
     """Enum class for icons in the status item widget."""
 
-    RUNNING = "SP_DialogApplyButton"
-    BUSY = "SP_BrowserReload"
-    IDLE = "SP_MessageBoxWarning"
-    ERROR = "SP_DialogCancelButton"
-    NOTCONNECTED = "SP_TitleBarContextHelpButton"
+    RUNNING = os.path.join(MODULE_PATH, "assets", "status_icons", "running.svg")
+    BUSY = os.path.join(MODULE_PATH, "assets", "status_icons", "refresh.svg")
+    IDLE = os.path.join(MODULE_PATH, "assets", "status_icons", "warning.svg")
+    ERROR = os.path.join(MODULE_PATH, "assets", "status_icons", "error.svg")
+    NOTCONNECTED = os.path.join(MODULE_PATH, "assets", "status_icons", "not_connected.svg")
 
 
 class StatusItem(QWidget):
@@ -91,8 +97,8 @@ class StatusItem(QWidget):
 
     def set_status(self) -> None:
         """Set the status icon for the status item widget."""
-        icon_name = IconsEnum[self.config.status].value
-        icon = self.style().standardIcon(getattr(QStyle.StandardPixmap, icon_name))
+        icon_path = IconsEnum[self.config.status].value
+        icon = QIcon(icon_path)
         self._icon.setPixmap(icon.pixmap(*self.icon_size))
         self._icon.setAlignment(Qt.AlignmentFlag.AlignRight)
 

bec_widgets/widgets/color_button/color_button_plugin.py

@@ -3,6 +3,7 @@ import os
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
 from qtpy.QtGui import QIcon
 
+import bec_widgets
 from bec_widgets.widgets.color_button.color_button import ColorButton
 
 DOM_XML = """
@@ -11,6 +12,7 @@ DOM_XML = """
     </widget>
 </ui>
 """
+MODULE_PATH = os.path.dirname(bec_widgets.__file__)
 
 
 class ColorButtonPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
@@ -29,8 +31,7 @@ class ColorButtonPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "BEC Buttons"
 
     def icon(self):
-        current_path = os.path.dirname(__file__)
-        icon_path = os.path.join(current_path, "assets", "color_button.png")
+        icon_path = os.path.join(MODULE_PATH, "assets", "designer_icons", "color_button.png")
         return QIcon(icon_path)
 
     def includeFile(self):

bec_widgets/widgets/device_box/device_box_plugin.py

@@ -1,9 +1,11 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+import os
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
 from qtpy.QtGui import QIcon
 
+import bec_widgets
 from bec_widgets.widgets.device_box.device_box import DeviceBox
 
 DOM_XML = """
@@ -13,6 +15,8 @@ DOM_XML = """
 </ui>
 """
 
+MODULE_PATH = os.path.dirname(bec_widgets.__file__)
+
 
 class DeviceBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
     def __init__(self):
@@ -30,7 +34,8 @@ class DeviceBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "Device Control"
 
     def icon(self):
-        return QIcon()
+        icon_path = os.path.join(MODULE_PATH, "assets", "designer_icons", "device_box.png")
+        return QIcon(icon_path)
 
     def includeFile(self):
         return "device_box"

bec_widgets/widgets/device_combobox/{device_combobox_plugin.py → device_combo_box_plugin.py}

@@ -5,6 +5,7 @@ import os
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
 from qtpy.QtGui import QIcon
 
+import bec_widgets
 from bec_widgets.widgets.device_combobox.device_combobox import DeviceComboBox
 
 DOM_XML = """
@@ -14,6 +15,8 @@ DOM_XML = """
 </ui>
 """
 
+MODULE_PATH = os.path.dirname(bec_widgets.__file__)
+
 
 class DeviceComboBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
     def __init__(self):
@@ -28,11 +31,10 @@ class DeviceComboBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return DOM_XML
 
     def group(self):
-        return "BEC Device Inputs"
+        return "Device Control"
 
     def icon(self):
-        current_path = os.path.dirname(__file__)
-        icon_path = os.path.join(current_path, "assets", "device_combobox_icon.png")
+        icon_path = os.path.join(MODULE_PATH, "assets", "designer_icons", "device_combo_box.png")
         return QIcon(icon_path)
 
     def includeFile(self):

bec_widgets/widgets/device_combobox/device_combobox.py

@@ -2,7 +2,6 @@ from typing import TYPE_CHECKING
 
 from qtpy.QtWidgets import QComboBox
 
-from bec_widgets.utils.bec_widget import BECWidget
 from bec_widgets.widgets.base_classes.device_input_base import DeviceInputBase, DeviceInputConfig
 
 if TYPE_CHECKING:
@@ -35,7 +34,7 @@ class DeviceComboBox(DeviceInputBase, QComboBox):
     ):
         super().__init__(client=client, config=config, gui_id=gui_id)
         QComboBox.__init__(self, parent=parent)
-
+        self.setMinimumSize(125, 26)
         self.populate_combobox()
 
         if arg_name is not None:

bec_widgets/widgets/device_combobox/{register_device_combobox.py → register_device_combo_box.py}

@@ -6,7 +6,7 @@ def main():  # pragma: no cover
         return
     from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection
 
-    from bec_widgets.widgets.device_combobox.device_combobox_plugin import DeviceComboBoxPlugin
+    from bec_widgets.widgets.device_combobox.device_combo_box_plugin import DeviceComboBoxPlugin
 
     QPyDesignerCustomWidgetCollection.addCustomWidget(DeviceComboBoxPlugin())
 

bec_widgets/widgets/device_line_edit/device_line_edit_plugin.py

@@ -5,6 +5,7 @@ import os
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
 from qtpy.QtGui import QIcon
 
+import bec_widgets
 from bec_widgets.widgets.device_line_edit.device_line_edit import DeviceLineEdit
 
 DOM_XML = """
@@ -14,6 +15,8 @@ DOM_XML = """
 </ui>
 """
 
+MODULE_PATH = os.path.dirname(bec_widgets.__file__)
+
 
 class DeviceLineEditPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
     def __init__(self):
@@ -28,11 +31,10 @@ class DeviceLineEditPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return DOM_XML
 
     def group(self):
-        return "BEC Device Inputs"
+        return "Device Control"
 
     def icon(self):
-        current_path = os.path.dirname(__file__)
-        icon_path = os.path.join(current_path, "assets", "line_edit_icon.png")
+        icon_path = os.path.join(MODULE_PATH, "assets", "designer_icons", "device_line_edit.png")
         return QIcon(icon_path)
 
     def includeFile(self):

bec_widgets/widgets/dock/dock.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from typing import TYPE_CHECKING, Any, Literal, Optional
 
 from pydantic import Field
-from pyqtgraph.dockarea import Dock
+from pyqtgraph.dockarea import Dock, DockLabel
 
 from bec_widgets.cli.rpc_wigdet_handler import widget_handler
 from bec_widgets.utils import ConnectionConfig, GridLayoutManager
@@ -25,6 +25,64 @@ class DockConfig(ConnectionConfig):
     )
 
 
+class CustomDockLabel(DockLabel):
+    def updateStyle(self):
+        r = "3px"
+        if self.dim:
+            fg = "#aaa"
+            bg = "#44a"
+            border = "#339"
+        else:
+            fg = "#fff"
+            bg = "#3f4042"
+            border = "#3f4042"
+
+        if self.orientation == "vertical":
+            self.vStyle = """DockLabel {
+                background-color : %s;
+                color : %s;
+                border-top-right-radius: 0px;
+                border-top-left-radius: %s;
+                border-bottom-right-radius: 0px;
+                border-bottom-left-radius: %s;
+                border-width: 0px;
+                border-right: 2px solid %s;
+                padding-top: 3px;
+                padding-bottom: 3px;
+                font-size: %s;
+            }""" % (
+                bg,
+                fg,
+                r,
+                r,
+                border,
+                self.fontSize,
+            )
+            self.setStyleSheet(self.vStyle)
+        else:
+            self.hStyle = """DockLabel {
+                background-color : %s;
+                color : %s;
+                border-top-right-radius: %s;
+                border-top-left-radius: %s;
+                border-bottom-right-radius: 0px;
+                border-bottom-left-radius: 0px;
+                border-width: 0px;
+                border-bottom: 2px solid %s;
+                padding-left: 3px;
+                padding-right: 3px;
+                font-size: %s;
+            }""" % (
+                bg,
+                fg,
+                r,
+                r,
+                border,
+                self.fontSize,
+            )
+            self.setStyleSheet(self.hStyle)
+
+
 class BECDock(BECWidget, Dock):
     USER_ACCESS = [
         "_config_dict",
@@ -46,11 +104,12 @@ class BECDock(BECWidget, Dock):
     def __init__(
         self,
         parent: QWidget | None = None,
-        parent_dock_area: BECDockArea | None = None,
+        parent_dock_area: QWidget | None = None,
         config: DockConfig | None = None,
         name: str | None = None,
         client=None,
         gui_id: str | None = None,
+        closable: bool = True,
         **kwargs,
     ) -> None:
         if config is None:
@@ -62,7 +121,11 @@ class BECDock(BECWidget, Dock):
                 config = DockConfig(**config)
             self.config = config
         super().__init__(client=client, config=config, gui_id=gui_id)
-        Dock.__init__(self, name=name, **kwargs)
+        label = CustomDockLabel(text=name, closable=closable)
+        Dock.__init__(self, name=name, label=label, **kwargs)
+        # Dock.__init__(self, name=name, **kwargs)
+
+        self.parent_dock_area = parent_dock_area
 
         # Layout Manager
         self.layout_manager = GridLayoutManager(self.layout)
@@ -230,7 +293,7 @@ class BECDock(BECWidget, Dock):
         Remove the dock from the parent dock area.
         """
         # self.cleanup()
-        self.orig_area.remove_dock(self.name())
+        self.parent_dock_area.remove_dock(self.name())
 
     def cleanup(self):
         """
@@ -249,3 +312,4 @@ class BECDock(BECWidget, Dock):
         """
         self.cleanup()
         super().close()
+        self.parent_dock_area.dock_area.docks.pop(self.name(), None)