qcanvas 1.0.6a6__tar.gz → 1.0.6a8__tar.gz

{qcanvas-1.0.6a6 → qcanvas-1.0.6a8}/PKG-INFO

@@ -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 → qcanvas-1.0.6a8}/pyproject.toml

@@ -1,15 +1,18 @@
 [tool.poetry]
 name = "qcanvas"
-version = "1.0.6a6"
+version = "1.0.6a8"
 description = "QCanvas is a desktop client for Canvas LMS."
 authors = ["QCanvas <QCanvas@noreply.codeberg.org>"]
 readme = "README.md"
+exclude = [
+    "images"
+]
 
 [tool.poetry.scripts]
 qcanvas = "qcanvas.run:main"
 
 [tool.poetry.dependencies]
-python = ">=3.11,<3.13"
+python = ">=3.12,<3.13"
 qcanvas-api-clients = "^0.2.2"
 qcanvas-backend = "0.1.10a2"
 asynctaskpool = "^0.2.1"

{qcanvas-1.0.6a6 → qcanvas-1.0.6a8}/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-1.0.6a8/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-1.0.6a6 → qcanvas-1.0.6a8}/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-1.0.6a6 → qcanvas-1.0.6a8}/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-1.0.6a6 → qcanvas-1.0.6a8}/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-1.0.6a6 → qcanvas-1.0.6a8}/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-1.0.6a8/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"},
+        )