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

qcanvas/util/auto_downloader.py

@@ -1,12 +1,13 @@
 import asyncio
 import logging
 
-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.QtWidgets import QMessageBox, QWidget
+from PySide6.QtCore import Qt
+from libqcanvas import db
+from libqcanvas.net.resources.download.resource_manager import ResourceManager
+from libqcanvas.net.sync.sync_receipt import SyncReceipt
+from PySide6.QtWidgets import QMessageBox, QWidget
 
-from qcanvas.util import settings
+import qcanvas.settings as settings
 
 _logger = logging.getLogger(__name__)
 
@@ -20,7 +21,7 @@ async def download_new_resources(
 ) -> None:
     resources_to_download = []
 
-    for file_id in receipt.updated_resources:
+    for file_id in receipt.updates[db.Resource]:
         resource = all_resources[file_id]
 
         if _should_auto_download_resource(resource, resource_manager=downloader):
@@ -36,7 +37,8 @@ async def download_new_resources(
         msg.accepted.connect(
             lambda: asyncio.get_running_loop().create_task(
                 downloader.batch_download(resources_to_download),
-            )
+            ),
+            Qt.ConnectionType.SingleShotConnection,
         )
     else:
         await downloader.batch_download(resources_to_download)

qcanvas/util/basic_fonts.py

@@ -1,5 +1,5 @@
-from qtpy.QtGui import QFont
-from qtpy.QtWidgets import QLabel
+from PySide6.QtGui import QFont
+from PySide6.QtWidgets import QLabel
 
 normal_font = QFont()
 bold_font = QFont()

qcanvas/util/context_dict.py

@@ -0,0 +1,12 @@
+from PySide6.QtQml import QQmlContext
+
+
+class ContextDict:
+    def __init__(self, context: QQmlContext):
+        self._context = context
+
+    def __getitem__(self, item):
+        return self._context.contextProperty(item)
+
+    def __setitem__(self, key, value):
+        self._context.setContextProperty(key, value)

qcanvas/util/file_icons.py

@@ -1,9 +1,10 @@
 import logging
 import os.path
 
-from qtpy.QtCore import QFileInfo, QMimeDatabase
-from qtpy.QtGui import QIcon
-from qtpy.QtWidgets import QApplication, QFileIconProvider, QStyle
+import cachetools
+from PySide6.QtCore import QFileInfo, QMimeDatabase
+from PySide6.QtGui import QIcon
+from PySide6.QtWidgets import QApplication, QFileIconProvider, QStyle
 
 import qcanvas.util.runtime as runtime
 
@@ -18,13 +19,9 @@ if runtime.is_running_on_windows:
 
 else:
     _mime_database = QMimeDatabase()
-    # This must be initialised lazily because the QApplication might not be initialised at this time
-    _default_icon: QIcon | None = None
     _icon_for_suffix: dict[str, QIcon] = {}
 
     def icon_for_filename(file_name: str) -> QIcon:
-        global _default_icon
-
         file_suffix = os.path.splitext(file_name)[1]
 
         # Check if we already know what icon this file type has
@@ -39,16 +36,11 @@ else:
                 _icon_for_suffix[file_suffix] = icon
                 return icon
 
-        _lazy_init_default_icon()
-
-        # No icon for this type of file was found, return default icon
-        _icon_for_suffix[file_suffix] = _default_icon
-        return _default_icon
-
-    def _lazy_init_default_icon() -> None:
-        global _default_icon
+        # No icon for this type of file was found, use default icon
+        icon = _default_icon()
+        _icon_for_suffix[file_suffix] = icon
+        return icon
 
-        if _default_icon is None:
-            _default_icon = QApplication.style().standardIcon(
-                QStyle.StandardPixmap.SP_FileIcon
-            )
+    @cachetools.cached(cachetools.LRUCache(maxsize=1))
+    def _default_icon() -> QIcon:
+        return QApplication.style().standardIcon(QStyle.StandardPixmap.SP_FileIcon)

