qcanvas 1.2.0a0__py3-none-any.whl → 1.2.1__py3-none-any.whl

qcanvas/icons/{file-downloaded.svg → universal/downloads/downloaded.svg}

@@ -13,7 +13,7 @@
             <path d="m5 1030.4c-1.1046 0-2 0.9-2 2v8 4 6c0 1.1 0.8954 2 2 2h14c1.105 0 2-0.9 2-2v-6-4-4l-6-6h-10z"
                   fill="#35a413"/>
             <path d="m5 1029.4c-1.1046 0-2 0.9-2 2v8 4 6c0 1.1 0.8954 2 2 2h14c1.105 0 2-0.9 2-2v-6-4-4l-6-6h-10z"
-                  fill="#7dec5b"/>
+                  fill="#6eea48"/>
             <path d="m21 1035.4-6-6v4c0 1.1 0.895 2 2 2h4z" fill="#35a413"/>
             <path d="m6 8v1h12v-1h-12zm0 3v1h12v-1h-12zm0 3v1h12v-1h-12zm0 3v1h12v-1h-12z"
                   transform="translate(0 1028.4)" fill="#35a413"/>

qcanvas/icons/universal/tabs/assignments_new_content.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#1e7bff">
+    <path d="M200-120q-33 0-56.5-23.5T120-200v-560q0-33 23.5-56.5T200-840h168q13-36 43.5-58t68.5-22q38 0 68.5 22t43.5 58h168q33 0 56.5 23.5T840-760v560q0 33-23.5 56.5T760-120H200Zm0-80h560v-560H200v560Zm80-80h280v-80H280v80Zm0-160h400v-80H280v80Zm0-160h400v-80H280v80Zm200-190q13 0 21.5-8.5T510-820q0-13-8.5-21.5T480-850q-13 0-21.5 8.5T450-820q0 13 8.5 21.5T480-790ZM200-200v-560 560Z"/>
+</svg>

qcanvas/icons/universal/tabs/mail_new_content.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#1e7bff">
+    <path d="M160-160q-33 0-56.5-23.5T80-240v-480q0-33 23.5-56.5T160-800h640q33 0 56.5 23.5T880-720v480q0 33-23.5 56.5T800-160H160Zm320-280L160-640v400h640v-400L480-440Zm0-80 320-200H160l320 200ZM160-640v-80 480-400Z"/>
+</svg>

qcanvas/icons/universal/tabs/pages_new_content.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#1e7bff">
+    <path d="M320-240h320v-80H320v80Zm0-160h320v-80H320v80ZM240-80q-33 0-56.5-23.5T160-160v-640q0-33 23.5-56.5T240-880h320l240 240v480q0 33-23.5 56.5T720-80H240Zm280-520v-200H240v640h480v-440H520ZM240-800v200-200 640-640Z"/>
+</svg>

qcanvas/icons/universal/tree_items/semester.svg

