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

qcanvas/ui/qml_components/CommentsListDelegate.ui.qml

@@ -0,0 +1,118 @@
+
+
+/*
+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
+import QtQuick.Controls
+
+Control {
+    padding: 15
+    topInset: 5
+    bottomInset: 5
+    background: Rectangle {
+        color: palette.midlight
+        radius: 4
+        border.color: palette.dark
+    }
+    clip: true
+    height: delegate.height + padding * 2
+    anchors {
+        left: view.contentItem.left
+        right: view.contentItem.right
+    }
+
+    contentItem: Item {
+        id: delegate
+        height: column.height
+        anchors {
+            left: parent.left
+            right: parent.right
+            margins: padding
+        }
+
+        Column {
+            id: column
+            anchors {
+                left: parent.left
+                right: parent.right
+            }
+
+            Item {
+                height: authorText.height
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
+
+                Text {
+                    id: authorText
+                    text: modelData.author
+                    clip: true
+                    color: palette.text
+
+                    font {
+                        pointSize: 12
+                        bold: true
+                    }
+                    anchors {
+                        left: parent.left
+                    }
+                }
+
+                Text {
+                    id: commentDate
+                    text: modelData.date
+                    verticalAlignment: Text.AlignVCenter
+                    horizontalAlignment: Text.AlignRight
+                    color: palette.text
+                    clip: true
+
+                    anchors {
+                        left: authorText.right
+                        right: parent.right
+                        top: parent.top
+                        bottom: parent.bottom
+                        leftMargin: 5
+                    }
+                }
+            }
+
+            Spacer {
+                size: 10
+            }
+
+            DecoratedText {
+                text: modelData.body
+                lineWidth: 2
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
+                content {
+                    wrapMode: Text.WrapAtWordBoundaryOrAnywhere
+                }
+            }
+
+            Spacer {
+                size: 10
+                visible: modelData.attachments.length > 0
+            }
+
+            AttachmentsList {
+                id: attachmentsList
+                height: contentHeight
+                model: modelData.attachments
+                interactive: false
+                visible: modelData.attachments.length > 0
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
+            }
+        }
+    }
+}

qcanvas/ui/qml_components/CommentsListModel.qml

@@ -0,0 +1,56 @@
+import QtQuick
+
+ListModel {
+    ListElement {
+        body: "This is a comment. Gaze at it. Be amazed."
+        author: "I am Steve"
+        date: "2001-01-01 36:00"
+        attachments: [
+            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"
+            }
+        ]
+    }
+    ListElement {
+        body: "If Morbius has a million fans, I am one of them.\nIf Morbius has 5 fans, I am one of them.\nIf Morbius has one fan, That one is me.\nIf Morbius has no fans, I am no longer alive.\nIf the world is against Morbius, I am against the world.\nTill my last breath, I'll love Morbius (2022)."
+        author: "Goku"
+        date: "1942-16-34 06:63"
+        attachments: [
+            ListElement {
+                file_name: "morbius_x264_1080.mkv"
+                resource_id: "blahblah"
+                download_state: "NOT_DOWNLOADED"
+            }
+        ]
+    }
+    ListElement {
+        body: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\nbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
+        author: "Word Wrap Test"
+        date: "2000-02-02"
+        attachments: []
+    }
+    ListElement {
+        body: "x264 forms the core of many web video services, such as Youtube, Facebook, Vimeo, and Hulu. It is widely used by television broadcasters and ISPs."
+        author: "BideoJAN Wordsblahblah"
+        date: "2027-07-28"
+        attachments: [
+            ListElement {
+                file_name: "Ass1_SOMEDUDE_48.pdf"
+                resource_id: "blah_v345"
+                download_state: "DOWNLOADED"
+            }
+        ]
+    }
+}

qcanvas/ui/qml_components/CommentsPane.qml

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

qcanvas/ui/qml_components/DarkTheme.qml

@@ -0,0 +1,12 @@
+import QtQuick
+
+Palette {
+        id: darkTheme
+        base: "#202124"
+        window: "#f8f9fa"
+        midlight: "#202124"
+        accent: "#e02424"
+        link: accent
+        dark: "#3f4042"
+        text: "#e4e7eb"
+}

qcanvas/ui/qml_components/DecoratedText.ui.qml

@@ -0,0 +1,44 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+Item {
+    property alias text: content.text
+    property int lineWidth: 3
+    property color lineColour: palette.accent
+    property alias content: content
+
+    Layout.fillWidth: true
+    height: content.contentHeight
+    clip: true
+
+    Item {
+        anchors.fill: parent
+        height: content.contentHeight
+
+        Rectangle {
+            id: decoration
+            width: lineWidth
+            color: lineColour
+            radius: 1
+            anchors {
+                left: parent.left
+                top: parent.top
+                bottom: parent.bottom
+            }
+        }
+
+        Text/*Edit*/ {
+            id: content
+            Layout.fillWidth: true
+            color: palette.text
+            //readOnly: true
+            //textFormat: TextEdit.AutoText
+            anchors {
+                left: decoration.right
+                leftMargin: 10
+                right: parent.right
+            }
+        }
+    }
+}

