qcanvas 1.0.6a6__py3-none-any.whl → 1.0.6a8__py3-none-any.whl

qcanvas/app_start/__init__.py

@@ -1,13 +1,13 @@
 import asyncio
 import sys
 
-import qdarktheme
 from qasync import QEventLoop
 from qtpy.QtWidgets import QApplication
 
 import qcanvas.backend_connectors.qcanvas_task_master as task_master
 from qcanvas.ui.main_ui.qcanvas_window import QCanvasWindow
 from qcanvas.ui.setup import SetupDialog, setup_checker
+from qcanvas.util import themes, settings
 
 main_window = None
 setup_window = None
@@ -24,11 +24,7 @@ def launch():
     app.setApplicationName("QCanvas")
 
     task_master.register()
-
-    # qdarktheme.setup_theme(
-    #     "auto",
-    #     custom_colors={"primary": "e02424"},
-    # )
+    themes.apply(settings.ui.theme)
 
     event_loop = QEventLoop(app)
     asyncio.set_event_loop(event_loop)

qcanvas/ui/main_ui/options/theme_selection_menu.py

@@ -0,0 +1,44 @@
+import logging
+
+from qtpy.QtCore import Slot
+from qtpy.QtGui import QAction
+from qtpy.QtGui import QActionGroup
+from qtpy.QtWidgets import QMenu
+
+from qcanvas.util import themes, settings
+
+_logger = logging.getLogger(__name__)
+
+
+class _ThemeAction(QAction):
+    def __init__(self, theme_text: str, theme_name: str, parent: QMenu):
+        super().__init__(theme_text, parent)
+        self._theme_name = theme_name
+        self.setCheckable(True)
+        self.setChecked(self._theme_name == settings.ui.theme)
+        self.triggered.connect(self._change_theme)
+
+    @Slot()
+    def _change_theme(self) -> None:
+        settings.ui.theme = self._theme_name
+        themes.apply(self._theme_name)
+
+
+class ThemeSelectionMenu(QMenu):
+
+    def __init__(self, parent: QMenu):
+        super().__init__("Theme", parent)
+
+        action_group = QActionGroup(self)
+
+        auto_theme = _ThemeAction("Auto", "auto", self)
+        light_theme = _ThemeAction("Light", "light", self)
+        dark_theme = _ThemeAction("Dark", "dark", self)
+        native_theme = _ThemeAction("Native (requires restart)", "native", self)
+
+        actions = [auto_theme, light_theme, dark_theme, native_theme]
+
+        self.addActions(actions)
+
+        for theme in actions:
+            action_group.addAction(theme)

qcanvas/ui/main_ui/qcanvas_window.py

@@ -17,6 +17,7 @@ from qcanvas.ui.course_viewer import CourseTree
 from qcanvas.ui.main_ui.course_viewer_container import CourseViewerContainer
 from qcanvas.ui.main_ui.options.quick_sync_option import QuickSyncOption
 from qcanvas.ui.main_ui.options.sync_on_start_option import SyncOnStartOption
+from qcanvas.ui.main_ui.options.theme_selection_menu import ThemeSelectionMenu
 from qcanvas.ui.main_ui.status_bar_progress_display import StatusBarProgressDisplay
 from qcanvas.util import paths, settings
 from qcanvas.util.qurl_util import file_url
@@ -100,6 +101,7 @@ class QCanvasWindow(QMainWindow):
 
         options_menu.addAction(QuickSyncOption(options_menu))
         options_menu.addAction(SyncOnStartOption(options_menu))
+        options_menu.addMenu(ThemeSelectionMenu(self))
 
     def _restore_window_position(self):
         if settings.ui.last_geometry is not None:

qcanvas/util/paths.py

@@ -35,8 +35,8 @@ def root() -> Path:
     elif _is_running_as_pyinstaller:
         root_path = platformdirs.user_data_path("QCanvasReborn", "QCanvasTeam")
 
-    print("Root path %s", root_path.absolute())
-    _logger.debug("Root path ", root_path.absolute())
+    print("Root path", root_path.absolute())
+    _logger.debug("Root path %s", root_path.absolute())
     return root_path
 
 

qcanvas/util/settings/_mapped_setting.py

@@ -5,10 +5,8 @@ from qtpy.QtCore import QSettings
 
 _logger = logging.getLogger(__name__)
 
-T = TypeVar("T")
 