@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+        viewBox="0 0 127.17 127.21"
+        version="1.1"
+        id="svg16"
+        sodipodi:docname="semester.svg"
+        inkscape:version="1.3.2 (1:1.3.2+202311252150+091e20ef0f)"
+        xmlns="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+          id="namedview16"
+          pagecolor="#ffffff"
+          bordercolor="#000000"
+          borderopacity="0.25"
+          inkscape:showpageshadow="2"
+          inkscape:pageopacity="0.0"
+          inkscape:pagecheckerboard="0"
+          inkscape:deskcolor="#d1d1d1"
+          inkscape:zoom="6.4538952"
+          inkscape:cx="63.605"
+          inkscape:cy="63.605"
+          inkscape:window-width="1920"
+          inkscape:window-height="1018"
+          inkscape:window-x="0"
+          inkscape:window-y="0"
+          inkscape:window-maximized="1"
+          inkscape:current-layer="svg16"/>
+  <defs
+          id="defs1">
+    <style
+            id="style1">.cls-1{fill:#e72429;}
+    </style>
+  </defs>
+  <g
+          id="Layer_2"
+          data-name="Layer 2"
+          transform="matrix(0.91348418,0,0,0.91348418,5.5011087,5.502839)">
+    <g
+            id="Layer_1-2"
+            data-name="Layer 1">
+      <path
+              class="cls-1"
+              d="M 18.45,63.47 A 18.4,18.4 0 0 0 2.31,45.23 73.13,73.13 0 0 0 2.31,81.7 18.38,18.38 0 0 0 18.45,63.47"
+              id="path1"/>
+      <path
+              class="cls-1"
+              d="M 29.13,57.7 A 5.77,5.77 0 1 0 34.9,63.47 5.77,5.77 0 0 0 29.13,57.7"
+              id="path2"/>
+      <path
+              class="cls-1"
+              d="m 108.72,63.47 a 18.38,18.38 0 0 0 16.14,18.23 73.13,73.13 0 0 0 0,-36.47 18.4,18.4 0 0 0 -16.14,18.24"
+              id="path3"/>
+      <path
+              class="cls-1"
+              d="m 98,57.7 a 5.77,5.77 0 1 0 5.76,5.77 A 5.77,5.77 0 0 0 98,57.7"
+              id="path4"/>
+      <path
+              class="cls-1"
+              d="m 63.46,108.77 a 18.39,18.39 0 0 0 -18.23,16.13 73.13,73.13 0 0 0 36.47,0 18.38,18.38 0 0 0 -18.24,-16.13"
+              id="path5"/>
+      <path
+              class="cls-1"
+              d="m 63.47,92.31 a 5.77,5.77 0 1 0 5.76,5.77 5.77,5.77 0 0 0 -5.76,-5.77"
+              id="path6"/>
+      <path
+              class="cls-1"
+              d="M 63.47,18.44 A 18.37,18.37 0 0 0 81.7,2.31 a 73.13,73.13 0 0 0 -36.47,0 18.39,18.39 0 0 0 18.24,16.13"
+              id="path7"/>
+      <path
+              class="cls-1"
+              d="m 63.47,23.37 a 5.77,5.77 0 1 0 5.76,5.76 5.76,5.76 0 0 0 -5.76,-5.76"
+              id="path8"/>
+      <path
+              class="cls-1"
+              d="m 95.44,95.44 a 18.4,18.4 0 0 0 -1.5,24.29 73,73 0 0 0 25.78,-25.79 18.39,18.39 0 0 0 -24.28,1.5"
+              id="path9"/>
+      <path
+              class="cls-1"
+              d="m 83.8,83.8 a 5.77,5.77 0 1 0 8.16,0 5.78,5.78 0 0 0 -8.16,0"
+              id="path10"/>
+      <path
+              class="cls-1"
+              d="M 31.59,31.59 A 18.36,18.36 0 0 0 33.09,7.31 72.93,72.93 0 0 0 7.31,33.09 18.36,18.36 0 0 0 31.59,31.59"
+              id="path11"/>
+      <path
+              class="cls-1"
+              d="m 35.07,35.08 a 5.77,5.77 0 1 0 8.16,0 5.78,5.78 0 0 0 -8.16,0"
+              id="path12"/>
+      <path
+              class="cls-1"
+              d="M 95.4,31.53 A 18.39,18.39 0 0 0 119.69,33 72.88,72.88 0 0 0 93.9,7.25 18.39,18.39 0 0 0 95.4,31.53"
+              id="path13"/>
+      <path
+              class="cls-1"
+              d="m 91.92,43.17 a 5.76,5.76 0 1 0 -8.15,0 5.76,5.76 0 0 0 8.15,0"
+              id="path14"/>
+      <path
+              class="cls-1"
+              d="M 31.56,95.37 A 18.39,18.39 0 0 0 7.28,93.87 73,73 0 0 0 33.06,119.66 18.38,18.38 0 0 0 31.56,95.37"
+              id="path15"/>
+      <path
+              class="cls-1"
+              d="m 35,83.73 a 5.77,5.77 0 1 0 8.16,0 5.79,5.79 0 0 0 -8.16,0"
+              id="path16"/>
+    </g>
+  </g>
+</svg>

qcanvas/run.py

@@ -23,7 +23,7 @@
 # nuitka-project: --nofollow-import-to=yt_dlp.extractor.lazy_extractors
 
 import logging
-from logging import DEBUG, INFO, WARNING
+from logging import INFO, WARNING
 
 import qcanvas.app_start
 from qcanvas.util import logs, paths
@@ -42,7 +42,6 @@ logs.set_levels(
         "qcanvas.ui": WARNING,
         "qcanvas_backend": INFO,
         "qcanvas.ui.main_ui.status_bar_progress_display": INFO,
-        "qcanvas.util.themes": DEBUG,
     }
 )
 

