bec-widgets 0.97.0__py3-none-any.whl → 0.98.0__py3-none-any.whl

CHANGELOG.md

@@ -1,5 +1,31 @@
 # CHANGELOG
 
+## 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
@@ -125,35 +151,3 @@ Since we now rely on reusing the BECClient singleton, we need the fix introduced
 * 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)

PKG-INFO

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

bec_widgets/widgets/positioner_box/positioner_box.py

@@ -7,13 +7,14 @@ from bec_lib.device import Positioner
 from bec_lib.endpoints import MessageEndpoints
 from bec_lib.logger import bec_logger
 from bec_lib.messages import ScanQueueMessage
-from qtpy.QtCore import Property, QSize, Signal, Slot
-from qtpy.QtGui import QDoubleValidator, QIcon
+from bec_qthemes import material_icon
+from qtpy.QtCore import Property, Signal, Slot
+from qtpy.QtGui import QDoubleValidator
 from qtpy.QtWidgets import QDialog, QDoubleSpinBox, QPushButton, QVBoxLayout, QWidget
 
 from bec_widgets.utils import UILoader
 from bec_widgets.utils.bec_widget import BECWidget
-from bec_widgets.utils.colors import apply_theme
+from bec_widgets.utils.colors import set_theme
 from bec_widgets.widgets.device_line_edit.device_line_edit import DeviceLineEdit
 
 logger = bec_logger.logger
@@ -78,11 +79,7 @@ class PositionerBox(BECWidget, QWidget):
         self.ui.setpoint.setValidator(self.setpoint_validator)
         self.ui.spinner_widget.start()
         self.ui.tool_button.clicked.connect(self._open_dialog_selection)
-        icon = QIcon()
-        icon.addFile(
-            os.path.join(MODULE_PATH, "assets", "toolbar_icons", "device_line_edit.svg"),
-            size=QSize(16, 16),
-        )
+        icon = material_icon(icon_name="edit_note", size=(16, 16), convert_to_pixmap=False)
         self.ui.tool_button.setIcon(icon)
 
     def _open_dialog_selection(self):
@@ -303,7 +300,7 @@ if __name__ == "__main__":  # pragma: no cover
     from qtpy.QtWidgets import QApplication
 
     app = QApplication(sys.argv)
-    apply_theme("dark")
+    set_theme("dark")
     widget = PositionerBox(device="bpm4i")
 
     widget.show()

bec_widgets/widgets/scan_control/scan_control.py

@@ -260,10 +260,12 @@ class ScanControl(BECWidget, QWidget):
 
 # Application example
 if __name__ == "__main__":  # pragma: no cover
+    from bec_widgets.utils.colors import set_theme
+
     app = QApplication([])
     scan_control = ScanControl()
 
-    apply_theme("dark")
+    set_theme("auto")
     window = scan_control
     window.show()
     app.exec()

bec_widgets/widgets/waveform/waveform_popups/curve_dialog/curve_dialog.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 import os
 from typing import Literal
 
+from bec_qthemes import material_icon
 from pydantic import BaseModel
 from qtpy.QtCore import QObject, QSize, Slot
 from qtpy.QtGui import QIcon
@@ -38,10 +39,7 @@ class CurveSettings(SettingWidget):
         self.ui.normalize_colors_dap.clicked.connect(lambda: self.change_colormap("dap"))
 
     def _setup_icons(self):
-        add_icon = QIcon()
-        add_icon.addFile(
-            os.path.join(MODULE_PATH, "assets", "toolbar_icons", "add.svg"), size=QSize(20, 20)
-        )
+        add_icon = material_icon(icon_name="add", size=(20, 20), convert_to_pixmap=False)
         self.ui.add_dap.setIcon(add_icon)
         self.ui.add_dap.setToolTip("Add DAP Curve")
         self.ui.add_curve.setIcon(add_icon)
@@ -339,5 +337,5 @@ class StyleComboBox(QComboBox):
 class RemoveButton(QPushButton):
     def __init__(self, parent=None):
         super().__init__(parent)
-        icon_path = os.path.join(MODULE_PATH, "assets", "toolbar_icons", "remove.svg")
-        self.setIcon(QIcon(icon_path))
+        icon = material_icon("disabled_by_default", size=(20, 20), convert_to_pixmap=False)
+        self.setIcon(icon)