qcanvas/util/layouts.py

@@ -1,13 +1,11 @@
 import logging
-from typing import *
+from typing import Iterable, NamedTuple
 
-from qtpy.QtCore import Qt
-from qtpy.QtWidgets import *
+from PySide6.QtCore import Qt
+from PySide6.QtWidgets import QGridLayout, QLayout, QWidget
 
 _logger = logging.getLogger(__name__)
 
-T = TypeVar("T")
-
 
 class GridItem(NamedTuple):
     widget: QWidget
@@ -16,13 +14,13 @@ class GridItem(NamedTuple):
     alignment: Qt.AlignmentFlag = Qt.AlignmentFlag.AlignLeft
 
 
-def layout_widget(layout_type: Type[T], *items: QWidget, **kwargs) -> QWidget:
+def layout_widget[T](layout_type: type[T], *items: QWidget, **kwargs) -> QWidget:
     widget = QWidget()
     widget.setLayout(layout(layout_type, *items, **kwargs))
     return widget
 
 
-def layout(layout_type: Type[T], *items: QWidget | QLayout, **kwargs) -> T:
+def layout[T](layout_type: type[T], *items: QWidget | QLayout, **kwargs) -> T:
     result_layout: QLayout = layout_type(**kwargs)
 
     for item in items:

qcanvas/util/paths.py

@@ -4,21 +4,30 @@ from pathlib import Path
 
 import cachetools
 import platformdirs
-from qtpy.QtCore import QSettings
+from PySide6.QtCore import QSettings
 
-from qcanvas.util.runtime import *
+from qcanvas.util.runtime import (
+    is_running_as_compiled,
+    is_running_as_flatpak,
+    is_running_portable,
+)
 
 _logger = logging.getLogger(__name__)
 
 
-def ui_storage() -> Path:
-    return root() / ".UI"
-
-
 def data_storage() -> Path:
     return root()
 
 
+def config_storage() -> Path:
+    if is_running_portable:
+        return root()
+    else:
+        path = platformdirs.user_config_path("QCanvasTeam", "QCanvas")
+        path.mkdir(parents=True, exist_ok=True)
+        return path
+
+
 def client_settings() -> QSettings:
     if is_running_portable:
         return QSettings("QCanvas.ini", QSettings.Format.IniFormat)
@@ -35,6 +44,8 @@ def root() -> Path:
         root_path = Path(os.environ["XDG_DATA_HOME"])
     elif not is_running_portable and is_running_as_compiled:
         root_path = platformdirs.user_data_path("QCanvasReborn", "QCanvasTeam")
+    elif not is_running_portable:
+        _logger.warning("Don't know how we're being run? Are you running from source?")
 
     print("Root path", root_path.absolute())
     _logger.debug("Root path %s", root_path.absolute())

qcanvas/util/qurl_util.py

@@ -1,7 +1,7 @@
 import logging
 from pathlib import Path
 
-from qtpy.QtCore import QUrl
+from PySide6.QtCore import QUrl
 
 _logger = logging.getLogger(__name__)
 

qcanvas/util/ui_tools.py

@@ -1,14 +1,124 @@
-import logging
-from typing import Any
+from typing import Any, Sequence
 
-from qtpy.QtGui import QIcon, QKeySequence, QPixmap
-from qtpy.QtWidgets import *
+from PySide6.QtCore import QSize
+from PySide6.QtGui import QAction, QIcon, QKeySequence, QPixmap, QFont
+from PySide6.QtWidgets import (
+    QMenu,
+    QSizePolicy,
+    QLabel,
+    QWidget,
+    QFormLayout,
+    QDockWidget,
+    QLayout,
+    QHBoxLayout,
+    QVBoxLayout,
+)
 
-_logger = logging.getLogger(__name__)
 
+def font(*, point_size: float | int | None = None, bold: bool | None = None) -> QFont:
+    _font = QFont()
 
