bec-widgets 0.83.0__tar.gz → 0.83.1__tar.gz

{bec_widgets-0.83.0 → bec_widgets-0.83.1}/CHANGELOG.md

@@ -1,5 +1,21 @@
 # CHANGELOG
 
+## v0.83.1 (2024-07-14)
+
+### Fix
+
+* fix(toolbar): default transparent background ([`eab7883`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/eab78839792f175b7ac127ca603385c6baa5ff15))
+
+* fix: use apply_theme ([`2d4249e`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/2d4249e73a792fed1c2c7ab79bb8aec38c57466c))
+
+* fix: spinner: update reference image for widget test, use apply_theme ([`63db135`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/63db1352ee883d35670b3a692dbe51d6d01872ae))
+
+* fix: replace pyqtdarktheme by qdarkstyle, add 'apply_theme' function (in utils/colors.py) ([`8308115`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/8308115f3646245d825fc47ab57297d3460bbcf5))
+
+### Test
+
+* test(toolbar): added reference pngs for spinner for Darwin ([`11a7204`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/11a7204c98e0bf211a8721d296b45d24a3102b97))
+
 ## v0.83.0 (2024-07-08)
 
 ### Feature
@@ -125,21 +141,3 @@
 * fix: overwrite closeEvent and call super class ([`bc0ef78`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/bc0ef7893ef100b71b62101c459655509b534a56))
 
 ## v0.79.1 (2024-07-03)
-
-### Fix
-
-* fix: use libdir env var to preload Python library, also for Linux platform ([`d7718d4`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/d7718d4dcb9728c050b6421388af4d484f3741f2))
-
-## v0.79.0 (2024-07-03)
-
-### Feature
-
-* feat(motor_map_widget): standalone MotorMap Widget with toolbar + plugin ([`6e75642`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/6e756420907d7093557e945bc92bc4cfc0138d07))
-
-* feat(motor_map): method to reset history trace ([`5960918`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/5960918137dd41cdeb94e50f8abc4f169cf45c11))
-
-### Fix
-
-* fix(toolbar): change default color to black to match BECFigure theme ([`b8774e0`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/b8774e0b0bc43dcd00f94f42539a778e507ca27d))
-
-* fix(motor_map): fixed bug with residual trace after changing motors ([`aaa0d10`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/aaa0d1003d2e94b45bafe4f700852c2c05288aea))