bec_widgets/widgets/waveform/waveform_widget.py

@@ -10,12 +10,7 @@ from qtpy.QtWidgets import QVBoxLayout, QWidget
 
 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 (
-    IconAction,
-    MaterialIconAction,
-    ModularToolBar,
-    SeparatorAction,
-)
+from bec_widgets.qt_utils.toolbar import MaterialIconAction, ModularToolBar, SeparatorAction
 from bec_widgets.utils.bec_widget import BECWidget
 from bec_widgets.widgets.figure import BECFigure
 from bec_widgets.widgets.figure.plots.axis_settings import AxisSettings
@@ -88,24 +83,26 @@ class BECWaveformWidget(BECWidget, QWidget):
         self.fig = BECFigure()
         self.toolbar = ModularToolBar(
             actions={
-                "save": IconAction(icon_path="save.svg", tooltip="Open Export Dialog"),
-                "matplotlib": IconAction(
-                    icon_path="photo_library.svg", tooltip="Open Matplotlib Plot"
+                "save": MaterialIconAction(icon_name="save", tooltip="Open Export Dialog"),
+                "matplotlib": MaterialIconAction(
+                    icon_name="photo_library", tooltip="Open Matplotlib Plot"
                 ),
                 "separator_1": SeparatorAction(),
-                "drag_mode": IconAction(
-                    icon_path="drag_pan_mode.svg", tooltip="Drag Mouse Mode", checkable=True
+                "drag_mode": MaterialIconAction(
+                    icon_name="drag_pan", tooltip="Drag Mouse Mode", checkable=True
+                ),
+                "rectangle_mode": MaterialIconAction(
+                    icon_name="frame_inspect", tooltip="Rectangle Zoom Mode", checkable=True
                 ),
-                "rectangle_mode": IconAction(
-                    icon_path="rectangle_mode.svg", tooltip="Rectangle Zoom Mode", checkable=True
+                "auto_range": MaterialIconAction(
+                    icon_name="open_in_full", tooltip="Autorange Plot"
                 ),
-                "auto_range": IconAction(icon_path="auto_range.svg", tooltip="Autorange Plot"),
                 "separator_2": SeparatorAction(),
-                "curves": IconAction(
-                    icon_path="line_axis.svg", tooltip="Open Curves Configuration"
+                "curves": MaterialIconAction(
+                    icon_name="stacked_line_chart", tooltip="Open Curves Configuration"
                 ),
-                "fit_params": IconAction(
-                    icon_path="fitting_parameters.svg", tooltip="Open Fitting Parameters"
+                "fit_params": MaterialIconAction(
+                    icon_name="monitoring", tooltip="Open Fitting Parameters"
                 ),
                 "axis_settings": MaterialIconAction(
                     icon_name="settings", tooltip="Open Configuration Dialog"
@@ -594,10 +591,12 @@ class BECWaveformWidget(BECWidget, QWidget):
 
 
 def main():  # pragma: no cover
-
     from qtpy.QtWidgets import QApplication
 
+    from bec_widgets.utils.colors import set_theme
+
     app = QApplication(sys.argv)
+    set_theme("auto")
     widget = BECWaveformWidget()
     widget.show()
     sys.exit(app.exec_())

{bec_widgets-0.97.0.dist-info → bec_widgets-0.98.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: bec_widgets
-Version: 0.97.0
+Version: 0.98.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.dist-info → bec_widgets-0.98.0.dist-info}/RECORD

@@ -2,11 +2,11 @@
 .gitlab-ci.yml,sha256=9dZ_EvimZrDzG8MtII0qtBYMM_Nc6xqh2iFRds0rlvE,8370
 .pylintrc,sha256=eeY8YwSI74oFfq6IYIbCqnx3Vk8ZncKaatv96n_Y8Rs,18544
 .readthedocs.yaml,sha256=aSOc277LqXcsTI6lgvm_JY80lMlr69GbPKgivua2cS0,603
-CHANGELOG.md,sha256=F5JNzWDV1tskuAnkR8S2x6KB1FPs-J2JUqZeBs7e00g,6733
+CHANGELOG.md,sha256=gjQfqaLDuPUnF3DFFQqOFpYcJNBi7cVD6D_-knI9F2k,6839
 LICENSE,sha256=YRKe85CBRyP7UpEAWwU8_qSIyuy5-l_9C-HKg5Qm8MQ,1511
-PKG-INFO,sha256=UkwD-_52GWkQgNpQnMa-cDG4Q_h3sMM1jqGYrM4Kjy8,1325
+PKG-INFO,sha256=IAkC6nhPjMKZoERtnUZtDsEU4stXZjICC1FDwQuyuoM,1325
 README.md,sha256=Od69x-RS85Hph0-WwWACwal4yUd67XkEn4APEfHhHFw,2649
-pyproject.toml,sha256=5LVT8PiePyXQ2W_r2fJjtBUzN7BRL233-0tjvBG_b_A,2416
+pyproject.toml,sha256=61TgaqglyIMXu3W2TMVVhZwG5g2bN4ShiDCSw16LnTE,2416
 .git_hooks/pre-commit,sha256=n3RofIZHJl8zfJJIUomcMyYGFi_rwq4CC19z0snz3FI,286
 .gitlab/issue_templates/bug_report_template.md,sha256=gAuyEwl7XlnebBrkiJ9AqffSNOywmr8vygUFWKTuQeI,386
 .gitlab/issue_templates/documentation_update_template.md,sha256=FHLdb3TS_D9aL4CYZCjyXSulbaW5mrN2CmwTaeLPbNw,860
@@ -85,14 +85,14 @@ bec_widgets/qt_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 bec_widgets/qt_utils/error_popups.py,sha256=y9gKKWaafp468ioHr96nBhf02ZpEgjDc-BAVOTWh-e8,7680
 bec_widgets/qt_utils/redis_message_waiter.py,sha256=fvL_QgC0cTDv_FPJdRyp5AKjf401EJU4z3r38p47ydY,1745
 bec_widgets/qt_utils/settings_dialog.py,sha256=NhtzTer_xzlB2lLLrGklkI1QYLJEWQpJoZbCz4o5daI,3645
-bec_widgets/qt_utils/toolbar.py,sha256=3gmwASDgZiE6SFI9dK3VE-dT4LMqwb68laowF7_rv3o,7773
+bec_widgets/qt_utils/toolbar.py,sha256=YIW0lV1zm7M6dC0mwEmWOYhhmnDfP4d1lMDgd2pwXao,7588
 bec_widgets/utils/__init__.py,sha256=1930ji1Jj6dVuY81Wd2kYBhHYNV-2R0bN_L4o9zBj1U,533
 bec_widgets/utils/bec_connector.py,sha256=SivHKXVyNVqeu3kCXYEPpbleTVw8g1cW0FKq1QrQgco,9987
 bec_widgets/utils/bec_designer.py,sha256=Z3MeMju-KmTz8POtm23VQfp4rvtD2sF6eIOKQkl2F7w,4729
 bec_widgets/utils/bec_dispatcher.py,sha256=NkObWO_gRO9Uobz-fy0gVTZqQsbFRaKj6fbjYZoErFI,6400
 bec_widgets/utils/bec_table.py,sha256=nA2b8ukSeUfquFMAxGrUVOqdrzMoDYD6O_4EYbOG2zk,717
 bec_widgets/utils/bec_widget.py,sha256=Bo2v1aP7rgSAQajW8GBJbI3iovTn_hGCsmeFMo7bT10,707
-bec_widgets/utils/colors.py,sha256=hNIi99EpMv3t3hTJIL2jBe5nzh5f2fuCyEKXEPWSQSc,10501
+bec_widgets/utils/colors.py,sha256=2lQZFfmin0YBJVrMH_81wSUPpmFz235_NYHpNRFlrbk,11383
 bec_widgets/utils/container_utils.py,sha256=0wr3ZfuMiAFKCrQHVjxjw-Vuk8wsHdridqcjy2eY840,1531
 bec_widgets/utils/crosshair.py,sha256=ywj4Pr2Xx8tFsD5qrHIocanKlNqDd51ElbEfxenuYM0,11363
 bec_widgets/utils/entry_validator.py,sha256=3skJIsUwTYicT76AMHm_M78RiWtUgyD2zb-Rxo2HdHQ,1313
@@ -153,12 +153,12 @@ bec_widgets/widgets/device_line_edit/device_line_edit_plugin.py,sha256=4ASFaDcpk
 bec_widgets/widgets/device_line_edit/register_device_line_edit.py,sha256=8gEPnC8djYCw-idoZAENNB3bPOxM6pbzEp9A366EAGg,489
 bec_widgets/widgets/dock/__init__.py,sha256=B7foHt02gnhM7mFksa7GJVwT7n0j_JvYDCt6wc6XR5g,61
 bec_widgets/widgets/dock/dock.py,sha256=hQw5tpGrRbybjfF-aVEAeGdLTudtH4kFa70flu6_ZA8,10349
-bec_widgets/widgets/dock/dock_area.py,sha256=VfKyMxKo-r1Ugu2xjSsfGMYZUg3i3xxaokaZCFcCoxA,13579
+bec_widgets/widgets/dock/dock_area.py,sha256=X98q9YZ9gRmA7BOz_GcVKuyH3fsbem-iBH9eUtM5Pi4,14416
 bec_widgets/widgets/dock/dock_area.pyproject,sha256=URW0UrDXCnkzk80rbQmUMgF6Uqay2TjHsq8Dq0g1j-c,37
 bec_widgets/widgets/dock/dock_area_plugin.py,sha256=BqWvXzRm90kZGKgP26APt7f6ARBWzLU839vGAjl7UYM,1308
 bec_widgets/widgets/dock/register_dock_area.py,sha256=Yqd1mq6CcHwlxHZxX5EHKONy4P44nMm8pso-4X0tvJI,464
 bec_widgets/widgets/figure/__init__.py,sha256=3hGx_KOV7QHCYAV06aNuUgKq4QIYCjUTad-DrwkUaBM,44
-bec_widgets/widgets/figure/figure.py,sha256=yujtlDj5NutRJ0gfHMkCVXvBNj5r2z3pb3gwWlUQ92Q,28822
+bec_widgets/widgets/figure/figure.py,sha256=ArJ_fN6xvqzuK8p6YQJfMJwSTh-Rvk69TKIgItPmBeA,28777
 bec_widgets/widgets/figure/plots/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bec_widgets/widgets/figure/plots/axis_settings.py,sha256=QxRpQwgfBr1H0HTjfOpiXi_-n8I0BaZhS8LRXNeVfFg,3544
 bec_widgets/widgets/figure/plots/axis_settings.ui,sha256=a2qIuK9lyi9HCyrSvPr6wxzmm1FymaWcpmyOhMIiFt8,11013
@@ -175,14 +175,14 @@ bec_widgets/widgets/figure/plots/waveform/waveform_curve.py,sha256=ZwRxSfPHbMWEv
 bec_widgets/widgets/image/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bec_widgets/widgets/image/bec_image_widget.pyproject,sha256=PHisdBo5_5UCApd27GkizzqgfdjsDx2bFZa_p9LiSW8,30
 bec_widgets/widgets/image/bec_image_widget_plugin.py,sha256=vU9JnJwz0TTITH4fK6uVGmbTnPdV8kLu2BIJU_LQH4c,1352
-bec_widgets/widgets/image/image_widget.py,sha256=TCpTF8v94iSMklG9bYxZOjm9SbO60XZB9X0ldEp8lWE,16288
+bec_widgets/widgets/image/image_widget.py,sha256=6KtyMAr_iCA8TmzKkM4CogJLkr9BepfceWtEdMeEjlg,16325
 bec_widgets/widgets/image/register_bec_image_widget.py,sha256=01YLZQTMSSIXvH1TSL-1AYsRs1a4EbSwKLVAwh9AjeA,478
 bec_widgets/widgets/jupyter_console/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bec_widgets/widgets/jupyter_console/jupyter_console.py,sha256=-e7HQOECeH5eDrJYh4BFIzRL78LDkooU4otabyN0aX4,2343
 bec_widgets/widgets/motor_map/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bec_widgets/widgets/motor_map/bec_motor_map_widget.pyproject,sha256=NAI8s5gRKz80ED4KY7OgD2OgSH5HEsjt2ux2BYp66yg,63
 bec_widgets/widgets/motor_map/bec_motor_map_widget_plugin.py,sha256=NSUlP06rTB73GKik7KR_sO66Yu-gp5_XA7ApgTbcwJo,1283
-bec_widgets/widgets/motor_map/motor_map_widget.py,sha256=URcysThbJKGsCZUqQm2lCtVn5FG8t4kT7DaN5EJUexg,7555
+bec_widgets/widgets/motor_map/motor_map_widget.py,sha256=vA1XuxMN5uBzvgdkogUnChtRXqMyIfcGXV9xdJMmgA0,7607
 bec_widgets/widgets/motor_map/register_bec_motor_map_widget.py,sha256=qRG8PtWGjso0pWbvj_DXKnbUfmQzfGqPSrnAozXfM7o,492
 bec_widgets/widgets/motor_map/motor_map_dialog/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bec_widgets/widgets/motor_map/motor_map_dialog/motor_map_settings.py,sha256=U-r3YHsxf2XvZn0kVbrYIT2aXKSaG5wM1JEnGzwGMVU,2258
@@ -193,7 +193,7 @@ bec_widgets/widgets/position_indicator/position_indicator.pyproject,sha256=s0JEf
 bec_widgets/widgets/position_indicator/position_indicator_plugin.py,sha256=5efV6Y5LSvCHgg2wogAs7JfKfDhzv59NFT0uT17cWsk,1409
 bec_widgets/widgets/position_indicator/register_position_indicator.py,sha256=OZNiMgM_80TPSAXK_0hXAkne4vUh8DGvh_OdpOiMpwI,516
 bec_widgets/widgets/positioner_box/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bec_widgets/widgets/positioner_box/positioner_box.py,sha256=FyUGskWAb-5m44bdUNVig_AkoDbLRbB0GucI6RRHge8,10839
+bec_widgets/widgets/positioner_box/positioner_box.py,sha256=dIShqGXPpltgNzzb6AzXCtWugk3xWsiYBoBwgcLaA3Y,10774
 bec_widgets/widgets/positioner_box/positioner_box.pyproject,sha256=7966pHdDseaHciaPNEKgdQgbUThSZf5wEDCeAEJh9po,32
 bec_widgets/widgets/positioner_box/positioner_box.ui,sha256=Y-Xp0z32okT7X4-rL5r7dF_QH_QpXvPes3f778cC7_k,5633
 bec_widgets/widgets/positioner_box/positioner_box_plugin.py,sha256=pcZcE0lwgdyWsopwi5ZM1tw32P5uD5QOtEC7sLYQIEc,1404
@@ -211,7 +211,7 @@ bec_widgets/widgets/ring_progress_bar/ring_progress_bar.pyproject,sha256=ZNYDnKD
 bec_widgets/widgets/ring_progress_bar/ring_progress_bar_plugin.py,sha256=4wYVyxs8osUa1VuJUI5A2KdCCghmZXwsNCEtFQq6pYI,1384
 bec_widgets/widgets/scan_control/__init__.py,sha256=IOfHl15vxb_uC6KN62-PeUzbBha_vQyqkkXbJ2HU674,38
 bec_widgets/widgets/scan_control/register_scan_control.py,sha256=xUX2yR0-MaIMg9_y9qe50yDDphzsh2x1b5PMrF90yPM,475
-bec_widgets/widgets/scan_control/scan_control.py,sha256=30pcaVaBVo6JxJuMH1ul1s-sPuWqCUKsUQ-XfAgzRZ8,9384
+bec_widgets/widgets/scan_control/scan_control.py,sha256=9cvFMZbU5ttoXpJAjcKVU3MnsUwc2XN3x9qlGEIL0IY,9434
 bec_widgets/widgets/scan_control/scan_control.pyproject,sha256=eTgVDFKToIH8_BbJjM2RvbOLr7HnYoidX0SAHx640DM,30
 bec_widgets/widgets/scan_control/scan_control_plugin.py,sha256=Oe0jvKoLa1jvV7IyoExTzd2vvJbKPgUUt4_cdunsVNY,1350
 bec_widgets/widgets/scan_control/scan_group_box.py,sha256=BpX9ZphqOhdEbQnGzNeNlmuZsMS__U97CkBMical2FY,9300
@@ -244,10 +244,10 @@ bec_widgets/widgets/waveform/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 bec_widgets/widgets/waveform/bec_waveform_widget.pyproject,sha256=GLD8GN9dXx9wNbtnevrxqqcwk7vKV-Uv8QYSycdaoaI,33
 bec_widgets/widgets/waveform/bec_waveform_widget_plugin.py,sha256=Qt8E5nvk6f5JYwOqVn5UkbIW_JqsXkIMdv3CM41gXsU,1387
 bec_widgets/widgets/waveform/register_bec_waveform_widget.py,sha256=qZHVZH_lP2hvzkG1Ra0EyrXlMeLkRCy0aceH-bfJ1cs,490
-bec_widgets/widgets/waveform/waveform_widget.py,sha256=nzRDgo_qfmmp_aSGbXhwy2U7yq5cR0pHdjM0YDCvTKE,20409
+bec_widgets/widgets/waveform/waveform_widget.py,sha256=7oOLIIQbx1Oam89cjtAidRU1QFLphTk-ALSRbiessrY,20512
 bec_widgets/widgets/waveform/waveform_popups/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bec_widgets/widgets/waveform/waveform_popups/curve_dialog/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bec_widgets/widgets/waveform/waveform_popups/curve_dialog/curve_dialog.py,sha256=S1j44i1xxJtmCcNtbOsxF8XdklMPsG9t4-1DZ2YfOPw,13128
+bec_widgets/widgets/waveform/waveform_popups/curve_dialog/curve_dialog.py,sha256=5e2BrKA97cfZCM04x7-S3z6sby82KKnUH1S0gVQUfLU,13090
 bec_widgets/widgets/waveform/waveform_popups/curve_dialog/curve_dialog.ui,sha256=OaQE5HlyBQ3RQoHqxOFHiUoNcx8SDZP5sHJ9NNGhsPI,10404
 bec_widgets/widgets/waveform/waveform_popups/dap_summary_dialog/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bec_widgets/widgets/waveform/waveform_popups/dap_summary_dialog/dap_summary.ui,sha256=PFEKro61UXd-jmx65U4pqJ5D29DXtVnhQRnsnDvN-wM,6138
@@ -400,8 +400,8 @@ tests/unit_tests/test_configs/config_device_no_entry.yaml,sha256=hdvue9KLc_kfNzG
 tests/unit_tests/test_configs/config_scan.yaml,sha256=vo484BbWOjA_e-h6bTjSV9k7QaQHrlAvx-z8wtY-P4E,1915
 tests/unit_tests/test_msgs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/unit_tests/test_msgs/available_scans_message.py,sha256=m_z97hIrjHXXMa2Ex-UvsPmTxOYXfjxyJaGkIY6StTY,46532
-bec_widgets-0.97.0.dist-info/METADATA,sha256=UkwD-_52GWkQgNpQnMa-cDG4Q_h3sMM1jqGYrM4Kjy8,1325
-bec_widgets-0.97.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-bec_widgets-0.97.0.dist-info/entry_points.txt,sha256=3otEkCdDB9LZJuBLzG4pFLK5Di0CVybN_12IsZrQ-58,166
-bec_widgets-0.97.0.dist-info/licenses/LICENSE,sha256=YRKe85CBRyP7UpEAWwU8_qSIyuy5-l_9C-HKg5Qm8MQ,1511
-bec_widgets-0.97.0.dist-info/RECORD,,
+bec_widgets-0.98.0.dist-info/METADATA,sha256=IAkC6nhPjMKZoERtnUZtDsEU4stXZjICC1FDwQuyuoM,1325
+bec_widgets-0.98.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+bec_widgets-0.98.0.dist-info/entry_points.txt,sha256=3otEkCdDB9LZJuBLzG4pFLK5Di0CVybN_12IsZrQ-58,166
+bec_widgets-0.98.0.dist-info/licenses/LICENSE,sha256=YRKe85CBRyP7UpEAWwU8_qSIyuy5-l_9C-HKg5Qm8MQ,1511
+bec_widgets-0.98.0.dist-info/RECORD,,

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "bec_widgets"
-version = "0.97.0"
+version = "0.98.0"
 description = "BEC Widgets"
 requires-python = ">=3.10"
 classifiers = [