-def make_truncatable(widget: QWidget) -> None:
-    widget.setSizePolicy(QSizePolicy.Policy.Ignored, QSizePolicy.Policy.Fixed)
+    if point_size is not None:
+        if isinstance(point_size, int):
+            _font.setPointSize(point_size)
+        elif isinstance(point_size, float):
+            _font.setPointSizeF(point_size)
+        else:
+            raise TypeError("point_size")
+
+    if bold is not None:
+        _font.setBold(bold)
+
+    return _font
+
+
+_bold = font(bold=True)
+
+
+def label(text: str, *, font: QFont = None, allow_truncation: bool = False) -> QLabel:
+    _label = QLabel(text)
+
+    if font is not None:
+        _label.setFont(font)
+
+    if allow_truncation:
+        _label.setSizePolicy(QSizePolicy.Policy.Ignored, QSizePolicy.Policy.Fixed)
+
+    return _label
+
+
+def bold_label(text: str, *, allow_truncation: bool = False) -> QLabel:
+    return label(text, allow_truncation=allow_truncation, font=_bold)
+
+
+def form_layout(
+    rows: dict[str, QWidget], label_font: QFont | None = _bold, label_suffix: str = ":"
+) -> QFormLayout:
+    layout = QFormLayout()
+
+    for name, widget in rows.items():
+        if label_font:
+            layout.addRow(label(name + label_suffix, font=label_font), widget)
+        else:
+            layout.addRow(name + label_suffix, widget)
+
+    return layout
+
+
+def size(width: int, height: int):
+    return QSize(width, height)
+
+
+def dock_widget(
+    *,
+    widget: QWidget,
+    title: str | None = None,
+    hide: bool = False,
+    name: str | None = None,
+    min_size: QSize | None = None,
+    features: QDockWidget.DockWidgetFeature | None = None,
+    parent: QWidget | None = None,
+) -> QDockWidget:
+    dock = QDockWidget(title, parent)
+    dock.setWidget(widget)
+
+    if name is not None:
+        dock.setObjectName(name)
+
+    if min_size is not None:
+        dock.setMinimumSize(min_size)
+
+    if features is not None:
+        dock.setFeatures(features)
+
+    if hide:
+        dock.hide()
+
+    return dock
+
+
+def widget(layout: QLayout) -> QWidget:
+    widget = QWidget()
+    widget.setLayout(layout)
+    return widget
+
+
+def hbox(*items: QWidget | QLayout) -> QHBoxLayout:
+    _add_layout_items(layout := QHBoxLayout(), items)
+    return layout
+
+
+def vbox(*items: QWidget | QLayout) -> QVBoxLayout:
+    _add_layout_items(layout := QVBoxLayout(), items)
+    return layout
+
+
+def _add_layout_items(layout: QLayout, items: Sequence[QWidget | QLayout]):
+    for item in items:
+        if isinstance(item, QLayout):
+            layout.addItem(item)
+        else:
+            layout.addWidget(item)
 
 
 def create_qaction(
@@ -19,7 +129,7 @@ def create_qaction(
     triggered: Any = None,
     checkable: bool | None = None,
     checked: bool | None = None,
-    icon: QIcon | QPixmap | None = None
+    icon: QIcon | QPixmap | None = None,
 ) -> QAction:
     action = QAction(name)
 

qcanvas/util/url_checker.py

@@ -6,4 +6,4 @@ _logger = logging.getLogger(__name__)
 
 
 def is_url(url: str) -> bool:
-    return validators.url(url) == True
+    return validators.url(url)

{qcanvas-1.2.1.dist-info → qcanvas-2.0.0.dist-info}/METADATA

@@ -1,23 +1,22 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: qcanvas
-Version: 1.2.1
+Version: 2.0.0
 Summary: QCanvas is a desktop client for Canvas LMS.
 Author: QCanvas
 Author-email: QCanvas@noreply.codeberg.org
-Requires-Python: >3.11.0,<3.13
+Requires-Python: >=3.12,<3.13
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
+Requires-Dist: aiofile (>=3.9.0,<4.0.0)
 Requires-Dist: aiosqlite (>=0.20.0,<0.21.0)
 Requires-Dist: asynctaskpool (>=0.2.1,<0.3.0)
-Requires-Dist: lightdb (>=2.0,<3.0)
+Requires-Dist: cachetools (>=5.5.0,<6.0.0)
+Requires-Dist: libqcanvas (>=0.5.1,<0.6.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.3.0,<0.4.0)
-Requires-Dist: qcanvas-backend (>=0.2.7,<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)
+Requires-Dist: validators (>=0.34.0,<0.35.0)
 Description-Content-Type: text/markdown
 
 # QCanvas
@@ -43,7 +42,7 @@ based distros.
 
 ## Prerequisites
 
-- Python 3.12+ (use [pyenv](https://github.com/pyenv/pyenv) if your distro does not have that version)
+- Python 3.11+ (use [pyenv](https://github.com/pyenv/pyenv) if your distro does not have that version)
 - [Pipx](https://pipx.pypa.io/stable/) (optional)
 - Poetry (recommended to install using `pipx install poetry`)
 - [Appimagetool](https://github.com/AppImage/appimagetool) (Only for building the appimage)
@@ -57,15 +56,18 @@ cd QCanvasApp
 # Enter shell and run it
 poetry shell
 poetry install
-python qcanvas/run.py
+python -m qcanvas
 
 # Alternatively you can run it like this:
 poetry install
-poetry run python qcanvas/run.py
+poetry run python -m qcanvas
 ```
 
 ## Build custom AppImage
 
+> [!INFO]
+> This is not recommended as the appimage produced by this process isn't a proper appimage.
+
 ```bash
 bash build_appimage.sh
 ```

qcanvas-2.0.0.dist-info/RECORD

@@ -0,0 +1,91 @@
+qcanvas/__init__.py,sha256=FSRKOgINpdkHq1lU0lzAKl6v6KmMYOyGcihFpf2HIQs,1719
+qcanvas/app.py,sha256=NNxjdzFtRaeGk0cSOHKepwK7ONvHwmY_RcW0IVVzoIs,2747
+qcanvas/backend_connectors/__init__.py,sha256=Wj8cmxQng3SSlmlXJyzHaPmvxbkauwsxINckPb7WuHc,108
+qcanvas/backend_connectors/frontend_resource_manager.py,sha256=uzi8z2bNBdQoVkvtwxWo4qX5r0s13qmH5QL2t0vD0d8,1613
+qcanvas/backend_connectors/qcanvas_task_master.py,sha256=G46WgM4LA9VGWUDe3cBfRqHEYrOqcM70UJ5ipwc8hm0,740
+qcanvas/icons/__init__.py,sha256=RHBT64IkUdQQtSRRxsMU1uiYRPvUoTHJV01x9WXHepA,1965
+qcanvas/icons/_icon_type.py,sha256=_Xq0qwz_4OsAOhT6_4lEWTFMsPSqKVRkmQjfXbJAeAE,904
+qcanvas/icons/icons.qrc,sha256=ec-_Hiy2GOA0NOQCeyRpIhexTZk0_SSDxZlWSvSUgno,2084
+qcanvas/icons/rc_icons.py,sha256=SZBFaQaLym2jkJ90csM-2W8TKWgBLMyRxnZUO0yAw_0,74285
+qcanvas/settings/__init__.py,sha256=GPOgh9fzK0zGiJhIy7fWfXJZVE86i6DE-ZjQSqFunco,176
+qcanvas/settings/_client_settings.py,sha256=6Oy5eXlttlwC11YSqbqLcgyVa5Nk3jBdB4Ea-gFC-yw,1397
+qcanvas/settings/_course_settings.py,sha256=mNNPNt88f5q1m_YtoqaHDUqoAiRnVZj4wUGd0xDlcjY,1547
+qcanvas/settings/_mapped_setting.py,sha256=a9wq60chtn9X8RLpQrf6JR7XsDxJlJfWrq0hfHHJvyU,1928
+qcanvas/settings/_ui_settings.py,sha256=gyC_ZwPdu4JzZgA4I6TelJmm6pXginBigp58u-fBd3w,753
+qcanvas/theme.py,sha256=7GVSpc1VCHxQiM7eamPNQJJKikVE8rejAsUFYOvsuaQ,3077
+qcanvas/ui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+qcanvas/ui/course_viewer/__init__.py,sha256=XkoFnh4ULw3_i-GDsOlueEWido0PkoDcN9_EX6-nkXY,76
+qcanvas/ui/course_viewer/content_tree.py,sha256=ewgi4oNN3uCURjykpLLRb2efzBxfFws14UAQ3H6z-64,4602
+qcanvas/ui/course_viewer/course_tree/__init__.py,sha256=N2XorJ4COFHzRYx53noANb4_qJYf6N8_YCjPdQuDCHs,36
+qcanvas/ui/course_viewer/course_tree/_course_icon_generator.py,sha256=facgU1YPLpPy5C6EJG5KURuKTn7LOTu9ZmPEj-UQLFI,3080
+qcanvas/ui/course_viewer/course_tree/course_tree.py,sha256=KaPVdvS2tPdMZFhggWCvg9DVSQugHS_EpGa12vgGNyw,3224
+qcanvas/ui/course_viewer/course_viewer.py,sha256=AGZ6eQlRLb1i2ex-gbe2ygT3_sHYD7bvXy3tYQ2Jugc,4974
+qcanvas/ui/course_viewer/tabs/__init__.py,sha256=SlfWUzk6_E5uM9GIV-y9BVeKMwqn3pRx_xWhMyb1dfI,54
+qcanvas/ui/course_viewer/tabs/assignment_tab/__init__.py,sha256=w936dW7za10Fh6rN0zVA-7Kyiup3kd6C-mPAFHtxmy0,42
+qcanvas/ui/course_viewer/tabs/assignment_tab/assignment_tab.py,sha256=HAy6SsPTC-FpaaTWELS7lc5rgkB3Wm0m3DIHb3cvaaI,4850
+qcanvas/ui/course_viewer/tabs/assignment_tab/assignment_tree.py,sha256=Lwj3Sq_W_XFV240VpLK6W3kIUQ00NH9qB88mAKsYHNs,2908
+qcanvas/ui/course_viewer/tabs/constants.py,sha256=rUVEGSREV9vTFs4o3AD2OjaSFA-GPsmelxYWz0J8OP4,48
+qcanvas/ui/course_viewer/tabs/content_tab.py,sha256=l2h1Vl7t0GAFYXzEjihMzpBv596sOu8BJKiMz1lcFAE,3274
+qcanvas/ui/course_viewer/tabs/file_tab/__init__.py,sha256=mMebnrNw_V-lQ-eBXS_kFinL-ZdUAXa459NmuyuCu6s,30
+qcanvas/ui/course_viewer/tabs/file_tab/file_tab.py,sha256=SeKGKNRLmSmL5Ij96YSRx6Skl-1wC14uDfIPJy_xmzw,1398
+qcanvas/ui/course_viewer/tabs/file_tab/file_tree.py,sha256=ely6qZTs6CFsKv9ZFDCAe_8unosJ6nt9AQFLkcuknvE,3357
+qcanvas/ui/course_viewer/tabs/file_tab/pages_file_tree.py,sha256=C1QtoY9GA2Q_lbUearVrdZbHCAefV4ZpsIPHGBAUxPI,1875
+qcanvas/ui/course_viewer/tabs/mail_tab/__init__.py,sha256=68iRUUWEP7mudbaxa4ZBKMra4rvs2oZKaZkBWwmUrsI,30
+qcanvas/ui/course_viewer/tabs/mail_tab/mail_tab.py,sha256=FGfRaEAcuLfcPo92_D7ZcyeIjePMbU_BSlpAtyT0qLo,2686
+qcanvas/ui/course_viewer/tabs/mail_tab/mail_tree.py,sha256=w4dkC4V_fKsMkVB68vbfvMRI1HBxbuKzxExclAn-AaQ,1762
+qcanvas/ui/course_viewer/tabs/page_tab/__init__.py,sha256=lcafxlSEVZ0wqZySxT6hTrvExX-GU2AfcZQbp6W8haU,30
+qcanvas/ui/course_viewer/tabs/page_tab/page_tab.py,sha256=-u6RaH7kO1cCrvcXNF0hcLrEL6nomy6IUXfKEGhANgg,743
+qcanvas/ui/course_viewer/tabs/page_tab/page_tree.py,sha256=mxQzhjiiO7onQALhKbcyQQtsKEdBGAspQreXljRu9i4,2147
+qcanvas/ui/course_viewer/tabs/resource_rich_browser.py,sha256=BlUHqoNKu5vzmLIYjUJZX6APxeNA2bia4xRZ3B0gaqc,6479
+qcanvas/ui/course_viewer/tree_widget_data_item.py,sha256=z3CnXNFivtDtKemkH41E0a_Dc-l_tKJ6AEqNqM23eao,569
+qcanvas/ui/memory_tree/__init__.py,sha256=-XLitM6teC0zmwPrGf-Q-A53-zgmIPASExdOtaLIvPU,107
+qcanvas/ui/memory_tree/_tree_memory.py,sha256=kPsAw0sL5AFPIhWuhfKSS56043t9pQFi2YpBdYkbfm0,2231
+qcanvas/ui/memory_tree/memory_tree_widget.py,sha256=NT8T9EMql7xxVRCQFkfb1p0h3gL7oQq9As2UGy_481k,4553
+qcanvas/ui/memory_tree/memory_tree_widget_item.py,sha256=76a7IEZGXwYhqx7WMbq-tA_GvinvQW7hdueZNWAvFxg,435
+qcanvas/ui/qcanvas_window/__init__.py,sha256=GeMsShFH9OGYLDDgB0KmKHlJr32NeewxurM-QzgabSQ,42
+qcanvas/ui/qcanvas_window/course_viewer_container.py,sha256=oEPdqnGU752JTY0p4HfSlFyNDw-12AW4JzgxZ1A31J0,3502
+qcanvas/ui/qcanvas_window/options/__init__.py,sha256=SlfWUzk6_E5uM9GIV-y9BVeKMwqn3pRx_xWhMyb1dfI,54
+qcanvas/ui/qcanvas_window/options/auto_download_resources_option.py,sha256=oeVdUsFUSrCRKKjb6eyjsJecaMSMnEKR66L9FTlm_Eo,1379
+qcanvas/ui/qcanvas_window/options/quick_sync_option.py,sha256=16zEFL__JRi-wE7Q99_Bqi-OHEBhRgf5QlnVUOUX3Eg,833
+qcanvas/ui/qcanvas_window/options/sync_on_start_option.py,sha256=gL_FIulULN1uGBJJWgUszyjayQDw5WfppjoErbM3850,773
+qcanvas/ui/qcanvas_window/options/theme_selection_menu.py,sha256=VMx79H45R7lcpMFpaN8eohbCxkQkq43MdH8W0nt2aTQ,1434
+qcanvas/ui/qcanvas_window/qcanvas_window.py,sha256=VDgoBpldNAu_7Rj4BqT7KQOgcBN1Koq6c0s0uduumc8,8945
+qcanvas/ui/qcanvas_window/status_bar_progress_display.py,sha256=v8cL7EzhKIO6YDo-IJGC2TvjnaHvHb9F2VyJtW0W4U8,5047
+qcanvas/ui/qml_components/AttachmentsList.ui.qml,sha256=kEgdn1s490hfvMtDtbba54_-_vF-3GUIEVpB8D12ET0,483
+qcanvas/ui/qml_components/AttachmentsListDelegate.qml,sha256=Frcd-vMd6lXBICF8SpPdpGJgxrk4vasvK29uTxXKAcs,2115
+qcanvas/ui/qml_components/AttachmentsListModel.qml,sha256=y4pQoJLVrSAEdl8BkeKZrMBln0pCCfjotCCxcCS9L6w,516
+qcanvas/ui/qml_components/AttachmentsPane.qml,sha256=50UElZB598m230dgBbDx9WDvK3uS5PvbcAhzSDIuIKQ,196
+qcanvas/ui/qml_components/CommentsList.ui.qml,sha256=l8uqDrqIGVeOIAHnn4rwQQGiedFXAdMFANzvcHflCJo,477
+qcanvas/ui/qml_components/CommentsListDelegate.ui.qml,sha256=iI-8Byw9dEOcbB18kQ6LGBH9IMCdmoK4Ak2WgSxkx78,3172
+qcanvas/ui/qml_components/CommentsListModel.qml,sha256=oEffdqXiavoO4zcyBu8aqIlR-0IYDQKli3aKlGUxltg,2230
+qcanvas/ui/qml_components/CommentsPane.qml,sha256=ZatxphygIA4aPJ5nEkEdU9SG03sOCqItaG3IewLJUBE,185
+qcanvas/ui/qml_components/DarkTheme.qml,sha256=cc9NltNQp9vzZeKItJEXCBUBzvvfDTC6y8nL3gKWMTY,222
+qcanvas/ui/qml_components/DecoratedText.ui.qml,sha256=U4p_P6gXRBj1GKDe0azJlp9-fT8yFw3XVjQH76L8MQ0,1003
+qcanvas/ui/qml_components/LightTheme.qml,sha256=ItN-3U9WiCUThIOlvYwGkTukx-ceHTGxHBqEZve__is,172
+qcanvas/ui/qml_components/Spacer.ui.qml,sha256=RE86ASh90JUV82QLWV9FoD3pVzv9F_gHFNyDpk_Befo,78
+qcanvas/ui/qml_components/ThemedRectangle.qml,sha256=9EIBZInRCTrO8vEqYLlIsWxa88PYHmNTgc1nqKiO7hY,653
+qcanvas/ui/qml_components/__init__.py,sha256=ogGsI7ynuB0EhAeQRH7VJeJIYYwMza_AzFzjPlBmsVc,136
+qcanvas/ui/qml_components/attachments_pane.py,sha256=PwvITNo9xwGKvqGYp6OkMO7MAeMJjOm9H_DajZzfM_E,2366
+qcanvas/ui/qml_components/comments_pane.py,sha256=IJkaR5cn4Ez08nh7V_iZEY56ojHcxRRPRLKgiZirslo,2993
+qcanvas/ui/qml_components/qml_bridge_types.py,sha256=iHyG9ACG7bj8X_fty4Qpd5oSTmcW3zaFZdSi_KNXymE,2725
+qcanvas/ui/qml_components/qml_pane.py,sha256=KNWFJ1--hRpDSCjiZB8yMWFxQdbZFGDemXP09KGFMMo,698
+qcanvas/ui/setup/__init__.py,sha256=QWt2lEyLqWG5QC-BmCBlYyi0LZsBfsQYbP0XkvqA2f8,77
+qcanvas/ui/setup/setup_checker.py,sha256=gU70geojUyOTW_fNgH-GzpTMrtYXsLHWf2wUnFaezmA,444
+qcanvas/ui/setup/setup_dialog.py,sha256=_-52R6B8UIpKWRQ5jqpypgJLdnm_aXrZ5cKtyAXq0JA,10730
+qcanvas/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+qcanvas/util/auto_downloader.py,sha256=DO2TCNQ2idUoITqlxxAp1tY8C5Zy52nghjCE4hv49aw,1905
+qcanvas/util/basic_fonts.py,sha256=TqaY2UchDseHDZYB-Bh6r3xRoRuc5S9lf8j-fMGGCYQ,249
+qcanvas/util/context_dict.py,sha256=05TlRto_fzmwdUBOVFEPVNCnch4gDYys1fpuMwLhpto,315
+qcanvas/util/file_icons.py,sha256=TKHITkkd2HKAWR7mBJuXc034l76Ptp1YXM_eeLbEKW8,1509
+qcanvas/util/html_cleaner.py,sha256=U-UbZVX9x85gatOvxLsQXe2hL6x4I86eUKwkm0p159E,710
+qcanvas/util/layouts.py,sha256=in7V6mzJIlnVc1DbvhpxA5fIYBIUIQT-OPa9dHUYIrI,1498
+qcanvas/util/logs.py,sha256=VZKFITiW2WR2POEFVv5GRpEXic23Pzjehry-vH3g3Gk,138
+qcanvas/util/paths.py,sha256=lLqQqOmREefJB8D1xARH3gCNNXXlSELlIuDQaCHpDr4,1373
+qcanvas/util/qurl_util.py,sha256=6nTk8VkQjT87wMOXyZucPBYdT6TTYzfCTElqsypLZPg,200
+qcanvas/util/runtime.py,sha256=EO1HFCN7dZbQtKHQOILuvjZFXGT7SzhlmPvU8ma95Z8,617
+qcanvas/util/ui_tools.py,sha256=cdwDrtljxIpzikvUt4CAMC06kogJ4WfhSTsC3lXAcz4,3575
+qcanvas/util/url_checker.py,sha256=HkNFixp1ARwc_YjYkpHb-IMTyuaC7CylvYCgDyo3sh4,136
+qcanvas-2.0.0.dist-info/METADATA,sha256=pXItdPg8BAwpQzOiLjtBKDtPHeiAQblNVnNGAly2whs,2118
+qcanvas-2.0.0.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
+qcanvas-2.0.0.dist-info/entry_points.txt,sha256=hqG_g3MRYh_eLyQcDN4H3EXqmBia_fnJTJ-3nqZGzvY,40
+qcanvas-2.0.0.dist-info/RECORD,,

{qcanvas-1.2.1.dist-info → qcanvas-2.0.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.0
+Generator: poetry-core 2.0.0
 Root-Is-Purelib: true
 Tag: py3-none-any

qcanvas-2.0.0.dist-info/entry_points.txt

@@ -0,0 +1,3 @@
+[console_scripts]
+qcanvas=qcanvas:main
+

qcanvas/app_start/__init__.py

@@ -1,59 +0,0 @@
-import asyncio
-import logging
-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 runtime, settings, themes
-
-main_window = None
-setup_window = None
-
-_logger = logging.getLogger(__name__)
-
-
-def _show_main():
-    global main_window
-    main_window = QCanvasWindow()
-    main_window.show()
-
-
-def _show_qt_api_name():
-    print(f"Using Qt bindings from {qtpy.API_NAME}")
-    _logger.info("Using Qt bindings from %s", qtpy.API_NAME)
-
-
-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()
-    themes.apply(settings.ui.theme)
-
-    event_loop = QEventLoop(app)
-    asyncio.set_event_loop(event_loop)
-
-    app_close_event = asyncio.Event()
-    app.aboutToQuit.connect(app_close_event.set)
-
-    if setup_checker.needs_setup():
-        setup_window = SetupDialog()
-        setup_window.show()
-        setup_window.closed.connect(_show_main)
-    else:
-        _show_main()
-
-    with event_loop:
-        event_loop.run_until_complete(app_close_event.wait())

qcanvas/icons/_update_icons.py

@@ -1,89 +0,0 @@
-# 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/icons/dark/actions/exit.svg

@@ -1,3 +0,0 @@
-<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>