qcanvas 1.0.3.post5__tar.gz → 1.0.6a1__tar.gz

{qcanvas-1.0.3.post5 → qcanvas-1.0.6a1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qcanvas
-Version: 1.0.3.post5
+Version: 1.0.6a1
 Summary: QCanvas is a desktop client for Canvas LMS.
 Author: QCanvas
 Author-email: QCanvas@noreply.codeberg.org
@@ -15,7 +15,7 @@ Requires-Dist: platformdirs (>=4.2.2,<5.0.0)
 Requires-Dist: pyqtdarktheme-fork (>=2.3.2,<3.0.0)
 Requires-Dist: qasync (>=0.27.1,<0.28.0)
 Requires-Dist: qcanvas-api-clients (>=0.2.2,<0.3.0)
-Requires-Dist: qcanvas-backend (==0.1.10a1)
+Requires-Dist: qcanvas-backend (==0.1.10a2)
 Requires-Dist: qtpy (>=2.4.1,<3.0.0)
 Requires-Dist: sqlalchemy (>=2.0.31,<3.0.0)
 Description-Content-Type: text/markdown

{qcanvas-1.0.3.post5 → qcanvas-1.0.6a1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "qcanvas"
-version = "1.0.3.post5"
+version = "1.0.6a1"
 description = "QCanvas is a desktop client for Canvas LMS."
 authors = ["QCanvas <QCanvas@noreply.codeberg.org>"]
 readme = "README.md"
@@ -11,7 +11,7 @@ qcanvas = "qcanvas.run:main"
 [tool.poetry.dependencies]
 python = ">=3.11,<3.13"
 qcanvas-api-clients = "^0.2.2"
-qcanvas-backend = "0.1.10a1"
+qcanvas-backend = "0.1.10a2"
 asynctaskpool = "^0.2.1"
 sqlalchemy = "^2.0.31"
 qtpy = "^2.4.1"

{qcanvas-1.0.3.post5 → qcanvas-1.0.6a1}/qcanvas/backend_connectors/qcanvas_task_master.py

@@ -14,7 +14,7 @@ class _TaskMaster(TaskMaster, QObject, metaclass=_Meta):
     task_progress = Signal(TaskID, int, int)
     task_failed = Signal(TaskID, object)
 
-    def report_failed(self, _task_id: TaskID, context: str | Exception) -> None:
+    def report_failed(self, _task_id: TaskID, context: object) -> None:
         self.task_failed.emit(_task_id, context)
 
     def report_progress(self, _task_id: TaskID, current: int, total: int) -> None:

{qcanvas-1.0.3.post5 → qcanvas-1.0.6a1}/qcanvas/icons/file-download-failed.svg

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
-<svg fill="#000000" width="800px" height="800px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg">
-    <title>file-times</title>
-    <path d="M26.731 9.902c-0.005-0.035-0.011-0.066-0.019-0.095l0.001 0.005c-0.031-0.134-0.094-0.249-0.182-0.342l0 0-8-8c-0.092-0.087-0.207-0.15-0.335-0.181l-0.005-0.001c-0.027-0.008-0.059-0.014-0.092-0.019l-0.003-0c-0.026-0.007-0.059-0.014-0.092-0.019l-0.004-0h-12c-0.414 0-0.75 0.336-0.75 0.75v0 28c0 0.414 0.336 0.75 0.75 0.75h20c0.414-0 0.75-0.336 0.75-0.75v0-20c-0.005-0.038-0.012-0.071-0.020-0.103l0.001 0.005zM24.189 9.25h-5.439v-5.439zM6.75 29.25v-26.5h10.5v7.25c0 0.414 0.336 0.75 0.75 0.75h7.25v18.5zM20.066 15.935c-0.136-0.136-0.324-0.22-0.531-0.22s-0.395 0.084-0.531 0.22v0l-3.004 3.004-3.005-3.004c-0.136-0.141-0.327-0.228-0.538-0.228-0.414 0-0.75 0.336-0.75 0.75 0 0.211 0.087 0.402 0.228 0.538l3.004 3.005-3.004 3.004c-0.136 0.136-0.22 0.324-0.22 0.531 0 0.415 0.336 0.751 0.751 0.751 0.207 0 0.395-0.084 0.53-0.219v0l3.005-3.005 3.004 3.005c0.136 0.136 0.324 0.22 0.531 0.22 0.415 0 0.751-0.336 0.751-0.751 0-0.207-0.084-0.395-0.22-0.531l-3.005-3.004 3.005-3.005c0.135-0.136 0.218-0.323 0.218-0.53s-0.083-0.394-0.218-0.53l0 0z"></path>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg fill="#000000" width="800px" height="800px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg">
+    <title>file-times</title>
+    <path d="M26.731 9.902c-0.005-0.035-0.011-0.066-0.019-0.095l0.001 0.005c-0.031-0.134-0.094-0.249-0.182-0.342l0 0-8-8c-0.092-0.087-0.207-0.15-0.335-0.181l-0.005-0.001c-0.027-0.008-0.059-0.014-0.092-0.019l-0.003-0c-0.026-0.007-0.059-0.014-0.092-0.019l-0.004-0h-12c-0.414 0-0.75 0.336-0.75 0.75v0 28c0 0.414 0.336 0.75 0.75 0.75h20c0.414-0 0.75-0.336 0.75-0.75v0-20c-0.005-0.038-0.012-0.071-0.020-0.103l0.001 0.005zM24.189 9.25h-5.439v-5.439zM6.75 29.25v-26.5h10.5v7.25c0 0.414 0.336 0.75 0.75 0.75h7.25v18.5zM20.066 15.935c-0.136-0.136-0.324-0.22-0.531-0.22s-0.395 0.084-0.531 0.22v0l-3.004 3.004-3.005-3.004c-0.136-0.141-0.327-0.228-0.538-0.228-0.414 0-0.75 0.336-0.75 0.75 0 0.211 0.087 0.402 0.228 0.538l3.004 3.005-3.004 3.004c-0.136 0.136-0.22 0.324-0.22 0.531 0 0.415 0.336 0.751 0.751 0.751 0.207 0 0.395-0.084 0.53-0.219v0l3.005-3.005 3.004 3.005c0.136 0.136 0.324 0.22 0.531 0.22 0.415 0 0.751-0.336 0.751-0.751 0-0.207-0.084-0.395-0.22-0.531l-3.005-3.004 3.005-3.005c0.135-0.136 0.218-0.323 0.218-0.53s-0.083-0.394-0.218-0.53l0 0z"></path>
 </svg>

{qcanvas-1.0.3.post5 → qcanvas-1.0.6a1}/qcanvas/icons/file-downloaded.svg

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
-<svg fill="#000000" width="800px" height="800px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg">
-    <title>file</title>
-    <path d="M26.731 9.902c-0.005-0.035-0.011-0.066-0.019-0.095l0.001 0.005c-0.031-0.134-0.094-0.249-0.182-0.342l0 0-8-8c-0.092-0.087-0.207-0.15-0.335-0.181l-0.005-0.001c-0.027-0.008-0.059-0.014-0.092-0.019l-0.003-0c-0.026-0.007-0.059-0.014-0.092-0.019l-0.004-0h-12c-0.414 0-0.75 0.336-0.75 0.75v0 28c0 0.414 0.336 0.75 0.75 0.75h20c0.414-0 0.75-0.336 0.75-0.75v0-20c-0.005-0.038-0.012-0.071-0.020-0.103l0.001 0.005zM24.189 9.25h-5.439v-5.439zM6.75 29.25v-26.5h10.5v7.25c0 0.414 0.336 0.75 0.75 0.75h7.25v18.5z"></path>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg fill="#000000" width="800px" height="800px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg">
+    <title>file</title>
+    <path d="M26.731 9.902c-0.005-0.035-0.011-0.066-0.019-0.095l0.001 0.005c-0.031-0.134-0.094-0.249-0.182-0.342l0 0-8-8c-0.092-0.087-0.207-0.15-0.335-0.181l-0.005-0.001c-0.027-0.008-0.059-0.014-0.092-0.019l-0.003-0c-0.026-0.007-0.059-0.014-0.092-0.019l-0.004-0h-12c-0.414 0-0.75 0.336-0.75 0.75v0 28c0 0.414 0.336 0.75 0.75 0.75h20c0.414-0 0.75-0.336 0.75-0.75v0-20c-0.005-0.038-0.012-0.071-0.020-0.103l0.001 0.005zM24.189 9.25h-5.439v-5.439zM6.75 29.25v-26.5h10.5v7.25c0 0.414 0.336 0.75 0.75 0.75h7.25v18.5z"></path>
 </svg>

{qcanvas-1.0.3.post5 → qcanvas-1.0.6a1}/qcanvas/icons/file-not-downloaded.svg

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
-<svg fill="#000000" width="800px" height="800px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg">
-    <title>file-arrow-down</title>
-    <path d="M26.731 9.902c-0.005-0.035-0.011-0.066-0.019-0.095l0.001 0.005c-0.031-0.134-0.094-0.249-0.182-0.342l0 0-8-8c-0.092-0.087-0.207-0.15-0.335-0.181l-0.005-0.001c-0.027-0.008-0.059-0.014-0.092-0.019l-0.003-0c-0.026-0.007-0.059-0.014-0.092-0.019l-0.004-0h-12c-0.414 0-0.75 0.336-0.75 0.75v0 28c0 0.414 0.336 0.75 0.75 0.75h20c0.414-0 0.75-0.336 0.75-0.75v0-20c-0.005-0.038-0.012-0.071-0.020-0.103l0.001 0.005zM24.189 9.25h-5.439v-5.439zM6.75 29.25v-26.5h10.5v7.25c0 0.414 0.336 0.75 0.75 0.75h7.25v18.5zM20.469 20.91l-3.719 3.721v-10.676c0-0.414-0.336-0.75-0.75-0.75s-0.75 0.336-0.75 0.75v0 10.675l-3.72-3.72c-0.136-0.134-0.322-0.218-0.528-0.218-0.415 0-0.751 0.336-0.751 0.751 0 0.207 0.083 0.394 0.219 0.529l5 5c0.026 0.026 0.065 0.017 0.093 0.038 0.052 0.040 0.088 0.098 0.15 0.124 0.085 0.035 0.184 0.056 0.287 0.057h0c0 0 0 0 0 0 0.207 0 0.394-0.084 0.53-0.219l5.001-5c0.136-0.136 0.22-0.324 0.22-0.531 0-0.415-0.336-0.751-0.751-0.751-0.207 0-0.395 0.084-0.531 0.22v0z"></path>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg fill="#000000" width="800px" height="800px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg">
+    <title>file-arrow-down</title>
+    <path d="M26.731 9.902c-0.005-0.035-0.011-0.066-0.019-0.095l0.001 0.005c-0.031-0.134-0.094-0.249-0.182-0.342l0 0-8-8c-0.092-0.087-0.207-0.15-0.335-0.181l-0.005-0.001c-0.027-0.008-0.059-0.014-0.092-0.019l-0.003-0c-0.026-0.007-0.059-0.014-0.092-0.019l-0.004-0h-12c-0.414 0-0.75 0.336-0.75 0.75v0 28c0 0.414 0.336 0.75 0.75 0.75h20c0.414-0 0.75-0.336 0.75-0.75v0-20c-0.005-0.038-0.012-0.071-0.020-0.103l0.001 0.005zM24.189 9.25h-5.439v-5.439zM6.75 29.25v-26.5h10.5v7.25c0 0.414 0.336 0.75 0.75 0.75h7.25v18.5zM20.469 20.91l-3.719 3.721v-10.676c0-0.414-0.336-0.75-0.75-0.75s-0.75 0.336-0.75 0.75v0 10.675l-3.72-3.72c-0.136-0.134-0.322-0.218-0.528-0.218-0.415 0-0.751 0.336-0.751 0.751 0 0.207 0.083 0.394 0.219 0.529l5 5c0.026 0.026 0.065 0.017 0.093 0.038 0.052 0.040 0.088 0.098 0.15 0.124 0.085 0.035 0.184 0.056 0.287 0.057h0c0 0 0 0 0 0 0.207 0 0.394-0.084 0.53-0.219l5.001-5c0.136-0.136 0.22-0.324 0.22-0.531 0-0.415-0.336-0.751-0.751-0.751-0.207 0-0.395 0.084-0.531 0.22v0z"></path>
 </svg>

{qcanvas-1.0.3.post5 → qcanvas-1.0.6a1}/qcanvas/icons/file-unknown.svg

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
-<svg fill="#000000" width="800px" height="800px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg">
-    <title>question</title>
-    <path d="M19.943 5.251c-1.145-0.635-2.511-1.008-3.964-1.008-1.461 0-2.834 0.378-4.026 1.040l0.042-0.022c-1.649 0.916-2.746 2.648-2.746 4.635 0 0.037 0 0.074 0.001 0.111l-0-0.006c0.001 0.413 0.336 0.747 0.75 0.747 0 0 0 0 0 0h-0c0.407-0.021 0.731-0.346 0.75-0.751l0-0.002c-0.001-0.026-0.001-0.058-0.001-0.089 0-1.441 0.8-2.694 1.98-3.341l0.020-0.010c0.934-0.511 2.047-0.812 3.23-0.812 1.178 0 2.287 0.298 3.255 0.824l-0.036-0.018c1.23 0.657 2.053 1.933 2.053 3.401 0 0.017-0 0.033-0 0.050l0-0.003c0.033 0.19 0.051 0.408 0.051 0.631 0 1.699-1.084 3.145-2.598 3.684l-0.027 0.008c-2.303 1.102-3.424 3.285-3.426 6.677 0 0 0 0 0 0.001 0 0.414 0.335 0.749 0.749 0.749h0.001c0.414-0 0.75-0.336 0.75-0.75v0c0.002-2.793 0.819-4.485 2.586-5.329 2.037-0.783 3.457-2.725 3.457-4.997 0-0.238-0.016-0.473-0.046-0.703l0.003 0.027c0-0.017 0-0.037 0-0.057 0-2.018-1.123-3.774-2.779-4.676l-0.028-0.014zM15.46 25.459c-0.123 0.145-0.198 0.334-0.2 0.541v0c-0.001 0.016-0.002 0.034-0.002 0.052 0 0.082 0.015 0.16 0.044 0.231l-0.002-0.004c0.039 0.094 0.093 0.173 0.16 0.24l0 0c0.071 0.076 0.158 0.137 0.255 0.178l0.005 0.002c0.084 0.026 0.18 0.041 0.28 0.041s0.196-0.015 0.287-0.043l-0.007 0.002c0.102-0.043 0.189-0.104 0.26-0.179l0-0c0.067-0.067 0.12-0.147 0.157-0.235l0.002-0.005c0.038-0.079 0.061-0.173 0.061-0.271 0-0.003-0-0.006-0-0.009v0c-0.010-0.209-0.092-0.397-0.221-0.542l0.001 0.001c-0.145-0.121-0.334-0.195-0.54-0.195s-0.395 0.074-0.541 0.196l0.001-0.001z"></path>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg fill="#000000" width="800px" height="800px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg">
+    <title>question</title>
+    <path d="M19.943 5.251c-1.145-0.635-2.511-1.008-3.964-1.008-1.461 0-2.834 0.378-4.026 1.040l0.042-0.022c-1.649 0.916-2.746 2.648-2.746 4.635 0 0.037 0 0.074 0.001 0.111l-0-0.006c0.001 0.413 0.336 0.747 0.75 0.747 0 0 0 0 0 0h-0c0.407-0.021 0.731-0.346 0.75-0.751l0-0.002c-0.001-0.026-0.001-0.058-0.001-0.089 0-1.441 0.8-2.694 1.98-3.341l0.020-0.010c0.934-0.511 2.047-0.812 3.23-0.812 1.178 0 2.287 0.298 3.255 0.824l-0.036-0.018c1.23 0.657 2.053 1.933 2.053 3.401 0 0.017-0 0.033-0 0.050l0-0.003c0.033 0.19 0.051 0.408 0.051 0.631 0 1.699-1.084 3.145-2.598 3.684l-0.027 0.008c-2.303 1.102-3.424 3.285-3.426 6.677 0 0 0 0 0 0.001 0 0.414 0.335 0.749 0.749 0.749h0.001c0.414-0 0.75-0.336 0.75-0.75v0c0.002-2.793 0.819-4.485 2.586-5.329 2.037-0.783 3.457-2.725 3.457-4.997 0-0.238-0.016-0.473-0.046-0.703l0.003 0.027c0-0.017 0-0.037 0-0.057 0-2.018-1.123-3.774-2.779-4.676l-0.028-0.014zM15.46 25.459c-0.123 0.145-0.198 0.334-0.2 0.541v0c-0.001 0.016-0.002 0.034-0.002 0.052 0 0.082 0.015 0.16 0.044 0.231l-0.002-0.004c0.039 0.094 0.093 0.173 0.16 0.24l0 0c0.071 0.076 0.158 0.137 0.255 0.178l0.005 0.002c0.084 0.026 0.18 0.041 0.28 0.041s0.196-0.015 0.287-0.043l-0.007 0.002c0.102-0.043 0.189-0.104 0.26-0.179l0-0c0.067-0.067 0.12-0.147 0.157-0.235l0.002-0.005c0.038-0.079 0.061-0.173 0.061-0.271 0-0.003-0-0.006-0-0.009v0c-0.010-0.209-0.092-0.397-0.221-0.542l0.001 0.001c-0.145-0.121-0.334-0.195-0.54-0.195s-0.395 0.074-0.541 0.196l0.001-0.001z"></path>
 </svg>

{qcanvas-1.0.3.post5 → qcanvas-1.0.6a1}/qcanvas/run.py

@@ -7,6 +7,7 @@ from qcanvas.util import logs, paths
 paths.data_storage().mkdir(parents=True, exist_ok=True)
 
 logging.basicConfig(
+    filemode="w",
     filename=paths.data_storage() / "debug.log",
     level="WARN",
 )

{qcanvas-1.0.3.post5 → qcanvas-1.0.6a1}/qcanvas/ui/course_viewer/content_tree.py

@@ -3,7 +3,7 @@ from abc import abstractmethod
 from typing import *
 
 from qcanvas_backend.net.sync.sync_receipt import SyncReceipt
-from qtpy.QtCore import Signal, Slot
+from qtpy.QtCore import QItemSelection, Signal, Slot
 from qtpy.QtWidgets import *
 
 from qcanvas.ui.memory_tree import MemoryTreeWidget, MemoryTreeWidgetItem
@@ -69,8 +69,8 @@ class ContentTree(MemoryTreeWidget, Generic[T]):
         self, data: T, sync_receipt: Optional[SyncReceipt]
     ) -> Sequence[MemoryTreeWidgetItem]: ...
 
-    @Slot()
-    def _selection_changed(self) -> None:
+    @Slot(QItemSelection, QItemSelection)
+    def _selection_changed(self, _0: QItemSelection, _1: QItemSelection) -> None:
         if self._reloading:
             return
 

{qcanvas-1.0.3.post5 → qcanvas-1.0.6a1}/qcanvas/ui/course_viewer/course_tree.py

@@ -3,7 +3,7 @@ from typing import *
 
 import qcanvas_backend.database.types as db
 from qcanvas_backend.net.sync.sync_receipt import SyncReceipt
-from qtpy.QtCore import QObject, Qt, Signal, Slot
+from qtpy.QtCore import Qt, Signal
 
 from qcanvas.ui.course_viewer.content_tree import ContentTree
 from qcanvas.ui.memory_tree import MemoryTreeWidgetItem
@@ -11,18 +11,16 @@ from qcanvas.ui.memory_tree import MemoryTreeWidgetItem
 _logger = logging.getLogger(__name__)
 
 
-class _CourseTreeItem(MemoryTreeWidgetItem, QObject):
-    renamed = Signal(db.Course, str)
-
-    def __init__(self, course: db.Course):
+class _CourseTreeItem(MemoryTreeWidgetItem):
+    def __init__(self, course: db.Course, owner: "CourseTree"):
         MemoryTreeWidgetItem.__init__(
             self,
             id=course.id,
             data=course,
             strings=[course.configuration.nickname or course.name],
         )
-        QObject.__init__(self)
 
+        self._owner = owner
         self._course = course
 
         self.setFlags(
@@ -39,10 +37,10 @@ class _CourseTreeItem(MemoryTreeWidgetItem, QObject):
 
         if len(value) == 0:
             super().setData(column, role, self._course.name)
-            self.renamed.emit(self._course, None)
+            self._owner.course_renamed.emit(self._course, None)
         else:
             super().setData(column, role, value)
-            self.renamed.emit(self._course, value)
+            self._owner.course_renamed.emit(self._course, value)
 
 
 class CourseTree(ContentTree[Sequence[db.Term]]):
@@ -63,6 +61,7 @@ class CourseTree(ContentTree[Sequence[db.Term]]):
 
             for course in term.courses:
                 course_widget = self._create_course_widget(course, sync_receipt)
+                # course_widget.renamed.connect(self._on_course_renamed)
                 term_widget.addChild(course_widget)
 
             widgets.append(term_widget)
@@ -71,9 +70,8 @@ class CourseTree(ContentTree[Sequence[db.Term]]):
 
     def _create_course_widget(
         self, course: db.Course, sync_receipt: Optional[SyncReceipt]
-    ) -> MemoryTreeWidgetItem:
-        course_widget = _CourseTreeItem(course)
-        course_widget.renamed.connect(self._on_course_renamed)
+    ) -> _CourseTreeItem:
+        course_widget = _CourseTreeItem(course, self)
 
         is_new = sync_receipt is not None and course.id in sync_receipt.updated_courses
 
@@ -88,6 +86,6 @@ class CourseTree(ContentTree[Sequence[db.Term]]):
 
         return term_widget
 
-    @Slot()
-    def _on_course_renamed(self, course: db.Course, new_name: str) -> None:
-        self.course_renamed.emit(course, new_name)
+    # @Slot(db.Course, str)
+    # def _on_course_renamed(self, course: db.Course, new_name: str) -> None:
+    #     self.course_renamed.emit(course, new_name)

{qcanvas-1.0.3.post5 → qcanvas-1.0.6a1}/qcanvas/ui/course_viewer/tabs/assignment_tab/assignment_tree.py

@@ -3,7 +3,7 @@ from typing import Optional, Sequence
 
 import qcanvas_backend.database.types as db
 from qcanvas_backend.net.sync.sync_receipt import SyncReceipt
-from qtpy.QtGui import Qt
+from qtpy.QtCore import Qt
 from qtpy.QtWidgets import QHeaderView
 
 from qcanvas.ui.course_viewer.content_tree import ContentTree

{qcanvas-1.0.3.post5 → qcanvas-1.0.6a1}/qcanvas/ui/course_viewer/tabs/content_tab.py

@@ -4,6 +4,7 @@ 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
+from qtpy.QtCore import Slot
 from qtpy.QtWidgets import *
 
 from qcanvas.ui.course_viewer.content_tree import ContentTree
@@ -70,6 +71,7 @@ class ContentTab(QWidget):
     def reload(self, course: db.Course, *, sync_receipt: Optional[SyncReceipt]) -> None:
         self._explorer.reload(course, sync_receipt=sync_receipt)
 
+    @Slot(object)
     def _item_selected(self, item: object) -> None:
         if isinstance(item, db.CourseContentItem):
             _logger.debug("Show %s", item.name)

{qcanvas-1.0.3.post5 → qcanvas-1.0.6a1}/qcanvas/ui/course_viewer/tabs/page_tab/page_tree.py

@@ -3,7 +3,7 @@ from typing import Optional, Sequence
 
 import qcanvas_backend.database.types as db
 from qcanvas_backend.net.sync.sync_receipt import SyncReceipt
-from qtpy.QtGui import Qt
+from qtpy.QtCore import Qt
 
 from qcanvas.ui.course_viewer.content_tree import ContentTree
 from qcanvas.ui.memory_tree import MemoryTreeWidgetItem

{qcanvas-1.0.3.post5 → qcanvas-1.0.6a1}/qcanvas/ui/course_viewer/tabs/resource_rich_browser.py

@@ -14,6 +14,7 @@ from qtpy.QtWidgets import QTextBrowser
 from qcanvas import icons
 from qcanvas.backend_connectors import FrontendResourceManager
 from qcanvas.util.html_cleaner import clean_up_html
+from qcanvas.util.qurl_util import file_url
 
 _logger = logging.getLogger(__name__)
 
@@ -148,7 +149,7 @@ class ResourceRichBrowser(QTextBrowser):
             case _:
                 raise ValueError()
 
-    @asyncSlot()
+    @asyncSlot(QUrl)
     async def _open_url(self, url: QUrl) -> None:
         if url.scheme() == "data":
             await self._open_resource_from_link(url)
@@ -167,10 +168,10 @@ class ResourceRichBrowser(QTextBrowser):
             )
             return
 
