qcanvas 1.2.2__py3-none-any.whl → 2.0.0__py3-none-any.whl

qcanvas/ui/memory_tree/memory_tree_widget.py

@@ -1,8 +1,8 @@
 import logging
-from typing import *
+from typing import Optional, Sequence
 
-from qtpy.QtCore import QItemSelectionModel, Slot
-from qtpy.QtWidgets import QTreeWidget, QTreeWidgetItem, QWidget
+from PySide6.QtCore import QItemSelectionModel, Slot
+from PySide6.QtWidgets import QTreeWidget, QTreeWidgetItem, QWidget
 
 from qcanvas.ui.memory_tree._tree_memory import TreeMemory
 from qcanvas.ui.memory_tree.memory_tree_widget_item import MemoryTreeWidgetItem
@@ -10,6 +10,10 @@ from qcanvas.ui.memory_tree.memory_tree_widget_item import MemoryTreeWidgetItem
 _logger = logging.getLogger(__name__)
 
 
+class _HasID:
+    id: str
+
+
 class MemoryTreeWidget(QTreeWidget):
     def __init__(
         self,
@@ -17,7 +21,7 @@ class MemoryTreeWidget(QTreeWidget):
         parent: Optional[QWidget] = None,
     ):
         super().__init__(parent)
-        self._id_map: dict[str, QTreeWidgetItem] = {}
+        self._id_map: dict[str, QTreeWidgetItem | _HasID] = {}
         self._memory = TreeMemory(tree_name)
         self._suppress_expansion_signals = False
         self._suppress_selection_signal = False
@@ -30,7 +34,7 @@ class MemoryTreeWidget(QTreeWidget):
 
         try:
             self._suppress_expansion_signals = True
-
+            self._memory.load()
             collapsed_ids = self._memory.collapsed_ids
 
             for widget in self._id_map.values():
@@ -44,7 +48,7 @@ class MemoryTreeWidget(QTreeWidget):
         super().clear()
         self._id_map.clear()
 
-    def select_ids(self, ids: List[str]) -> bool:
+    def select_ids(self, ids: list[str]) -> bool:
         """
         :returns: True if all ids were still found in the tree, False if one or more was missing
         """
@@ -94,26 +98,26 @@ class MemoryTreeWidget(QTreeWidget):
     def _add_widget_to_id_map(
         self, widget: QTreeWidgetItem | Sequence[QTreeWidgetItem]
     ):
-        map_updates = {}
-        widget_stack = widget if isinstance(widget, List) else [widget]
+        widget_stack = widget if isinstance(widget, list) else [widget]
 
         while len(widget_stack) > 0:
-            item = widget_stack.pop()
+            popped_widget = widget_stack.pop()
 
-            if hasattr(item, "id"):
-                if item.id in self._id_map or item.id in map_updates:
-                    raise ValueError(f"Item with ID {item.id} is already in the tree")
+            if hasattr(popped_widget, "id"):
+                if popped_widget.id in self._id_map:
+                    raise ValueError(
+                        f"Item with ID {popped_widget.id} is already in the tree"
+                    )
 
-                map_updates[item.id] = item
-                _logger.debug("Add %s to map", item.id)
+                self._id_map[popped_widget.id] = popped_widget
+                _logger.debug("Add %s to map", popped_widget.id)
 
-            if item.childCount() > 0:
+            if popped_widget.childCount() > 0:
                 widget_stack.extend(
-                    [item.child(index) for index in range(0, item.childCount())]
+                    popped_widget.child(index)
+                    for index in range(0, popped_widget.childCount())
                 )
 
-        self._id_map.update(map_updates.items())
-
     @Slot(QTreeWidgetItem)
     def _expanded(self, item: QTreeWidgetItem):
         if self._suppress_expansion_signals:

qcanvas/ui/memory_tree/memory_tree_widget_item.py

@@ -1,14 +1,14 @@
 import logging
-from typing import *
+from typing import Optional
 
-from qtpy.QtWidgets import QTreeWidgetItem
+from PySide6.QtWidgets import QTreeWidgetItem
 
 _logger = logging.getLogger(__name__)
 
 
 class MemoryTreeWidgetItem(QTreeWidgetItem):
     def __init__(
-        self, id: str, data: Optional[object], strings: Optional[List[str]] = None
+        self, id: str, data: Optional[object], strings: Optional[list[str]] = None
     ):
         super().__init__(strings)
         self._id = id

qcanvas/ui/qcanvas_window/__init__.py

@@ -0,0 +1 @@
+from .qcanvas_window import QCanvasWindow

