bec-widgets 0.99.1__tar.gz → 0.99.9__tar.gz

{bec_widgets-0.99.1 → bec_widgets-0.99.9}/.gitlab-ci.yml

@@ -178,7 +178,6 @@ test-matrix:
     - *install-repos
     - pip install -e .[dev,$QT_PCKG]
     - pytest -v --maxfail=2 --junitxml=report.xml --random-order ./tests/unit_tests
-  allow_failure: true
 
 end-2-end-conda:
   stage: End2End

bec_widgets-0.99.9/CHANGELOG.md

@@ -0,0 +1,161 @@
+# CHANGELOG
+
+## v0.99.9 (2024-08-28)
+
+### Fix
+
+* fix: fixed build process and excluded docs and tests from tarballs and wheels ([`719254c`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/719254cf0a48e1fc4bd541edba239570778bcfea))
+
+## v0.99.8 (2024-08-28)
+
+### Fix
+
+* fix(website): fixed designer integration for website widget ([`5f37e86`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/5f37e862c95ac7173b6918ad39bcaef938dad698))
+
+### Refactor
+
+* refactor(website): changed inheritance of website widget to simple qwidget; closes #325 ([`9925bbd`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/9925bbdb48b55eacbbce9fd6a1555a21b84221f9))
+
+## v0.99.7 (2024-08-28)
+
+### Fix
+
+* fix(toolbar): material icons can accept color as kwarg ([`ffc871e`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/ffc871ebbd3b68abc3e151bb8f5849e6c50e775e))
+
+## v0.99.6 (2024-08-28)
+
+### Documentation
+
+* docs: various bugs fixed ([`c31e9a3`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/c31e9a3aff3ee8e984674dee0965ee7f1b6e2b8f))
+
+### Fix
+
+* fix(toolbar): use of native qt separators ([`09c6c93`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/09c6c93c397ce4a21c293f6c79106c74b2db65ca))
+
+## v0.99.5 (2024-08-28)
+
+### Documentation
+
+* docs(index): index page is centered ([`02239de`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/02239de0a36fcd6cbf97990b0dec1ddf7ecf6ba6))
+
+### Fix
+
+* fix(dock_area): dark button added ([`e6f204b`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/e6f204b6aa295747a68769f43af2e549149b401a))
+
+## v0.99.4 (2024-08-28)
+
+### Documentation
+
+* docs(buttons): added missing buttons docs ([`4e5520a`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/4e5520aee2115d2fc0cebb3865433478a5ec8253))
+
+* docs(developer): tutorial for BECWidget base class ([`ac2cb51`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/ac2cb5197deef4d51e26ee5beb070eba3ffc210d))
+
+### Fix
+
+* fix(theme): apply theme to all pyqtgraph widgets on manual updates ([`c550186`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/c5501860e8e07a53f4bce144d44ed39eda6290ef))
+
+### Refactor
+
+* refactor(buttons): changed grid and thumbnail fig in gallery ([`4591ba8`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/4591ba8f73e22aba7258cad93c073f1387cb74a0))
+
+* refactor(icons): removed toolbar icons from assets ([`f335763`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/f335763280adb1d83ba31f073ce206e4cb5d15ef))
+
+* refactor(icons): moved widget icons to class attribute ICON_NAME ([`e890091`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/e890091d862e42317c7a54fc414ba37c85f268b0))
+
+## v0.99.3 (2024-08-27)
+
+### Build
+
+* build: updated min version of bec qthemes ([`d482434`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/d48243483ef8228cc5eb85e40a6b8f5da3b45520))
+
+### Fix
+
+* fix(cmaps): unified all defaults to magma cmap ([`1ca9499`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/1ca9499edd334c19fe1e7aac71d3940a80a1ec95))
+
+* fix(color maps): color maps should take the background color into account; fixed min colors to 10 ([`060935f`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/060935ffc5472a958c337bf60834c5291f104ece))
+
+## v0.99.2 (2024-08-27)
+
+### Ci
+
+* ci: additional tests are not allowed to fail ([`bb385f0`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/bb385f07ca18904461a541b5cadde05398c84438))
+
+### Fix
+
+* fix(widgets): fixed default theme for widgets
+
+If not theme is set, the init of the BECWidget base class sets the default theme to "dark" ([`cf28730`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/cf28730515e3c2d5914e0205768734c578711e5c))
+
+## v0.99.1 (2024-08-27)
+
+### Fix
+
+* fix(crosshair): emit all crosshair events, not just line coordinates ([`2265458`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/2265458dcc57970db18c62619f5877d542d72e81))
+
+## v0.99.0 (2024-08-25)
+
+### Documentation
+
+* docs(darkmodebutton): added dark mode button docs ([`406c263`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/406c263746f0e809c1a4d98356c48f40428c23d7))
+
+### Feature
+
+* feat(darkmodebutton): added button to toggle between dark and light mode ([`cc8c166`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/cc8c166b5c1d37e0f64c83801b2347a54a6550b6))
+
+### Fix
+
+* fix(toggle): emit state change ([`c4f3308`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/c4f3308dc0c3e4b2064760ccd7372d71b3e49f96))
+
+### Refactor
+
+* refactor(darkmodebutton): renamed set_dark_mode_enabled to toggle_dark_mode ([`c70724a`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/c70724a456900bcb06b040407a2c5d497e49ce77))
+
+### Test
+
+* test(dark_mode_button): added tests for dark mode button ([`df35aab`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/df35aabff30c5d00b1c441132bd370446653741e))
+
+## v0.98.0 (2024-08-25)
+
+### Feature
+
+* feat(themes): added set_theme method ([`2b4449a`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/2b4449afebdda0a97f95712a1353cf40ec55c283))
+
+### Fix
+
+* fix(toolbar): removed hardcoded color values ([`afdf4e8`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/afdf4e8782a22566932180224fa1c924d24c810f))
+
+* fix: transitioning to material icons ([`2a82032`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/2a82032644a84e38df04e2035a6aa63f4a046360))
+
+* fix(dock_area): transitioned to MaterialIconAction ([`88a2f66`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/88a2f667588e9aeb34ae556fa327898824052bc3))
+
+* fix: fix color palette if qtheme was not called ([`3f3b207`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/3f3b207295ebd406ebaeecee465c774965161b8b))
+
+* fix(figure): removed theme from figure init ([`e42b84c`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/e42b84c63650297d67feffccc02a2c2ba111ca79))
+
+* fix: use globally set theme instead of the internal bec widgets theme ([`77c5aa7`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/77c5aa741cf1f5b969a42aa878aa2965176dbf41))
+
+* fix(waveform): fixed icon appearance ([`36ad464`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/36ad4641594b67c9b789515c28f7db78a12757ee))
+
+### Refactor
+
+* refactor(waveform): use set theme for demo ([`44cfda1`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/44cfda1c07306669c9a4e09706d95e6b91dee370))
+
+## v0.97.0 (2024-08-23)
+
+### Feature
+
+* feat(designer): added designer icon factory ([`82a55dd`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/82a55ddf3eafb589cb63408db1c0e7e5c9d629da))
+
+### Fix
+
+* fix(toolbar icon): fixed material icon toolbar for theme changes ([`3ecbd60`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/3ecbd60627994417c9175364e5909710dbcdceb2))
+
+## v0.96.3 (2024-08-23)
+
+### Documentation
+
+* docs(dispatcher): docs added ([`dd7c71b`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/dd7c71bb1e0b7ef5398b1e1a05fc1147c772420a))
+
+### Fix
+
+* fix: minor fixes for type annotations ([`8c2e7c8`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/8c2e7c82592ace50e4e1f47e392a0ddc988f57ae))