-
-class MappedSetting(Generic[T]):
+class MappedSetting[T]:
     """
     Acts as a proxy for a named value in a QSettings object.
     Stores the value in memory when initialised and updates it accordingly, to protect it from changes on disk.
@@ -48,7 +46,7 @@ class BoolSetting(MappedSetting[bool]):
     def __init__(self, default: bool = False):
         super().__init__(default)
 
-    # @override
+    @override
     def _read(self) -> bool:
         try:
             # noinspection PyTypeChecker
@@ -57,7 +55,7 @@ class BoolSetting(MappedSetting[bool]):
         except:
             return self.default
 
-    # @override
+    @override
     def _write(self, value: object) -> None:
         if not isinstance(value, bool):
             raise TypeError()

qcanvas/util/settings/_ui_settings.py

@@ -3,22 +3,14 @@ import logging
 from qtpy.QtCore import QByteArray, QSettings
 
 from qcanvas.util.settings._mapped_setting import MappedSetting
+from qcanvas.util.themes import ensure_theme_is_valid, default_theme
 
 _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
-
 
 class ThemeSetting(MappedSetting):
     def __init__(self):
-        super().__init__(default=_default_theme)
+        super().__init__(default=default_theme)
 
     def __get__(self, instance, owner):
         return ensure_theme_is_valid(super().__get__(instance, owner))

qcanvas/util/themes.py

@@ -0,0 +1,24 @@
+import logging
+
+import qdarktheme
+
+_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"},
+        )

{qcanvas-1.0.6a6.dist-info → qcanvas-1.0.6a8.dist-info}/METADATA

@@ -1,12 +1,11 @@
 Metadata-Version: 2.1
 Name: qcanvas
-Version: 1.0.6a6
+Version: 1.0.6a8
 Summary: QCanvas is a desktop client for Canvas LMS.
 Author: QCanvas
 Author-email: QCanvas@noreply.codeberg.org
-Requires-Python: >=3.11,<3.13
+Requires-Python: >=3.12,<3.13
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: aiosqlite (>=0.20.0,<0.21.0)
 Requires-Dist: asynctaskpool (>=0.2.1,<0.3.0)

{qcanvas-1.0.6a6.dist-info → qcanvas-1.0.6a8.dist-info}/RECORD

@@ -1,5 +1,5 @@
 qcanvas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-qcanvas/app_start/__init__.py,sha256=pIpmAt8gla-V4-UZIvvFxal1Ui4pr9kkkNyMSFVaIeU,1086
+qcanvas/app_start/__init__.py,sha256=6FC-OYO8yXXjBDKJ_JXjzbqHUjnvJ5VmOs76gzPSnn0,1042
 qcanvas/backend_connectors/__init__.py,sha256=Wj8cmxQng3SSlmlXJyzHaPmvxbkauwsxINckPb7WuHc,108
 qcanvas/backend_connectors/frontend_resource_manager.py,sha256=EpwsVzA4b6M9y5twn9cG_GujwzwmKxBfdgqPCQ8tB3I,2131
 qcanvas/backend_connectors/qcanvas_task_master.py,sha256=CTPBvf_9w-livscKNspnd98mNvFLYTYHef0RQSUkfFc,742
@@ -36,7 +36,8 @@ qcanvas/ui/main_ui/course_viewer_container.py,sha256=PgqgWoUdP1QoLt1ZSGke6sCLko8
 qcanvas/ui/main_ui/options/__init__.py,sha256=SlfWUzk6_E5uM9GIV-y9BVeKMwqn3pRx_xWhMyb1dfI,54
 qcanvas/ui/main_ui/options/quick_sync_option.py,sha256=qEfmtLllO32ejc-bydCvFRjal5RUlk2HtC5Ld4mT7ss,753
 qcanvas/ui/main_ui/options/sync_on_start_option.py,sha256=zFFAAyGZEa6qBchJJIm7bJpOwxcntnto9Ee-lzCiHX4,731
-qcanvas/ui/main_ui/qcanvas_window.py,sha256=25YohSgGP3oCwgTN-5-1B4mKrHqxJFHjUzulW2zG7FQ,7422
+qcanvas/ui/main_ui/options/theme_selection_menu.py,sha256=P_Eqc5XTd0USqQo-QYCVRB5Dzi1j3o93S8JR8SAliC4,1285
+qcanvas/ui/main_ui/qcanvas_window.py,sha256=sgoLGTDjj6cLKhkQvqXJ8WdIDqs94WEcT2iyEoJSYiU,7556
 qcanvas/ui/main_ui/status_bar_progress_display.py,sha256=SVjPawDL79jLcgSfpxhCYr8qhbggWx3niYFdKhEocuo,4854
 qcanvas/ui/memory_tree/__init__.py,sha256=-XLitM6teC0zmwPrGf-Q-A53-zgmIPASExdOtaLIvPU,107
 qcanvas/ui/memory_tree/_tree_memory.py,sha256=CMKfCnrHj22ervaq7xB5U4AiKijYvghUK5ZL0MJIFmQ,1805
@@ -51,15 +52,16 @@ qcanvas/util/fe_resource_manager.py,sha256=5YO549oBpSgcthD9hxm8trnjHEfudltkh-Sfq
 qcanvas/util/html_cleaner.py,sha256=O9_PhvZZw3RcPjdXZagAbNmp8Hfyq9fydBH-ee-DfII,615
 qcanvas/util/layouts.py,sha256=7wQ0-DAbRHPPcfVIQoOmVhPdhGqcF-6qWE1-P86e7ys,1351
 qcanvas/util/logs.py,sha256=VZKFITiW2WR2POEFVv5GRpEXic23Pzjehry-vH3g3Gk,138
-qcanvas/util/paths.py,sha256=7GziMI3pgR-IDQHXdY7QMIB0zHzC3bDemX-DQXh_Tb0,1307
+qcanvas/util/paths.py,sha256=uEV4AJFaWtP7hbie7H6-MYnCUE4_IJl0fkuxuZVMffA,1306
 qcanvas/util/qurl_util.py,sha256=NkskYvrMQJuYWMNF4DFQ4J5-YM5CGl5gHQKxJaAhHBE,197
 qcanvas/util/settings/__init__.py,sha256=ivc8bczhQdEJsWse6fc81Xyz0i2YX57pL4UubM3NJfw,228
 qcanvas/util/settings/_client_settings.py,sha256=HxGH9eOCdBj8wYboGhzNX0LFw_bmzF-Vwo44y1W0EqY,1036
-qcanvas/util/settings/_mapped_setting.py,sha256=Z6635FfDll9cCLfSkVg-unsDLvUWuKT5MmxJEiUkd2k,1823
-qcanvas/util/settings/_ui_settings.py,sha256=X1AFVIJzck0S3YdEWN6VMws4k9sWquM1t5hwMYOsfTw,927
+qcanvas/util/settings/_mapped_setting.py,sha256=1zQAfXxWB9yUtWCBObnOZl7EQ22bS-4u2yGGGSdhKJo,1792
+qcanvas/util/settings/_ui_settings.py,sha256=tuzrIZ0H66pDA0hSlynuKXsk0w-MAPVU8qCxjdVjRAs,804
+qcanvas/util/themes.py,sha256=BE6lMf0lVE-0G_QYhK5emMdtKG4lUJw76HFX4go7R80,473
 qcanvas/util/ui_tools.py,sha256=bSM1xrmZPn847YEbXAC9VIAv--8hMLMWrsEMWGA5p3E,916
 qcanvas/util/url_checker.py,sha256=03jqnQ1_GOlCJyRHrlMbSQE9QsHrVNsg0kFsA8oKP60,361
-qcanvas-1.0.6a6.dist-info/METADATA,sha256=e9iBGx8ogVgZYdaz-lgd_OMO5_BMjo4woziQUqyrJFk,1652
-qcanvas-1.0.6a6.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-qcanvas-1.0.6a6.dist-info/entry_points.txt,sha256=46VbnhQ9w2CYdfhYcPfWgjXYHjsKshu0asQ1B_sAMac,44
-qcanvas-1.0.6a6.dist-info/RECORD,,
+qcanvas-1.0.6a8.dist-info/METADATA,sha256=Jeyv9u6rbWDNN02YjetmmvYyABG2J6oAoWKx-AAzytM,1601
+qcanvas-1.0.6a8.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+qcanvas-1.0.6a8.dist-info/entry_points.txt,sha256=46VbnhQ9w2CYdfhYcPfWgjXYHjsKshu0asQ1B_sAMac,44
+qcanvas-1.0.6a8.dist-info/RECORD,,