qcanvas/ui/{main_ui → qcanvas_window}/course_viewer_container.py

@@ -1,16 +1,16 @@
 import logging
 from math import floor
-from typing import *
+from typing import Optional, Sequence
 
-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, Slot
-from qtpy.QtWidgets import *
+from libqcanvas import db
+from libqcanvas.net.resources.download.resource_manager import ResourceManager
+from libqcanvas.net.sync.sync_receipt import SyncReceipt, empty_receipt
+from PySide6.QtCore import Qt, Slot
+from PySide6.QtWidgets import QLabel, QSizePolicy, QStackedWidget
 
 from qcanvas import icons
 from qcanvas.ui.course_viewer.course_viewer import CourseViewer
-from qcanvas.util import themes
+from qcanvas.theme import app_theme
 
 _logger = logging.getLogger(__name__)
 
@@ -29,17 +29,17 @@ class _PlaceholderLogo(QLabel):
         self.setSizePolicy(QSizePolicy.Policy.Ignored, QSizePolicy.Policy.Ignored)
         # Because we are using a pixmap for the icon, it will not get updated like a normal QIcon when the theme changes,
         # So we need to update it ourselves
-        themes.theme_changed().connect(self._theme_changed)
+        app_theme.darkModeChanged.connect(self._dark_mode_changed)
 
     def resizeEvent(self, event) -> None:
         self._update_image()
 
     @Slot()
-    def _theme_changed(self) -> None:
+    def _dark_mode_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
+        # Calculate the size of the logo as half of the width/height, but prevent it from becoming too large
         width = min(floor(self.width() * 0.5), 500)
         height = min(floor(self.height() * 0.5), 500)
 

qcanvas/ui/{main_ui → qcanvas_window}/options/auto_download_resources_option.py

@@ -1,12 +1,12 @@
 import logging
-from typing import *
+from typing import Optional
 
-from qtpy.QtCore import Slot
-from qtpy.QtGui import QAction
-from qtpy.QtWidgets import QMenu
+from PySide6.QtCore import Slot
+from PySide6.QtGui import QAction
+from PySide6.QtWidgets import QMenu
 
 from qcanvas import icons
-from qcanvas.util import settings
+import qcanvas.settings as settings
 
 _logger = logging.getLogger(__name__)
 

qcanvas/ui/{main_ui → qcanvas_window}/options/quick_sync_option.py

@@ -1,11 +1,11 @@
 import logging
-from typing import *
+from typing import Optional
 
-from qtpy.QtCore import Slot
-from qtpy.QtGui import QAction
-from qtpy.QtWidgets import QMenu
+from PySide6.QtCore import Slot
+from PySide6.QtGui import QAction
+from PySide6.QtWidgets import QMenu
 
-from qcanvas.util import settings
+import qcanvas.settings as settings
 
 _logger = logging.getLogger(__name__)
 
@@ -14,11 +14,12 @@ class QuickSyncOption(QAction):
     def __init__(self, parent: Optional[QMenu] = None):
         super().__init__("Ignore old courses", parent)
         self.setToolTip(
-            "When this option is selected, old courses will not be synchronised. This will only effect the first sync."
+            "When enabled, old courses will not be synchronised. This won't hide any old courses that were previously synchronised."
         )
         self.setCheckable(True)
         self.setChecked(settings.client.quick_sync_enabled)
         self.triggered.connect(self._triggered)
+        # self.setIcon(icons.options.ignore_old)
 
     @Slot()
     def _triggered(self) -> None:

qcanvas/ui/{main_ui → qcanvas_window}/options/sync_on_start_option.py

@@ -1,11 +1,11 @@
 import logging
-from typing import *
+from typing import Optional
 
-from qtpy.QtCore import Slot
-from qtpy.QtGui import QAction
-from qtpy.QtWidgets import QMenu
+from PySide6.QtCore import Slot
+from PySide6.QtGui import QAction
+from PySide6.QtWidgets import QMenu
 
-from qcanvas.util import settings
+import qcanvas.settings as settings
 
 _logger = logging.getLogger(__name__)
 
@@ -14,11 +14,12 @@ class SyncOnStartOption(QAction):
     def __init__(self, parent: Optional[QMenu] = None):
         super().__init__("Sync on start", parent)
         self.setToolTip(
-            "When this option is selected, synchronisation will be started automatically when the app starts."
+            "When enabled, synchronisation will start when the application is opened."
         )
         self.setCheckable(True)
         self.setChecked(settings.client.sync_on_start)
         self.triggered.connect(self._triggered)