{bec_widgets-0.99.1 → bec_widgets-0.99.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: bec_widgets
-Version: 0.99.1
+Version: 0.99.9
 Summary: BEC Widgets
 Project-URL: Bug Tracker, https://gitlab.psi.ch/bec/bec_widgets/issues
 Project-URL: Homepage, https://gitlab.psi.ch/bec/bec_widgets
@@ -11,7 +11,7 @@ Classifier: Topic :: Scientific/Engineering
 Requires-Python: >=3.10
 Requires-Dist: bec-ipython-client>=2.21.4,~=2.21
 Requires-Dist: bec-lib>=2.21.4,~=2.21
-Requires-Dist: bec-qthemes~=0.0
+Requires-Dist: bec-qthemes>=0.4.2,~=0.4
 Requires-Dist: black~=24.0
 Requires-Dist: isort>=5.13.2,~=5.13
 Requires-Dist: pydantic~=2.0

{bec_widgets-0.99.1 → bec_widgets-0.99.9}/bec_widgets/cli/client.py

@@ -483,7 +483,7 @@ class BECFigure(RPCBase):
         y_entry: "str | None" = None,
         z_entry: "str | None" = None,
         color: "str | None" = None,
-        color_map_z: "str | None" = "plasma",
+        color_map_z: "str | None" = "magma",
         label: "str | None" = None,
         validate: "bool" = True,
         new: "bool" = False,
@@ -1728,7 +1728,7 @@ class BECWaveform(RPCBase):
         y_entry: "str | None" = None,
         z_entry: "str | None" = None,
         color: "str | None" = None,
-        color_map_z: "str | None" = "plasma",
+        color_map_z: "str | None" = "magma",
         label: "str | None" = None,
         validate: "bool" = True,
         dap: "str | None" = None,
@@ -2042,7 +2042,7 @@ class BECWaveformWidget(RPCBase):
         y_entry: "str | None" = None,
         z_entry: "str | None" = None,
         color: "str | None" = None,
-        color_map_z: "str | None" = "plasma",
+        color_map_z: "str | None" = "magma",
         label: "str | None" = None,
         validate: "bool" = True,
         dap: "str | None" = None,

{bec_widgets-0.99.1 → bec_widgets-0.99.9}/bec_widgets/qt_utils/toolbar.py

@@ -2,10 +2,11 @@
 import os
 from abc import ABC, abstractmethod
 from collections import defaultdict
+from typing import Literal
 
 from bec_qthemes._icon.material_icons import material_icon
 from qtpy.QtCore import QSize
-from qtpy.QtGui import QAction, QIcon
+from qtpy.QtGui import QAction, QColor, QIcon
 from qtpy.QtWidgets import QHBoxLayout, QLabel, QMenu, QToolBar, QToolButton, QWidget
 
 import bec_widgets
@@ -45,9 +46,7 @@ class SeparatorAction(ToolBarAction):
     """Separator action for the toolbar."""
 
     def add_to_toolbar(self, toolbar: QToolBar, target: QWidget):
-        self.separator = QToolButton()
-        self.separator.setFixedSize(2, 22)
-        toolbar.addWidget(self.separator)
+        toolbar.addSeparator()
 
 
 class IconAction(ToolBarAction):
@@ -88,12 +87,14 @@ class MaterialIconAction:
         tooltip: str = None,
         checkable: bool = False,
         filled: bool = False,
+        color: str | tuple | QColor | dict[Literal["dark", "light"], str] | None = None,
     ):
         self.icon_name = icon_name
         self.tooltip = tooltip
         self.checkable = checkable
         self.action = None
         self.filled = filled