{bec_widgets-0.83.0 → bec_widgets-0.83.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: bec_widgets
-Version: 0.83.0
+Version: 0.83.1
 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
@@ -14,9 +14,9 @@ Requires-Dist: bec-lib~=2.16
 Requires-Dist: black~=24.0
 Requires-Dist: isort>=5.13.2,~=5.13
 Requires-Dist: pydantic~=2.0
-Requires-Dist: pyqtdarktheme~=2.1
 Requires-Dist: pyqtgraph~=0.13
 Requires-Dist: pyte
+Requires-Dist: qdarkstyle>=3.2.2
 Requires-Dist: qtconsole>=5.5.1,~=5.5
 Requires-Dist: qtpy~=2.4
 Provides-Extra: dev

{bec_widgets-0.83.0 → bec_widgets-0.83.1}/bec_widgets/examples/jupyter_console/jupyter_console_window.py

@@ -2,7 +2,6 @@ import os
 
 import numpy as np
 import pyqtgraph as pg
-import qdarktheme
 from qtconsole.inprocess import QtInProcessKernelManager
 from qtconsole.rich_jupyter_widget import RichJupyterWidget
 from qtpy.QtCore import QSize
@@ -10,6 +9,7 @@ from qtpy.QtGui import QIcon
 from qtpy.QtWidgets import QApplication, QVBoxLayout, QWidget
 
 from bec_widgets.utils import BECDispatcher, UILoader
+from bec_widgets.utils.colors import apply_theme
 from bec_widgets.widgets.dock.dock_area import BECDockArea
 from bec_widgets.widgets.figure import BECFigure
 from bec_widgets.widgets.jupyter_console.jupyter_console import BECJupyterConsole
@@ -147,7 +147,7 @@ if __name__ == "__main__":  # pragma: no cover
     app = QApplication(sys.argv)
     app.setApplicationName("Jupyter Console")
     app.setApplicationDisplayName("Jupyter Console")
-    qdarktheme.setup_theme("auto")
+    apply_theme("dark")
     icon = QIcon()
     icon.addFile(os.path.join(module_path, "assets", "terminal_icon.png"), size=QSize(48, 48))
     app.setWindowIcon(icon)

{bec_widgets-0.83.0 → bec_widgets-0.83.1}/bec_widgets/qt_utils/toolbar.py

@@ -26,7 +26,9 @@ class ModularToolBar(QToolBar):
         color (str, optional): The background color of the toolbar. Defaults to "black".
     """
 
-    def __init__(self, parent=None, actions=None, target_widget=None, color: str = "black"):
+    def __init__(
+        self, parent=None, actions=None, target_widget=None, color: str = "rgba(255, 255, 255, 0)"
+    ):
         super().__init__(parent)
 
         self.widgets = defaultdict(dict)

{bec_widgets-0.83.0 → bec_widgets-0.83.1}/bec_widgets/utils/colors.py

@@ -1,10 +1,37 @@
+import itertools
 import re
 from typing import Literal
 
 import numpy as np
 import pyqtgraph as pg
+import qdarkstyle
 from pydantic_core import PydanticCustomError
+from qdarkstyle import DarkPalette, LightPalette
 from qtpy.QtGui import QColor
+from qtpy.QtWidgets import QApplication
+
+CURRENT_THEME = "dark"
+
+
+def get_theme_palette():
+    return DarkPalette if CURRENT_THEME == "dark" else LightPalette
+
+
+def apply_theme(theme: Literal["dark", "light"]):
+    global CURRENT_THEME
+    CURRENT_THEME = theme
+
+    app = QApplication.instance()
+    # go through all pyqtgraph widgets and set background
+    children = itertools.chain.from_iterable(
+        top.findChildren(pg.GraphicsLayoutWidget) for top in app.topLevelWidgets()
+    )
+    for pg_widget in children:
+        pg_widget.setBackground("k" if theme == "dark" else "w")
+
+    # now define stylesheet according to theme and apply it
+    style = qdarkstyle.load_stylesheet(palette=get_theme_palette())
+    app.setStyleSheet(style)
 
 
 class Colors:

{bec_widgets-0.83.0 → bec_widgets-0.83.1}/bec_widgets/widgets/bec_status_box/bec_status_box.py

@@ -9,12 +9,12 @@ from collections import defaultdict
 from dataclasses import dataclass
 from typing import TYPE_CHECKING
 
-import qdarktheme
 from bec_lib.utils.import_utils import lazy_import_from
 from qtpy.QtCore import QObject, QTimer, Signal, Slot
 from qtpy.QtWidgets import QHBoxLayout, QTreeWidget, QTreeWidgetItem, QWidget
 
 from bec_widgets.utils.bec_connector import BECConnector
+from bec_widgets.utils.colors import apply_theme
 from bec_widgets.widgets.bec_status_box.status_item import StatusItem
 
 if TYPE_CHECKING:
@@ -306,7 +306,7 @@ def main():
     from qtpy.QtWidgets import QApplication
 
     app = QApplication(sys.argv)
-    qdarktheme.setup_theme("auto")
+    apply_theme("dark")
     main_window = BECStatusBox()
     main_window.show()
     sys.exit(app.exec())

{bec_widgets-0.83.0 → bec_widgets-0.83.1}/bec_widgets/widgets/device_box/device_box.py

@@ -9,6 +9,7 @@ from qtpy.QtWidgets import QDoubleSpinBox, QVBoxLayout, QWidget
 
 from bec_widgets.utils import UILoader
 from bec_widgets.utils.bec_connector import BECConnector
+from bec_widgets.utils.colors import apply_theme
 
 
 class DeviceBox(BECConnector, QWidget):
@@ -186,11 +187,10 @@ class DeviceBox(BECConnector, QWidget):
 if __name__ == "__main__":  # pragma: no cover
     import sys
 
-    import qdarktheme
     from qtpy.QtWidgets import QApplication
 
     app = QApplication(sys.argv)
-    qdarktheme.setup_theme("light")
+    apply_theme("light")
     widget = DeviceBox(device="samx")
 
     widget.show()

{bec_widgets-0.83.0 → bec_widgets-0.83.1}/bec_widgets/widgets/figure/figure.py

@@ -7,13 +7,13 @@ from typing import Literal, Optional
 
 import numpy as np
 import pyqtgraph as pg
-import qdarktheme
 from pydantic import Field, ValidationError, field_validator
 from qtpy.QtCore import Signal as pyqtSignal
 from qtpy.QtWidgets import QWidget
 from typeguard import typechecked
 
 from bec_widgets.utils import BECConnector, ConnectionConfig, WidgetContainerUtils
+from bec_widgets.utils.colors import apply_theme
 from bec_widgets.widgets.figure.plots.image.image import BECImageShow, ImageConfig
 from bec_widgets.widgets.figure.plots.motor_map.motor_map import BECMotorMap, MotorMapConfig
 from bec_widgets.widgets.figure.plots.plot_base import BECPlotBase, SubplotConfig
@@ -670,9 +670,8 @@ class BECFigure(BECConnector, pg.GraphicsLayoutWidget):
         Args:
             theme(Literal["dark","light"]): The theme to set for the figure widget.
         """
-        qdarktheme.setup_theme(theme)
-        self.setBackground("k" if theme == "dark" else "w")
         self.config.theme = theme
+        apply_theme(theme)
         for plot in self.widget_list:
             plot.set_x_label(plot.plot_item.getAxis("bottom").label.toPlainText())
             plot.set_y_label(plot.plot_item.getAxis("left").label.toPlainText())

{bec_widgets-0.83.0 → bec_widgets-0.83.1}/bec_widgets/widgets/figure/plots/axis_settings.py

@@ -1,10 +1,10 @@
 import os
 
-import qdarktheme
 from qtpy.QtCore import Slot
 from qtpy.QtWidgets import QVBoxLayout, QWidget
 
 from bec_widgets.utils import UILoader
+from bec_widgets.utils.colors import apply_theme
 from bec_widgets.utils.widget_io import WidgetIO
 
 
@@ -55,7 +55,7 @@ if __name__ == "__main__":
     from qtpy.QtWidgets import QApplication
 
     app = QApplication(sys.argv)
-    qdarktheme.setup_theme("dark")
+    apply_theme("dark")
     window = AxisSettings()
     window.show()
     sys.exit(app.exec_())

{bec_widgets-0.83.0 → bec_widgets-0.83.1}/bec_widgets/widgets/scan_control/scan_control.py

@@ -1,4 +1,3 @@
-import qdarktheme
 from bec_lib.endpoints import MessageEndpoints
 from qtpy.QtWidgets import (
     QApplication,
@@ -12,6 +11,7 @@ from qtpy.QtWidgets import (
 )
 
 from bec_widgets.utils import BECConnector
+from bec_widgets.utils.colors import apply_theme
 from bec_widgets.widgets.scan_control.scan_group_box import ScanGroupBox
 from bec_widgets.widgets.stop_button.stop_button import StopButton
 
@@ -206,7 +206,7 @@ if __name__ == "__main__":  # pragma: no cover
     app = QApplication([])
     scan_control = ScanControl()
 
-    qdarktheme.setup_theme("auto")
+    apply_theme("dark")
     window = scan_control
     window.show()
     app.exec()

{bec_widgets-0.83.0 → bec_widgets-0.83.1}/bec_widgets/widgets/spinner/spinner.py

@@ -1,11 +1,12 @@
 import sys
 
 import numpy as np
-import qdarktheme
 from qtpy.QtCore import QRect, Qt, QTimer
 from qtpy.QtGui import QColor, QPainter, QPen
 from qtpy.QtWidgets import QApplication, QMainWindow, QWidget
 
+from bec_widgets.utils.colors import get_theme_palette
+
 
 def ease_in_out_sine(t):
     return 1 - np.sin(np.pi * t)
@@ -52,9 +53,9 @@ class SpinnerWidget(QWidget):
         background_color = QColor(200, 200, 200, 50)
         line_width = 5
 
-        color_palette = qdarktheme.load_palette()
+        color_palette = get_theme_palette()
 
-        color = QColor(color_palette.accent().color())
+        color = QColor(color_palette.COLOR_ACCENT_4)
 
         rect.adjust(line_width, line_width, -line_width, -line_width)
 

{bec_widgets-0.83.0 → bec_widgets-0.83.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "bec_widgets"
-version = "0.83.0"
+version = "0.83.1"
 description = "BEC Widgets"
 requires-python = ">=3.10"
 classifiers = [
@@ -19,7 +19,7 @@ dependencies = [
     "isort~=5.13, >=5.13.2",    # needed for bw-generate-cli
     "pydantic~=2.0",
     "pyqtgraph~=0.13",
-    "pyqtdarktheme~=2.1",
+    "qdarkstyle>=3.2.2",
     "qtconsole~=5.5, >=5.5.1",  # needed for jupyter console
     "qtpy~=2.4",
     "pyte",                     # needed for vt100 console

{bec_widgets-0.83.0 → bec_widgets-0.83.1}/tests/unit_tests/test_spinner.py

@@ -1,13 +1,13 @@
 import pytest
-import qdarktheme
 
+from bec_widgets.utils.colors import apply_theme
 from bec_widgets.utils.reference_utils import snap_and_compare
 from bec_widgets.widgets.spinner.spinner import SpinnerWidget
 
 
 @pytest.fixture
 def spinner_widget(qtbot):
-    qdarktheme.setup_theme("light")
+    apply_theme("light")
     spinner = SpinnerWidget()
     qtbot.addWidget(spinner)
     qtbot.waitExposed(spinner)