qcanvas 1.2.0a0__py3-none-any.whl → 1.2.0a1__py3-none-any.whl

qcanvas/run.py

@@ -23,7 +23,7 @@
 # nuitka-project: --nofollow-import-to=yt_dlp.extractor.lazy_extractors
 
 import logging
-from logging import DEBUG, INFO, WARNING
+from logging import INFO, WARNING
 
 import qcanvas.app_start
 from qcanvas.util import logs, paths
@@ -42,7 +42,6 @@ logs.set_levels(
         "qcanvas.ui": WARNING,
         "qcanvas_backend": INFO,
         "qcanvas.ui.main_ui.status_bar_progress_display": INFO,
-        "qcanvas.util.themes": DEBUG,
     }
 )
 

qcanvas/ui/main_ui/course_viewer_container.py

@@ -5,12 +5,13 @@ from typing import *
 import qcanvas_backend.database.types as db
 from qcanvas_backend.net.resources.download.resource_manager import ResourceManager
 from qcanvas_backend.net.sync.sync_receipt import SyncReceipt, empty_receipt
-from qtpy.QtCore import Qt
+from qtpy.QtCore import Qt, Slot
 from qtpy.QtGui import QIcon
 from qtpy.QtWidgets import *
 
 from qcanvas import icons
 from qcanvas.ui.course_viewer.course_viewer import CourseViewer
+from qcanvas.util import themes
 
 _logger = logging.getLogger(__name__)
 
@@ -23,24 +24,35 @@ class _PlaceholderLogo(QLabel):
 
     def __init__(self):
         super().__init__()
-        self._icon = QIcon(icons.logo_transparent_light)
+        self._light_icon = QIcon(icons.logo_transparent_light)
+        self._dark_icon = QIcon(icons.logo_transparent_dark)
         self._old_width = -1
         self._old_height = -1
         self.setAlignment(Qt.AlignmentFlag.AlignCenter)
         self.setSizePolicy(QSizePolicy.Policy.Ignored, QSizePolicy.Policy.Ignored)
+        themes.theme_changed().connect(self._theme_changed)
 
     def resizeEvent(self, event) -> None:
+        self._update_image()
+
+    @Slot()
+    def _theme_changed(self) -> None:
+        self._update_image(force=True)
+
+    def _update_image(self, force: bool = False) -> None:
         # Calculate the size of the logo as half of the width/height with a max size of 1000x1000
         width = min(floor(self.width() * 0.5), 500)
         height = min(floor(self.height() * 0.5), 500)
 
-        if width == self._old_width or height == self._old_height:
-            return
-        else:
+        if force or (width != self._old_width and height != self._old_height):
             self._old_width = width
             self._old_height = height
+        else:
+            return
+
+        icon = self._dark_icon if themes.is_dark_mode() else self._light_icon
 
-        self.setPixmap(self._icon.pixmap(width, height))
+        self.setPixmap(icon.pixmap(width, height))
 
 
 class CourseViewerContainer(QStackedWidget):

qcanvas/util/themes/__init__.py

@@ -0,0 +1,2 @@
+from ._theme_changed_event import theme_changed
+from ._theme_changer import apply, default_theme, ensure_theme_is_valid, is_dark_mode

qcanvas/util/themes/_colour_scheme_helper.py

@@ -0,0 +1,38 @@
+import logging
+
+from qtpy.QtCore import QObject, Signal, Slot
+from qtpy.QtGui import QGuiApplication, Qt
+
+_logger = logging.getLogger(__name__)
+
+
+def colour_scheme() -> Qt.ColorScheme:
+    return QGuiApplication.styleHints().colorScheme()
+
+
+def is_dark_colour_scheme() -> bool:
+    return colour_scheme() == Qt.ColorScheme.Dark
+
+
+class ColourSchemeChangeEvent(QObject):
+    theme_changed = Signal()
+
+    def __init__(self):
+        super().__init__(None)
+        self._last_theme = colour_scheme()
+        QGuiApplication.styleHints().colorSchemeChanged.connect(self._theme_changed)
+
+    @Slot(Qt.ColorScheme)
+    def _theme_changed(self, colour_scheme: Qt.ColorScheme) -> None:
+        # Ensure the signal isn't fired when there wasn't actually a change
+        if colour_scheme != self._last_theme:
+            self._last_theme = colour_scheme
+            self.theme_changed.emit()
+
+
+_theme_changed_listener = ColourSchemeChangeEvent()
+
+
+def colour_scheme_changed() -> Signal:
+    global _theme_changed_listener
+    return _theme_changed_listener.theme_changed

