bec-widgets 0.97.0__tar.gz → 0.99.0__tar.gz

{bec_widgets-0.97.0 → bec_widgets-0.99.0}/CHANGELOG.md

@@ -1,5 +1,53 @@
 # CHANGELOG
 
+## 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
@@ -123,37 +171,3 @@ Since we now rely on reusing the BECClient singleton, we need the fix introduced
 ### Fix
 
 * fix(rpc): use client singleton instead of dispatcher ([`ea9240d`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/ea9240d2f71931082f33fb6b68231469875c3d63))
-
-* fix: removed qcoreapplication for polling events ([`4d02b42`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/4d02b42f11e9882b843317255a4975565c8a536f))
-
-## v0.94.4 (2024-08-14)
-
-### Documentation
-
-* docs: review developer section; add introduction ([`2af5c94`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/2af5c94913a3435c1839034df4f45f885b56d08b))
-
-### Fix
-
-* fix: do not shutdown client in "close"
-
-Terminating client connections has to be done at the application level ([`198c1d1`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/198c1d1064cc2dae55de4b941929341faddacb28))
-
-## v0.94.3 (2024-08-13)
-
-### Fix
-
-* fix(curve_dialog): async curves are shown in curve dialog after addition. ([`7aeb2b5`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/7aeb2b5c26c7c2851e8d663d32521da8daec95ef))
-
-* fix(waveform): async device entry is correctly passed, updated and with new scan the previous data are cleared ([`d56ea95`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/d56ea95ef97bfdd0bc3eeddc4505d20b38e28559))
-
-### Test
-
-* test(waveform_widget): added tests for axis setting and curve dialog ([`f285b35`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/f285b35b491660549e74349318119f7c2c44f619))
-
-## v0.94.2 (2024-08-13)
-
-### Fix
-
-* fix(image): image is single image mode do not raise popup error when connected twice with the same monitor ([`98b79aa`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/98b79aac7b47b73137f4d582f7f1d552b1d95366))
-
-## v0.94.1 (2024-08-12)

