Use upload-artifact v4

.github/workflows/make_bundle.yml

@@ -44,7 +44,7 @@ jobs:
         run: |
           mkdir embedded-python
           cd embedded-python
-          curl -o python.zip https://www.python.org/ftp/python/3.12.3/python-3.12.3-embed-amd64.zip
+          curl -o python.zip https://www.python.org/ftp/python/3.12.7/python-3.12.7-embed-amd64.zip
           tar xf python.zip
           del python.zip
       - name: Edit embedded Python search paths
@@ -65,7 +65,7 @@ jobs:
         run: |
           cd embedded-python/Scripts
           ./pip.exe --version
-          ./pip.exe install ipykernel jill
+          ./pip.exe install ipykernel jill pandas spinedb-api
       - name: List packages in embedded Python
         run: |
           cd embedded-python/Scripts
@@ -79,7 +79,7 @@ jobs:
         run: |
           python -c "from importlib.metadata import version; print('version=' + version('spinetoolbox'))" >> $GITHUB_OUTPUT
       - name: Upload archive
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Spine-Toolbox-win-${{ steps.toolbox-version.outputs.version }}
           path: "./dist/Spine Toolbox"

requirements.txt

@@ -1,4 +1,4 @@
 -e git+https://github.com/spine-tools/Spine-Database-API.git#egg=spinedb_api
 -e git+https://github.com/spine-tools/spine-engine.git#egg=spine_engine
--e git+https://github.com/spine-tools/spine-items.git#egg=spine_items
+-e git+https://github.com/spine-tools/spine-items.git@toolbox_issue_2794#egg=spine_items
 -e .

spinetoolbox.py

@@ -10,10 +10,7 @@
 # this program. If not, see <http://www.gnu.org/licenses/>.
 ######################################################################################################################
 
-"""
-Starts Spine Toolbox.
-"""
-
+"""Starts Spine Toolbox."""
 
 if __name__ == "__main__":
     import sys

spinetoolbox/group.py