+        # self.set(icons.options.sync_on_start)
 
     @Slot()
     def _triggered(self) -> None:

qcanvas/ui/{main_ui → qcanvas_window}/options/theme_selection_menu.py

@@ -1,11 +1,12 @@
 import logging
 
-from qtpy.QtCore import Slot
-from qtpy.QtGui import QAction, QActionGroup
-from qtpy.QtWidgets import QMenu
+from PySide6.QtCore import Slot
+from PySide6.QtGui import QAction, QActionGroup
+from PySide6.QtWidgets import QMenu
 
 from qcanvas import icons
-from qcanvas.util import settings, themes
+from qcanvas.theme import app_theme
+import qcanvas.settings as settings
 
 _logger = logging.getLogger(__name__)
 
@@ -21,11 +22,10 @@ class _ThemeAction(QAction):
     @Slot()
     def _change_theme(self) -> None:
         settings.ui.theme = self._theme_name
-        themes.apply(self._theme_name)
+        app_theme.theme = self._theme_name
 
 
 class ThemeSelectionMenu(QMenu):
-
     def __init__(self, parent: QMenu):
         super().__init__("Theme", parent)
 
@@ -36,10 +36,10 @@ class ThemeSelectionMenu(QMenu):
         dark_theme = _ThemeAction("Dark", "dark", self)
         native_theme = _ThemeAction("Native (requires restart)", "native", self)
 
-        actions = [auto_theme, light_theme, dark_theme, native_theme]
+        select_theme_actions = [auto_theme, light_theme, dark_theme, native_theme]
 
-        self.addActions(actions)
+        self.addActions(select_theme_actions)
         self.setIcon(icons.options.theme)
 
-        for theme in actions:
-            action_group.addAction(theme)
+        for selection_action in select_theme_actions:
+            action_group.addAction(selection_action)

qcanvas/ui/{main_ui → qcanvas_window}/qcanvas_window.py

@@ -1,29 +1,39 @@
 import logging
 from threading import BoundedSemaphore
-from typing import *
+from typing import Optional, Sequence
 
 import httpx
-import qcanvas_backend.database.types as db
+from libqcanvas import db
+from libqcanvas.database.data_monolith import DataMonolith
+from libqcanvas.net.sync.sync_receipt import SyncReceipt, empty_receipt
+from libqcanvas.qcanvas import QCanvas
+from PySide6.QtCore import QUrl, Signal, Slot, Qt
+from PySide6.QtGui import QDesktopServices, QKeySequence
+from PySide6.QtWidgets import (
+    QErrorMessage,
+    QHBoxLayout,
+    QMainWindow,
+    QProgressDialog,
+    QPushButton,
+    QVBoxLayout,
+    QWidget,
+)
 from qasync import asyncSlot
-from qcanvas_backend.database.data_monolith import DataMonolith
-from qcanvas_backend.net.sync.sync_receipt import SyncReceipt, empty_receipt
-from qcanvas_backend.qcanvas import QCanvas
-from qtpy.QtCore import QUrl, Signal, Slot
-from qtpy.QtGui import QDesktopServices, QKeySequence
-from qtpy.QtWidgets import *
 
 from qcanvas import icons
 from qcanvas.backend_connectors import FrontendResourceManager
+from qcanvas.settings import course_configs
 from qcanvas.ui.course_viewer import CourseTree
-from qcanvas.ui.main_ui.course_viewer_container import CourseViewerContainer
-from qcanvas.ui.main_ui.options.auto_download_resources_option import (
+from .course_viewer_container import CourseViewerContainer
+from .options.auto_download_resources_option import (
     AutoDownloadResourcesMenu,
 )
-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 auto_downloader, paths, settings
+from .options.quick_sync_option import QuickSyncOption
+from .options.sync_on_start_option import SyncOnStartOption
+from .options.theme_selection_menu import ThemeSelectionMenu
+from .status_bar_progress_display import StatusBarProgressDisplay
+from qcanvas.util import auto_downloader
+import qcanvas.settings as settings
 from qcanvas.util.qurl_util import file_url
 from qcanvas.util.ui_tools import create_qaction
 
@@ -33,7 +43,7 @@ _logger = logging.getLogger(__name__)
 class QCanvasWindow(QMainWindow):
     _loaded = Signal()
 
-    def __init__(self):
+    def __init__(self, _qcanvas: QCanvas[FrontendResourceManager]):
         super().__init__()
 
         self.setWindowTitle("QCanvas")
@@ -41,12 +51,7 @@ class QCanvasWindow(QMainWindow):
 
         self._operation_semaphore = BoundedSemaphore()
         self._data: Optional[DataMonolith] = None
-        self._qcanvas = QCanvas[FrontendResourceManager](
-            canvas_config=settings.client.canvas_config,
-            panopto_config=settings.client.panopto_config,
-            storage_path=paths.data_storage(),
-            resource_manager_class=FrontendResourceManager,
-        )
+        self._qcanvas = _qcanvas
 
         self._course_tree = CourseTree()
         self._course_tree.item_selected.connect(self._on_course_selected)
@@ -62,7 +67,9 @@ class QCanvasWindow(QMainWindow):
         self._setup_menu_bar()
         self._restore_window_position()
 
-        self._loaded.connect(self._on_app_loaded)
+        self._loaded.connect(
+            self._on_app_loaded, Qt.ConnectionType.SingleShotConnection
+        )
         self._loaded.emit()
 
     def _setup_menu_bar(self) -> None:
@@ -109,7 +116,7 @@ class QCanvasWindow(QMainWindow):
         )
 
         options_menu = menu_bar.addMenu("Options")