+        self.color = color
 
     def add_to_toolbar(self, toolbar: QToolBar, target: QWidget):
         icon = self.get_icon()
@@ -104,7 +105,11 @@ class MaterialIconAction:
     def get_icon(self):
 
         icon = material_icon(
-            self.icon_name, size=(20, 20), convert_to_pixmap=False, filled=self.filled
+            self.icon_name,
+            size=(20, 20),
+            convert_to_pixmap=False,
+            filled=self.filled,
+            color=self.color,
         )
         return icon
 
@@ -219,3 +224,4 @@ class ModularToolBar(QToolBar):
         self.setMovable(False)
         self.setFloatable(False)
         self.setContentsMargins(0, 0, 0, 0)
+        self.setStyleSheet("QToolBar { background-color: rgba(0, 0, 0, 0); border: none; }")

{bec_widgets-0.99.1 → bec_widgets-0.99.9}/bec_widgets/utils/bec_widget.py

@@ -1,19 +1,28 @@
-from qtpy.QtWidgets import QWidget
+from qtpy.QtWidgets import QApplication, QWidget
 
 from bec_widgets.utils.bec_connector import BECConnector, ConnectionConfig
+from bec_widgets.utils.colors import set_theme
 
 
 class BECWidget(BECConnector):
     """Mixin class for all BEC widgets, to handle cleanup"""
 