qcanvas/util/themes/_selected_theme.py

@@ -0,0 +1,10 @@
+import logging
+from enum import Enum
+
+_logger = logging.getLogger(__name__)
+
+
+class SelectedTheme(Enum):
+    AUTO = 0
+    NATIVE = 1
+    OVERRIDE = 2

qcanvas/util/themes/_theme_changed_event.py

@@ -0,0 +1,17 @@
+import logging
+
+from qtpy.QtCore import QObject, Signal
+
+_logger = logging.getLogger(__name__)
+
+
+class ThemeChangedEvent(QObject):
+    theme_changed = Signal()
+
+
+theme_changed_event = ThemeChangedEvent(None)
+
+
+def theme_changed() -> Signal:
+    global theme_changed_event
+    return theme_changed_event.theme_changed

qcanvas/util/themes/_theme_changer.py

@@ -0,0 +1,74 @@
+import logging
+
+import qdarktheme
+from qtpy.QtCore import Slot
+from qtpy.QtWidgets import QApplication, QStyleFactory
+
+from qcanvas.util.themes._colour_scheme_helper import (
+    colour_scheme_changed,
+    is_dark_colour_scheme,
+)
+from qcanvas.util.themes._selected_theme import SelectedTheme
+from qcanvas.util.themes._theme_changed_event import theme_changed
+
+_logger = logging.getLogger(__name__)
+
+default_theme = "auto"
+_is_dark_mode: bool | None = None
+_selected_theme: SelectedTheme | None = None
+
+
+def apply(theme: str) -> None:
+    global _is_dark_mode, _selected_theme
+
+    theme = ensure_theme_is_valid(theme)
+    was_dark_mode = _is_dark_mode
+
+    if theme != "native":
+        if theme == "auto":
+            _is_dark_mode = is_dark_colour_scheme()
+            _selected_theme = SelectedTheme.AUTO
+            selected_colour_scheme = "dark" if _is_dark_mode else "light"
+        else:
+            _is_dark_mode = theme == "dark"
+            _selected_theme = SelectedTheme.OVERRIDE
+            selected_colour_scheme = theme
+
+        qdarktheme.setup_theme(
+            selected_colour_scheme,
+            custom_colors={"primary": "e02424"},
+        )
+
+        QApplication.setStyle(QStyleFactory.create("Fusion"))
+    else:
+        _is_dark_mode = is_dark_colour_scheme()
+        _selected_theme = SelectedTheme.NATIVE
+
+    if was_dark_mode != _is_dark_mode:
+        theme_changed().emit()
+
+
+def is_dark_mode() -> bool:
+    return _is_dark_mode
+
+
+def ensure_theme_is_valid(theme: str) -> str:
+    if theme not in ["auto", "light", "dark", "native"]:
+        return default_theme
+    else:
+        return theme
+
+
+@Slot()
+def _scheme_changed():
+    global _selected_theme, _is_dark_mode
+
+    if _selected_theme == SelectedTheme.AUTO:
+        apply("auto")
+    elif _selected_theme == SelectedTheme.NATIVE:
+        # noinspection PyTestUnpassedFixture
+        _is_dark_mode = is_dark_colour_scheme()
+        theme_changed().emit()
+
+
+colour_scheme_changed().connect(_scheme_changed)

