Sync with Mac accent color (#219)

Author: 5yutan5

.pre-commit-config.yaml

@@ -41,9 +41,9 @@ repos:
     hooks:
       - id: check-jsonschema
         name: Validate color map json files with json schema
-        files: ^style/colors
-        exclude: ^style/colors/validate.json$
-        args: ["--schemafile", "style/colors/validate.json"]
+        files: ^style/colors/themes
+        exclude: ^style/colors/themes/validate.json$
+        args: ["--schemafile", "style/colors/themes/validate.json"]
 
   - repo: https://github.com/asottile/pyupgrade
     rev: v3.2.2

.vscode/settings.json

@@ -2,9 +2,9 @@
   "json.schemas": [
     {
       "fileMatch": [
-        "/style/colors/*"
+        "/style/colors/themes/*"
       ],
-      "url": "/style/colors/validate.json"
+      "url": "/style/colors/themes/validate.json"
     }
   ],
   "python.testing.pytestEnabled": true,
@@ -18,23 +18,28 @@
   "cSpell.words": [
     "AARRGGBB",
     "absolufy",
+    "alloc",
     "argb",
     "autofix",
+    "Autorelease",
     "backticks",
     "cmpfiles",
     "codecov",
     "darkdetect",
     "docstrings",
     "Duquesnoy",
     "filecmp",
+    "HIGHDPI",
     "isort",
     "jakebailey",
     "jsonschema",
     "kargs",
+    "libobjc",
     "linebreak",
     "markdownlint",
     "maxdepth",
     "ncipollo",
+    "objc",
     "Pixmap",
     "Pixmaps",
     "pydata",

README.md

@@ -21,7 +21,7 @@ Check out the [complete documentation](https://pyqtdarktheme.readthedocs.io).
 - A flat dark and light theme
 - Support PySide and PyQt
 - Support PyInstaller
-- Sync with OS's theme (Mac, Windows, Linux)
+- Sync with OS's theme and accent (Mac, Windows, Linux)
 - Resolve the style differences between Qt versions
 - Provide dark/light theme QPalette
 - Override Qt old standard icons
@@ -99,14 +99,17 @@ For Qt6 bindings, HiDPI “just works” without using this function.
 qdarktheme.setup_theme("light")
 ```
 
-### Sync with OS's theme
+### Sync with OS's theme and accent
 
 ```Python
 qdarktheme.setup_theme("auto")
 ```
 
 ![sync with os theme](https://raw.githubusercontent.com/5yutan5/PyQtDarkTheme/main/images/sync_with_os_theme.gif)
 
+On macOS, qdarktheme also syncs with accent colors.
+![sync with os accent](https://raw.githubusercontent.com/5yutan5/PyQtDarkTheme/main/images/sync_with_os_accent.gif)
+
 ### Customizing colors
 
 You can customize theme color.
@@ -148,7 +151,7 @@ python -m qdarktheme.widget_gallery
 
 ## License
 
-The svg files for the PyQtDarkTheme are derived [Material design icons](https://fonts.google.com/icons)(Apache License Version 2.0). Qt stylesheets are originally fork of [QDarkStyleSheet](https://github.com/ColinDuquesnoy/QDarkStyleSheet)(MIT License). Other files are covered by PyQtDarkTheme's MIT license.
+The svg files for the PyQtDarkTheme are derived [Material design icons](https://fonts.google.com/icons)(Apache License Version 2.0). Qt stylesheets are originally fork of [QDarkStyleSheet](https://github.com/ColinDuquesnoy/QDarkStyleSheet)(MIT License). Other files are covered by PyQtDarkTheme's MIT license. The accent detector(qdarktheme/_os_appearance/_accent/_mac_detect) is inspired by [darkdetect](https://github.com/albertosottile/darkdetect)(3-clause BSD License).
 
 ## Contributing
 

docs/source/how_to_use.rst

@@ -42,7 +42,7 @@ If you want to enable HiDPI, you can use ``qdarktheme.enable_hi_dpi()``. For Qt6
 Toggle dark/light Theme
 -----------------------
 
-If you add ``theme`` argument as "auto", your Qt Application sync with OS's theme.
+If you add ``theme`` argument as "auto", your Qt Application sync with OS's theme. On macOS, qdarktheme also syncs with accent colors.
 
 .. tab-set::
 

docs/source/index.rst

@@ -25,7 +25,7 @@ PyQtDarkTheme applies a flat dark theme to QtWidgets application(PySide and PyQt
 
 * A flat dark/light theme
 * Support PySide, PyQt and PyInstaller
-* Sync with OS's theme (Mac, Windows, Linux)
+* Sync with OS's theme and accent (Mac, Windows, Linux)
 * Resolve the style differences between Qt versions
 * Provide dark/light theme QPalette
 * :ref:`Override Qt old standard icons <how_to_use:Use overridden Qt default icons>`.

images/sync_with_os_accent.gif

@@ -10,7 +10,7 @@
 
 @lru_cache()
 def _svg_resources() -> dict[str, str]:
-    return json.loads(_resources.SVG_RESOURCES)
+    return json.loads(_resources.svg.SVG_RESOURCES)
 
 
 class Svg:

images/sync_with_os_theme.gif

@@ -36,14 +36,14 @@ def _apply_style(app, additional_qss: str | None, **kargs) -> None:
 
 
 def _sync_theme_with_system(app, callback) -> None:
-    from qdarktheme._theme_listener import OSThemeSwitchListener
+    from qdarktheme._os_appearance import listener
 
     global _listener
     if _listener is not None:
         _listener.sig_run.emit(True)
         return
 
-    _listener = OSThemeSwitchListener(callback)
+    _listener = listener.OSThemeSwitchListener(callback)
 
     if platform.system() == "Darwin":
         app.installEventFilter(_listener)
@@ -100,9 +100,10 @@ def setup_theme(
 
     Args:
         theme: The theme name. There are `dark`, `light` and `auto`.
-            If ``auto``, try to sync with system theme.
-            If failed to detect system theme,
-            use the theme set in argument ``default_theme``.
+            If ``auto``, try to sync with system theme and accent(only on Mac).
+            If failed to detect system theme, use the theme set in argument ``default_theme``.
+            When primary color including child color(eg. ``primary>selection.background``) set to
+            custom_colors, disable to sync with accent.
         corner_shape: The corner shape. There are `rounded` and `sharp` shape.
         custom_colors: The custom color map. Overrides the default color for color id you set.
             Also you can customize a specific theme only. See example 5.

qdarktheme/_icon/svg.py

@@ -0,0 +1 @@
+from qdarktheme._os_appearance._accent import accent