+    # The icon name is the name of the icon in the icon theme, typically a name taken
+    # from fonts.google.com/icons. Override this in subclasses to set the icon name.
+    ICON_NAME = "widgets"
+
     def __init__(self, client=None, config: ConnectionConfig = None, gui_id: str = None):
         if not isinstance(self, QWidget):
             raise RuntimeError(f"{repr(self)} is not a subclass of QWidget")
         super().__init__(client, config, gui_id)
 
+        # Set the theme to auto if it is not set yet
+        app = QApplication.instance()
+        if not hasattr(app, "theme"):
+            set_theme("dark")
+
     def cleanup(self):
         """Cleanup the widget."""
-        pass
 
     def closeEvent(self, event):
         self.rpc_register.remove_rpc(self)

{bec_widgets-0.99.1 → bec_widgets-0.99.9}/bec_widgets/utils/colors.py

@@ -29,6 +29,7 @@ def set_theme(theme: Literal["dark", "light", "auto"]):
     app = QApplication.instance()
     bec_qthemes.setup_theme(theme)
     pg.setConfigOption("background", "w" if app.theme["theme"] == "light" else "k")
+    apply_theme(theme)
 
     # pylint: disable=protected-access
     if theme != "auto":
@@ -44,6 +45,9 @@ def set_theme(theme: Literal["dark", "light", "auto"]):
 
 
 def apply_theme(theme: Literal["dark", "light"]):
