From b75f65a8b6e12d08cd739f153d3d27aaaf664b34 Mon Sep 17 00:00:00 2001 From: Charles Haley Date: Tue, 24 Sep 2024 22:10:28 +0100 Subject: [PATCH] Use the builtin is_dark_theme() method --- src/calibre/utils/formatter_functions.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/calibre/utils/formatter_functions.py b/src/calibre/utils/formatter_functions.py index 8329742148..20ec80e7b3 100644 --- a/src/calibre/utils/formatter_functions.py +++ b/src/calibre/utils/formatter_functions.py @@ -2654,15 +2654,10 @@ class BuiltinIsDarkMode(BuiltinFormatterFunction): "Example: if is_dark_mode() then 'dark.png' else 'light.png' fi ") def evaluate(self, formatter, kwargs, mi, locals): - # Import these here so that Qt isn't referenced unless this function is used. try: - from qt.core import QApplication, Qt - from calibre.gui2 import gprefs - - system_is_dark = QApplication.instance().styleHints().colorScheme() == Qt.ColorScheme.Dark - palette = gprefs['color_palette'] - is_dark = palette == 'dark' or (palette == 'system' and system_is_dark) - return '1' if is_dark else '' + # Import this here so that Qt isn't referenced unless this function is used. + from calibre.gui2 import is_dark_theme + return '1' if is_dark_theme() else '' except Exception: only_in_gui_error('is_dark_mode')