GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-18 22:12:21 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

Update get_linux_dark_mode to use freedesktop.org standard (#1905)

Browse source 
* update get_linux_dark_mode to use freedesktop.org standard

* Update CONTRIBUTORS

* run formatter

* Update CONTRIBUTORS

* allow for multiple dark mode detection strategies on Linux

* string -> str

* update docstring

* Update CONTRIBUTORS
This commit is contained in:
Bart Louwers 2022-06-07 01:30:42 +02:00 committed by GitHub
parent 311d0342a0
commit d6b8520d03
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 50 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CONTRIBUTORS
View file

@ -102,6 +102,7 @@ Brayan Oliveira <github.com/BrayanDSO>
Luka Warren <github.com/lukawarren> Luka Warren <github.com/lukawarren>
wisherhxl <wisherhxl@gmail.com> wisherhxl <wisherhxl@gmail.com>
dobefore <1432338032@qq.com> dobefore <1432338032@qq.com>
Bart Louwers <bart.git@emeel.net>
******************** ********************

66
qt/aqt/theme.py
View file

@ -7,6 +7,7 @@ import enum
import platform import platform
import subprocess import subprocess
from dataclasses import dataclass from dataclasses import dataclass
from typing import Callable, List, Tuple
import aqt import aqt
from anki.utils import is_lin, is_mac, is_win from anki.utils import is_lin, is_mac, is_win
@ -354,27 +355,58 @@ def get_macos_dark_mode() -> bool:
def get_linux_dark_mode() -> bool: def get_linux_dark_mode() -> bool:
"""True if Linux system is in dark mode. """True if Linux system is in dark mode.
This only works if the GTK theme name contains '-dark'""" Only works if D-Bus is installed and system uses org.freedesktop.appearance
color-scheme to indicate dark mode preference OR if GNOME theme has
'-dark' in the name."""
if not is_lin: if not is_lin:
return False return False
try:
process = subprocess.run(
["gsettings", "get", "org.gnome.desktop.interface", "gtk-theme"],
check=True,
capture_output=True,
encoding="utf8",
)
except FileNotFoundError as e:
# swallow exceptions, as gsettings may not be installed
print(e)
return False
except subprocess.CalledProcessError as e: def parse_stdout_dbus_send(stdout: str) -> bool:
# gsettings is installed, but cannot return a value dbus_response = stdout.split()
print(e) if len(dbus_response) != 4:
return False return False
return "-dark" in process.stdout.lower() # https://github.com/flatpak/xdg-desktop-portal/blob/main/data/org.freedesktop.impl.portal.Settings.xml#L40
PREFER_DARK = "1"
return dbus_response[-1] == PREFER_DARK
dark_mode_detection_strategies: List[Tuple[str, Callable[[str], bool]]] = [
(
"dbus-send --session --print-reply=literal --reply-timeout=1000 "
"--dest=org.freedesktop.portal.Desktop /org/freedesktop/portal/desktop "
"org.freedesktop.portal.Settings.Read string:'org.freedesktop.appearance' "
"string:'color-scheme'",
parse_stdout_dbus_send,
),
(
"gsettings get org.gnome.desktop.interface gtk-theme",
lambda stdout: "-dark" in stdout.lower(),
),
]
for cmd, parse_stdout in dark_mode_detection_strategies:
try:
process = subprocess.run(
cmd,
shell=True,
check=True,
capture_output=True,
encoding="utf8",
)
except FileNotFoundError as e:
# detection strategy failed, missing program
print(e)
continue
except subprocess.CalledProcessError as e:
# detection strategy failed, command returned error
print(e)
continue
return parse_stdout(process.stdout)
return False # all dark mode detection strategies failed
theme_manager = ThemeManager() theme_manager = ThemeManager()