@@ -0,0 +1,322 @@
+######################################################################################################################
+# Copyright (C) 2017-2022 Spine project consortium
+# Copyright Spine Toolbox contributors
+# This file is part of Spine Toolbox.
+# Spine Toolbox is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General
+# Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option)
+# any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+# without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+# Public License for more details. You should have received a copy of the GNU Lesser General Public License along with
+# this program. If not, see <http://www.gnu.org/licenses/>.
+######################################################################################################################
+
+"""Class for drawing an item group on QGraphicsScene."""
+from PySide6.QtCore import Qt, Slot, QMarginsF, QRectF, QPointF
+from PySide6.QtGui import QBrush, QPen, QAction, QPainterPath, QTransform
+from PySide6.QtWidgets import (
+    QGraphicsItem,
+    QGraphicsRectItem,
+    QGraphicsTextItem,
+    QGraphicsDropShadowEffect,
+    QStyle
+)
+from .project_item_icon import ProjectItemIcon
+from .project_commands import RenameGroupCommand
+from widgets.notification import Notification
+
+
+class Group(QGraphicsRectItem):
+
+    FONT_SIZE_PIXELS = 12  # pixel size to prevent font scaling by system
+
+    def __init__(self, toolbox, name, item_names):
+        super().__init__()
+        self._toolbox = toolbox
+        self._scene = None
+        self._name = name
+        self._item_names = item_names  # strings
+        self._items = dict()  # QGraphicsItems
+        conns = self._toolbox.project.connections + self._toolbox.project.jumps
+        for name in item_names:
+            try:
+                icon = self._toolbox.project.get_item(name).get_icon()
+                self._items[name] = icon
+            except KeyError:  # name refers to a link or to a jump
+                link_icons = [link.graphics_item for link in conns if link.name == name]
+                self._items[name] = link_icons[0]
+        for item_icon in self._items.values():
+            item_icon.my_groups.add(self)
+        self._n_items = len(self._items)
+        disband_action = QAction("Ungroup items")
+        disband_action.triggered.connect(self.call_disband_group)
+        rename_group_action = QAction("Rename group...")
+        rename_group_action.triggered.connect(self.rename_group)
+        self._actions = [disband_action, rename_group_action]
+        self.margins = QMarginsF(0, 0, 0, 10.0)  # left, top, right, bottom
+        self.setFlag(QGraphicsItem.GraphicsItemFlag.ItemIsSelectable, enabled=True)
+        self.setFlag(QGraphicsItem.GraphicsItemFlag.ItemIsMovable, enabled=True)
+        self.setFlag(QGraphicsItem.GraphicsItemFlag.ItemSendsScenePositionChanges, enabled=True)
+        self.setAcceptHoverEvents(True)
+        self.setZValue(-10)
+        self.name_item = QGraphicsTextItem(self._name, parent=self)
+        self.set_name_attributes()
+        self.setRect(self.current_rect())
+        self._reposition_name_item()
+        self.setBrush(self._toolbox.ui.graphicsView.scene().bg_color.lighter(107))
+        self.normal_pen = QPen(QBrush("gray"), 1, Qt.PenStyle.SolidLine)
+        self.selected_pen_for_ui_lite = QPen(QBrush("gray"), 5, Qt.PenStyle.DashLine)
+        self.selected_pen = QPen(QBrush("black"), 1, Qt.PenStyle.DashLine)
+        self.setPen(self.normal_pen)
+        self.set_graphics_effects()
+        self.previous_pos = QPointF()
+        self._moved_on_scene = False
+        self._bumping = True
+        # self.setOpacity(0.5)
+        self.mouse_press_pos = None
+
+    @property
+    def name(self):
+        return self._name
+
+    @name.setter
+    def name(self, new_name):
+        self._name = new_name
+        self.name_item.setPlainText(new_name)
+
+    @property
+    def items(self):
+        return self._items.values()
+
+    @property
+    def item_names(self):
+        return list(self._items.keys())
+
+    @property
+    def project_items(self):
+        return [item for item in self.items if isinstance(item, ProjectItemIcon)]
+
+    @property
+    def n_items(self):
+        return len(self._items)
+
+    def actions(self):
+        return self._actions
+
+    def set_name_attributes(self):
+        """Sets name item attributes (font, size, style, alignment)."""
+        self.name_item.setZValue(100)
+        font = self.name_item.font()
+        font.setPixelSize(self.FONT_SIZE_PIXELS)
+        font.setBold(True)
+        self.name_item.setFont(font)
+        option = self.name_item.document().defaultTextOption()
+        option.setAlignment(Qt.AlignmentFlag.AlignCenter)
+        self.name_item.document().setDefaultTextOption(option)
+
+    def _reposition_name_item(self):
+        """Sets name item position (left side on top of the group icon)."""
+        main_rect = self.boundingRect()
+        name_rect = self.name_item.sceneBoundingRect()
+        self.name_item.setPos(main_rect.left(), main_rect.y() - name_rect.height() - 4)
+
+    def add_item(self, name):
+        """Adds item to this Group.
+
+        Args:
+            name (str): Project item or Link name
+        """
+        try:
+            icon = self._toolbox.project.get_item(name).get_icon()
+        except KeyError:  # name refers to a link or to a jump
+            conns = self._toolbox.project.connections + self._toolbox.project.jumps
+            link_icons = [link.graphics_item for link in conns if link.name == name]
+            icon = link_icons[0]
+        icon.my_groups.add(self)
+        self._items[name] = icon
+        self.update_group_rect()
+
+    def remove_item(self, name):
+        """Removes item from this Group.
+
+        Args:
+            name (str): Project item name
+        """
+        item = self._items.pop(name)
+        for conn in item.connectors.values():
+            for link in conn.outgoing_links():
+                if link.name in self._items.keys():
+                    self._items.pop(link.name)
+                    link.my_groups.remove(self)
+            for link in conn.incoming_links():
+                if link.name in self._items.keys():
+                    self._items.pop(link.name)
+                    link.my_groups.remove(self)
+        item.my_groups.remove(self)
+        self.update_group_rect()
+
+    @Slot(bool)
+    def call_disband_group(self, _=False):
+        self._toolbox.toolboxuibase.active_ui_window.ui.graphicsView.push_disband_group_command(self.name)
+
+    @Slot(bool)
+    def rename_group(self, _=False):
+        """Renames Group."""
+        new_name = self._toolbox.show_simple_input_dialog("Rename Group", "New name:", self.name)
+        if not new_name or new_name == self.name:
+            return
+        if new_name in self._toolbox.project.groups.keys():
+            notif = Notification(self._toolbox.toolboxuibase.active_ui_window, f"Group {new_name} already exists")
+            notif.show()
+            return
+        self._toolbox.toolboxuibase.undo_stack.push(RenameGroupCommand(self._toolbox.project, self.name, new_name))
+
+    def remove_all_items(self):
+        """Removes all items (ProjectItemIcons) from this group."""
+        for item in self.project_items:
+            self.remove_item(item.name)
+
+    def update_group_rect(self, current_pos=None):
+        """Updates group rectangle, and it's position when group member(s) is/are moved."""
+        self.prepareGeometryChange()
+        r = self.current_rect()
+        self.setRect(r)
+        if current_pos is not None:
+            diff_x = current_pos.x() - self.mouse_press_pos.x()
+            diff_y = current_pos.y() - self.mouse_press_pos.y()
+            self.setPos(QPointF(diff_x, diff_y))
+        self._reposition_name_item()
+
+    def current_rect(self):
+        """Calculates the size of the rectangle for this group."""
+        united_rect = QRectF()
+        for item in self.items:
+            if isinstance(item, ProjectItemIcon):
+                # Combine item icon box and name item
+                icon_rect = item.name_item.sceneBoundingRect().united(item.sceneBoundingRect())
+                # Combine spec item rect if available
+                if item.spec_item is not None:
+                    icon_rect = icon_rect.united(item.spec_item.sceneBoundingRect())
+                united_rect = united_rect.united(icon_rect)
+            else:
+                united_rect = united_rect.united(item.sceneBoundingRect())
+        return united_rect
+
+    def itemChange(self, change, value):
+        """
+        Reacts to item removal and position changes.
+
+        In particular, destroys the drop shadow effect when the item is removed from a scene
+        and keeps track of item's movements on the scene.
+
+        Args:
+            change (GraphicsItemChange): a flag signalling the type of the change
+            value: a value related to the change
+
+        Returns:
+             Whatever super() does with the value parameter
+        """
+        if change == QGraphicsItem.GraphicsItemChange.ItemScenePositionHasChanged:
+            self._moved_on_scene = True
+        elif change == QGraphicsItem.GraphicsItemChange.ItemSceneChange and value is None:
+            self.prepareGeometryChange()
+            self.setGraphicsEffect(None)
+        elif change == QGraphicsItem.GraphicsItemChange.ItemSceneHasChanged:
+            scene = value
+            if scene is None:
+                self._scene.removeItem(self.name_item)
+            else:
+                self._scene = scene
+                self._scene.addItem(self.name_item)
+                self._reposition_name_item()
+        return super().itemChange(change, value)
+
+    def set_graphics_effects(self):
+        shadow_effect = QGraphicsDropShadowEffect()
+        shadow_effect.setOffset(1)
+        shadow_effect.setEnabled(False)
+        self.setGraphicsEffect(shadow_effect)
+
+    def mousePressEvent(self, event):
+        """Sets all items belonging to this group selected.
+
+        Args:
+            event (QMousePressEvent): Event
+        """
+        event.accept()
+        self.scene().clearSelection()
+        path = QPainterPath()
+        path.addRect(self.sceneBoundingRect())
+        self._toolbox.toolboxuibase.active_ui_window.ui.graphicsView.scene().setSelectionArea(path, QTransform())
+        icon_group = set(self.project_items)
+        for icon in icon_group:
+            icon.this_icons_group_is_moving = True
+            icon.previous_pos = icon.scenePos()
+        self.scene().icon_group = icon_group
+
+    def mouseReleaseEvent(self, event):
+        """Accepts the event to prevent graphics view's mouseReleaseEvent from clearing the selections."""
+        if (self.scenePos() - self.previous_pos).manhattanLength() > qApp.startDragDistance():
+            # self._toolbox.undo_stack.push(MoveGroupCommand(self, self._toolbox.project))
+            self.notify_item_move()
+            event.accept()
+        # icon_group = set(self.project_items)
+        # for icon in icon_group:
+        #     icon.this_icons_group_is_moving = False
+        super().mouseReleaseEvent(event)
+
+    def set_pos_without_bumping(self, pos):
+        self._bumping = False
+        self.setPos(pos)
+        self._bumping = True
+
+    def notify_item_move(self):
+        if self._moved_on_scene:
+            self._moved_on_scene = False
+            scene = self.scene()
+            scene.item_move_finished.emit(self)
+
+    def contextMenuEvent(self, event):
+        """Opens context-menu in design mode."""
+        if self._toolbox.active_ui_mode == "toolboxuilite":
+            event.ignore()  # Send context-menu request to graphics view
+            return
+        event.accept()
+        self.scene().clearSelection()
+        self.setSelected(True)
+        self._toolbox.show_project_or_item_context_menu(event.screenPos(), self)
+
+    def hoverEnterEvent(self, event):
+        """Sets a drop shadow effect to icon when mouse enters group boundaries.
+
+        Args:
+            event (QGraphicsSceneMouseEvent): Event
+        """
+        self.prepareGeometryChange()
+        self.graphicsEffect().setEnabled(True)
+        event.accept()
+
+    def hoverLeaveEvent(self, event):
+        """Disables the drop shadow when mouse leaves group boundaries.
+
+        Args:
+            event (QGraphicsSceneMouseEvent): Event
+        """
+        self.prepareGeometryChange()
+        self.graphicsEffect().setEnabled(False)
+        event.accept()
+
+    def to_dict(self):
+        """Returns a dictionary mapping group name to item names."""
+        return {self.name: self.item_names}
+
+    def paint(self, painter, option, widget=None):
+        """Sets a dash line pen when selected."""
+        if option.state & QStyle.StateFlag.State_Selected:
+            option.state &= ~QStyle.StateFlag.State_Selected
+            if self._toolbox.active_ui_mode == "toolboxui":
+                self.setPen(self.selected_pen)
+            elif self._toolbox.active_ui_mode == "toolboxuilite":
+                self.setPen(self.selected_pen_for_ui_lite)
+        else:
+            self.setPen(self.normal_pen)
+        super().paint(painter, option, widget)