-        resource_path = self._downloader.resource_download_location(resource)
-        QDesktopServices.openUrl(QUrl.fromLocalFile(resource_path.absolute()))
+        resource_path = file_url(self._downloader.resource_download_location(resource))
+        QDesktopServices.openUrl(resource_path)
 
-    @Slot()
+    @Slot(db.Resource)
     def _download_updated(self, resource: db.Resource) -> None:
         if self._content is not None and resource.id in self._current_content_resources:
             self._show_page_content(self._content)

{qcanvas-1.0.3.post5 → qcanvas-1.0.6a1}/qcanvas/ui/main_ui/qcanvas_window.py

@@ -5,9 +5,10 @@ from typing import *
 import qcanvas_backend.database.types as db
 from qasync import asyncSlot
 from qcanvas_backend.database.data_monolith import DataMonolith
+from qcanvas_backend.net.sync.sync_receipt import SyncReceipt
 from qcanvas_backend.qcanvas import QCanvas
 from qtpy.QtCore import QUrl, Signal, Slot
-from qtpy.QtGui import QDesktopServices, QKeySequence, QPixmap
+from qtpy.QtGui import QDesktopServices, QIcon, QKeySequence
 from qtpy.QtWidgets import *
 
 from qcanvas import icons
@@ -18,6 +19,7 @@ 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.status_bar_progress_display import StatusBarProgressDisplay
 from qcanvas.util import paths, settings
