Skip to content

Commit 79876bb

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 eb29080 commit 79876bb

3 files changed

Lines changed: 12 additions & 12 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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def detect_system_color_theme(hints: QStyleHints) -> ColorTheme:
5252
return _COLOR_THEME_MAP.get(hints.colorScheme(), _palette_fallback())
5353

5454

55-
class ColorSchemeManager(QObject):
55+
class ColorThemeManager(QObject):
5656
color_theme_changed = pyqtSignal(ColorTheme)
5757

5858
def __init__(self, parent: QObject | None = None) -> None:

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,
@@ -112,7 +112,7 @@ def test_that_palette_fallback_resolves_theme_from_base_value_threshold(
112112
def test_that_apply_raises_runtime_error_when_no_qapplication_exists(
113113
qtbot, monkeypatch
114114
) -> None:
115-
manager = ColorSchemeManager()
115+
manager = ColorThemeManager()
116116

117117
monkeypatch.setattr(
118118
manager_module.QApplication, "instance", staticmethod(lambda: None)
@@ -125,7 +125,7 @@ def test_that_apply_raises_runtime_error_when_no_qapplication_exists(
125125
def test_that_apply_sets_the_processed_qss_as_the_application_stylesheet(
126126
qtbot, monkeypatch
127127
) -> None:
128-
manager = ColorSchemeManager()
128+
manager = ColorThemeManager()
129129
monkeypatch.setattr(manager_module, "process_qss", lambda _theme: "QWidget {}")
130130

131131
manager.apply_stylesheet_from_qss()
@@ -141,7 +141,7 @@ def test_that_construction_applies_the_stylesheet_for_the_detected_theme(
141141
_pin_system_scheme(monkeypatch, Qt.ColorScheme.Dark)
142142
_stub_qss_per_theme(monkeypatch)
143143

144-
ColorSchemeManager()
144+
ColorThemeManager()
145145

146146
app = QApplication.instance()
147147
assert app is not None
@@ -151,7 +151,7 @@ def test_that_construction_applies_the_stylesheet_for_the_detected_theme(
151151
def test_that_apply_keeps_previous_stylesheet_and_logs_when_qss_is_missing(
152152
qtbot, monkeypatch, caplog
153153
) -> None:
154-
manager = ColorSchemeManager()
154+
manager = ColorThemeManager()
155155
app = QApplication.instance()
156156
assert app is not None
157157
previous = app.styleSheet()
@@ -172,7 +172,7 @@ def test_that_os_theme_change_updates_current_theme_and_emits_signal(
172172
qtbot, monkeypatch
173173
) -> None:
174174
_pin_system_scheme(monkeypatch, Qt.ColorScheme.Light)
175-
manager = ColorSchemeManager()
175+
manager = ColorThemeManager()
176176
assert manager.current_color_theme == ColorTheme.LIGHT
177177

178178
received: list[ColorTheme] = []
@@ -189,7 +189,7 @@ def test_that_os_theme_change_to_the_active_theme_emits_no_signal(
189189
qtbot, monkeypatch
190190
) -> None:
191191
_pin_system_scheme(monkeypatch, Qt.ColorScheme.Dark)
192-
manager = ColorSchemeManager()
192+
manager = ColorThemeManager()
193193

194194
received: list[ColorTheme] = []
195195
manager.color_theme_changed.connect(received.append)
@@ -204,7 +204,7 @@ def test_that_theme_change_reapplies_the_stylesheet_for_the_new_theme(
204204
) -> None:
205205
_pin_system_scheme(monkeypatch, Qt.ColorScheme.Light)
206206
_stub_qss_per_theme(monkeypatch)
207-
manager = ColorSchemeManager()
207+
manager = ColorThemeManager()
208208
app = QApplication.instance()
209209
assert app is not None
210210
assert app.styleSheet() == "/* qss for light */"
@@ -220,7 +220,7 @@ def test_that_style_hints_color_scheme_signal_triggers_a_stylesheet_reapply(
220220
) -> None:
221221
_pin_system_scheme(monkeypatch, Qt.ColorScheme.Light)
222222
_stub_qss_per_theme(monkeypatch)
223-
manager = ColorSchemeManager()
223+
manager = ColorThemeManager()
224224
app = QApplication.instance()
225225
assert app is not None
226226

0 commit comments

Comments
 (0)