qcanvas/ui/course_viewer/content_tree.py

@@ -7,7 +7,8 @@ from qcanvas_backend.net.sync.sync_receipt import SyncReceipt
 from qtpy.QtCore import QItemSelection, Signal, Slot
 from qtpy.QtWidgets import *
 
-from qcanvas.ui.memory_tree import MemoryTreeWidget, MemoryTreeWidgetItem
+from qcanvas.ui.course_viewer.tree_widget_data_item import AnyTreeDataItem
+from qcanvas.ui.memory_tree import MemoryTreeWidget
 from qcanvas.util.basic_fonts import bold_font, normal_font
 
 _logger = logging.getLogger(__name__)
@@ -47,6 +48,7 @@ class ContentTree(MemoryTreeWidget, Generic[T]):
         indentation: int = 20,
         max_width: Optional[int] = None,
         min_width: Optional[int] = None,
+        alternating_row_colours: bool = False,
     ) -> None:
         if not isinstance(header_text, str) and isinstance(header_text, Sequence):
             self.setHeaderLabels(header_text)
@@ -61,6 +63,8 @@ class ContentTree(MemoryTreeWidget, Generic[T]):
         if min_width is not None:
             self.setMinimumWidth(min_width)
 
+        self.setAlternatingRowColors(alternating_row_colours)
+
     def set_columns_resize_mode(
         self,
         resize_mode_for_columns: list[QHeaderView.ResizeMode],
@@ -94,7 +98,7 @@ class ContentTree(MemoryTreeWidget, Generic[T]):
     @abstractmethod
     def create_tree_items(
         self, data: T, sync_receipt: SyncReceipt
-    ) -> Sequence[MemoryTreeWidgetItem]: ...
+    ) -> Sequence[QTreeWidgetItem]: ...
 
     @Slot(QItemSelection, QItemSelection)
     def _selection_changed(self, _0: QItemSelection, _1: QItemSelection) -> None:
@@ -110,7 +114,7 @@ class ContentTree(MemoryTreeWidget, Generic[T]):
         if self.is_unseen(selected):
             self.mark_as_seen(selected)
 
-        if not isinstance(selected, MemoryTreeWidgetItem):
+        if not isinstance(selected, AnyTreeDataItem):
             self._clear_selection()
             return
 

qcanvas/ui/course_viewer/course_tree/__init__.py

@@ -0,0 +1 @@
+from .course_tree import CourseTree

qcanvas/ui/course_viewer/course_tree/_course_icon_generator.py

