qcanvas 1.0.12.dev3__tar.gz → 1.2.0__tar.gz

{qcanvas-1.0.12.dev3 → qcanvas-1.2.0}/PKG-INFO

@@ -1,12 +1,11 @@
 Metadata-Version: 2.1
 Name: qcanvas
-Version: 1.0.12.dev3
+Version: 1.2.0
 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.11.0,<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)
@@ -14,8 +13,8 @@ Requires-Dist: lightdb (>=2.0,<3.0)
 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.10)
+Requires-Dist: qcanvas-api-clients (>=0.3.0,<0.4.0)
+Requires-Dist: qcanvas-backend (>=0.2.5,<0.3.0)
 Requires-Dist: qtpy (>=2.4.1,<3.0.0)
 Requires-Dist: sqlalchemy (>=2.0.31,<3.0.0)
 Requires-Dist: validators (>=0.33.0,<0.34.0)
@@ -25,9 +24,20 @@ Description-Content-Type: text/markdown
 
 QCanvas is an **unofficial** desktop client for Canvas LMS.
 
+https://codeberg.org/QCanvas/QCanvas
+
+https://github.com/QCanvas/QCanvasApp
+
 # Downloads
 
-Download it from [releases](https://github.com/QCanvas/QCanvasApp/releases)
+<a href='https://flathub.org/apps/io.github.qcanvas.QCanvasApp'>
+    <img width='240' alt='Get it on Flathub' src='https://flathub.org/api/badge?svg&locale=en'/>
+</a>
+
+You can download a **windows** version from [releases](https://github.com/QCanvas/QCanvasApp/releases)
+
+The appimage version is *not recommended* as it is not a proper portable appimage. It will only work on debian/ubuntu
+based distros.
 
 # Development/Run from source
 

{qcanvas-1.0.12.dev3 → qcanvas-1.2.0}/README.md

@@ -2,9 +2,20 @@
 
 QCanvas is an **unofficial** desktop client for Canvas LMS.
 
+https://codeberg.org/QCanvas/QCanvas
+
+https://github.com/QCanvas/QCanvasApp
+
 # Downloads
 
-Download it from [releases](https://github.com/QCanvas/QCanvasApp/releases)
+<a href='https://flathub.org/apps/io.github.qcanvas.QCanvasApp'>
+    <img width='240' alt='Get it on Flathub' src='https://flathub.org/api/badge?svg&locale=en'/>
+</a>
+
+You can download a **windows** version from [releases](https://github.com/QCanvas/QCanvasApp/releases)
+
+The appimage version is *not recommended* as it is not a proper portable appimage. It will only work on debian/ubuntu
+based distros.
 
 # Development/Run from source
 

{qcanvas-1.0.12.dev3 → qcanvas-1.2.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "qcanvas"
-version = "1.0.12.dev3"
+version = "1.2.0"
 description = "QCanvas is a desktop client for Canvas LMS."
 authors = ["QCanvas <QCanvas@noreply.codeberg.org>"]
 readme = "README.md"
@@ -15,9 +15,10 @@ exclude = [
 qcanvas = "qcanvas.run:main"
 
 [tool.poetry.dependencies]
-python = ">=3.11,<3.13"
-qcanvas-api-clients = "^0.2.2"
-qcanvas-backend = "0.1.10"
+python = ">=3.11,<3.13,!=3.11.0"
+qcanvas-api-clients = "^0.3.0"
+qcanvas-backend = "^0.2.5"
+#qcanvas-backend = { path = "../QCanvas-Backend/", develop = true }
 asynctaskpool = "^0.2.1"
 sqlalchemy = "^2.0.31"
 qtpy = "^2.4.1"
@@ -28,6 +29,7 @@ lightdb = "^2.0"
 platformdirs = "^4.2.2"
 validators = "^0.33.0"
 
+
 [tool.poetry.group.flatpak-exclude.dependencies]
 pyside6-essentials = "^6.7.2"
 #2024-07-18: Latest version causes error with pyinstaller
@@ -38,15 +40,13 @@ pyinstaller = "^6.9.0"
 optional = true
 
 [tool.poetry.group.dev-tools.dependencies]
-black = "^24.4.2"
-isort = "^5.13.2"
+#nuitka = "^2.4.5"
+rich = "^13.7.1"
+pre-commit = "^3.8.0"
+scalene = "^1.5.44.1"
+xmltodict = "^0.13.0"
+#block-timer = "^0.2.0"
 
-[tool.poetry.group.local-deps]
-optional = true
-
-[tool.poetry.group.local-deps.dependencies]
-#qcanvas-api-clients = { path = "../QCanvas-API-Clients/", develop = false }
-#qcanvas-backend = { path = "../QCanvas-Backend/", develop = true }
 
 [build-system]
 requires = ["poetry-core"]

{qcanvas-1.0.12.dev3 → qcanvas-1.2.0}/qcanvas/app_start/__init__.py

@@ -4,12 +4,13 @@ import sys
 
 import qtpy
 from qasync import QEventLoop
+from qtpy.QtGui import QGuiApplication
 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 settings, themes
+from qcanvas.util import runtime, settings, themes
 
 main_window = None
 setup_window = None
@@ -32,6 +33,10 @@ def launch():
     _show_qt_api_name()
 
     app = QApplication(sys.argv)
+
+    if runtime.is_running_as_flatpak:
+        QGuiApplication.setDesktopFileName("io.github.qcanvas.QCanvasApp")
+
     app.setApplicationName("QCanvas")
 
     task_master.register()

qcanvas-1.2.0/qcanvas/icons/__init__.py

@@ -0,0 +1,56 @@
+from qtpy.QtGui import QIcon
+
+from ._icon_type import ThemeIcon, UniversalIcon
+from .rc_icons import (
+    qt_resource_data as _,  # Without this, icon data will not be loaded
+)
+
+
+# noinspection PyPep8Naming
+class actions:
+    exit = QIcon.fromTheme("actions/exit")
+    mark_all_read = QIcon.fromTheme("actions/mark_all_read")
+    open_downloads = QIcon.fromTheme("actions/open_downloads")
+    quick_login = QIcon.fromTheme("actions/quick_login")
+    sync = QIcon.fromTheme("actions/sync")
+
+
+# noinspection PyPep8Naming
+class branding:
+    logo_transparent = QIcon.fromTheme("branding/logo_transparent")
+    main_icon = QIcon.fromTheme("branding/main_icon")
+
+
+# noinspection PyPep8Naming
+class options:
+    auto_download = QIcon.fromTheme("options/auto_download")
+    ignore_old = QIcon.fromTheme("options/ignore_old")
+    include_videos = QIcon.fromTheme("options/include_videos")
+    theme = QIcon.fromTheme("options/theme")
+
+
+# noinspection PyPep8Naming
+class tabs:
+    assignments = QIcon.fromTheme("tabs/assignments")
+    assignments_new_content = QIcon.fromTheme("tabs/assignments_new_content")
+    mail = QIcon.fromTheme("tabs/mail")
+    mail_new_content = QIcon.fromTheme("tabs/mail_new_content")
+    pages = QIcon.fromTheme("tabs/pages")
+    pages_new_content = QIcon.fromTheme("tabs/pages_new_content")
+
+
+# noinspection PyPep8Naming
+class tree_items:
+    assignment = QIcon.fromTheme("tree_items/assignment")
+    mail = QIcon.fromTheme("tree_items/mail")
+    module = QIcon.fromTheme("tree_items/module")
+    page = QIcon.fromTheme("tree_items/page")
+    semester = QIcon.fromTheme("tree_items/semester")
+
+
+# noinspection PyPep8Naming
+class downloads:
+    download_failed = QIcon.fromTheme("downloads/download_failed")
+    downloaded = QIcon.fromTheme("downloads/downloaded")
+    not_downloaded = QIcon.fromTheme("downloads/not_downloaded")
+    unknown = QIcon.fromTheme("downloads/unknown")

qcanvas-1.2.0/qcanvas/icons/_icon_type.py

@@ -0,0 +1,42 @@
+# Unused
+import logging
+
+from qtpy.QtGui import QIcon
+
+_logger = logging.getLogger(__name__)
+
+
+class ThemeIcon:
+    def __init__(self, theme_path: str):
+        self._theme_path = theme_path
+        self._icon = None
+
+    @property
+    def icon(self) -> QIcon:
+        if self._icon is None:
+            self._icon = QIcon.fromTheme(self._theme_path)
+
+        return self._icon
+
+    @property
+    def theme_path(self) -> str:
+        return self._theme_path
+
+    def __hash__(self) -> int:
+        return hash(self._theme_path)
+
+
+class UniversalIcon(ThemeIcon):
+    def __init__(self, theme_path: str, full_path: str):
+        super().__init__(theme_path)
+        self._full_path = full_path
+
+    @property
+    def full_path(self) -> str:
+        return self._full_path
+
+    def __hash__(self) -> int:
+        return hash(self._theme_path) ^ hash(self.full_path)
+
+
+AnyIcon = UniversalIcon | ThemeIcon

qcanvas-1.2.0/qcanvas/icons/_update_icons.py

@@ -0,0 +1,89 @@
+# This file regenerates icons.qrc, rc_icons.py and the icons definition file based on the icons in dark/, light/ and universal/
+
+import glob
+import logging
+import os
+import subprocess
+from pathlib import Path
+
+import xmltodict
+
+_logger = logging.getLogger(__name__)
+
+
+def remove_base_directory(path: str | Path) -> Path:
+    if isinstance(path, str):
+        path = Path(path)
+
+    return Path(*path.parts[1:])
+
+
+def generate_xml(all_icons: list[Path]) -> str:
+    xml_dict = {
+        "RCC": {
+            "@version": "1.0",
+            "qresource": {"@prefix": "icons/", "file": all_icons},
+        }
+    }
+
+    return "<!DOCTYPE RCC>\n" + xmltodict.unparse(
+        xml_dict, pretty=True, full_document=False
+    )
+
+
+def generate_icon_defs(icons: list[Path]) -> str:
+    icons_base_removed = [remove_base_directory(icon) for icon in icons]
+    groups = group_icons_by_category(icons_base_removed)
+    classes = [
+        generate_group_class(group_name, icons) for group_name, icons in groups.items()
+    ]
+
+    return f"""from .rc_icons import qt_resource_data as _  # Without this, icon data will not be loaded
+from qtpy.QtGui import QIcon
+from ._icon_type import UniversalIcon, ThemeIcon
+
+""" + "\n\n".join(
+        classes
+    )
+
+
+def group_icons_by_category(icons: list[Path]) -> dict[str, set[Path]]:
+    groups: dict[str, set[Path]] = {}
+
+    for icon in icons:
+        icon_category = icon.parts[0]
+        groups.setdefault(icon_category, set())
+        groups[icon_category].add(icon)
+
+    return groups
+
+
+def generate_group_class(group_name: str, icons: set[Path]) -> str:
+    # pascal_case_class_name = "".join([part.title() for part in group_name.split("_")])
+    lines = ["# noinspection PyPep8Naming", f"class {group_name}:"]
+
+    for icon in sorted(icons):
+        path_no_ext = os.path.splitext(icon)[0]
+        lines.append(f'    {icon.stem} = QIcon.fromTheme("{path_no_ext}")')
+
+    return "\n".join(lines)
+
+
+def run_rcc() -> None:
+    subprocess.run(["pyside6-rcc", "icons.qrc", "-o", "rc_icons.py"])
+
+
+def write(file_name: str, content: str) -> None:
+    with open(file_name, "w") as f:
+        f.write(content)
+
+
+if __name__ == "__main__":
+    all_icons: list[Path] = [
+        Path(file) for file in glob.glob("**/*.svg", recursive=True)
+    ]
+    all_icons.sort()
+
+    write("icons.qrc", generate_xml(all_icons))
+    write("__init__.py", generate_icon_defs(all_icons))
+    run_rcc()

qcanvas-1.2.0/qcanvas/icons/dark/actions/exit.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#e8eaed">
+    <path d="m256-200-56-56 224-224-224-224 56-56 224 224 224-224 56 56-224 224 224 224-56 56-224-224-224 224Z"/>
+</svg>

qcanvas-1.2.0/qcanvas/icons/dark/actions/mark_all_read.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#e8eaed">
+    <path d="M120-280v-80h560v80H120Zm80-160v-80h560v80H200Zm80-160v-80h560v80H280Z"/>
+</svg>

qcanvas-1.2.0/qcanvas/icons/dark/actions/open_downloads.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#e8eaed">
+    <path d="M160-160q-33 0-56.5-23.5T80-240v-480q0-33 23.5-56.5T160-800h240l80 80h320q33 0 56.5 23.5T880-640H447l-80-80H160v480l96-320h684L837-217q-8 26-29.5 41.5T760-160H160Zm84-80h516l72-240H316l-72 240Zm0 0 72-240-72 240Zm-84-400v-80 80Z"/>
+</svg>

qcanvas-1.2.0/qcanvas/icons/dark/actions/quick_login.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#e8eaed">
+    <path d="M480-80q-82 0-155-31.5t-127.5-86Q143-252 111.5-325T80-480q0-83 31.5-155.5t86-127Q252-817 325-848.5T480-880q83 0 155.5 31.5t127 86q54.5 54.5 86 127T880-480q0 82-31.5 155t-86 127.5q-54.5 54.5-127 86T480-80Zm0-82q26-36 45-75t31-83H404q12 44 31 83t45 75Zm-104-16q-18-33-31.5-68.5T322-320H204q29 50 72.5 87t99.5 55Zm208 0q56-18 99.5-55t72.5-87H638q-9 38-22.5 73.5T584-178ZM170-400h136q-3-20-4.5-39.5T300-480q0-21 1.5-40.5T306-560H170q-5 20-7.5 39.5T160-480q0 21 2.5 40.5T170-400Zm216 0h188q3-20 4.5-39.5T580-480q0-21-1.5-40.5T574-560H386q-3 20-4.5 39.5T380-480q0 21 1.5 40.5T386-400Zm268 0h136q5-20 7.5-39.5T800-480q0-21-2.5-40.5T790-560H654q3 20 4.5 39.5T660-480q0 21-1.5 40.5T654-400Zm-16-240h118q-29-50-72.5-87T584-782q18 33 31.5 68.5T638-640Zm-234 0h152q-12-44-31-83t-45-75q-26 36-45 75t-31 83Zm-200 0h118q9-38 22.5-73.5T376-782q-56 18-99.5 55T204-640Z"/>
+</svg>

qcanvas-1.2.0/qcanvas/icons/dark/actions/sync.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#e8eaed">
+    <path d="M160-160v-80h110l-16-14q-52-46-73-105t-21-119q0-111 66.5-197.5T400-790v84q-72 26-116 88.5T240-478q0 45 17 87.5t53 78.5l10 10v-98h80v240H160Zm400-10v-84q72-26 116-88.5T720-482q0-45-17-87.5T650-648l-10-10v98h-80v-240h240v80H690l16 14q49 49 71.5 106.5T800-482q0 111-66.5 197.5T560-170Z"/>
+</svg>