+    """
+    Apply the theme to all pyqtgraph widgets. Do not use this function directly. Use set_theme instead.
+    """
     app = QApplication.instance()
     # go through all pyqtgraph widgets and set background
     children = itertools.chain.from_iterable(
@@ -105,8 +109,19 @@ class Colors:
         angles = Colors.golden_ratio(len(cmap_colors))
         color_selection = np.round(np.interp(angles, (-np.pi, np.pi), (0, len(cmap_colors))))
         colors = []
-        for ii in color_selection[:num]:
-            color = cmap_colors[int(ii)]
+        ii = 0
+        while len(colors) < num:
+            color_index = int(color_selection[ii])
+            color = cmap_colors[color_index]
+            app = QApplication.instance()
+            if hasattr(app, "theme") and app.theme["theme"] == "light":
+                background = 255
+            else:
+                background = 0
+            if np.abs(np.mean(color[:3] * 255) - background) < 50:
+                ii += 1
+                continue
+
             if format.upper() == "HEX":
                 colors.append(QColor.fromRgbF(*color).name())
             elif format.upper() == "RGB":
@@ -115,6 +130,7 @@ class Colors:
                 colors.append(QColor.fromRgbF(*color))
             else:
                 raise ValueError("Unsupported format. Please choose 'RGB', 'HEX', or 'QColor'.")
+            ii += 1
         return colors
 
     @staticmethod

{bec_widgets-0.99.1 → bec_widgets-0.99.9}/bec_widgets/utils/plugin_templates/plugin.template

@@ -2,8 +2,8 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtGui import QIcon
 
+from bec_widgets.utils.bec_designer import designer_material_icon
 {widget_import}
 
 DOM_XML = """
@@ -30,7 +30,7 @@ class {plugin_name_pascal}Plugin(QDesignerCustomWidgetInterface):  # pragma: no
         return ""
 
     def icon(self):
-        return QIcon()
+        return designer_material_icon({plugin_name_pascal}.ICON_NAME)
 
     def includeFile(self):
         return "{plugin_name_snake}"

{bec_widgets-0.99.1 → bec_widgets-0.99.9}/bec_widgets/widgets/bec_queue/bec_queue.py

@@ -13,6 +13,8 @@ class BECQueue(BECWidget, QWidget):
     Widget to display the BEC queue.
     """
 
+    ICON_NAME = "edit_note"
+
     def __init__(
         self,
         parent: QWidget | None = None,

{bec_widgets-0.99.1 → bec_widgets-0.99.9}/bec_widgets/widgets/bec_queue/bec_queue_plugin.py

@@ -34,7 +34,7 @@ class BECQueuePlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "BEC Services"
 
     def icon(self):
-        return designer_material_icon("edit_note")
+        return designer_material_icon(BECQueue.ICON_NAME)
 
     def includeFile(self):
         return "bec_queue"

{bec_widgets-0.99.1 → bec_widgets-0.99.9}/bec_widgets/widgets/bec_status_box/bec_status_box.py

@@ -43,6 +43,8 @@ class BECServiceStatusMixin(QObject):
 
     services_update = Signal(dict, dict)
 
+    ICON_NAME = "dns"
+
     def __init__(self, parent, client: BECClient):
         super().__init__(parent)
         self.client = client

{bec_widgets-0.99.1 → bec_widgets-0.99.9}/bec_widgets/widgets/bec_status_box/bec_status_box_plugin.py

@@ -34,7 +34,7 @@ class BECStatusBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "BEC Services"
 
     def icon(self):
-        return designer_material_icon("dns")
+        return designer_material_icon(BECStatusBox.ICON_NAME)
 
     def includeFile(self):
         return "bec_status_box"

{bec_widgets-0.99.1 → bec_widgets-0.99.9}/bec_widgets/widgets/color_button/color_button.py

@@ -11,6 +11,8 @@ class ColorButton(pg.ColorButton):
     Patches event loop of the ColorDialog, if opened in another QDialog.
     """
 
+    ICON_NAME = "colors"
+
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 

{bec_widgets-0.99.1 → bec_widgets-0.99.9}/bec_widgets/widgets/color_button/color_button_plugin.py

@@ -31,7 +31,7 @@ class ColorButtonPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "BEC Buttons"
 
     def icon(self):
-        return designer_material_icon("colors")
+        return designer_material_icon(ColorButton.ICON_NAME)
 
     def includeFile(self):
         return "color_button"

{bec_widgets-0.99.1 → bec_widgets-0.99.9}/bec_widgets/widgets/colormap_selector/colormap_selector.py

@@ -46,6 +46,7 @@ class ColormapSelector(QWidget):
     """
 
     colormap_changed_signal = Signal(str)
+    ICON_NAME = "palette"
 
     def __init__(self, parent=None, default_colormaps=None):
         super().__init__(parent=parent)

{bec_widgets-0.99.1 → bec_widgets-0.99.9}/bec_widgets/widgets/colormap_selector/colormap_selector_plugin.py

@@ -34,7 +34,7 @@ class ColormapSelectorPlugin(QDesignerCustomWidgetInterface):  # pragma: no cove
         return "BEC Buttons"
 
     def icon(self):
-        return designer_material_icon("palette")
+        return designer_material_icon(ColormapSelector.ICON_NAME)
 
     def includeFile(self):
         return "colormap_selector"

{bec_widgets-0.99.1 → bec_widgets-0.99.9}/bec_widgets/widgets/dark_mode_button/dark_mode_button.py

@@ -1,6 +1,6 @@
 from bec_qthemes import material_icon
 from qtpy.QtCore import Property, Qt, Slot
-from qtpy.QtWidgets import QHBoxLayout, QPushButton, QWidget
+from qtpy.QtWidgets import QHBoxLayout, QPushButton, QToolButton, QWidget
 
 from bec_widgets.utils.bec_widget import BECWidget
 from bec_widgets.utils.colors import set_theme
@@ -9,8 +9,14 @@ from bec_widgets.utils.colors import set_theme
 class DarkModeButton(BECWidget, QWidget):
     USER_ACCESS = ["toggle_dark_mode"]
 
+    ICON_NAME = "dark_mode"
+
     def __init__(
-        self, parent: QWidget | None = None, client=None, gui_id: str | None = None
+        self,
+        parent: QWidget | None = None,
+        client=None,
+        gui_id: str | None = None,
+        toolbar: bool = False,
     ) -> None:
         super().__init__(client=client, gui_id=gui_id)
         QWidget.__init__(self, parent)
@@ -22,7 +28,10 @@ class DarkModeButton(BECWidget, QWidget):
         self.layout.setAlignment(Qt.AlignmentFlag.AlignVCenter)
 
         icon = material_icon("dark_mode", size=(20, 20), convert_to_pixmap=False)
-        self.mode_button = QPushButton(icon=icon)
+        if toolbar:
+            self.mode_button = QToolButton(icon=icon)
+        else:
+            self.mode_button = QPushButton(icon=icon)
         self.update_mode_button()
         self.mode_button.clicked.connect(self.toggle_dark_mode)
         self.layout.addWidget(self.mode_button)

{bec_widgets-0.99.1 → bec_widgets-0.99.9}/bec_widgets/widgets/dark_mode_button/dark_mode_button_plugin.py

@@ -30,7 +30,7 @@ class DarkModeButtonPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "BEC Buttons"
 
     def icon(self):
-        return designer_material_icon("dark_mode")
+        return designer_material_icon(DarkModeButton.ICON_NAME)
 
     def includeFile(self):
         return "dark_mode_button"

{bec_widgets-0.99.1 → bec_widgets-0.99.9}/bec_widgets/widgets/device_browser/device_browser.py

@@ -15,6 +15,8 @@ from bec_widgets.widgets.device_browser.device_item import DeviceItem
 class DeviceBrowser(BECWidget, QWidget):
     device_update: Signal = Signal()
 
+    ICON_NAME = "lists"
+
     def __init__(
         self,
         parent: Optional[QWidget] = None,

{bec_widgets-0.99.1 → bec_widgets-0.99.9}/bec_widgets/widgets/device_browser/device_browser_plugin.py

@@ -30,7 +30,7 @@ class DeviceBrowserPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "BEC Services"
 
     def icon(self):
-        return designer_material_icon("lists")
+        return designer_material_icon(DeviceBrowser.ICON_NAME)
 
     def includeFile(self):
         return "device_browser"

{bec_widgets-0.99.1 → bec_widgets-0.99.9}/bec_widgets/widgets/device_combobox/device_combo_box_plugin.py

@@ -34,7 +34,7 @@ class DeviceComboBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "Device Control"
 
     def icon(self):
-        return designer_material_icon("list_alt")
+        return designer_material_icon(DeviceComboBox.ICON_NAME)
 
     def includeFile(self):
         return "device_combobox"

{bec_widgets-0.99.1 → bec_widgets-0.99.9}/bec_widgets/widgets/device_combobox/device_combobox.py

@@ -22,6 +22,8 @@ class DeviceComboBox(DeviceInputBase, QComboBox):
         arg_name: Argument name, can be used for the other widgets which has to call some other function in bec using correct argument names.
     """
 
+    ICON_NAME = "list_alt"
+
     def __init__(
         self,
         parent=None,

{bec_widgets-0.99.1 → bec_widgets-0.99.9}/bec_widgets/widgets/device_line_edit/device_line_edit.py

@@ -24,6 +24,8 @@ class DeviceLineEdit(DeviceInputBase, QLineEdit):
         arg_name: Argument name, can be used for the other widgets which has to call some other function in bec using correct argument names.
     """
 
+    ICON_NAME = "edit_note"
+
     def __init__(
         self,
         parent=None,

{bec_widgets-0.99.1 → bec_widgets-0.99.9}/bec_widgets/widgets/device_line_edit/device_line_edit_plugin.py

@@ -34,7 +34,7 @@ class DeviceLineEditPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return "Device Control"
 
     def icon(self):
-        return designer_material_icon("edit_note")
+        return designer_material_icon(DeviceLineEdit.ICON_NAME)
 
     def includeFile(self):
         return "device_line_edit"

{bec_widgets-0.99.1 → bec_widgets-0.99.9}/bec_widgets/widgets/dock/dock.py

@@ -100,6 +100,7 @@ class CustomDockLabel(DockLabel):
 
 
 class BECDock(BECWidget, Dock):
+    ICON_NAME = "widgets"
     USER_ACCESS = [
         "_config_dict",
         "_rpc_id",

{bec_widgets-0.99.1 → bec_widgets-0.99.9}/bec_widgets/widgets/dock/dock_area.py

@@ -7,7 +7,7 @@ from pydantic import Field
 from pyqtgraph.dockarea.DockArea import DockArea
 from qtpy.QtCore import Qt
 from qtpy.QtGui import QPainter, QPaintEvent
-from qtpy.QtWidgets import QVBoxLayout, QWidget
+from qtpy.QtWidgets import QSizePolicy, QVBoxLayout, QWidget
 
 from bec_widgets.qt_utils.error_popups import SafeSlot
 from bec_widgets.qt_utils.toolbar import (
@@ -18,7 +18,17 @@ from bec_widgets.qt_utils.toolbar import (
 )
 from bec_widgets.utils import ConnectionConfig, WidgetContainerUtils
 from bec_widgets.utils.bec_widget import BECWidget
+from bec_widgets.widgets.bec_queue.bec_queue import BECQueue
+from bec_widgets.widgets.bec_status_box.bec_status_box import BECStatusBox
+from bec_widgets.widgets.dark_mode_button.dark_mode_button import DarkModeButton
 from bec_widgets.widgets.dock.dock import BECDock, DockConfig
+from bec_widgets.widgets.image.image_widget import BECImageWidget
+from bec_widgets.widgets.motor_map.motor_map_widget import BECMotorMapWidget
+from bec_widgets.widgets.positioner_box.positioner_box import PositionerBox
+from bec_widgets.widgets.ring_progress_bar.ring_progress_bar import RingProgressBar
+from bec_widgets.widgets.scan_control.scan_control import ScanControl
+from bec_widgets.widgets.vscode.vscode import VSCodeEditor
+from bec_widgets.widgets.waveform.waveform_widget import BECWaveformWidget
 
 
 class DockAreaConfig(ConnectionConfig):
@@ -71,13 +81,17 @@ class BECDockArea(BECWidget, QWidget):
                     label="Add Plot ",
                     actions={
                         "waveform": MaterialIconAction(
-                            icon_name="show_chart", tooltip="Add Waveform", filled=True
+                            icon_name=BECWaveformWidget.ICON_NAME,
+                            tooltip="Add Waveform",
+                            filled=True,
                         ),
                         "image": MaterialIconAction(
-                            icon_name="image", tooltip="Add Image", filled=True
+                            icon_name=BECImageWidget.ICON_NAME, tooltip="Add Image", filled=True
                         ),
                         "motor_map": MaterialIconAction(
-                            icon_name="my_location", tooltip="Add Motor Map", filled=True
+                            icon_name=BECMotorMapWidget.ICON_NAME,
+                            tooltip="Add Motor Map",
+                            filled=True,
                         ),
                     },
                 ),
@@ -86,10 +100,10 @@ class BECDockArea(BECWidget, QWidget):
                     label="Add Device Control ",
                     actions={
                         "scan_control": MaterialIconAction(
-                            icon_name="stacked_line_chart", tooltip="Add Scan Control", filled=True
+                            icon_name=ScanControl.ICON_NAME, tooltip="Add Scan Control", filled=True
                         ),
                         "positioner_box": MaterialIconAction(
-                            icon_name="switch_right", tooltip="Add Device Box", filled=True
+                            icon_name=PositionerBox.ICON_NAME, tooltip="Add Device Box", filled=True
                         ),
                     },
                 ),
@@ -98,16 +112,18 @@ class BECDockArea(BECWidget, QWidget):
                     label="Add Utils ",
                     actions={
                         "queue": MaterialIconAction(
-                            icon_name="edit_note", tooltip="Add Scan Queue", filled=True
+                            icon_name=BECQueue.ICON_NAME, tooltip="Add Scan Queue", filled=True
                         ),
                         "vs_code": MaterialIconAction(
-                            icon_name="show_chart", tooltip="Add VS Code", filled=True
+                            icon_name=VSCodeEditor.ICON_NAME, tooltip="Add VS Code", filled=True
                         ),
                         "status": MaterialIconAction(
-                            icon_name="dns", tooltip="Add BEC Status Box", filled=True
+                            icon_name=BECStatusBox.ICON_NAME,
+                            tooltip="Add BEC Status Box",
+                            filled=True,
                         ),
                         "progress_bar": MaterialIconAction(
-                            icon_name="track_changes",
+                            icon_name=RingProgressBar.ICON_NAME,
                             tooltip="Add Circular ProgressBar",
                             filled=True,
                         ),
@@ -127,6 +143,10 @@ class BECDockArea(BECWidget, QWidget):
 
         self.layout.addWidget(self.toolbar)
         self.layout.addWidget(self.dock_area)
+        self.spacer = QWidget()
+        self.spacer.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
+        self.toolbar.addWidget(self.spacer)
+        self.toolbar.addWidget(DarkModeButton(toolbar=True))
         self._hook_toolbar()
 
     def _hook_toolbar(self):