@@ -0,0 +1,86 @@
+import itertools
+import logging
+import random
+
+from cachetools import cached
+from qtpy.QtCore import QByteArray
+from qtpy.QtGui import QColor, QPainter, QPixmap
+from qtpy.QtSvg import QSvgRenderer
+
+_logger = logging.getLogger(__name__)
+_transparent = QColor("#00000000")
+_colours = [
+    QColor(f"#{colour}")
+    for colour in [
+        "2ad6cb",
+        "2d50ed",
+        "7a10e4",
+        "c61aaf",
+        "d91b1b",
+        "c7541b",
+        "facd07",  # facd07
+        "a9cf12",
+    ]
+]
+
+
+class CourseIconGenerator:
+    @staticmethod
+    @cached(cache={})
+    def get_for_term(term_id: str) -> "CourseIconGenerator":
+        return CourseIconGenerator(term_id)
+
+    def __init__(self, term_id: str):
+        shuffled = list(_colours)
+
+        # This is the dumbest way I've ever seen a language implement setting a seed for a RNG.
+        # WTF python?! Why???
+        random.seed(term_id)
+        random.shuffle(shuffled)
+
+        self._iterator = itertools.cycle(shuffled)
+
+    def get_icon(self) -> QPixmap:
+        return _create_icon(self._get_colour())
+
+    def _get_colour(self) -> QColor:
+        return next(self._iterator)
+
+
+@cached(cache={}, key=lambda colour: colour.name(QColor.NameFormat.HexRgb))
+def _create_icon(base_colour: QColor) -> QPixmap:
+    dark_colour = QColor.fromHslF(
+        base_colour.hslHueF(),
+        base_colour.hslSaturationF(),
+        base_colour.lightnessF() * 0.6875,
+    )
+
+    result_pixmap = QPixmap(256, 256)
+    result_pixmap.fill(_transparent)
+
+    with (painter := QPainter(result_pixmap)):
+        svg = _create_svg_from_colours(base_colour, dark_colour)
+        svg.render(painter)
+
+    return result_pixmap
+
+
+def _create_svg_from_colours(light_colour: QColor, dark_colour: QColor) -> QSvgRenderer:
+    # Original SVG is from SVGRepo.com
+    return QSvgRenderer(
+        QByteArray(
+            f"""
+            <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+            <svg width="800px" height="800px" viewBox="0 0 24 24" >
+             <g transform="translate(0 -1028.4)">
+              <path d="m3 8v2 1 3 1 5 1c0 1.105 0.8954 2 2 2h14c1.105 0 2-0.895 2-2v-1-5-4-3h-18z" transform="translate(0 1028.4)" fill="{dark_colour.name()}"/>
+              <path d="m3 1035.4v2 1 3 1 5 1c0 1.1 0.8954 2 2 2h14c1.105 0 2-0.9 2-2v-1-5-4-3h-18z" fill="#ecf0f1"/>
+              <path d="m3 1034.4v2 1 3 1 5 1c0 1.1 0.8954 2 2 2h14c1.105 0 2-0.9 2-2v-1-5-4-3h-18z" fill="#bdc3c7"/>
+              <path d="m3 1033.4v2 1 3 1 5 1c0 1.1 0.8954 2 2 2h14c1.105 0 2-0.9 2-2v-1-5-4-3h-18z" fill="#ecf0f1"/>
+              <path d="m5 1c-1.1046 0-2 0.8954-2 2v1 4 2 1 3 1 5 1c0 1.105 0.8954 2 2 2h2v-1h-1.5c-0.8284 0-1.5-0.672-1.5-1.5s0.6716-1.5 1.5-1.5h12.5 1c1.105 0 2-0.895 2-2v-1-5-4-3-1c0-1.1046-0.895-2-2-2h-4-10z" transform="translate(0 1028.4)" fill="{dark_colour.name()}"/>
+              <path d="m8 1v18h1 9 1c1.105 0 2-0.895 2-2v-1-5-4-3-1c0-1.1046-0.895-2-2-2h-4-6-1z" transform="translate(0 1028.4)" fill="{light_colour.name()}"/>
+             </g>
+            </svg>
+            """.strip().encode()
+        )
+    )

qcanvas/ui/course_viewer/{course_tree.py → course_tree/course_tree.py}

@@ -5,15 +5,20 @@ import qcanvas_backend.database.types as db
 from qcanvas_backend.net.sync.sync_receipt import SyncReceipt
 from qtpy.QtCore import Qt, Signal
 
+from qcanvas import icons
 from qcanvas.ui.course_viewer.content_tree import ContentTree
+from qcanvas.ui.course_viewer.course_tree._course_icon_generator import (
+    CourseIconGenerator,
+)
+from qcanvas.ui.course_viewer.tree_widget_data_item import TreeWidgetDataItem
 from qcanvas.ui.memory_tree import MemoryTreeWidgetItem
 
 _logger = logging.getLogger(__name__)
 
 
-class _CourseTreeItem(MemoryTreeWidgetItem):
+class _CourseTreeItem(TreeWidgetDataItem):
     def __init__(self, course: db.Course, owner: "CourseTree"):
