Skip to content

Commit 6e3d648

Browse files
committed
Rename ColorSchemeManager to ColorThemeManager
Everything else in the package is named after themes: the ColorTheme enum, the color_theme_changed signal and the current_color_theme property. "Scheme" only belongs to the Qt API the manager consumes, so the class name was the odd one out.
1 parent 64c4236 commit 6e3d648

3 files changed

Lines changed: 14 additions & 14 deletions

File tree

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
from __future__ import annotations
22

3-
from ert.gui.theme_manager.theme_manager import ColorSchemeManager
3+
from ert.gui.theme_manager.theme_manager import ColorThemeManager
44
from ert.gui.theme_manager.theme_utils import ColorTheme
55

66
__all__ = [
7-
"ColorSchemeManager",
87
"ColorTheme",
8+
"ColorThemeManager",
99
]

src/ert/gui/theme_manager/theme_manager.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
_STYLE_HINTS_MISSING = "styleHints() unavailable; is a QGuiApplication running?"
1616
_QAPPLICATION_MISSING = (
1717
"QApplication instance not found; construct a QApplication before applying "
18-
"a colour scheme."
18+
"a color theme."
1919
)
2020

2121
# HSV value cutoff for a dark palette base: dark bases sit near 42, light ones near 255.
@@ -55,7 +55,7 @@ def detect_system_color_theme(hints: QStyleHints) -> ColorTheme:
5555
return color_theme
5656

5757

58-
class ColorSchemeManager(QObject):
58+
class ColorThemeManager(QObject):
5959
color_theme_changed = pyqtSignal(ColorTheme)
6060

6161
def __init__(self, parent: QObject | None = None) -> None:
@@ -77,7 +77,7 @@ def apply_stylesheet_from_qss(self) -> None:
7777
stylesheet = process_qss(self._current_color_theme)
7878
except (OSError, UnicodeDecodeError, ValueError, QssProcessingError):
7979
logger.exception(
80-
"Failed to load QSS for colour scheme '%s';"
80+
"Failed to load QSS for color theme '%s';"
8181
" keeping the previously applied stylesheet.",
8282
self._current_color_theme.value,
8383
)

tests/ert/unit_tests/gui/theme_manager/test_theme_manager.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from PyQt6.QtGui import QColor, QGuiApplication, QPalette
66
from PyQt6.QtWidgets import QApplication
77

8-
from ert.gui.theme_manager import ColorSchemeManager, ColorTheme
8+
from ert.gui.theme_manager import ColorTheme, ColorThemeManager
99
from ert.gui.theme_manager import theme_manager as manager_module
1010
from ert.gui.theme_manager.theme_manager import (
1111
_DARK_BASE_VALUE_THRESHOLD,
@@ -126,7 +126,7 @@ def test_that_palette_fallback_resolves_theme_from_base_value_threshold(
126126
def test_that_apply_raises_runtime_error_when_no_qapplication_exists(
127127
qtbot, monkeypatch
128128
) -> None:
129-
manager = ColorSchemeManager()
129+
manager = ColorThemeManager()
130130

131131
monkeypatch.setattr(
132132
manager_module.QApplication, "instance", staticmethod(lambda: None)
@@ -139,7 +139,7 @@ def test_that_apply_raises_runtime_error_when_no_qapplication_exists(
139139
def test_that_apply_sets_the_processed_qss_as_the_application_stylesheet(
140140
qtbot, monkeypatch
141141
) -> None:
142-
manager = ColorSchemeManager()
142+
manager = ColorThemeManager()
143143
monkeypatch.setattr(manager_module, "process_qss", lambda _theme: "QWidget {}")
144144

145145
manager.apply_stylesheet_from_qss()
@@ -155,7 +155,7 @@ def test_that_construction_applies_the_stylesheet_for_the_detected_theme(
155155
_pin_system_scheme(monkeypatch, Qt.ColorScheme.Dark)
156156
_stub_qss_per_theme(monkeypatch)
157157

158-
ColorSchemeManager()
158+
ColorThemeManager()
159159

160160
app = QApplication.instance()
161161
assert app is not None
@@ -165,7 +165,7 @@ def test_that_construction_applies_the_stylesheet_for_the_detected_theme(
165165
def test_that_apply_keeps_previous_stylesheet_and_logs_when_qss_is_missing(
166166
qtbot, monkeypatch, caplog
167167
) -> None:
168-
manager = ColorSchemeManager()
168+
manager = ColorThemeManager()
169169
app = QApplication.instance()
170170
assert app is not None
171171
previous = app.styleSheet()
@@ -186,7 +186,7 @@ def test_that_os_theme_change_updates_current_theme_and_emits_signal(
186186
qtbot, monkeypatch
187187
) -> None:
188188
_pin_system_scheme(monkeypatch, Qt.ColorScheme.Light)
189-
manager = ColorSchemeManager()
189+
manager = ColorThemeManager()
190190
assert manager.current_color_theme == ColorTheme.LIGHT
191191

192192
received: list[ColorTheme] = []
@@ -203,7 +203,7 @@ def test_that_os_theme_change_to_the_active_theme_emits_no_signal(
203203
qtbot, monkeypatch
204204
) -> None:
205205
_pin_system_scheme(monkeypatch, Qt.ColorScheme.Dark)
206-
manager = ColorSchemeManager()
206+
manager = ColorThemeManager()
207207

208208
received: list[ColorTheme] = []
209209
manager.color_theme_changed.connect(received.append)
@@ -218,7 +218,7 @@ def test_that_theme_change_reapplies_the_stylesheet_for_the_new_theme(
218218
) -> None:
219219
_pin_system_scheme(monkeypatch, Qt.ColorScheme.Light)
220220
_stub_qss_per_theme(monkeypatch)
221-
manager = ColorSchemeManager()
221+
manager = ColorThemeManager()
222222
app = QApplication.instance()
223223
assert app is not None
224224
assert app.styleSheet() == "/* qss for light */"
@@ -234,7 +234,7 @@ def test_that_style_hints_color_scheme_signal_triggers_a_stylesheet_reapply(
234234
) -> None:
235235
_pin_system_scheme(monkeypatch, Qt.ColorScheme.Light)
236236
_stub_qss_per_theme(monkeypatch)
237-
manager = ColorSchemeManager()
237+
manager = ColorThemeManager()
238238
app = QApplication.instance()
239239
assert app is not None
240240

0 commit comments

Comments
 (0)