qcanvas/ui/qml_components/LightTheme.qml

@@ -0,0 +1,11 @@
+import QtQuick
+
+Palette {
+    base: "#f8f9fa"
+    window: "#f8f9fa"
+    midlight: "#f8f9fa"
+    accent: "#e02424"
+    link: accent
+    dark: "#dadce0"
+    text: "#4d5157"
+}

qcanvas/ui/qml_components/Spacer.ui.qml

@@ -0,0 +1,7 @@
+import QtQuick
+
+Item {
+    property real size
+    height: size
+    width: 1
+}

qcanvas/ui/qml_components/ThemedRectangle.qml

@@ -0,0 +1,37 @@
+import QtQuick
+
+Rectangle {
+    property Palette theme: getTheme()
+
+    function getTheme() {
+        if (appTheme.theme === "native")
+            return palette
+        else if (appTheme.dark_mode === true)
+            return darkTheme
+        else
+            return lightTheme
+    }
+
+    LightTheme {
+        id: lightTheme
+    }
+    DarkTheme {
+        id: darkTheme
+    }
+
+    Connections {
+        target: appTheme
+
+        function onThemeChanged() {
+            updateTheme()
+        }
+
+        function onDarkModeChanged() {
+            updateTheme()
+        }
+
+        function updateTheme() {
+            theme = getTheme()
+        }
+    }
+}

qcanvas/ui/qml_components/__init__.py

@@ -0,0 +1,3 @@
+from .comments_pane import CommentsPane
+from .attachments_pane import AttachmentsPane
+from .qml_bridge_types import Attachment, Comment

qcanvas/ui/qml_components/attachments_pane.py

@@ -0,0 +1,72 @@
+from pathlib import Path
+
+from PySide6.QtCore import Slot
+from PySide6.QtWidgets import QWidget
+from qasync import asyncSlot
+
+from qcanvas.backend_connectors import FrontendResourceManager
+from .qml_bridge_types import Attachment
+from .qml_pane import QmlPane
+from libqcanvas import db
+import logging
+
+_logger = logging.getLogger(__name__)
+
+
+class AttachmentsPane(QmlPane):
+    def __init__(
+        self, downloader: FrontendResourceManager, parent: QWidget | None = None
+    ):
+        super().__init__(Path(__file__).parent / "AttachmentsPane.qml", parent)
+
+        self._original_dock_name = None
+        self._downloader = downloader
+        self._files: dict[str, db.Resource] = {}
+        self._qfiles: dict[str, Attachment] = {}
+        self.ctx["submission_files"] = []
+        self.load_view()
+
+        self._downloader.download_finished.connect(self._download_updated)
+        self._downloader.download_failed.connect(self._download_updated)
+
+    def clear_files(self):
+        self.ctx["submission_files"] = []
+        self._files.clear()
+        self._qfiles.clear()
+
+    def load_files(self, files: list[db.Resource]):
+        qfiles = []
+
+        if self._original_dock_name is None:
+            self._original_dock_name = self.parent().windowTitle()
+
+        self.parent().setWindowTitle(f"{self._original_dock_name} ({len(files)})")
+
+        for file in files:
+            qfile = Attachment(
+                file_name=file.file_name,
+                resource_id=file.id,
+                download_state=file.download_state,
+            )
+            qfile.opened.connect(self._on_attachment_opened)
+            qfiles.append(qfile)
+
+            self._qfiles[file.id] = qfile
+            self._files[file.id] = file
+
+        self.ctx["submission_files"] = qfiles
+
+    @asyncSlot(str)
+    async def _on_attachment_opened(self, resource_id: str) -> None:
+        if resource_id in self._files:
+            await self._downloader.download_and_open(self._files[resource_id])
+        else:
+            _logger.warning(
+                "User opened an attachment that doesn't belong to any comment! id=%s",
+                resource_id,
+            )
+
+    @Slot(db.Resource)
+    def _download_updated(self, resource: db.Resource) -> None:
+        if resource.id in self._files:
+            self._qfiles[resource.id].download_state = resource.download_state

qcanvas/ui/qml_components/comments_pane.py