spinetoolbox/helpers.py

@@ -117,7 +117,25 @@ def format_log_message(msg_type, message, show_datetime=True):
     Returns:
         str: formatted message
     """
-    color = {"msg": "white", "msg_success": "#00ff00", "msg_error": "#ff3333", "msg_warning": "yellow"}[msg_type]
+    color = {"msg": "white", "msg_success": "#00cc00", "msg_error": "#ff3333", "msg_warning": "#e6e600"}[msg_type]
+    open_tag = f"<span style='color:{color};white-space: pre-wrap;'>"
+    date_str = get_datetime(show=show_datetime)
+    return open_tag + date_str + message + "</span>"
+
+
+def format_log_message_lite(msg_type, message, show_datetime=True):
+    """Adds color tags and optional time stamp to message.
+    Text colors are selected for a QTextBrowser with a white background.
+
+    Args:
+        msg_type (str): message's type; accepts only 'msg', 'msg_success', 'msg_warning', or 'msg_error'
+        message (str): message to format
+        show_datetime (bool): True to add time stamp, False to omit it
+
+    Returns:
+        str: formatted message
+    """
+    color = {"msg": "black", "msg_success": "#009900", "msg_error": "#ff3333", "msg_warning": "yellow"}[msg_type]
     open_tag = f"<span style='color:{color};white-space: pre-wrap;'>"
     date_str = get_datetime(show=show_datetime)
     return open_tag + date_str + message + "</span>"