-
+        options_menu.setToolTipsVisible(True)
         options_menu.addAction(QuickSyncOption(options_menu))
         options_menu.addAction(SyncOnStartOption(options_menu))
         options_menu.addMenu(AutoDownloadResourcesMenu(options_menu))
@@ -147,7 +154,6 @@ class QCanvasWindow(QMainWindow):
 
     @asyncSlot()
     async def _on_app_loaded(self) -> None:
-        await self._qcanvas.init()
         self._course_tree.reload(await self._get_terms(), sync_receipt=empty_receipt())
 
         if settings.client.sync_on_start:
@@ -199,14 +205,14 @@ class QCanvasWindow(QMainWindow):
             await self._get_courses(), sync_receipt=receipt
         )
 
-    async def _get_resources(self) -> Dict[str, db.Resource]:
-        return (await self._qcanvas.get_data()).resources
+    async def _get_resources(self) -> dict[str, db.Resource]:
+        return (await self._qcanvas.load()).resources
 
     async def _get_terms(self) -> Sequence[db.Term]:
-        return (await self._qcanvas.get_data()).terms
+        return (await self._qcanvas.load()).terms
 
     async def _get_courses(self) -> Sequence[db.Course]:
-        return (await self._qcanvas.get_data()).courses
+        return (await self._qcanvas.load()).courses
 
     @Slot(db.Course)
     def _on_course_selected(self, course: Optional[db.Course]) -> None:
@@ -218,10 +224,9 @@ class QCanvasWindow(QMainWindow):
     @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)
-
-        async with self._qcanvas.database.session() as session:
-            session.add(course)
-            course.configuration.nickname = new_name
+        config = course_configs[course.id]
+        config.nickname = new_name
+        await config.save()
 
     @asyncSlot()
     async def _open_quick_auth_in_browser(self) -> None:

qcanvas/ui/{main_ui → qcanvas_window}/status_bar_progress_display.py

@@ -1,11 +1,10 @@
 import logging
 from asyncio import Lock
 from dataclasses import dataclass
-from typing import *
 
+from libqcanvas.task_master import TaskID
+from PySide6.QtWidgets import QProgressBar, QStatusBar
 from qasync import asyncSlot
-from qcanvas_backend.task_master import TaskID
-from qtpy.QtWidgets import *
 
 from qcanvas.backend_connectors import task_master
 
@@ -90,7 +89,7 @@ class StatusBarProgressDisplay(QStatusBar):
         self.showMessage("Done", 5000)
         self._progress_bar.hide()
 
-    def _show_single_task_progress(self, task: Tuple[TaskID, _TaskProgress]) -> None:
+    def _show_single_task_progress(self, task: tuple[TaskID, _TaskProgress]) -> None:
         _logger.debug("Single task %s", task)
         id, progress = task
 