@@ -0,0 +1,85 @@
+from pathlib import Path
+
+from PySide6.QtCore import Signal, Slot
+from PySide6.QtWidgets import QWidget
+from libqcanvas.util import remove_unwanted_whitespaces, as_local
+from qasync import asyncSlot
+
+from qcanvas.backend_connectors import FrontendResourceManager
+from .qml_bridge_types import Attachment, Comment
+from libqcanvas import db
+import logging
+from .qml_pane import QmlPane
+
+_logger = logging.getLogger(__name__)
+
+
+class CommentsPane(QmlPane):
+    attachment_opened = Signal(str)
+
+    def __init__(
+        self, downloader: FrontendResourceManager, parent: QWidget | None = None
+    ):
+        super().__init__(Path(__file__).parent / "CommentsPane.qml", parent)
+        self._downloader = downloader
+        self._attachments: dict[str, db.Resource] = {}
+        self._qattachments: dict[str, Attachment] = {}
+
+        # Add context objects before we load the view
+        self.ctx["comments"] = []
+        self.load_view()
+
+        self._downloader.download_finished.connect(self._download_updated)
+        self._downloader.download_failed.connect(self._download_updated)
+
+    def clear_comments(self) -> None:
+        self.ctx["comments"] = []
+        self._attachments.clear()
+        self._qattachments.clear()
+
+    def load_comments(self, comments: list[db.SubmissionComment]) -> None:
+        qcomments = []
+
+        self.parent().setWindowTitle(f"Comments ({len(comments)})")
+
+        for comment in comments:
+            attachments = []
+
+            for attachment in comment.attachments:
+                qattachment = Attachment(
+                    file_name=attachment.file_name,
+                    resource_id=attachment.id,
+                    download_state=attachment.download_state,
+                )
+                qattachment.opened.connect(self._on_attachment_opened)
+                attachments.append(qattachment)
+
+                self._attachments[attachment.id] = attachment
+                self._qattachments[attachment.id] = qattachment
+
+            qcomments.append(
+                Comment(
+                    body=remove_unwanted_whitespaces(comment.body),
+                    author=comment.author,
+                    date=as_local(comment.creation_date).strftime("%Y-%m-%d %H:%M"),
+                    attachments=attachments,
+                    parent=self,
+                )
+            )
+
+        self.ctx["comments"] = qcomments
+
+    @asyncSlot(str)
+    async def _on_attachment_opened(self, resource_id: str) -> None:
+        if resource_id in self._attachments:
+            await self._downloader.download_and_open(self._attachments[resource_id])
+        else:
+            _logger.warning(
+                "User opened an attachment that doesn't belong to any comment! id=%s",
+                resource_id,
+            )
+
+    @Slot(db.Resource)
+    def _download_updated(self, resource: db.Resource) -> None:
+        if resource.id in self._qattachments:
+            self._qattachments[resource.id].download_state = resource.download_state

qcanvas/ui/qml_components/qml_bridge_types.py

@@ -0,0 +1,95 @@
+from PySide6.QtCore import Property, QObject, Signal
+from PySide6.QtQml import ListProperty, QmlElement
+from libqcanvas.database.tables import ResourceDownloadState
+
+
+QML_IMPORT_NAME = "QCanvas"
+QML_IMPORT_MAJOR_VERSION = 1
+
+
+@QmlElement
+class Attachment(QObject):
+    file_name_changed = Signal()
+    resource_id_changed = Signal()
+    download_state_changed = Signal()
+
+    # Emitted by AttachmentsListDelegate when the user clicks on an attachment
+    opened = Signal(str)
+
+    def __init__(
+        self,
+        file_name: str,
+        resource_id: str,
+        download_state: ResourceDownloadState,
+        parent: QObject | None = None,
+    ):
+        super().__init__(parent)
+        self._file_name = file_name
+        self._resource_id = resource_id
+        self._download_state = download_state.name
+
+    @Property(str, notify=file_name_changed)
+    def file_name(self) -> str:
+        return self._file_name
+
+    @Property(str, notify=resource_id_changed)
+    def resource_id(self) -> str:
+        return self._resource_id
+
+    @Property(str, notify=download_state_changed)
+    def download_state(self) -> str:
+        return self._download_state
+
+    @download_state.setter
+    def download_state(self, value: ResourceDownloadState):
+        if value.name != self._download_state:
+            self._download_state = value.name
+            self.download_state_changed.emit()
+
+
+@QmlElement
+class Comment(QObject):
+    body_changed = Signal()
+    author_changed = Signal()
+    date_changed = Signal()
+    attachments_changed = Signal()
+
+    def __init__(
+        self,
+        body: str,
+        author: str,
+        date: str,
+        attachments: list[Attachment],
+        parent: QObject | None = None,
+    ):
+        super().__init__(parent)
+
+        self._body = body
+        self._author = author
+        self._date = date
+        self._attachments = attachments
+
+    @Property(str, notify=body_changed)
+    def body(self) -> str:
+        return self._body
+
+    @Property(str, notify=date_changed)
+    def date(self) -> str:
+        return self._date
+
+    @Property(str, notify=author_changed)
+    def author(self) -> str:
+        return self._author
+
+    def attachment(self, n) -> Attachment:
+        return self._attachments[n]
+
+    def attachment_count(self) -> int:
+        return len(self._attachments)
+
+    # You must set `count`, `at` and `notify` EXPLICTLY (even if you name them according to the examples, which examples are all inconsistent and wrong).
+    # Qt?? Are you ok???
+    # Oh and you have to use `.length` instead of `.count` on the QML side because javascript.
+    attachments = ListProperty(
+        Attachment, count=attachment_count, at=attachment, notify=attachments_changed
+    )