+from qcanvas.util.qurl_util import file_url
 from qcanvas.util.ui_tools import create_qaction
 
 _logger = logging.getLogger(__name__)
@@ -30,7 +32,7 @@ class QCanvasWindow(QMainWindow):
         super().__init__()
 
         self.setWindowTitle("QCanvas")
-        self.setWindowIcon(QPixmap(icons.main_icon))
+        self.setWindowIcon(QIcon(icons.main_icon))
 
         self._operation_semaphore = Semaphore()
         self._data: Optional[DataMonolith] = None
@@ -83,6 +85,10 @@ class QCanvasWindow(QMainWindow):
             parent=app_menu,
         )
 
+        create_qaction(
+            name="Mark all as seen", triggered=self._clear_new_items, parent=app_menu
+        )
+
         create_qaction(
             name="Quit",
             shortcut=QKeySequence("Ctrl+Q"),
@@ -96,8 +102,11 @@ class QCanvasWindow(QMainWindow):
         options_menu.addAction(SyncOnStartOption(options_menu))
 
     def _restore_window_position(self):
-        self.restoreGeometry(settings.ui.last_geometry)
-        self.restoreState(settings.ui.last_window_state)
+        if settings.ui.last_geometry is not None:
+            self.restoreGeometry(settings.ui.last_geometry)
+
+        if settings.ui.last_window_state is not None:
+            self.restoreState(settings.ui.last_window_state)
 
     def closeEvent(self, event):
         settings.ui.last_geometry = self.saveGeometry()
@@ -143,30 +152,36 @@ class QCanvasWindow(QMainWindow):
             receipt = await self._qcanvas.synchronise_canvas(
                 quick_sync=settings.client.quick_sync_enabled
             )
-
-            self._course_tree.reload(await self._get_terms(), sync_receipt=receipt)
-            await self._course_viewer_container.reload_all(
-                await self._get_courses(), sync_receipt=receipt
-            )
+            await self._reload(receipt)
             self._sync_button.setText("Synchronise")
+        except Exception as e:
+            error = QErrorMessage(self)
+            error.showMessage(str(e))
 
+            raise e
         finally:
             self._operation_semaphore.release()
 
+    async def _reload(self, receipt: Optional[SyncReceipt]) -> None:
+        self._course_tree.reload(await self._get_terms(), sync_receipt=receipt)
+        await self._course_viewer_container.reload_all(
+            await self._get_courses(), sync_receipt=receipt
+        )
+
     async def _get_terms(self) -> Sequence[db.Term]:
         return (await self._qcanvas.get_data()).terms
 
     async def _get_courses(self) -> Sequence[db.Course]:
         return (await self._qcanvas.get_data()).courses
 
-    @Slot()
+    @Slot(db.Course)
     def _on_course_selected(self, course: Optional[db.Course]) -> None:
         if course is not None:
             self._course_viewer_container.load_course(course)
         else:
             self._course_viewer_container.show_blank()
 
-    @asyncSlot()
+    @asyncSlot(db.Course, str)
     async def _on_course_renamed(self, course: db.Course, new_name: str) -> None:
         _logger.debug("Rename %s -> %s", course.name, new_name)
 
@@ -175,18 +190,22 @@ class QCanvasWindow(QMainWindow):
             course.configuration.nickname = new_name
 
     @asyncSlot()
-    async def _open_quick_auth_in_browser(self):
+    async def _open_quick_auth_in_browser(self) -> None:
         opening_progress_dialog = QProgressDialog("Opening canvas", None, 0, 0, self)
         opening_progress_dialog.setWindowTitle("Please wait")
         opening_progress_dialog.show()
         QDesktopServices.openUrl(
-            await self._qcanvas.canvas_client.get_temporary_session_url()
+            QUrl(await self._qcanvas.canvas_client.get_temporary_session_url())
         )
         opening_progress_dialog.close()
 
     @Slot()
     def _open_downloads_folder(self) -> None:
-        # fixme hard coded path! >:(
-        QDesktopServices.openUrl(
-            QUrl(f"file://{(paths.data_storage() / 'downloads').absolute()}")
-        )
+        directory = self._qcanvas.resource_manager.downloads_folder
+        directory.mkdir(parents=True, exist_ok=True)
+
+        QDesktopServices.openUrl(file_url(directory))
+
+    @asyncSlot()
+    async def _clear_new_items(self) -> None:
+        await self._reload(None)

{qcanvas-1.0.3.post5 → qcanvas-1.0.6a1}/qcanvas/ui/main_ui/status_bar_progress_display.py

@@ -38,7 +38,7 @@ class StatusBarProgressDisplay(QStatusBar):
         bar.hide()
         return bar
 
-    @asyncSlot()
+    @asyncSlot(TaskID, int, int)
     async def _on_task_progress(
         self, task_id: TaskID, current: int, total: int
     ) -> None:
@@ -60,8 +60,8 @@ class StatusBarProgressDisplay(QStatusBar):
         task.current = current
         task.total = total
 
-    @asyncSlot()
-    async def _on_task_failed(self, task_id: TaskID, context: str | Exception) -> None:
+    @asyncSlot(TaskID, object)
+    async def _on_task_failed(self, task_id: TaskID, context: object) -> None:
         _logger.debug("%s failed", task_id)
 
         async with self._lock:

{qcanvas-1.0.3.post5 → qcanvas-1.0.6a1}/qcanvas/ui/memory_tree/memory_tree_widget.py

@@ -114,7 +114,7 @@ class MemoryTreeWidget(QTreeWidget):
 
         self._id_map.update(map_updates.items())
 
-    @Slot()
+    @Slot(QTreeWidgetItem)
     def _expanded(self, item: QTreeWidgetItem):
         if self._suppress_expansion_signals:
             return
@@ -123,7 +123,7 @@ class MemoryTreeWidget(QTreeWidget):
             _logger.debug("Expanded %s", item.id)
             self._memory.expanded(item.id)
 
-    @Slot()
+    @Slot(QTreeWidgetItem)
     def _collapsed(self, item: QTreeWidgetItem):
         if self._suppress_expansion_signals:
             return

{qcanvas-1.0.3.post5 → qcanvas-1.0.6a1}/qcanvas/ui/setup/setup_dialog.py

@@ -6,7 +6,7 @@ from qcanvas_api_clients.canvas import CanvasClient, CanvasClientConfig
 from qcanvas_api_clients.panopto import PanoptoClient, PanoptoClientConfig
 from qcanvas_api_clients.util.request_exceptions import ConfigInvalidError
 from qtpy.QtCore import QUrl, Signal, Slot
-from qtpy.QtGui import QDesktopServices, QPixmap
+from qtpy.QtGui import QDesktopServices, QIcon
 from qtpy.QtWidgets import *
 
 import qcanvas.util.settings as settings
@@ -30,7 +30,7 @@ class SetupDialog(QDialog):
         self.setWindowTitle("Configure QCanvas")
         self.setMinimumSize(550, 200)
         self.resize(550, 200)
-        self.setWindowIcon(QPixmap(icons.main_icon))
+        self.setWindowIcon(QIcon(icons.main_icon))
 
         self._semaphore = Semaphore()
         self._canvas_url_box = QLineEdit(settings.client.canvas_url)
@@ -76,7 +76,6 @@ class SetupDialog(QDialog):
         size_policy.setRetainSizeWhenHidden(True)
         widget.setSizePolicy(size_policy)
 
-    # @Slot()
     @asyncSlot()
     async def _accepted(self) -> None:
         if self._semaphore.acquire(False):
@@ -208,5 +207,9 @@ class SetupDialog(QDialog):
             "Don't share this key. You can revoke it at any time.",
             parent=self,
         )
-        msg.accepted.connect(lambda: QDesktopServices.openUrl(_tutorial_url))
+        msg.accepted.connect(self._open_tutorial)
         msg.show()
+
+    @Slot()
+    def _open_tutorial(self) -> None:
+        QDesktopServices.openUrl(QUrl(_tutorial_url))

qcanvas-1.0.6a1/qcanvas/util/qurl_util.py

@@ -0,0 +1,10 @@
+import logging
+from pathlib import Path
+
+from qtpy.QtCore import QUrl
+
+_logger = logging.getLogger(__name__)
+
+
+def file_url(path: Path) -> QUrl:
+    return QUrl.fromLocalFile(str(path.absolute()))