-        MemoryTreeWidgetItem.__init__(
+        TreeWidgetDataItem.__init__(
             self,
             id=course.id,
             data=course,
@@ -49,7 +54,9 @@ class CourseTree(ContentTree[Sequence[db.Term]]):
     def __init__(self):
         super().__init__("course_tree", emit_selection_signal_for_type=db.Course)
 
-        self.ui_setup(max_width=250, min_width=150, header_text="Courses")
+        self.ui_setup(
+            max_width=250, min_width=150, header_text="Courses", indentation=15
+        )
 
     def create_tree_items(
         self, terms: List[db.Term], sync_receipt: SyncReceipt
@@ -58,10 +65,12 @@ class CourseTree(ContentTree[Sequence[db.Term]]):
 
         for term in reversed(terms):
             term_widget = self._create_term_widget(term)
+            course_icon_generator = CourseIconGenerator(term.id)
 
             for course in term.courses:
-                course_widget = self._create_course_widget(course, sync_receipt)
-                # course_widget.renamed.connect(self._on_course_renamed)
+                course_widget = self._create_course_widget(
+                    course, course_icon_generator, sync_receipt
+                )
                 term_widget.addChild(course_widget)
 
             widgets.append(term_widget)
@@ -69,9 +78,13 @@ class CourseTree(ContentTree[Sequence[db.Term]]):
         return widgets
 
     def _create_course_widget(
-        self, course: db.Course, sync_receipt: SyncReceipt
+        self,
+        course: db.Course,
+        course_icon_generator: CourseIconGenerator,
+        sync_receipt: SyncReceipt,
     ) -> _CourseTreeItem:
         course_widget = _CourseTreeItem(course, self)
+        course_widget.setIcon(0, course_icon_generator.get_icon())
 
         if sync_receipt.was_updated(course):
             self.mark_as_unseen(course_widget)
@@ -81,5 +94,6 @@ class CourseTree(ContentTree[Sequence[db.Term]]):
     def _create_term_widget(self, term: db.Term) -> MemoryTreeWidgetItem:
         term_widget = MemoryTreeWidgetItem(id=term.id, data=term, strings=[term.name])
         term_widget.setFlags(Qt.ItemFlag.ItemIsEnabled)
+        term_widget.setIcon(0, icons.tree_items.semester)
 
         return term_widget

qcanvas/ui/course_viewer/course_viewer.py

@@ -1,13 +1,15 @@
 import logging
+from dataclasses import dataclass
 
 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.QtGui import QIcon
 from qtpy.QtWidgets import *
 
+from qcanvas import icons
 from qcanvas.ui.course_viewer.tabs.assignment_tab import AssignmentTab
-from qcanvas.ui.course_viewer.tabs.file_tab import FileTab
 from qcanvas.ui.course_viewer.tabs.mail_tab import MailTab
 from qcanvas.ui.course_viewer.tabs.page_tab import PageTab
 from qcanvas.util.basic_fonts import bold_font
@@ -17,17 +19,25 @@ from qcanvas.util.ui_tools import make_truncatable
 _logger = logging.getLogger(__name__)
 
 
+@dataclass
+class _Tab:
+    icon: QIcon
+    highlighted_icon: QIcon
+
+
 class CourseViewer(QWidget):
+
     def __init__(
         self,
         course: db.Course,
         downloader: ResourceManager,
         *,
-        sync_receipt: SyncReceipt
+        sync_receipt: SyncReceipt,
     ):
         super().__init__()
         # todo this is a mess. there are several other messes like this too, do they all have to be a mess?
         self._course_id = course.id
+        self._previous_tab_index = 0
 
         self._course_label = QLabel(course.name)
         self._course_label.setFont(bold_font)
@@ -48,28 +58,54 @@ class CourseViewer(QWidget):
             downloader=downloader,
             sync_receipt=sync_receipt,
         )
-        self._files_tab = FileTab.create_from_receipt(
-            course=course,
-            downloader=downloader,
-            sync_receipt=sync_receipt,
+        # self._files_tab = FileTab.create_from_receipt(
+        #     course=course,
+        #     downloader=downloader,
+        #     sync_receipt=sync_receipt,
+        # )
+
+        self._tab_widget = QTabWidget()
+        self._tabs: dict[int, _Tab] = {}
+
+        # self._setup_tab(
+        #     name="Files",
+        #     widget=self._files_tab,
+        #     icon=icons.tabs.pages,
+        #     highlighted_icon=icons.tabs.pages_new_content,
+        # )
+        self._PAGES_TAB = self._setup_tab(
+            name="Pages",
+            widget=self._pages_tab,
+            icon=icons.tabs.pages,
+            highlighted_icon=icons.tabs.pages_new_content,
+        )
+        self._ASSIGNMENTS_TAB = self._setup_tab(
+            name="Assignments",
+            widget=self._assignments_tab,
+            icon=icons.tabs.assignments,
+            highlighted_icon=icons.tabs.assignments_new_content,
+        )
+        self._MAIL_TAB = self._setup_tab(
+            name="Mail",
+            widget=self._mail_tab,
+            icon=icons.tabs.mail,
+            highlighted_icon=icons.tabs.mail_new_content,
         )
-
-        self._tabs = QTabWidget()
-        self._tabs.addTab(self._files_tab, "Files")
-        self._tabs.addTab(self._pages_tab, "Pages")
-        self._tabs.addTab(self._assignments_tab, "Assignments")
-        self._tabs.addTab(self._mail_tab, "Mail")
         # self._tabs.addTab(QLabel("Not implemented"), "Panopto")  # The meme lives on!
 
-        self.setLayout(layout(QVBoxLayout, self._course_label, self._tabs))
-
-        self._tabs.currentChanged.connect(self._tab_changed)
-
+        self.setLayout(layout(QVBoxLayout, self._course_label, self._tab_widget))
+        self._tab_widget.currentChanged.connect(self._tab_changed)
         self._highlight_tabs(sync_receipt)
-        self._unhighlight_tab(0)  # Because the first tab always gets auto-selected
+
+    def _setup_tab(
+        self, widget: QWidget, icon: QIcon, highlighted_icon: QIcon, name: str
+    ) -> int:
+        index = self._tab_widget.addTab(widget, icon, name)
+        self._tabs[index] = _Tab(icon, highlighted_icon)
+        return index
 
     def reload(self, course: db.Course, *, sync_receipt: SyncReceipt) -> None:
-        self._files_tab.reload(course, sync_receipt=sync_receipt)
+        # self._files_tab.reload(course, sync_receipt=sync_receipt)
         self._pages_tab.reload(course, sync_receipt=sync_receipt)
         self._assignments_tab.reload(course, sync_receipt=sync_receipt)
         self._mail_tab.reload(course, sync_receipt=sync_receipt)
@@ -77,32 +113,38 @@ class CourseViewer(QWidget):
 
     @Slot(int)
     def _tab_changed(self, index: int) -> None:
+        _logger.debug(f"Index = {index}")
         if index != -1:
-            self._unhighlight_tab(index)
+            _logger.debug(f"Previous tab = {self._previous_tab_index}")
+            self._unhighlight_tab(self._previous_tab_index)
+            self._previous_tab_index = index
 
     def _highlight_tabs(self, sync_receipt: SyncReceipt) -> None:
         updates = sync_receipt.updates_by_course.get(self._course_id, None)
 
         if updates is not None:
-            if len(updates.updated_resources) > 0:
-                self._highlight_tab(0)
-
             if len(updates.updated_pages) > 0:
-                self._highlight_tab(1)
+                self._highlight_tab(self._PAGES_TAB)
+            else:
+                self._unhighlight_tab(self._PAGES_TAB)
 
             if len(updates.updated_assignments) > 0:
-                self._highlight_tab(2)
+                self._highlight_tab(self._ASSIGNMENTS_TAB)
+            else:
+                self._unhighlight_tab(self._ASSIGNMENTS_TAB)
 
             if len(updates.updated_messages) > 0:
-                self._highlight_tab(3)
+                self._highlight_tab(self._MAIL_TAB)
+            else:
+                self._unhighlight_tab(self._MAIL_TAB)
         else:
-            for index in range(0, 4):
+            for index in range(0, len(self._tabs)):
                 self._unhighlight_tab(index)
 
     def _highlight_tab(self, tab_index: int) -> None:
-        self._tabs.setTabText(tab_index, "* " + self._tabs.tabText(tab_index))
+        tab = self._tabs[tab_index]
+        self._tab_widget.setTabIcon(tab_index, tab.highlighted_icon)
 
     def _unhighlight_tab(self, tab_index: int) -> None:
-        self._tabs.setTabText(
-            tab_index, self._tabs.tabText(tab_index).replace("* ", "")
-        )
+        tab = self._tabs[tab_index]
+        self._tab_widget.setTabIcon(tab_index, tab.icon)

qcanvas/ui/course_viewer/tabs/assignment_tab/assignment_tree.py

@@ -6,7 +6,9 @@ from qcanvas_backend.net.sync.sync_receipt import SyncReceipt
 from qtpy.QtCore import Qt
 from qtpy.QtWidgets import QHeaderView
 
+from qcanvas import icons
 from qcanvas.ui.course_viewer.content_tree import ContentTree
+from qcanvas.ui.course_viewer.tree_widget_data_item import TreeWidgetDataItem
 from qcanvas.ui.memory_tree import MemoryTreeWidgetItem
 
 _logger = logging.getLogger(__name__)
@@ -63,19 +65,21 @@ class AssignmentTree(ContentTree[db.Course]):
         )
 
         assignment_group_widget.setFlags(Qt.ItemFlag.ItemIsEnabled)
+        assignment_group_widget.setIcon(0, icons.tree_items.module)
 
         return assignment_group_widget
 
     def _create_assignment_widget(
         self, assignment: db.Assignment, sync_receipt: SyncReceipt
-    ) -> MemoryTreeWidgetItem:
-        assignment_widget = MemoryTreeWidgetItem(
+    ) -> TreeWidgetDataItem:
+        assignment_widget = TreeWidgetDataItem(
             id=assignment.id, data=assignment, strings=[assignment.name]
         )
 
         assignment_widget.setFlags(
             Qt.ItemFlag.ItemIsEnabled | Qt.ItemFlag.ItemIsSelectable
         )
+        assignment_widget.setIcon(0, icons.tree_items.assignment)
 
         if sync_receipt.was_updated(assignment):
             self.mark_as_unseen(assignment_widget)

qcanvas/ui/course_viewer/tabs/file_tab/file_tree.py

@@ -8,6 +8,10 @@ from qtpy.QtCore import QPoint, Qt, Slot
 from qtpy.QtWidgets import *
 
 from qcanvas.ui.course_viewer.content_tree import ContentTree
+from qcanvas.ui.course_viewer.tree_widget_data_item import (
+    AnyTreeDataItem,
+    TreeWidgetDataItem,
+)
 from qcanvas.ui.memory_tree import MemoryTreeWidgetItem
 from qcanvas.util.file_icons import icon_for_filename
 from qcanvas.util.ui_tools import create_qaction
@@ -63,8 +67,10 @@ class FileTree(ContentTree[db.Course]):
         # fixme the reesource widget items shouls NOT be a memory widget item because they can't be collapsed, but
         #  mostly because the same file can appear in the tree multiple times in different places, which memory tree
         #  can NOT deal with!
-        item_widget = QTreeWidgetItem(
-            [resource.file_name, str(resource.discovery_date.date())],
+        item_widget = TreeWidgetDataItem(
+            id=resource.id,
+            data=resource,
+            strings=[resource.file_name, str(resource.discovery_date.date())],
         )
         item_widget.setIcon(
             0,
@@ -81,15 +87,13 @@ class FileTree(ContentTree[db.Course]):
     def _context_menu(self, point: QPoint) -> None:
         item = self.itemAt(point)
 
-        if item is None or not isinstance(item, MemoryTreeWidgetItem):
-            return
+        if isinstance(item, AnyTreeDataItem):
+            menu = QMenu()
+            create_qaction(
+                name="Test",
+                parent=menu,
+                triggered=lambda: print(f"Clicked {item.extra_data.file_name}"),
+            )
+            menu.addAction("Another thing")
 
-        menu = QMenu()
-        create_qaction(
-            name="Test",
-            parent=menu,
-            triggered=lambda: print(f"Clicked {item.extra_data.file_name}"),
-        )
-        menu.addAction("Another thing")
-
-        menu.exec(self.mapToGlobal(point))
+            menu.exec(self.mapToGlobal(point))

qcanvas/ui/course_viewer/tabs/file_tab/pages_file_tree.py

@@ -27,24 +27,30 @@ class PagesFileTree(FileTree):
             if len(group.content_items) == 0:
                 continue
 
-            group_widget = self._create_group_widget(group, sync_receipt)
+            # Init group_widget lazily to prevent creating pointless tree widgets
+            group_widget: MemoryTreeWidgetItem | None = None
             items_in_group = set()
 
             for item in group.content_items:
-                for resource in item.resources:  # type: db.Resource
+                resource_widgets = []
 
+                for resource in item.resources:  # type: db.Resource
                     if resource.id not in items_in_group:
                         items_in_group.add(resource.id)
-                    else:
-                        continue
 
-                    resource_widget = self._create_resource_widget(
-                        resource, sync_receipt
-                    )
+                        if group_widget is None:
+                            group_widget = self._create_group_widget(
+                                group, sync_receipt
+                            )
+
+                        resource_widgets.append(
+                            self._create_resource_widget(resource, sync_receipt)
+                        )
 
-                    group_widget.addChild(resource_widget)
+                if len(resource_widgets) > 0:
+                    group_widget.addChildren(resource_widgets)
 
-            if group_widget.childCount() > 0:
+            if group_widget is not None:
                 widgets.append(group_widget)
 
         return widgets