{qcanvas-1.2.0a0.dist-info → qcanvas-1.2.0a1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qcanvas
-Version: 1.2.0a0
+Version: 1.2.0a1
 Summary: QCanvas is a desktop client for Canvas LMS.
 Author: QCanvas
 Author-email: QCanvas@noreply.codeberg.org

{qcanvas-1.2.0a0.dist-info → qcanvas-1.2.0a1.dist-info}/RECORD

@@ -3,17 +3,18 @@ qcanvas/app_start/__init__.py,sha256=r16bg9Otw8Sy6MYLmIt5Nu-oSwyYP8Y2kzMtbmeF6m0
 qcanvas/backend_connectors/__init__.py,sha256=Wj8cmxQng3SSlmlXJyzHaPmvxbkauwsxINckPb7WuHc,108
 qcanvas/backend_connectors/frontend_resource_manager.py,sha256=87oszxCle0Y9AUAHH3wn_7oilY45ddMET-4EnpTtjn0,1322
 qcanvas/backend_connectors/qcanvas_task_master.py,sha256=CTPBvf_9w-livscKNspnd98mNvFLYTYHef0RQSUkfFc,742
-qcanvas/icons/__init__.py,sha256=UxZ4PLlkLirumWPU8OreBYXjnelexE6W8VK5u9UWXKo,302
+qcanvas/icons/__init__.py,sha256=HQJzW9BXiWqj8yRHRvevlSWZ-TLB7vUbVlwuQKgX_Lk,356
 qcanvas/icons/file-download-failed.svg,sha256=lhDf8ul__T2ByRcd5KZicNtUVl4BdSqeZ3yOR6DvCLk,1091
 qcanvas/icons/file-downloaded.svg,sha256=fWDcSy0PwQX3LZwaEVJLE3fUVg7q1TO3n44svyUyb64,1091
 qcanvas/icons/file-not-downloaded.svg,sha256=7zl_Gmx2IHZrugFYAUjBCSwmfXM0pvlshj8GhewxY5Q,1091
 qcanvas/icons/file-unknown.svg,sha256=9xlN244HJX3zM_MqdMTnNbKlqLjOFgCx3ZdM4Wc4zC0,1729
-qcanvas/icons/icons.qrc,sha256=h181m7XWs1Xs_yhuT8UNj-LBO5hdcpCGbU0uoeXUT7A,328
+qcanvas/icons/icons.qrc,sha256=tI5HDO3a9eMWhkrEfdQrnIkEAH7L4-kpDu-t-wstE10,375
+qcanvas/icons/logo-transparent-dark.svg,sha256=1bVg8AK9FepOvWTcu_zDLX2eZ1inYuAMBwZRi252-5o,18660
 qcanvas/icons/logo-transparent-light.svg,sha256=DsNOFWHGAVCZ-ue-pf1iatQ1t_IBmnyxs3FNw-UUukg,18647
 qcanvas/icons/main_icon.svg,sha256=st2sfA8HIETmoacJ2Oq84iJzfnNHH-T03ijB-J419_s,16104
-qcanvas/icons/rc_icons.py,sha256=VI1sBDuXbHHzolgtjDVi2flt4SjB9DKqt-vlQuRvXvY,31692
+qcanvas/icons/rc_icons.py,sha256=AlCluQJETsrxGHG4lBrZnDpJY5oVt9OzTj0qIODkYSE,44764
 qcanvas/icons/sync.svg,sha256=J-7_KnFbQL3uh-RrTy0_wSJUVW4Cc6ZSTacld6ULv1w,2829
-qcanvas/run.py,sha256=XW4NQEZtBICRqLQUOCzzbFspYtBHBJhkHJKdB25hpVQ,1726
+qcanvas/run.py,sha256=tP5bplaPa_Z8DaKqP59bwYaIEccW5B18xoyXgKJsrf8,1681
 qcanvas/ui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qcanvas/ui/course_viewer/__init__.py,sha256=XkoFnh4ULw3_i-GDsOlueEWido0PkoDcN9_EX6-nkXY,76
 qcanvas/ui/course_viewer/content_tree.py,sha256=QS0mcyxLDdXt27TBzdCTYu2fuchPO-j6z6VPJT6rhkA,4478
@@ -37,7 +38,7 @@ qcanvas/ui/course_viewer/tabs/page_tab/page_tree.py,sha256=ffM-IFdNPBdTggmJCnseu
 qcanvas/ui/course_viewer/tabs/resource_rich_browser.py,sha256=dTRsJO_xeo72vsX0FrT1XHfr9VlFjnM9woeFxVg0dDw,6649
 qcanvas/ui/course_viewer/tabs/util.py,sha256=Cg8FmPbkiTepV9IlTZQSWtcUaovv66iAD4_BUYJjIAY,344
 qcanvas/ui/main_ui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-qcanvas/ui/main_ui/course_viewer_container.py,sha256=yXZyVfqyKZWkmsYVqIzNHWfShTib40Rs60BpLzCRM0c,2849
+qcanvas/ui/main_ui/course_viewer_container.py,sha256=EJo0QnlD-Rz04Yy_k1md4YjYTGOwg1dxdsPMPHtCVFA,3277
 qcanvas/ui/main_ui/options/__init__.py,sha256=SlfWUzk6_E5uM9GIV-y9BVeKMwqn3pRx_xWhMyb1dfI,54
 qcanvas/ui/main_ui/options/auto_download_resources_option.py,sha256=W9BleGh6egfN9d9awnjEAAFq6_6DyXyD-rIopkofVDw,1284
 qcanvas/ui/main_ui/options/quick_sync_option.py,sha256=qEfmtLllO32ejc-bydCvFRjal5RUlk2HtC5Ld4mT7ss,753
@@ -66,10 +67,14 @@ qcanvas/util/settings/__init__.py,sha256=ivc8bczhQdEJsWse6fc81Xyz0i2YX57pL4UubM3
 qcanvas/util/settings/_client_settings.py,sha256=HyUpXoc7TinOviEd-eCo8g8Fbw8TqGAH2KfCkgPr9N0,1413
 qcanvas/util/settings/_mapped_setting.py,sha256=Z6635FfDll9cCLfSkVg-unsDLvUWuKT5MmxJEiUkd2k,1823
 qcanvas/util/settings/_ui_settings.py,sha256=zlWMjpntuqm7ZN3aBEROGrXc4bhtKOfWijmiGkdt1UA,804
-qcanvas/util/themes.py,sha256=Lw33zWTkD2jSuntYZYWPi8rxLfj5VLv-_PjtjgkPsEQ,796
+qcanvas/util/themes/__init__.py,sha256=Ng-Rii7cFKrhSoE03J5tSYeaMY4UebFubKCBsWxouYM,134
+qcanvas/util/themes/_colour_scheme_helper.py,sha256=QTrQ5c9AduBJMUuXp8sG-WPmYU82cF1tXjGDKhpI10w,1063
+qcanvas/util/themes/_selected_theme.py,sha256=w1CXvMuLM8wKDgANOhcvNnlEXDyjdgnWO0TtA3vGomY,150
+qcanvas/util/themes/_theme_changed_event.py,sha256=dIu1857h2ytSqmcRb2CABro3Gc0s9bm5DHdT23jyuk8,317
+qcanvas/util/themes/_theme_changer.py,sha256=ybMgKT2sL_orvH0OYXPOlA5w6hociMjMQbbTJgNw1Us,1993
 qcanvas/util/ui_tools.py,sha256=bSM1xrmZPn847YEbXAC9VIAv--8hMLMWrsEMWGA5p3E,916
 qcanvas/util/url_checker.py,sha256=gaV_KZZsG5bfJaGBv9jbHJjq0rVxIH55HRtucT6Qkx8,144
-qcanvas-1.2.0a0.dist-info/METADATA,sha256=LgyN2I1DImidV4JuLlK53bshAe6BvW4T1GbbGVu0W74,1794
-qcanvas-1.2.0a0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-qcanvas-1.2.0a0.dist-info/entry_points.txt,sha256=46VbnhQ9w2CYdfhYcPfWgjXYHjsKshu0asQ1B_sAMac,44
-qcanvas-1.2.0a0.dist-info/RECORD,,
+qcanvas-1.2.0a1.dist-info/METADATA,sha256=DvxP1JLD7MNLfjfpxZ6hOOiEKzV88TS4WiUwbrtER3o,1794
+qcanvas-1.2.0a1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+qcanvas-1.2.0a1.dist-info/entry_points.txt,sha256=46VbnhQ9w2CYdfhYcPfWgjXYHjsKshu0asQ1B_sAMac,44
+qcanvas-1.2.0a1.dist-info/RECORD,,

qcanvas/util/themes.py

@@ -1,33 +0,0 @@
-import logging
-
-import darkdetect
-import qdarktheme
-from qtpy.QtGui import QGuiApplication
-from qtpy.QtWidgets import QApplication, QStyleFactory
-
-_logger = logging.getLogger(__name__)
-
-default_theme = "auto"
-
-
-def ensure_theme_is_valid(theme: str) -> str:
-    if theme not in ["auto", "light", "dark", "native"]:
-        return default_theme
-    else:
-        return theme
-
-
-def apply(theme: str) -> None:
-    theme = ensure_theme_is_valid(theme)
-
-    if theme != "native":
-
-        qdarktheme.setup_theme(
-            theme,
-            custom_colors={"primary": "e02424"},
-        )
-
-        QApplication.setStyle(QStyleFactory.create("Fusion"))
-
-        _logger.debug("darkdetect says: %s", darkdetect.theme())
-        _logger.debug("qt says: %s", QGuiApplication.styleHints().colorScheme())