qcanvas/ui/qml_components/qml_pane.py

@@ -0,0 +1,22 @@
+from pathlib import Path
+
+from PySide6.QtQuick import QQuickView
+from PySide6.QtWidgets import QGroupBox, QWidget
+
+from qcanvas.theme import app_theme
+from qcanvas.util.context_dict import ContextDict
+import qcanvas.util.ui_tools as ui
+
+
+class QmlPane(QGroupBox):
+    def __init__(self, qml_path: Path, parent: QWidget | None = None):
+        super().__init__(parent)
+        self.qview = QQuickView(parent)
+        self._qml_path = qml_path
+        self.ctx = ContextDict(self.qview.rootContext())
+        self.ctx["appTheme"] = app_theme
+
+        self.setLayout(ui.hbox(QWidget.createWindowContainer(self.qview, self)))
+
+    def load_view(self):
+        self.qview.setSource(str(self._qml_path))

qcanvas/ui/setup/setup_checker.py

@@ -1,6 +1,6 @@
 import logging
 
-import qcanvas.util.settings as settings
+import qcanvas.settings as settings
 from qcanvas.util.url_checker import is_url
 
 _logger = logging.getLogger(__name__)

qcanvas/ui/setup/setup_dialog.py

@@ -2,15 +2,26 @@ import logging
 from threading import Semaphore
 from typing import Optional
 
+from libqcanvas_clients.canvas import CanvasClient, CanvasClientConfig
+from libqcanvas_clients.panopto import PanoptoClient, PanoptoClientConfig
+from libqcanvas_clients.util.request_exceptions import ConfigInvalidError
+from PySide6.QtCore import Qt, QUrl, Signal, Slot
+from PySide6.QtGui import QDesktopServices, QIcon
+from PySide6.QtWidgets import (
+    QCheckBox,
+    QDialog,
+    QDialogButtonBox,
+    QErrorMessage,
+    QLabel,
+    QLineEdit,
+    QMessageBox,
+    QProgressBar,
+    QVBoxLayout,
+    QWidget,
+)
 from qasync import asyncSlot
-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 Qt, QUrl, Signal, Slot
-from qtpy.QtGui import QDesktopServices, QIcon
-from qtpy.QtWidgets import *
-
-import qcanvas.util.settings as settings
+
+import qcanvas.settings as settings
 from qcanvas import icons
 from qcanvas.util.layouts import GridItem, grid_layout_widget, layout
 from qcanvas.util.url_checker import is_url
@@ -113,9 +124,11 @@ class SetupDialog(QDialog):
             is_password=True,
         )
         self._disable_panopto_checkbox = QCheckBox("Continue without Panopto")
+        self._disable_panopto_checkbox.setChecked(settings.client.panopto_disabled)
         self._disable_panopto_checkbox.checkStateChanged.connect(
             self._disable_panopto_check_changed
         )
+        self._panopto_url_box.enabled = not settings.client.panopto_disabled
         self._button_box = self._setup_button_box()
         self._waiting_indicator = self._setup_progress_bar()
 
@@ -254,7 +267,9 @@ class SetupDialog(QDialog):
             QMessageBox.StandardButton.Ok,
             self,
         )
-        msg.accepted.connect(self._open_panopto_login)
+        msg.accepted.connect(
+            self._open_panopto_login, Qt.ConnectionType.SingleShotConnection
+        )
         msg.show()
 
     @Slot()
@@ -288,7 +303,9 @@ class SetupDialog(QDialog):
             "Don't share this key. You can revoke it at any time.",
             parent=self,
         )
-        msg.accepted.connect(self._open_tutorial)
+        msg.accepted.connect(
+            self._open_tutorial, Qt.ConnectionType.SingleShotConnection
+        )
         msg.show()
 
     @Slot()