{bec_widgets-0.97.0 → bec_widgets-0.99.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: bec_widgets
-Version: 0.97.0
+Version: 0.99.0
 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

{bec_widgets-0.97.0 → bec_widgets-0.99.0}/bec_widgets/cli/client.py

@@ -21,6 +21,7 @@ class Widgets(str, enum.Enum):
     BECQueue = "BECQueue"
     BECStatusBox = "BECStatusBox"
     BECWaveformWidget = "BECWaveformWidget"
+    DarkModeButton = "DarkModeButton"
     DeviceBrowser = "DeviceBrowser"
     DeviceComboBox = "DeviceComboBox"
     DeviceLineEdit = "DeviceLineEdit"
@@ -2289,6 +2290,15 @@ class BECWaveformWidget(RPCBase):
         """
 
 
+class DarkModeButton(RPCBase):
+    @rpc_call
+    def toggle_dark_mode(self) -> None:
+        """
+        Toggle the dark mode state. This will change the theme of the entire
+        application to dark or light mode.
+        """
+
+
 class DeviceBrowser(RPCBase):
     @property
     @rpc_call

{bec_widgets-0.97.0 → bec_widgets-0.99.0}/bec_widgets/qt_utils/toolbar.py

@@ -76,31 +76,38 @@ class MaterialIconAction:
     Action with a Material icon for the toolbar.
 
     Args:
-        icon_path (str, optional): The name of the icon file from `assets/toolbar_icons`. Defaults to None.
+        icon_path (str, optional): The name of the Material icon. Defaults to None.
         tooltip (bool, optional): The tooltip for the action. Defaults to None.
         checkable (bool, optional): Whether the action is checkable. Defaults to False.
+        filled (bool, optional): Whether the icon is filled. Defaults to False.
     """
 
-    def __init__(self, icon_name: str = None, tooltip: str = None, checkable: bool = False):
+    def __init__(
+        self,
+        icon_name: str = None,
+        tooltip: str = None,
+        checkable: bool = False,
+        filled: bool = False,
+    ):
         self.icon_name = icon_name
         self.tooltip = tooltip
         self.checkable = checkable
         self.action = None
+        self.filled = filled
 
     def add_to_toolbar(self, toolbar: QToolBar, target: QWidget):
-        color = {
-            "dark": "#FFFFFF",
-            "light": "#000000",
-        }  # FIXME: This should be a theme color but the toolbar doesn't respect the theme atm
-        # once fixed, change it to
-        # palette = QGuiApplication.palette()
-        # palette.toolTipBase().color()
-
-        icon = material_icon(self.icon_name, size=(20, 20), color=color, convert_to_pixmap=False)
+        icon = self.get_icon()
         self.action = QAction(icon, self.tooltip, target)
         self.action.setCheckable(self.checkable)
         toolbar.addAction(self.action)
 
+    def get_icon(self):
+
+        icon = material_icon(
+            self.icon_name, size=(20, 20), convert_to_pixmap=False, filled=self.filled
+        )
+        return icon
+
 
 class DeviceSelectionAction(ToolBarAction):
     """
@@ -165,10 +172,12 @@ class ExpandableMenuAction(ToolBarAction):
         menu = QMenu(button)
         for action_id, action in self.actions.items():
             sub_action = QAction(action.tooltip, target)
-            if action.icon_path:
+            if hasattr(action, "icon_path"):
                 icon = QIcon()
                 icon.addFile(action.icon_path, size=QSize(20, 20))
                 sub_action.setIcon(icon)
+            elif hasattr(action, "get_icon"):
+                sub_action.setIcon(action.get_icon())
             sub_action.setCheckable(action.checkable)
             menu.addAction(sub_action)
             self.widgets[action_id] = sub_action
@@ -182,20 +191,13 @@ class ModularToolBar(QToolBar):
         parent (QWidget, optional): The parent widget of the toolbar. Defaults to None.
         actions (list[ToolBarAction], optional): A list of action creators to populate the toolbar. Defaults to None.
         target_widget (QWidget, optional): The widget that the actions will target. Defaults to None.
-        color (str, optional): The background color of the toolbar. Defaults to "black".
     """
 
-    def __init__(
-        self,
-        parent=None,
-        actions: dict | None = None,
-        target_widget=None,
-        color: str = "rgba(255, 255, 255, 0)",
-    ):
+    def __init__(self, parent=None, actions: dict | None = None, target_widget=None):
         super().__init__(parent)
 
         self.widgets = defaultdict(dict)
-        self.set_background_color(color)
+        self.set_background_color()
 
         if actions is not None and target_widget is not None:
             self.populate_toolbar(actions, target_widget)
@@ -212,8 +214,7 @@ class ModularToolBar(QToolBar):
             action.add_to_toolbar(self, target_widget)
             self.widgets[action_id] = action
 
-    def set_background_color(self, color: str):
-        self.setStyleSheet(f"QToolBar {{ background: {color}; }}")
+    def set_background_color(self):
         self.setIconSize(QSize(20, 20))
         self.setMovable(False)
         self.setFloatable(False)

{bec_widgets-0.97.0 → bec_widgets-0.99.0}/bec_widgets/utils/colors.py

@@ -5,21 +5,45 @@ from typing import Literal
 import bec_qthemes
 import numpy as np
 import pyqtgraph as pg
+from bec_qthemes._os_appearance.listener import OSThemeSwitchListener
 from pydantic_core import PydanticCustomError
 from qtpy.QtGui import QColor
 from qtpy.QtWidgets import QApplication
 
-CURRENT_THEME = "dark"
-
 
 def get_theme_palette():
-    return bec_qthemes.load_palette(CURRENT_THEME)
+    if QApplication.instance() is None or not hasattr(QApplication.instance(), "theme"):
+        theme = "dark"
+    else:
+        theme = QApplication.instance().theme["theme"]
+    return bec_qthemes.load_palette(theme)
 
 
-def apply_theme(theme: Literal["dark", "light"]):
-    global CURRENT_THEME
-    CURRENT_THEME = theme
+def set_theme(theme: Literal["dark", "light", "auto"]):
+    """
+    Set the theme for the application.
+
+    Args:
+        theme (Literal["dark", "light", "auto"]): The theme to set. "auto" will automatically switch between dark and light themes based on the system theme.
+    """
+    app = QApplication.instance()
+    bec_qthemes.setup_theme(theme)
+    pg.setConfigOption("background", "w" if app.theme["theme"] == "light" else "k")
+
+    # pylint: disable=protected-access
+    if theme != "auto":
+        return
 
+    def callback():
+        app.theme["theme"] = listener._theme.lower()
+        apply_theme(listener._theme.lower())
+
+    listener = OSThemeSwitchListener(callback)
+
+    app.installEventFilter(listener)
+
+
+def apply_theme(theme: Literal["dark", "light"]):
     app = QApplication.instance()
     # go through all pyqtgraph widgets and set background
     children = itertools.chain.from_iterable(

bec_widgets-0.99.0/bec_widgets/widgets/dark_mode_button/dark_mode_button.py

@@ -0,0 +1,71 @@
+from bec_qthemes import material_icon
+from qtpy.QtCore import Property, Qt, Slot
+from qtpy.QtWidgets import QHBoxLayout, QPushButton, QWidget
+
+from bec_widgets.utils.bec_widget import BECWidget
+from bec_widgets.utils.colors import set_theme
+
+
+class DarkModeButton(BECWidget, QWidget):
+    USER_ACCESS = ["toggle_dark_mode"]
+
+    def __init__(
+        self, parent: QWidget | None = None, client=None, gui_id: str | None = None
+    ) -> None:
+        super().__init__(client=client, gui_id=gui_id)
+        QWidget.__init__(self, parent)
+
+        self._dark_mode_enabled = False
+        self.layout = QHBoxLayout(self)
+        self.layout.setSpacing(0)
+        self.layout.setContentsMargins(0, 0, 0, 0)
+        self.layout.setAlignment(Qt.AlignmentFlag.AlignVCenter)
+
+        icon = material_icon("dark_mode", size=(20, 20), convert_to_pixmap=False)
+        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)
+        self.setLayout(self.layout)
+        self.setFixedSize(40, 40)
+
+    @Property(bool)
+    def dark_mode_enabled(self) -> bool:
+        """
+        The dark mode state. If True, dark mode is enabled. If False, light mode is enabled.
+        """
+        return self._dark_mode_enabled
+
+    @dark_mode_enabled.setter
+    def dark_mode_enabled(self, state: bool) -> None:
+        self._dark_mode_enabled = state
+
+    @Slot()
+    def toggle_dark_mode(self) -> None:
+        """
+        Toggle the dark mode state. This will change the theme of the entire
+        application to dark or light mode.
+        """
+        self.dark_mode_enabled = not self.dark_mode_enabled
+        self.update_mode_button()
+        set_theme("dark" if self.dark_mode_enabled else "light")
+
+    def update_mode_button(self):
+        icon = material_icon(
+            "light_mode" if self.dark_mode_enabled else "dark_mode",
+            size=(20, 20),
+            convert_to_pixmap=False,
+        )
+        self.mode_button.setIcon(icon)
+        self.mode_button.setToolTip("Set Light Mode" if self.dark_mode_enabled else "Set Dark Mode")
+
+
+if __name__ == "__main__":
+    from qtpy.QtWidgets import QApplication
+
+    app = QApplication([])
+
+    w = DarkModeButton()
+    w.show()
+
+    app.exec_()

bec_widgets-0.99.0/bec_widgets/widgets/dark_mode_button/dark_mode_button.pyproject

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

bec_widgets-0.99.0/bec_widgets/widgets/dark_mode_button/dark_mode_button_plugin.py

@@ -0,0 +1,54 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+
+from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+
+from bec_widgets.utils.bec_designer import designer_material_icon
+from bec_widgets.widgets.dark_mode_button.dark_mode_button import DarkModeButton
+
+DOM_XML = """
+<ui language='c++'>
+    <widget class='DarkModeButton' name='dark_mode_button'>
+    </widget>
+</ui>
+"""
+
+
+class DarkModeButtonPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
+    def __init__(self):
+        super().__init__()
+        self._form_editor = None
+
+    def createWidget(self, parent):
+        t = DarkModeButton(parent)
+        return t
+
+    def domXml(self):
+        return DOM_XML
+
+    def group(self):
+        return "BEC Buttons"
+
+    def icon(self):
+        return designer_material_icon("dark_mode")
+
+    def includeFile(self):
+        return "dark_mode_button"
+
+    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 "DarkModeButton"
+
+    def toolTip(self):
+        return "Button to toggle between dark and light mode."
+
+    def whatsThis(self):
+        return self.toolTip()

bec_widgets-0.99.0/bec_widgets/widgets/dark_mode_button/register_dark_mode_button.py

@@ -0,0 +1,15 @@
+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.dark_mode_button.dark_mode_button_plugin import DarkModeButtonPlugin
+
+    QPyDesignerCustomWidgetCollection.addCustomWidget(DarkModeButtonPlugin())
+
+
+if __name__ == "__main__":  # pragma: no cover
+    main()

{bec_widgets-0.97.0 → bec_widgets-0.99.0}/bec_widgets/widgets/dock/dock_area.py

@@ -9,17 +9,16 @@ from qtpy.QtCore import Qt
 from qtpy.QtGui import QPainter, QPaintEvent
 from qtpy.QtWidgets import QVBoxLayout, QWidget
 
+from bec_widgets.qt_utils.error_popups import SafeSlot
 from bec_widgets.qt_utils.toolbar import (
     ExpandableMenuAction,
-    IconAction,
+    MaterialIconAction,
     ModularToolBar,
     SeparatorAction,
 )
 from bec_widgets.utils import ConnectionConfig, WidgetContainerUtils
 from bec_widgets.utils.bec_widget import BECWidget
-
-from ...qt_utils.error_popups import SafeSlot
-from .dock import BECDock, DockConfig
+from bec_widgets.widgets.dock.dock import BECDock, DockConfig
 
 
 class DockAreaConfig(ConnectionConfig):
@@ -71,20 +70,26 @@ class BECDockArea(BECWidget, QWidget):
                 "menu_plots": ExpandableMenuAction(
                     label="Add Plot ",
                     actions={
-                        "waveform": IconAction(icon_path="waveform.svg", tooltip="Add Waveform"),
-                        "image": IconAction(icon_path="image.svg", tooltip="Add Image"),
-                        "motor_map": IconAction(icon_path="motor_map.svg", tooltip="Add Motor Map"),
+                        "waveform": MaterialIconAction(
+                            icon_name="show_chart", tooltip="Add Waveform", filled=True
+                        ),
+                        "image": MaterialIconAction(
+                            icon_name="image", tooltip="Add Image", filled=True
+                        ),
+                        "motor_map": MaterialIconAction(
+                            icon_name="my_location", tooltip="Add Motor Map", filled=True
+                        ),
                     },
                 ),
                 "separator_0": SeparatorAction(),
                 "menu_devices": ExpandableMenuAction(
                     label="Add Device Control ",
                     actions={
-                        "scan_control": IconAction(
-                            icon_path="scan_control.svg", tooltip="Add Scan Control"
+                        "scan_control": MaterialIconAction(
+                            icon_name="stacked_line_chart", tooltip="Add Scan Control", filled=True
                         ),
-                        "positioner_box": IconAction(
-                            icon_path="positioner_box.svg", tooltip="Add Device Box"
+                        "positioner_box": MaterialIconAction(
+                            icon_name="switch_right", tooltip="Add Device Box", filled=True
                         ),
                     },
                 ),
@@ -92,21 +97,29 @@ class BECDockArea(BECWidget, QWidget):
                 "menu_utils": ExpandableMenuAction(
                     label="Add Utils ",
                     actions={
-                        "queue": IconAction(icon_path="queue.svg", tooltip="Add Scan Queue"),
-                        "vs_code": IconAction(icon_path="terminal.svg", tooltip="Add VS Code"),
-                        "status": IconAction(icon_path="status.svg", tooltip="Add BEC Status Box"),
-                        "progress_bar": IconAction(
-                            icon_path="ring_progress.svg", tooltip="Add Circular ProgressBar"
+                        "queue": MaterialIconAction(
+                            icon_name="edit_note", tooltip="Add Scan Queue", filled=True
+                        ),
+                        "vs_code": MaterialIconAction(
+                            icon_name="show_chart", tooltip="Add VS Code", filled=True
+                        ),
+                        "status": MaterialIconAction(
+                            icon_name="dns", tooltip="Add BEC Status Box", filled=True
+                        ),
+                        "progress_bar": MaterialIconAction(
+                            icon_name="track_changes",
+                            tooltip="Add Circular ProgressBar",
+                            filled=True,
                         ),
                     },
                 ),
                 "separator_2": SeparatorAction(),
-                "attach_all": IconAction(
-                    icon_path="attach_all.svg", tooltip="Attach all floating docks"
+                "attach_all": MaterialIconAction(
+                    icon_name="zoom_in_map", tooltip="Attach all floating docks"
                 ),
-                "save_state": IconAction(icon_path="save_state.svg", tooltip="Save Dock State"),
-                "restore_state": IconAction(
-                    icon_path="restore_state.svg", tooltip="Restore Dock State"
+                "save_state": MaterialIconAction(icon_name="bookmark", tooltip="Save Dock State"),
+                "restore_state": MaterialIconAction(
+                    icon_name="frame_reload", tooltip="Restore Dock State"
                 ),
             },
             target_widget=self,
@@ -368,3 +381,15 @@ class BECDockArea(BECWidget, QWidget):
         """
         self.cleanup()
         super().close()
+
+
+if __name__ == "__main__":
+    from qtpy.QtWidgets import QApplication
+
+    from bec_widgets.utils.colors import set_theme
+
+    app = QApplication([])
+    set_theme("auto")
+    dock_area = BECDockArea()
+    dock_area.show()
+    app.exec_()

{bec_widgets-0.97.0 → bec_widgets-0.99.0}/bec_widgets/widgets/figure/figure.py

@@ -182,7 +182,6 @@ class BECFigure(BECWidget, pg.GraphicsLayoutWidget):
                 print(f"Error in applying config: {e}")
                 return
         self.config = config
-        self.change_theme(self.config.theme)
 
         # widget_config has to be reset for not have each widget config twice when added to the figure
         widget_configs = list(self.config.widgets.values())

{bec_widgets-0.97.0 → bec_widgets-0.99.0}/bec_widgets/widgets/image/image_widget.py

@@ -10,7 +10,7 @@ from bec_widgets.qt_utils.error_popups import SafeSlot, WarningPopupUtility
 from bec_widgets.qt_utils.settings_dialog import SettingsDialog
 from bec_widgets.qt_utils.toolbar import (
     DeviceSelectionAction,
-    IconAction,
+    MaterialIconAction,
     ModularToolBar,
     SeparatorAction,
 )
@@ -66,45 +66,45 @@ class BECImageWidget(BECWidget, QWidget):
                 "monitor": DeviceSelectionAction(
                     "Monitor:", DeviceComboBox(device_filter="Device")
                 ),
-                "connect": IconAction(icon_path="connection.svg", tooltip="Connect Device"),
+                "connect": MaterialIconAction(icon_name="link", tooltip="Connect Device"),
                 "separator_0": SeparatorAction(),
-                "save": IconAction(icon_path="save.svg", tooltip="Open Export Dialog"),
+                "save": MaterialIconAction(icon_name="save", tooltip="Open Export Dialog"),
                 "separator_1": SeparatorAction(),
-                "drag_mode": IconAction(
-                    icon_path="drag_pan_mode.svg", tooltip="Drag Mouse Mode", checkable=True
+                "drag_mode": MaterialIconAction(
+                    icon_name="open_with", tooltip="Drag Mouse Mode", checkable=True
                 ),
-                "rectangle_mode": IconAction(
-                    icon_path="rectangle_mode.svg", tooltip="Rectangle Zoom Mode", checkable=True
+                "rectangle_mode": MaterialIconAction(
+                    icon_name="frame_inspect", tooltip="Rectangle Zoom Mode", checkable=True
                 ),
-                "auto_range": IconAction(icon_path="auto_range.svg", tooltip="Autorange Plot"),
-                "auto_range_image": IconAction(
-                    icon_path="image_autorange.svg",
-                    tooltip="Autorange Image Intensity",
-                    checkable=True,
+                "auto_range": MaterialIconAction(
+                    icon_name="open_in_full", tooltip="Autorange Plot"
                 ),
-                "aspect_ratio": IconAction(
-                    icon_path="lock_aspect_ratio.svg",
-                    tooltip="Lock image aspect ratio",
-                    checkable=True,
+                "auto_range_image": MaterialIconAction(
+                    icon_name="hdr_auto", tooltip="Autorange Image Intensity", checkable=True
+                ),
+                "aspect_ratio": MaterialIconAction(
+                    icon_name="aspect_ratio", tooltip="Lock image aspect ratio", checkable=True
                 ),
                 "separator_2": SeparatorAction(),
-                "FFT": IconAction(icon_path="fft.svg", tooltip="Toggle FFT", checkable=True),
-                "log": IconAction(
-                    icon_path="log_scale.png", tooltip="Toggle log scale", checkable=True
+                "FFT": MaterialIconAction(icon_name="fft", tooltip="Toggle FFT", checkable=True),
+                "log": MaterialIconAction(
+                    icon_name="log_scale", tooltip="Toggle log scale", checkable=True
+                ),
+                "transpose": MaterialIconAction(
+                    icon_name="transform", tooltip="Transpose Image", checkable=True
                 ),
-                "transpose": IconAction(
-                    icon_path="transform.svg", tooltip="Transpose Image", checkable=True
+                "rotate_right": MaterialIconAction(
+                    icon_name="rotate_right", tooltip="Rotate image clockwise by 90 deg"
                 ),
-                "rotate_right": IconAction(
-                    icon_path="rotate_right.svg", tooltip="Rotate image clockwise by 90 deg"
+                "rotate_left": MaterialIconAction(
+                    icon_name="rotate_left", tooltip="Rotate image counterclockwise by 90 deg"
                 ),
-                "rotate_left": IconAction(
-                    icon_path="rotate_left.svg", tooltip="Rotate image counterclockwise by 90 deg"
+                "reset": MaterialIconAction(
+                    icon_name="reset_settings", tooltip="Reset Image Settings"
                 ),
-                "reset": IconAction(icon_path="reset_settings.svg", tooltip="Reset Image Settings"),
                 "separator_3": SeparatorAction(),
-                "axis_settings": IconAction(
-                    icon_path="settings.svg", tooltip="Open Configuration Dialog"
+                "axis_settings": MaterialIconAction(
+                    icon_name="settings", tooltip="Open Configuration Dialog"
                 ),
             },
             target_widget=self,

{bec_widgets-0.97.0 → bec_widgets-0.99.0}/bec_widgets/widgets/motor_map/motor_map_widget.py

@@ -5,7 +5,7 @@ import sys
 from qtpy.QtWidgets import QVBoxLayout, QWidget
 
 from bec_widgets.qt_utils.settings_dialog import SettingsDialog
-from bec_widgets.qt_utils.toolbar import DeviceSelectionAction, IconAction, ModularToolBar
+from bec_widgets.qt_utils.toolbar import DeviceSelectionAction, MaterialIconAction, ModularToolBar
 from bec_widgets.utils.bec_widget import BECWidget
 from bec_widgets.widgets.device_combobox.device_combobox import DeviceComboBox
 from bec_widgets.widgets.figure import BECFigure
@@ -54,9 +54,11 @@ class BECMotorMapWidget(BECWidget, QWidget):
                 "motor_y": DeviceSelectionAction(
                     "Motor Y:", DeviceComboBox(device_filter="Positioner")
                 ),
-                "connect": IconAction(icon_path="connection.svg", tooltip="Connect Motors"),
-                "history": IconAction(icon_path="history.svg", tooltip="Reset Trace History"),
-                "config": IconAction(icon_path="settings.svg", tooltip="Open Configuration Dialog"),
+                "connect": MaterialIconAction(icon_name="link", tooltip="Connect Motors"),
+                "history": MaterialIconAction(icon_name="history", tooltip="Reset Trace History"),
+                "config": MaterialIconAction(
+                    icon_name="settings", tooltip="Open Configuration Dialog"
+                ),
             },
             target_widget=self,
         )