@@ -98,7 +97,7 @@ class StatusBarProgressDisplay(QStatusBar):
         self.showMessage(id.step_name)
 
     def _show_multiple_tasks_progress(
-        self, tasks: list[Tuple[TaskID, _TaskProgress]]
+        self, tasks: list[tuple[TaskID, _TaskProgress]]
     ) -> None:
         _logger.debug("Multiple tasks %s", tasks)
         self.showMessage(
@@ -107,7 +106,7 @@ class StatusBarProgressDisplay(QStatusBar):
         self._show_progress(self._calculate_progress(tasks))
 
     def _calculate_progress(
-        self, tasks: list[Tuple[TaskID, _TaskProgress]]
+        self, tasks: list[tuple[TaskID, _TaskProgress]]
     ) -> _TaskProgress:
         # Task progresses are floats from 0 to 1, multiplier is used to turn them into ints
         multiplier = 1000

qcanvas/ui/qml_components/AttachmentsList.ui.qml

@@ -0,0 +1,15 @@
+
+
+/*
+This is a UI file (.ui.qml) that is intended to be edited in Qt Design Studio only.
+It is supposed to be strictly declarative and only uses a subset of QML. If you edit
+this file manually, you might introduce QML code that is not supported by Qt Design Studio.
+Check out https://doc.qt.io/qtcreator/creator-quick-ui-forms.html for details on .ui.qml files.
+*/
+import QtQuick
+
+ListView {
+    id: view
+    model: AttachmentsListModel {}
+    delegate: AttachmentsListDelegate {}
+}

qcanvas/ui/qml_components/AttachmentsListDelegate.qml

@@ -0,0 +1,77 @@
+import QtQuick
+import QtQuick.Layouts
+
+Item {
+    id: delegate
+    height: childrenRect.height
+    anchors {
+        left: parent.left
+        right: parent.right
+    }
+
+    ColumnLayout {
+        spacing: 0
+
+        anchors {
+            left: parent.left
+            right: parent.right
+        }
+
+        RowLayout {
+            height: childrenRect.implicitHeight
+            Layout.fillWidth: true
+            spacing: 10
+
+            Image {
+                function attachmentIcon(downloadStatus) {
+                    switch(downloadStatus)
+                    {
+                        case "DOWNLOADED":
+                            return "qrc:///icons/universal/downloads/downloaded.svg";
+                        case "FAILED":
+                            return "qrc:///icons/universal/downloads/download_failed.svg";
+                        case "NOT_DOWNLOADED":
+                            return "qrc:///icons/universal/downloads/not_downloaded.svg";
+                        default:
+                            return "qrc:///icons/universal/downloads/unknown.svg"
+                    }
+                }
+
+                id: fileIcon
+                source: attachmentIcon(modelData.download_state)
+                fillMode: Image.PreserveAspectFit
+                sourceSize.height: 17
+                sourceSize.width: 17
+            }
+
+            Text {
+                id: file_name_text
+                text: modelData.file_name
+                wrapMode: Text.WrapAtWordBoundaryOrAnywhere
+                Layout.fillWidth: true
+                font.underline: true
+                color: palette.link
+
+                MouseArea {
+                    id: textClickArea
+                    anchors.fill: parent
+                    cursorShape: Qt.PointingHandCursor
+                    hoverEnabled: true
+                }
+            }
+        }
+
+        Spacer {
+            size: 5
+            visible: index !== count - 1
+        }
+    }
+
+    Connections {
+        target: textClickArea
+
+        function onClicked() {
+            modelData.opened(modelData.resource_id)
+        }
+    }
+}

qcanvas/ui/qml_components/AttachmentsListModel.qml

@@ -0,0 +1,19 @@
+import QtQuick
+
+ListModel {
+    ListElement {
+        file_name: "texas.pdf"
+        resource_id: "1"
+        download_state: "NOT_DOWNLOADED"
+    }
+    ListElement {
+        file_name: "oh_no_what_a_terribly_long_file_name_its_not_like_someone_would_actually_do_this.pdf"
+        resource_id: "2"
+        download_state: "FAILED"
+    }
+    ListElement {
+        file_name: "i was transported to another world where javascript doesn't exist.cbz"
+        resource_id: "3"
+        download_state: "DOWNLOADED"
+    }
+}

qcanvas/ui/qml_components/AttachmentsPane.qml

@@ -0,0 +1,12 @@
+import QtQuick
+
+ThemedRectangle {
+    anchors.fill: parent
+    color: theme.base
+
+    AttachmentsList {
+        anchors.fill: parent
+        model: submission_files
+        palette: theme
+    }
+}

qcanvas/ui/qml_components/CommentsList.ui.qml

@@ -0,0 +1,15 @@
+
+
+/*
+This is a UI file (.ui.qml) that is intended to be edited in Qt Design Studio only.
+It is supposed to be strictly declarative and only uses a subset of QML. If you edit
+this file manually, you might introduce QML code that is not supported by Qt Design Studio.
+Check out https://doc.qt.io/qtcreator/creator-quick-ui-forms.html for details on .ui.qml files.
+*/
+import QtQuick
+
+ListView {
+    id: view
+    model: CommentsListModel {}
+    delegate: CommentsListDelegate {}
+}