diff --git a/bec_widgets/utils/colors.py b/bec_widgets/utils/colors.py index 7642a82a..c6d9a379 100644 --- a/bec_widgets/utils/colors.py +++ b/bec_widgets/utils/colors.py @@ -2,11 +2,10 @@ import itertools import re from typing import Literal +import bec_qthemes 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 @@ -14,7 +13,7 @@ CURRENT_THEME = "dark" def get_theme_palette(): - return DarkPalette if CURRENT_THEME == "dark" else LightPalette + return bec_qthemes.load_palette(CURRENT_THEME) def apply_theme(theme: Literal["dark", "light"]): @@ -30,7 +29,7 @@ def apply_theme(theme: Literal["dark", "light"]): 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()) + style = bec_qthemes.load_stylesheet(theme) app.setStyleSheet(style) diff --git a/bec_widgets/widgets/spinner/spinner.py b/bec_widgets/widgets/spinner/spinner.py index 9fe0a0dd..881b5b64 100644 --- a/bec_widgets/widgets/spinner/spinner.py +++ b/bec_widgets/widgets/spinner/spinner.py @@ -55,7 +55,7 @@ class SpinnerWidget(QWidget): color_palette = get_theme_palette() - color = QColor(color_palette.COLOR_ACCENT_4) + color = QColor(color_palette.accent().color()) rect.adjust(line_width, line_width, -line_width, -line_width) diff --git a/pyproject.toml b/pyproject.toml index 976124a8..5f54e2b1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -19,7 +19,7 @@ dependencies = [ "isort~=5.13, >=5.13.2", # needed for bw-generate-cli "pydantic~=2.0", "pyqtgraph~=0.13", - "qdarkstyle>=3.2.2", + "bec_qthemes~=0.0", "qtconsole~=5.5, >=5.5.1", # needed for jupyter console "qtpy~=2.4", "pyte", # needed for vt100 console diff --git a/tests/references/SpinnerWidget/SpinnerWidget_darwin.png b/tests/references/SpinnerWidget/SpinnerWidget_darwin.png index 08c42b4c..2b75d66a 100644 Binary files a/tests/references/SpinnerWidget/SpinnerWidget_darwin.png and b/tests/references/SpinnerWidget/SpinnerWidget_darwin.png differ diff --git a/tests/references/SpinnerWidget/SpinnerWidget_linux.png b/tests/references/SpinnerWidget/SpinnerWidget_linux.png index 08c42b4c..2b75d66a 100644 Binary files a/tests/references/SpinnerWidget/SpinnerWidget_linux.png and b/tests/references/SpinnerWidget/SpinnerWidget_linux.png differ diff --git a/tests/references/SpinnerWidget/SpinnerWidget_started_darwin.png b/tests/references/SpinnerWidget/SpinnerWidget_started_darwin.png index f82728e5..ff6827cd 100644 Binary files a/tests/references/SpinnerWidget/SpinnerWidget_started_darwin.png and b/tests/references/SpinnerWidget/SpinnerWidget_started_darwin.png differ diff --git a/tests/references/SpinnerWidget/SpinnerWidget_started_linux.png b/tests/references/SpinnerWidget/SpinnerWidget_started_linux.png index f82728e5..bf2d9470 100644 Binary files a/tests/references/SpinnerWidget/SpinnerWidget_started_linux.png and b/tests/references/SpinnerWidget/SpinnerWidget_started_linux.png differ