diff --git a/.github/workflows/make_bundle.yml b/.github/workflows/make_bundle.yml
index aca47c640..fb6efef85 100644
--- a/.github/workflows/make_bundle.yml
+++ b/.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"
diff --git a/requirements.txt b/requirements.txt
index 0ff41d492..e72de293e 100644
--- a/requirements.txt
+++ b/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 .
diff --git a/spinetoolbox.py b/spinetoolbox.py
index eaa17cfe5..f92f75264 100644
--- a/spinetoolbox.py
+++ b/spinetoolbox.py
@@ -10,10 +10,7 @@
# this program. If not, see .
######################################################################################################################
-"""
-Starts Spine Toolbox.
-"""
-
+"""Starts Spine Toolbox."""
if __name__ == "__main__":
import sys
diff --git a/spinetoolbox/group.py b/spinetoolbox/group.py
new file mode 100644
index 000000000..bd011d4c4
--- /dev/null
+++ b/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 .
+######################################################################################################################
+
+"""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)
diff --git a/spinetoolbox/helpers.py b/spinetoolbox/helpers.py
index 469d83aaa..2d57b36bd 100644
--- a/spinetoolbox/helpers.py
+++ b/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""
+ date_str = get_datetime(show=show_datetime)
+ return open_tag + date_str + message + ""
+
+
+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""
date_str = get_datetime(show=show_datetime)
return open_tag + date_str + message + ""
diff --git a/spinetoolbox/link.py b/spinetoolbox/link.py
index c29ee61bd..2762d6ee9 100644
--- a/spinetoolbox/link.py
+++ b/spinetoolbox/link.py
@@ -40,6 +40,8 @@ class LinkBase(QGraphicsPathItem):
"""
_COLOR = QColor(0, 0, 0, 0)
+ DEFAULT_LINK_SELECTION_PEN_W = 2
+ USER_MODE_LINK_SELECTION_PEN_W = 5
def __init__(self, toolbox, src_connector, dst_connector):
"""
@@ -53,20 +55,20 @@ def __init__(self, toolbox, src_connector, dst_connector):
self.src_connector = src_connector
self.dst_connector = dst_connector
self.arrow_angle = pi / 4
- self.setCursor(Qt.PointingHandCursor)
+ self.setCursor(Qt.CursorShape.PointingHandCursor)
self._guide_path = None
self._pen = QPen(self._COLOR)
self._pen.setWidthF(self.magic_number)
- self._pen.setJoinStyle(Qt.MiterJoin)
+ self._pen.setJoinStyle(Qt.PenJoinStyle.MiterJoin)
self.setPen(self._pen)
- self.selected_pen = QPen(self.outline_color, 2, Qt.DotLine)
+ self.selected_pen = QPen(self.outline_color, self.DEFAULT_LINK_SELECTION_PEN_W, Qt.PenStyle.DotLine)
self.normal_pen = QPen(self.outline_color, 1)
self._outline = QGraphicsPathItem(self)
- self._outline.setFlag(QGraphicsPathItem.ItemStacksBehindParent)
+ self._outline.setFlag(QGraphicsPathItem.GraphicsItemFlag.ItemStacksBehindParent)
self._outline.setPen(self.normal_pen)
self._stroker = QPainterPathStroker()
self._stroker.setWidth(self.magic_number)
- self._stroker.setJoinStyle(Qt.MiterJoin)
+ self._stroker.setJoinStyle(Qt.PenJoinStyle.MiterJoin)
self._shape = QPainterPath()
def shape(self):
@@ -100,6 +102,10 @@ def dst_center(self):
"""Returns the center point of the destination rectangle."""
return self.dst_rect.center()
+ def set_link_selection_pen_w(self, pen_width):
+ """Sets selected links dash line width."""
+ self.selected_pen = QPen(self.outline_color, pen_width, Qt.PenStyle.DotLine)
+
def moveBy(self, _dx, _dy):
"""Does nothing. This item is not moved the regular way, but follows the ConnectorButtons it connects."""
@@ -107,7 +113,7 @@ def update_geometry(self, curved_links=None):
"""Updates geometry."""
self.prepareGeometryChange()
if curved_links is None:
- qsettings = self._toolbox.qsettings()
+ qsettings = self._toolbox.qsettings
curved_links = qsettings.value("appSettings/curvedLinks", defaultValue="false") == "true"
self._guide_path = self._make_guide_path(curved_links)
self._do_update_geometry()
@@ -131,7 +137,7 @@ def _add_ellipse_path(self, path):
"""Adds an ellipse for the link's base.
Args:
- QPainterPath
+ path (QPainterPath)
"""
radius = 0.5 * self.magic_number
rect = QRectF(0, 0, radius, radius)
@@ -145,7 +151,7 @@ def _add_arrow_path(self, path):
"""Returns an arrow path for the link's tip.
Args:
- QPainterPath
+ path (QPainterPath)
"""
angle = self._get_joint_angle()
arrow_p0 = self.dst_center + 0.5 * self.magic_number * self._get_dst_offset()
@@ -275,7 +281,7 @@ def __init__(self, x, y, w, h, parent, tooltip=None, active=True):
if tooltip:
self.setToolTip(tooltip)
self.setAcceptHoverEvents(True)
- self.setFlag(QGraphicsItem.ItemIsSelectable, enabled=False)
+ self.setFlag(QGraphicsItem.GraphicsItemFlag.ItemIsSelectable, enabled=False)
self.setBrush(palette.window())
def hoverEnterEvent(self, event):
@@ -300,7 +306,7 @@ def __init__(self, parent, extent, path, tooltip=None, active=False):
scale = 0.8 * self.rect().width() / self._renderer.defaultSize().width()
self._svg_item.setScale(scale)
self._svg_item.setPos(self.sceneBoundingRect().center() - self._svg_item.sceneBoundingRect().center())
- self.setPen(Qt.NoPen)
+ self.setPen(Qt.PenStyle.NoPen)
def wipe_out(self):
"""Cleans up icon's resources."""
@@ -315,12 +321,12 @@ class _TextIcon(_IconBase):
def __init__(self, parent, extent, char, tooltip=None, active=False):
super().__init__(0, 0, extent, extent, parent, tooltip=tooltip, active=active)
self._text_item = QGraphicsTextItem(self)
- font = QFont("Font Awesome 5 Free Solid", weight=QFont.Bold)
+ font = QFont("Font Awesome 5 Free Solid", weight=QFont.Weight.Bold)
self._text_item.setFont(font)
self._text_item.setDefaultTextColor(self._fg_color)
self._text_item.setPlainText(char)
self._text_item.setPos(self.sceneBoundingRect().center() - self._text_item.sceneBoundingRect().center())
- self.setPen(Qt.NoPen)
+ self.setPen(Qt.PenStyle.NoPen)
def wipe_out(self):
"""Cleans up icon's resources."""
@@ -342,11 +348,12 @@ class JumpOrLink(LinkBase):
def __init__(self, toolbox, src_connector, dst_connector):
super().__init__(toolbox, src_connector, dst_connector)
- self.setFlag(QGraphicsItem.ItemIsSelectable, enabled=True)
- self.setFlag(QGraphicsItem.ItemIsFocusable, enabled=True)
+ self.setFlag(QGraphicsItem.GraphicsItemFlag.ItemIsSelectable, enabled=True)
+ self.setFlag(QGraphicsItem.GraphicsItemFlag.ItemIsFocusable, enabled=True)
self._icon_extent = 3 * self.magic_number
self._icons = []
self._anim = self._make_execution_animation()
+ self.my_groups = set()
self.update_geometry()
@property
@@ -385,6 +392,7 @@ def mousePressEvent(self, e):
"""
if any(isinstance(x, ConnectorButton) for x in self.scene().items(e.scenePos())):
e.ignore()
+ return
def contextMenuEvent(self, e):
"""Selects the link and shows context menu.
@@ -396,7 +404,7 @@ def contextMenuEvent(self, e):
self._toolbox.show_link_context_menu(e.screenPos(), self)
def paint(self, painter, option, widget=None):
- """Sets a dashed pen if selected."""
+ """Sets a dotted pen when selected."""
if option.state & QStyle.StateFlag.State_Selected:
option.state &= ~QStyle.StateFlag.State_Selected
self._outline.setPen(self.selected_pen)
@@ -436,7 +444,7 @@ def _make_execution_animation(self):
def run_execution_animation(self):
"""Runs execution animation."""
- qsettings = self._toolbox.qsettings()
+ qsettings = self._toolbox.qsettings
duration = int(qsettings.value("appSettings/dataFlowAnimationDuration", defaultValue="100"))
self._anim.setDuration(duration)
self._anim.start()
@@ -494,7 +502,7 @@ def update_icons(self):
active = self._connection.purge_before_writing
self._icons.append(_TextIcon(self, self._icon_extent, self._PURGE, active=active))
if self._connection.may_have_write_index():
- sibling_conns = self._toolbox.project().incoming_connections(self.connection.destination)
+ sibling_conns = self._toolbox.project.incoming_connections(self.connection.destination)
active = any(l.write_index > 1 for l in sibling_conns)
self._icons.append(_TextIcon(self, self._icon_extent, str(self._connection.write_index), active=active))
notifications = self._connection.notifications()
@@ -562,7 +570,7 @@ def issues(self):
Returns:
list of str: issues regarding the jump
"""
- return self._toolbox.project().jump_issues(self.jump)
+ return self._toolbox.project.jump_issues(self.jump)
def update_icons(self):
while self._icons:
diff --git a/spinetoolbox/main.py b/spinetoolbox/main.py
index 97ac4acd6..f5105d922 100644
--- a/spinetoolbox/main.py
+++ b/spinetoolbox/main.py
@@ -28,7 +28,7 @@
from PySide6.QtWidgets import QApplication
from .headless import Status, headless_main
from .helpers import pyside6_version_check
-from .ui_main import ToolboxUI
+from .ui_main_base import ToolboxUIBase
from .version import __version__
# Importing resources_icons_rc initializes resources and Font Awesome gets added to the application
@@ -59,9 +59,9 @@ def main():
status = QFontDatabase.addApplicationFont(":/fonts/fontawesome5-solid-webfont.ttf")
if status < 0:
logging.warning("Could not load fonts from resources file. Some icons may not render properly.")
- window = ToolboxUI()
+ window = ToolboxUIBase()
window.show()
- QTimer.singleShot(0, lambda: window.init_tasks(args.project))
+ QTimer.singleShot(0, lambda: window.toolboxui.init_tasks(args.project))
# Enter main event loop and wait until exit() is called
return_code = app.exec()
return return_code
diff --git a/spinetoolbox/plugin_manager.py b/spinetoolbox/plugin_manager.py
index f0e41bb04..16be28688 100644
--- a/spinetoolbox/plugin_manager.py
+++ b/spinetoolbox/plugin_manager.py
@@ -100,17 +100,17 @@ def plugin_specs(self):
def load_installed_plugins(self):
"""Loads installed plugins and adds their specifications to toolbars."""
- project = self._toolbox.project()
+ project = self._toolbox.project
local_data = load_specification_local_data(project.config_dir) if project else {}
- for plugin_dir in plugins_dirs(self._toolbox.qsettings()):
+ for plugin_dir in plugins_dirs(self._toolbox.qsettings):
self.load_individual_plugin(plugin_dir, local_data)
def reload_plugins_with_local_data(self):
"""Reloads plugins that have project specific local data."""
- project = self._toolbox.project()
+ project = self._toolbox.project
local_data = load_specification_local_data(project.config_dir) if project else {}
specification_factories = self._toolbox.item_specification_factories()
- app_settings = self._toolbox.qsettings()
+ app_settings = self._toolbox.qsettings
for plugin_name, specifications in self._plugin_specs.items():
for specification in specifications:
if not specification.may_have_local_data():
@@ -135,7 +135,7 @@ def load_individual_plugin(self, plugin_dir, specification_local_data):
plugin_dict,
specification_local_data,
self._toolbox.item_specification_factories(),
- self._toolbox.qsettings(),
+ self._toolbox.qsettings,
self._toolbox,
)
if plugin_specs is None:
@@ -143,9 +143,9 @@ def load_individual_plugin(self, plugin_dir, specification_local_data):
name = plugin_dict["name"]
self._installed_plugins[name] = plugin_dict
disabled_plugins = set()
- if self._toolbox.project() is not None:
+ if self._toolbox.project is not None:
for spec in itertools.chain(*plugin_specs.values()):
- spec_id = self._toolbox.project().add_specification(spec, save_to_disk=False)
+ spec_id = self._toolbox.project.add_specification(spec, save_to_disk=False)
if spec_id is None:
disabled_plugins.add(spec.name)
self._plugin_specs.update(plugin_specs)
@@ -205,7 +205,7 @@ def _install_plugin(self, plugin_name):
worker.start(_download_plugin, plugin, plugin_local_dir)
def _load_installed_plugin(self, plugin_local_dir):
- project = self._toolbox.project()
+ project = self._toolbox.project
local_data = load_specification_local_data(project.config_dir) if project is not None else {}
self.load_individual_plugin(plugin_local_dir, local_data)
self._toolbox.refresh_toolbars()
@@ -242,10 +242,10 @@ def _remove_plugin(self, plugin_name):
plugin_dict = self._installed_plugins.pop(plugin_name)
plugin_dir = plugin_dict["plugin_dir"]
self._plugin_specs.pop(plugin_name, None)
- if self._toolbox.project() is not None:
- for spec in list(self._toolbox.project().specifications()):
+ if self._toolbox.project is not None:
+ for spec in list(self._toolbox.project.specifications()):
if spec.plugin == plugin_name:
- self._toolbox.project().remove_specification(spec.name)
+ self._toolbox.project.remove_specification(spec.name)
# Remove plugin dir
shutil.rmtree(plugin_dir)
self._plugin_toolbars.pop(plugin_name).deleteLater()
diff --git a/spinetoolbox/project.py b/spinetoolbox/project.py
index 352a1d79c..667ef75b2 100644
--- a/spinetoolbox/project.py
+++ b/spinetoolbox/project.py
@@ -17,7 +17,7 @@
import os
from pathlib import Path
import networkx as nx
-from PySide6.QtCore import QCoreApplication, Signal
+from PySide6.QtCore import QCoreApplication, Signal, Slot
from PySide6.QtGui import QColor
from PySide6.QtWidgets import QMessageBox
from spine_engine.exception import EngineInitFailed, RemoteEngineInitFailed
@@ -62,6 +62,8 @@
from .project_upgrader import ProjectUpgrader
from .server.engine_client import EngineClient
from .spine_engine_worker import SpineEngineWorker
+from .ui_main_lite import ToolboxUILite
+from .group import Group
@unique
@@ -107,6 +109,10 @@ class SpineToolboxProject(MetaObject):
"""Emitted after a specification has been replaced."""
specification_saved = Signal(str, str)
"""Emitted after a specification has been saved."""
+ group_added = Signal(object)
+ """Emitted after new Group has been added to project."""
+ group_disbanded = Signal(object)
+ """Emitted after a Group has been removed from project."""
LOCAL_EXECUTION_JOB_ID = "1"
@@ -132,6 +138,7 @@ def __init__(self, toolbox, p_dir, plugin_specs, app_settings, settings, logger)
self._settings = settings
self._engine_workers = []
self._execution_in_progress = False
+ self._groups = dict() # Dictionary, which maps group names to group instances
self.project_dir = None # Full path to project directory
self.config_dir = None # Full path to .spinetoolbox directory
self.items_dir = None # Full path to items directory
@@ -161,6 +168,67 @@ def n_items(self):
def settings(self):
return self._settings
+ @property
+ def connections(self):
+ return self._connections
+
+ @property
+ def jumps(self):
+ return self._jumps
+
+ @property
+ def app_settings(self):
+ return self._app_settings
+
+ @property
+ def groups(self):
+ return self._groups
+
+ def make_new_group_name(self):
+ """Returns a unique name for a new Group."""
+ group_number = 1
+ group_name_taken = True
+ group_name = "NA"
+ while group_name_taken:
+ group_name = "Group " + str(group_number)
+ if group_name in self.groups.keys():
+ group_name_taken = True
+ group_number += 1
+ else:
+ group_name_taken = False
+ return group_name
+
+ def make_group(self, group_name, item_names):
+ """Adds a Group with the given name and given item names to project.
+
+ Args:
+ group_name (str): Group name
+ item_names (list): List of item names to group
+ """
+ group = Group(self.toolbox().active_ui_window, group_name, item_names)
+ self._groups[group_name] = group
+ self.group_added.emit(group)
+
+ def add_item_to_group(self, item_name, group_name):
+ """Adds item with given name to Group with given name."""
+ self.groups[group_name].add_item(item_name)
+
+ def remove_item_from_group(self, item_name, group_name):
+ """Removes item with given name from given group. If the last item in
+ the group was removed, destroys the whole group."""
+ self.groups[group_name].remove_item(item_name)
+ if not self.groups[group_name].project_items:
+ self.disband_group(False, group_name)
+
+ @Slot(bool, str)
+ def disband_group(self, _, group_name):
+ """Removes all items from a given group and destroys the group."""
+ self.groups[group_name].remove_all_items()
+ self.groups[group_name].prepareGeometryChange()
+ self.groups[group_name].setGraphicsEffect(None)
+ group = self.groups.pop(group_name)
+ self.group_disbanded.emit(group)
+
def has_items(self):
"""Returns True if project has project items.
@@ -248,6 +316,7 @@ def save(self):
"specifications": serialized_spec_paths,
"connections": [connection.to_dict() for connection in self._connections],
"jumps": [jump.to_dict() for jump in self._jumps],
+ "groups": [group.to_dict() for group in self.groups.values()],
}
items_dict = {name: item.item_dict() for name, item in self._project_items.items()}
local_items_data = self._pop_local_data_from_items_dict(items_dict)
@@ -358,8 +427,9 @@ def load(self, spec_factories, item_factories):
if not items_dict:
self._logger.msg_warning.emit("Project has no items")
self.restore_project_items(items_dict, item_factories)
- self._logger.msg.emit("Restoring connections...")
connection_dicts = project_info["project"]["connections"]
+ if len(connection_dicts) > 0:
+ self._logger.msg.emit("Restoring connections...")
connections = list(map(self.connection_from_dict, connection_dicts))
for connection in connections:
self.add_connection(connection, silent=True, notify_resource_changes=False)
@@ -369,10 +439,17 @@ def load(self, spec_factories, item_factories):
self._notify_rsrc_changes(destination, source)
for connection in connections:
connection.link.update_icons()
- self._logger.msg.emit("Restoring jumps...")
jump_dicts = project_info["project"].get("jumps", [])
+ if len(jump_dicts) > 0:
+ self._logger.msg.emit("Restoring jumps...")
for jump in map(self.jump_from_dict, jump_dicts):
self.add_jump(jump, silent=True)
+ groups_list = project_info["project"].get("groups", [])
+ if len(groups_list) > 0:
+ self._logger.msg.emit("Restoring groups...")
+ for group_dict in groups_list:
+ for group_name, item_names in group_dict.items():
+ self.make_group(group_name, item_names)
return True
@staticmethod
@@ -656,7 +733,7 @@ def rename_item(self, previous_name, new_name, rename_data_dir_message):
self._logger.error_box.emit("Invalid name", msg)
return False
item = self._project_items.pop(previous_name, None)
- if item is None:
+ if not item:
# Happens when renaming an item, removing, and then closing the project.
# We try to undo the renaming because it's critical, but the item doesn't exist anymore so it's fine.
return True
@@ -702,10 +779,6 @@ def validate_project_item_name(self, name):
return ItemNameStatus.SHORT_NAME_EXISTS
return ItemNameStatus.OK
- @property
- def connections(self):
- return self._connections
-
def find_connection(self, source_name, destination_name):
"""Searches for a connection between given items.
@@ -1458,10 +1531,6 @@ def _update_ranks(self, dag):
item = self._project_items[item_name]
item.set_rank(ranks[item_name])
- @property
- def app_settings(self):
- return self._app_settings
-
@busy_effect
def prepare_remote_execution(self):
"""Pings the server and sends the project as a zip-file to server.
diff --git a/spinetoolbox/project_commands.py b/spinetoolbox/project_commands.py
index e32c5bc9f..f204c265a 100644
--- a/spinetoolbox/project_commands.py
+++ b/spinetoolbox/project_commands.py
@@ -71,10 +71,10 @@ def __init__(self, icon, project):
self._representative = next(iter(icon_group), None)
if self._representative is None:
self.setObsolete(True)
- self._previous_pos = {x.name(): x.previous_pos for x in icon_group}
- self._current_pos = {x.name(): x.scenePos() for x in icon_group}
+ self._previous_pos = {x.name: x.previous_pos for x in icon_group}
+ self._current_pos = {x.name: x.scenePos() for x in icon_group}
if len(icon_group) == 1:
- self.setText(f"move {self._representative.name()}")
+ self.setText(f"move {self._representative.name}")
else:
self.setText("move multiple items")
@@ -92,6 +92,45 @@ def _move_to(self, positions):
self._representative.notify_item_move()
+class MoveGroupCommand(SpineToolboxCommand):
+ """Command to move Group in the Design view."""
+
+ def __init__(self, icon, project):
+ """
+ Args:
+ icon (Group): the icon
+ project (SpineToolboxProject): project
+ """
+ super().__init__()
+ self._icon = icon
+ self._project = project
+ icon_group = icon.scene().icon_group
+ self._representative = next(iter(icon_group), None)
+ if self._representative is None:
+ self.setObsolete(True)
+ self._previous_group_position = self._icon.previous_pos
+ self._current_group_position = self._icon.scenePos()
+ self._previous_item_positions = {x.name: x.previous_pos for x in icon_group}
+ self._current_item_positions = {x.name: x.scenePos() for x in icon_group}
+ if len(icon_group) == 1:
+ self.setText(f"move {self._icon.name}")
+ else:
+ self.setText("move multiple items")
+
+ def redo(self):
+ self._move_to(self._current_item_positions, self._current_group_position)
+
+ def undo(self):
+ self._move_to(self._previous_item_positions, self._previous_group_position)
+
+ def _move_to(self, item_positions, group_position):
+ for item_name, position in item_positions.items():
+ icon = self._project.get_item(item_name).get_icon()
+ icon.set_pos_without_bumping(position)
+ self._icon.set_pos_without_bumping(group_position)
+ self._icon.notify_item_move()
+
+
class SetProjectDescriptionCommand(SpineToolboxCommand):
"""Command to set the project description."""
@@ -244,6 +283,119 @@ def is_critical(self):
return True
+class MakeGroupCommand(SpineToolboxCommand):
+ """Command to add a group of project items to project."""
+
+ def __init__(self, project, item_names):
+ """
+ Args:
+ project (SpineToolboxProject): project
+ item_names (list): List of item names to group
+ """
+ super().__init__()
+ self._project = project
+ self._item_names = item_names
+ self._group_name = self._project.make_new_group_name()
+ self.setText(f"make {self._group_name}")
+
+ def redo(self):
+ self._project.make_group(self._group_name, self._item_names)
+
+ def undo(self):
+ self._project.disband_group(False, self._group_name)
+
+
+class RenameGroupCommand(SpineToolboxCommand):
+ """Command to rename groups."""
+
+ def __init__(self, project, previous_name, new_name):
+ """
+ Args:
+ project (SpineToolboxProject): The project
+ previous_name (str): Groups previous name
+ new_name (str): New Group name
+ """
+ super().__init__()
+ self._project = project
+ self._previous_name = previous_name
+ self._new_name = new_name
+ self.setText(f"rename Group {self._previous_name} to {self._new_name}")
+
+ def redo(self):
+ if self._new_name in self._project.groups.keys():
+ self.setObsolete(True)
+ group = self._project.groups.pop(self._previous_name)
+ group.name = self._new_name
+ self._project.groups[self._new_name] = group
+
+ def undo(self):
+ group = self._project.groups.pop(self._new_name)
+ group.name = self._previous_name
+ self._project.groups[self._previous_name] = group
+
+
+class RemoveItemFromGroupCommand(SpineToolboxCommand):
+ """Command to remove an item from a group. If only one item
+ remains in the group after the operation, disbands the group."""
+
+ def __init__(self, project, item_name, group_name):
+ """
+ Args:
+ project (SpineToolboxProject): Project
+ item_name (str): Item name to remove from group
+ group_name (str): Group to edit
+ """
+ super().__init__()
+ self._project = project
+ self._item_name = item_name
+ self._group_name = group_name
+ self._item_names = self._project.groups[group_name].item_names
+ self._links_removed = []
+ self._remake_group = False
+ if len(self._project.groups[group_name].project_items) == 1:
+ self._remake_group = True
+ self.setText(f"disband {self._group_name}")
+
+ def redo(self):
+ self._project.remove_item_from_group(self._item_name, self._group_name)
+ if not self._remake_group:
+ self._links_removed = [i for i in self._item_names if i not in self._project.groups[self._group_name].item_names]
+ self._links_removed.remove(self._item_name)
+
+ def undo(self):
+ if self._remake_group:
+ # Redo removed the whole group
+ self._project.make_group(self._group_name, self._item_names)
+ return
+ # First, add the project item icon back into group
+ self._project.add_item_to_group(self._item_name, self._group_name)
+ # Then, add link icons back
+ for link_name in self._links_removed:
+ self._project.add_item_to_group(link_name, self._group_name)
+
+
+class DisbandGroupCommand(SpineToolboxCommand):
+ """Command to disband a group of project items."""
+
+ def __init__(self, project, group_name):
+ """
+ Args:
+ project (SpineToolboxProject): project
+ group_name (Group): Name of Group to disband
+ """
+ super().__init__()
+ self._project = project
+ self._group_name = group_name
+ self._item_names = self._project.groups[group_name].item_names
+ self.setText(f"disband {self._group_name}")
+
+ def redo(self):
+ self._project.disband_group(False, self._group_name)
+
+ def undo(self):
+ self._project.make_group(self._group_name, self._item_names)
+
+
class AddConnectionCommand(SpineToolboxCommand):
"""Command to add connection between project items."""
diff --git a/spinetoolbox/project_item/logging_connection.py b/spinetoolbox/project_item/logging_connection.py
index 730b644cf..d91278532 100644
--- a/spinetoolbox/project_item/logging_connection.py
+++ b/spinetoolbox/project_item/logging_connection.py
@@ -143,10 +143,10 @@ class LoggingConnection(LogMixin, HeadlessConnection):
def __init__(self, *args, toolbox, **kwargs):
super().__init__(*args, **kwargs)
self._toolbox = toolbox
- self.resource_filter_model = ResourceFilterModel(self, toolbox.project(), toolbox.undo_stack, toolbox)
+ self.resource_filter_model = ResourceFilterModel(self, toolbox.project, toolbox.undo_stack, toolbox)
self.link = None
- self._source_item_type = self._toolbox.project().get_item(self.source).item_type()
- self._destination_item_type = self._toolbox.project().get_item(self.destination).item_type()
+ self._source_item_type = self._toolbox.project.get_item(self.source).item_type()
+ self._destination_item_type = self._toolbox.project.get_item(self.destination).item_type()
self._db_maps = {}
self._fetch_parents = {}
@@ -370,7 +370,7 @@ def set_connection_options(self, options):
if options == self.options:
return
self.options = options
- project = self._toolbox.project()
+ project = self._toolbox.project
sibling_conns = project.incoming_connections(self.destination)
for conn in sibling_conns:
conn.link.update_icons()
diff --git a/spinetoolbox/project_item/project_item.py b/spinetoolbox/project_item/project_item.py
index 0d1c87f11..a64ddd9cc 100644
--- a/spinetoolbox/project_item/project_item.py
+++ b/spinetoolbox/project_item/project_item.py
@@ -19,6 +19,7 @@
from ..log_mixin import LogMixin
from ..metaobject import MetaObject
from ..project_commands import SetItemSpecificationCommand
+from ..ui_main_lite import ToolboxUILite
class ProjectItem(LogMixin, MetaObject):
@@ -211,6 +212,11 @@ def set_rank(self, rank):
else:
self.get_icon().rank_icon.set_rank("X")
+ def update_progress_bar(self):
+ if self._toolbox.active_ui_mode == "toolboxuilite":
+ n_selected = len(self._toolbox.ui.graphicsView.scene().selectedItems())
+ print(f"[{n_selected}] started: {self.name}")
+
@property
def executable_class(self):
raise NotImplementedError()
@@ -387,7 +393,7 @@ def rename(self, new_name, rename_data_dir_message):
Returns:
bool: True if item was renamed successfully, False otherwise
"""
- new_data_dir = os.path.join(self._toolbox.project().items_dir, shorten(new_name))
+ new_data_dir = os.path.join(self._toolbox.project.items_dir, shorten(new_name))
if not rename_dir(self.data_dir, new_data_dir, self._toolbox, rename_data_dir_message):
return False
self.set_name(new_name)
diff --git a/spinetoolbox/project_item/specification_editor_window.py b/spinetoolbox/project_item/specification_editor_window.py
index 19fbd474b..4e496b849 100644
--- a/spinetoolbox/project_item/specification_editor_window.py
+++ b/spinetoolbox/project_item/specification_editor_window.py
@@ -112,7 +112,7 @@ def __init__(self, toolbox, specification=None, item=None):
self._original_spec_name = None if specification is None else specification.name
self.specification = specification
self.item = item
- self._app_settings = toolbox.qsettings()
+ self._app_settings = toolbox.qsettings
# Setup UI from Qt Designer file
self._ui = self._make_ui()
self._ui.setupUi(self)
@@ -218,7 +218,7 @@ def _save(self, exiting=None):
Returns:
bool: True if operation was successful, False otherwise
"""
- if not self._toolbox.project():
+ if not self._toolbox.project:
self.show_error("Please open or create a project first")
return False
name = self._spec_toolbar.name()
@@ -231,21 +231,21 @@ def _save(self, exiting=None):
if spec is None:
return self.prompt_exit_without_saving() if exiting else False
if not self._original_spec_name:
- if self._toolbox.project().is_specification_name_reserved(name):
+ if self._toolbox.project.is_specification_name_reserved(name):
self.show_error("Specification name already in use. Please enter a new name.")
return False
self._toolbox.add_specification(spec)
- if not self._toolbox.project().is_specification_name_reserved(name):
+ if not self._toolbox.project.is_specification_name_reserved(name):
return False
if self.item is not None:
self.item.set_specification(spec)
else:
- if name != self._original_spec_name and self._toolbox.project().is_specification_name_reserved(name):
+ if name != self._original_spec_name and self._toolbox.project.is_specification_name_reserved(name):
self.show_error("Specification name already in use. Please enter a new name.")
return False
spec.definition_file_path = self.specification.definition_file_path
self._toolbox.replace_specification(self._original_spec_name, spec)
- if not self._toolbox.project().is_specification_name_reserved(name):
+ if not self._toolbox.project.is_specification_name_reserved(name):
return False
self._original_spec_name = name
self._undo_stack.setClean()
@@ -277,7 +277,7 @@ def _duplicate_kwargs(self):
return {}
def _duplicate(self):
- if not self._toolbox.project():
+ if not self._toolbox.project:
self.show_error("Please open or create a project first")
return
new_spec = self._make_new_specification("")
@@ -287,7 +287,7 @@ def tear_down(self):
if self.focusWidget():
self.focusWidget().clearFocus()
if not self._undo_stack.isClean() and not prompt_to_save_changes(
- self, self._toolbox.qsettings(), self._save, True
+ self, self._toolbox.qsettings, self._save, True
):
return False
self._change_notifier.tear_down()
diff --git a/spinetoolbox/project_item_icon.py b/spinetoolbox/project_item_icon.py
index f14280a49..68112dbac 100644
--- a/spinetoolbox/project_item_icon.py
+++ b/spinetoolbox/project_item_icon.py
@@ -36,6 +36,8 @@ class ProjectItemIcon(QGraphicsPathItem):
ITEM_EXTENT = 64
FONT_SIZE_PIXELS = 12 # pixel size to prevent font scaling by system
+ DEFAULT_ICON_SELECTION_PEN_W = 1
+ USER_MODE_ICON_SELECTION_PEN_W = 5
def __init__(self, toolbox, icon_file, icon_color):
"""
@@ -52,8 +54,10 @@ def __init__(self, toolbox, icon_file, icon_color):
self.icon_file = icon_file
self._icon_color = icon_color
self._moved_on_scene = False
+ self.this_icons_group_is_moving = False
self.previous_pos = QPointF()
self.icon_group = {self}
+ self.my_groups = set()
self.renderer = QSvgRenderer()
self.svg_item = QGraphicsSvgItem(self)
self.svg_item.setZValue(100)
@@ -67,7 +71,7 @@ def __init__(self, toolbox, icon_file, icon_color):
self.rank_icon = RankIcon(self)
# Make item name graphics item.
self._name = ""
- self.name_item = QGraphicsTextItem(self._name)
+ self.name_item = QGraphicsTextItem(self._name, parent=self)
self.name_item.setZValue(100)
self.set_name_attributes() # Set font, size, position, etc.
self.spec_item = None # For displaying Tool Spec icon
@@ -79,11 +83,14 @@ def __init__(self, toolbox, icon_file, icon_color):
"right": ConnectorButton(toolbox, self, position="right"),
}
self._setup()
+ self.set_graphics_effects()
+ self._update_path()
+
+ def set_graphics_effects(self):
shadow_effect = QGraphicsDropShadowEffect()
shadow_effect.setOffset(1)
shadow_effect.setEnabled(False)
self.setGraphicsEffect(shadow_effect)
- self._update_path()
def add_specification_icon(self, spec_icon_path):
"""Adds an SVG icon to bottom left corner of the item icon based on Tool Specification type.
@@ -114,7 +121,7 @@ def rect(self):
return self._rect
def _update_path(self):
- rounded = self._toolbox.qsettings().value("appSettings/roundedItems", defaultValue="false") == "true"
+ rounded = self._toolbox.qsettings.value("appSettings/roundedItems", defaultValue="false") == "true"
self._do_update_path(rounded)
def update_path(self, rounded):
@@ -129,12 +136,15 @@ def _do_update_path(self, rounded):
for conn in self.connectors.values():
conn.update_path(radius)
# Selection halo
- pen_width = 1
margin = 1
path = QPainterPath()
path.addRoundedRect(self._rect.adjusted(-margin, -margin, margin, margin), radius + margin, radius + margin)
self._selection_halo.setPath(path)
- selection_pen = QPen(Qt.DashLine)
+ self.set_icon_selection_pen_w(self.DEFAULT_ICON_SELECTION_PEN_W)
+
+ def set_icon_selection_pen_w(self, pen_width):
+ """Sets the selected items dash line width."""
+ selection_pen = QPen(Qt.PenStyle.DashLine)
selection_pen.setWidthF(pen_width)
self._selection_halo.setPen(selection_pen)
@@ -157,7 +167,7 @@ def _setup(self):
gradient.setColorAt(0, background_color.lighter(105))
gradient.setColorAt(1, background_color.darker(105))
brush = QBrush(gradient)
- pen = QPen(QBrush(background_color.darker()), 1, Qt.SolidLine)
+ pen = QPen(QBrush(background_color.darker()), 1, Qt.PenStyle.SolidLine)
self.setPen(pen)
for conn in self.connectors.values():
conn.setPen(pen)
@@ -177,12 +187,12 @@ def _setup(self):
self.svg_item.setScale((rect_w - margin) / dim_max)
self.svg_item.setPos(self.rect().center() - self.svg_item.sceneBoundingRect().center())
self.svg_item.setGraphicsEffect(self.colorizer)
- self.setFlag(QGraphicsItem.ItemIsMovable, enabled=True)
- self.setFlag(QGraphicsItem.ItemIsSelectable, enabled=True)
- self.setFlag(QGraphicsItem.ItemIsFocusable, enabled=True)
- self.setFlag(QGraphicsItem.ItemSendsScenePositionChanges, enabled=True)
+ self.setFlag(QGraphicsItem.GraphicsItemFlag.ItemIsMovable, enabled=True)
+ self.setFlag(QGraphicsItem.GraphicsItemFlag.ItemIsSelectable, enabled=True)
+ self.setFlag(QGraphicsItem.GraphicsItemFlag.ItemIsFocusable, enabled=True)
+ self.setFlag(QGraphicsItem.GraphicsItemFlag.ItemSendsScenePositionChanges, enabled=True)
self.setAcceptHoverEvents(True)
- self.setCursor(Qt.PointingHandCursor)
+ self.setCursor(Qt.CursorShape.PointingHandCursor)
# Set exclamation, execution_log, and rank icons position
self.exclamation_icon.setPos(self.rect().topRight() - self.exclamation_icon.sceneBoundingRect().topRight())
self.execution_icon.setPos(
@@ -190,12 +200,8 @@ def _setup(self):
)
self.rank_icon.setPos(self.rect().topLeft())
+ @property
def name(self):
- """Returns name of the item that is represented by this icon.
-
- Returns:
- str: icon's name
- """
return self._name
def update_name_item(self, new_name):
@@ -221,7 +227,8 @@ def set_name_attributes(self):
def _reposition_name_item(self):
"""Sets name item position (centered on top of the master icon)."""
- main_rect = self.sceneBoundingRect()
+
+ main_rect = self.boundingRect()
name_rect = self.name_item.sceneBoundingRect()
self.name_item.setPos(main_rect.center().x() - name_rect.width() / 2, main_rect.y() - name_rect.height() - 4)
@@ -302,11 +309,19 @@ def hoverLeaveEvent(self, event):
def mousePressEvent(self, event):
"""Updates scene's icon group."""
- super().mousePressEvent(event)
+ for group in self.my_groups:
+ group.mouse_press_pos = event.pos()
icon_group = set(x for x in self.scene().selectedItems() if isinstance(x, ProjectItemIcon)) | {self}
for icon in icon_group:
icon.previous_pos = icon.scenePos()
self.scene().icon_group = icon_group
+ super().mousePressEvent(event)
+
+ def mouseMoveEvent(self, event):
+ """Updates group rectangles on scene, if this item is in group(s)."""
+ for group in self.my_groups:
+ group.update_group_rect(event.pos())
+ super().mouseMoveEvent(event)
def update_links_geometry(self):
"""Updates geometry of connected links to reflect this item's most recent position."""
@@ -317,18 +332,20 @@ def update_links_geometry(self):
dirty_links = set(link for icon in icon_group for conn in icon.connectors.values() for link in conn.links)
if not dirty_links:
return
- qsettings = self._toolbox.qsettings()
+ qsettings = self._toolbox.qsettings
curved_links = qsettings.value("appSettings/curvedLinks", defaultValue="false") == "true"
for link in dirty_links:
link.update_geometry(curved_links)
def mouseReleaseEvent(self, event):
"""Clears pre-bump rects, and pushes a move icon command if necessary."""
+ for group in self.my_groups:
+ group.mouse_press_pos = None
for icon in self.scene().icon_group:
icon.bumped_rects.clear()
# pylint: disable=undefined-variable
if (self.scenePos() - self.previous_pos).manhattanLength() > qApp.startDragDistance():
- self._toolbox.undo_stack.push(MoveIconCommand(self, self._toolbox.project()))
+ self._toolbox.undo_stack.push(MoveIconCommand(self, self._toolbox.project))
event.ignore()
super().mouseReleaseEvent(event)
@@ -347,7 +364,7 @@ def contextMenuEvent(self, event):
event.accept()
self.scene().clearSelection()
self.setSelected(True)
- item = self._toolbox.project().get_item(self.name())
+ item = self._toolbox.project.get_item(self.name)
self._toolbox.show_project_or_item_context_menu(event.screenPos(), item)
def itemChange(self, change, value):
@@ -364,7 +381,7 @@ def itemChange(self, change, value):
Returns:
Whatever super() does with the value parameter
"""
- if change == QGraphicsItem.ItemScenePositionHasChanged:
+ if change == QGraphicsItem.GraphicsItemChange.ItemScenePositionHasChanged:
self._moved_on_scene = True
self._reposition_name_item()
self.update_links_geometry()
@@ -394,7 +411,7 @@ def set_pos_without_bumping(self, pos):
def _handle_collisions(self):
"""Handles collisions with other items."""
- prevent_overlapping = self._toolbox.qsettings().value("appSettings/preventOverlapping", defaultValue="false")
+ prevent_overlapping = self._toolbox.qsettings.value("appSettings/preventOverlapping", defaultValue="false")
if not self.scene() or not self._bumping or prevent_overlapping != "true":
return
restablished = self._restablish_bumped_items()
@@ -406,7 +423,7 @@ def make_room_for_item(self, other):
"""Makes room for another item.
Args:
- item (ProjectItemIcon)
+ other (ProjectItemIcon): Other item
"""
if self not in other.bumped_rects:
other.bumped_rects[self] = self.sceneBoundingRect()
@@ -473,7 +490,7 @@ def __init__(self, toolbox, parent, position="left"):
elif position == "right":
self._rect.moveCenter(QPointF(parent_rect.right() - extent / 2, parent_rect.center().y()))
self.setAcceptHoverEvents(True)
- self.setCursor(Qt.PointingHandCursor)
+ self.setCursor(Qt.CursorShape.PointingHandCursor)
def rect(self):
return self._rect
@@ -496,7 +513,7 @@ def incoming_links(self):
def parent_name(self):
"""Returns project item name owning this connector button."""
- return self._parent.name()
+ return self._parent.name
def project_item(self):
"""Returns the project item this connector button is attached to.
@@ -504,7 +521,7 @@ def project_item(self):
Returns:
ProjectItem: project item
"""
- return self._toolbox.project().get_item(self._parent.name())
+ return self._toolbox.project.get_item(self._parent.name)
def mousePressEvent(self, event):
"""Connector button mouse press event.
@@ -588,17 +605,17 @@ def __init__(self, parent):
self._text_item.setFont(font)
parent_rect = parent.rect()
self.setRect(0, 0, 0.5 * parent_rect.width(), 0.5 * parent_rect.height())
- self.setPen(Qt.NoPen)
+ self.setPen(Qt.PenStyle.NoPen)
# pylint: disable=undefined-variable
self.normal_brush = qApp.palette().window()
self.selected_brush = qApp.palette().highlight()
self.setBrush(self.normal_brush)
self.setAcceptHoverEvents(True)
- self.setFlag(QGraphicsItem.ItemIsSelectable, enabled=False)
+ self.setFlag(QGraphicsItem.GraphicsItemFlag.ItemIsSelectable, enabled=False)
self.hide()
def item_name(self):
- return self._parent.name()
+ return self._parent.name
def _repaint(self, text, color):
self._text_item.prepareGeometryChange()
diff --git a/spinetoolbox/resources_icons_rc.py b/spinetoolbox/resources_icons_rc.py
index c2238df72..631f1d435 100644
--- a/spinetoolbox/resources_icons_rc.py
+++ b/spinetoolbox/resources_icons_rc.py
@@ -27067,6 +27067,38 @@
48zm-16 352H64V6\
4h448v288z\x22/>\
+\x00\x00\x01\xd3\
+<\
+svg xmlns=\x22http:\
+//www.w3.org/200\
+0/svg\x22 viewBox=\x22\
+0 0 384 512\x22>\
\x00\x00\x02k\
<\
svg xmlns=\x22http:\
@@ -28710,6 +28742,64 @@
88 80 80 80 80-3\
5.888 80-80z\x22/><\
/svg>\
+\x00\x00\x03\x7f\
+<\
+svg xmlns=\x22http:\
+//www.w3.org/200\
+0/svg\x22 viewBox=\x22\
+0 0 640 512\x22>\
\x00\x00\x0d\xd9\
<\
?xml version=\x221.\
@@ -28934,6 +29024,25 @@
5391 z \x22\x0d\x0a i\
d=\x22path2-0\x22 />\x0d\x0a\
\x0d\x0a\
+\x00\x00\x01\x0b\
+<\
+svg xmlns=\x22http:\
+//www.w3.org/200\
+0/svg\x22 viewBox=\x22\
+0 0 384 512\x22>\
\x00\x00\x02X\
<\
svg xmlns=\x22http:\
@@ -28974,25 +29083,6 @@
7.2 16 16 16s16-\
7.2 16-16V208z\x22/\
>\
-\x00\x00\x01\x0b\
-<\
-svg xmlns=\x22http:\
-//www.w3.org/200\
-0/svg\x22 viewBox=\x22\
-0 0 384 512\x22>\
\x00\x00\x02-\
<\
svg xmlns=\x22http:\
@@ -29726,6 +29816,51 @@
dth:0.70175511;f\
ill:#0000ff\x22 />\x0d\
\x0a\x0d\x0a\
+\x00\x00\x02\xa7\
+<\
+svg xmlns=\x22http:\
+//www.w3.org/200\
+0/svg\x22 viewBox=\x22\
+0 0 512 512\x22>\
+\
\x00\x00\x0a\x8e\
<\
?xml version=\x221.\
@@ -31243,6 +31378,39 @@
6.207 9.997-36.2\
04-.001z\x22/>\
+\x00\x00\x01\xe1\
+<\
+svg xmlns=\x22http:\
+//www.w3.org/200\
+0/svg\x22 viewBox=\x22\
+0 0 640 512\x22>\
+\
\x00\x00\x0b\xf3\
<\
?xml version=\x221.\
@@ -32131,6 +32299,10 @@
\x0b\xb6\xce\x87\
\x00d\
\x00e\x00s\x00k\x00t\x00o\x00p\x00.\x00s\x00v\x00g\
+\x00\x0f\
+\x00\x7f`\xa7\
+\x00f\
+\x00i\x00l\x00e\x00-\x00u\x00p\x00l\x00o\x00a\x00d\x00.\x00s\x00v\x00g\
\x00\x08\
\x068W'\
\x00h\
@@ -32226,6 +32398,10 @@
\x0aZZ\x07\
\x00c\
\x00o\x00g\x00.\x00s\x00v\x00g\
+\x00\x0b\
+\x0b6\xcdg\
+\x00r\
+\x00e\x00t\x00w\x00e\x00e\x00t\x00.\x00s\x00v\x00g\
\x00\x0e\
\x04\xdfl\x87\
\x00c\
@@ -32284,6 +32460,10 @@
\x03\xf0\xc9\xa7\
\x00c\
\x00u\x00b\x00e\x00s\x00_\x00p\x00e\x00n\x00.\x00s\x00v\x00g\
+\x00\x10\
+\x01\x90C\xc7\
+\x00o\
+\x00b\x00j\x00e\x00c\x00t\x00-\x00g\x00r\x00o\x00u\x00p\x00.\x00s\x00v\x00g\
\x00\x0e\
\x03a\x89\xe7\
\x00s\
@@ -32353,6 +32533,10 @@
\x00c\
\x00h\x00e\x00c\x00k\x00.\x00s\x00v\x00g\
\x00\x0c\
+\x0b&r\xc7\
+\x00t\
+\x00e\x00r\x00m\x00i\x00n\x00a\x00l\x00.\x00s\x00v\x00g\
+\x00\x0c\
\x0c\x16L\x07\
\x00c\
\x00u\x00b\x00e\x00_\x00p\x00e\x00n\x00.\x00s\x00v\x00g\
@@ -32399,9 +32583,9 @@
qt_resource_struct = b"\
\x00\x00\x00\x00\x00\x02\x00\x00\x00\x04\x00\x00\x00\x01\
\x00\x00\x00\x00\x00\x00\x00\x00\
-\x00\x00\x00\x10\x00\x02\x00\x00\x00\x03\x00\x00\x00_\
+\x00\x00\x00\x10\x00\x02\x00\x00\x00\x03\x00\x00\x00c\
\x00\x00\x00\x00\x00\x00\x00\x00\
-\x00\x00\x00\x00\x00\x02\x00\x00\x00\x1a\x00\x00\x00\x09\
+\x00\x00\x00\x00\x00\x02\x00\x00\x00\x1b\x00\x00\x00\x09\
\x00\x00\x00\x00\x00\x00\x00\x00\
\x00\x00\x00 \x00\x02\x00\x00\x00\x03\x00\x00\x00\x06\
\x00\x00\x00\x00\x00\x00\x00\x00\
@@ -32417,23 +32601,25 @@
\x00\x00\x01\x8f\xec\xcf\x12\xea\
\x00\x00\x02R\x00\x00\x00\x00\x00\x01\x00\x06A\x9c\
\x00\x00\x01\x8f\xec\xcf\x12\xea\
+\x00\x00\x03\xf6\x00\x00\x00\x00\x00\x01\x00\x06\x978\
+\x00\x00\x01\x93IP\xaeM\
\x00\x00\x01\xea\x00\x00\x00\x00\x00\x01\x00\x062\x92\
\x00\x00\x01\x8f\xec\xcf\x13\x09\
-\x00\x00\x04p\x00\x00\x00\x00\x00\x01\x00\x06\xa8\xcd\
+\x00\x00\x04\x94\x00\x00\x00\x00\x00\x01\x00\x06\xaa\xa4\
\x00\x00\x01\x8f\xec\xcf\x12\xea\
-\x00\x00\x04\xb8\x00\x00\x00\x00\x00\x01\x00\x06\xbd\xb7\
+\x00\x00\x04\xdc\x00\x00\x00\x00\x00\x01\x00\x06\xbf\x8e\
\x00\x00\x01\x8f\xec\xcf\x12\xfa\
\x00\x00\x03D\x00\x00\x00\x00\x00\x01\x00\x06\x88\x1a\
\x00\x00\x01\x8f\xec\xcf\x13\x09\
-\x00\x00\x04\x98\x00\x00\x00\x00\x00\x01\x00\x06\xaa\xa1\
+\x00\x00\x04\xbc\x00\x00\x00\x00\x00\x01\x00\x06\xacx\
\x00\x00\x01\x8f\xec\xcf\x12\xea\
-\x00\x00\x04\x0c\x00\x00\x00\x00\x00\x01\x00\x06\x99\xa7\
+\x00\x00\x040\x00\x00\x00\x00\x00\x01\x00\x06\x9b~\
\x00\x00\x01\x8f\xec\xcf\x12\xfa\
\x00\x00\x02\x80\x00\x00\x00\x00\x00\x01\x00\x06E\xb2\
\x00\x00\x01\x8f\xec\xcf\x12\xea\
\x00\x00\x02h\x00\x00\x00\x00\x00\x01\x00\x06B\xab\
\x00\x00\x01\x8f\xec\xcf\x13\x09\
-\x00\x00\x03\xf6\x00\x00\x00\x00\x00\x01\x00\x06\x978\
+\x00\x00\x04\x1a\x00\x00\x00\x00\x00\x01\x00\x06\x99\x0f\
\x00\x00\x01\x8f\xec\xcf\x12\xea\
\x00\x00\x03^\x00\x00\x00\x00\x00\x01\x00\x06\x8a3\
\x00\x00\x01\x8f\xec\xcf\x12\xea\
@@ -32449,15 +32635,15 @@
\x00\x00\x01\x8f\xec\xcf\x13\x09\
\x00\x00\x01\xa6\x00\x00\x00\x00\x00\x01\x00\x06/\x9c\
\x00\x00\x01\x8f\xec\xcf\x13\x09\
-\x00\x00\x04$\x00\x00\x00\x00\x00\x01\x00\x06\xa0\x10\
+\x00\x00\x04H\x00\x00\x00\x00\x00\x01\x00\x06\xa1\xe7\
\x00\x00\x01\x8f\xec\xcf\x13\x09\
-\x00\x00\x03\xb0\x00\x02\x00\x00\x00\x09\x00\x00\x00V\
+\x00\x00\x03\xb0\x00\x02\x00\x00\x00\x09\x00\x00\x00Z\
\x00\x00\x00\x00\x00\x00\x00\x00\
-\x00\x00\x03~\x00\x02\x00\x00\x003\x00\x00\x00#\
+\x00\x00\x03~\x00\x02\x00\x00\x006\x00\x00\x00$\
\x00\x00\x00\x00\x00\x00\x00\x00\
\x00\x00\x02\x0a\x00\x00\x00\x00\x00\x01\x00\x065G\
\x00\x00\x01\x8f\xec\xcf\x13\x09\
-\x00\x00\x04T\x00\x00\x00\x00\x00\x01\x00\x06\xa3)\
+\x00\x00\x04x\x00\x00\x00\x00\x00\x01\x00\x06\xa5\x00\
\x00\x00\x01\x8f\xec\xcf\x13\x09\
\x00\x00\x03\xda\x00\x00\x00\x00\x00\x01\x00\x06\x96\x00\
\x00\x00\x01\x8f\xec\xcf\x12\xea\
@@ -32467,125 +32653,131 @@
\x00\x00\x01\x8f\xec\xcf\x13\x09\
\x00\x00\x03\x02\x00\x00\x00\x00\x00\x01\x00\x06`G\
\x00\x00\x01\x8f\xec\xcf\x12\xea\
-\x00\x00\x02R\x00\x00\x00\x00\x00\x01\x00\x07\x0a\xf8\
+\x00\x00\x02R\x00\x00\x00\x00\x00\x01\x00\x07\x0d\xf6\
\x00\x00\x01\x8f\xec\xcf\x12\xfa\
-\x00\x00\x0b\xec\x00\x00\x00\x00\x00\x01\x00\x07\xbf\xb6\
+\x00\x00\x0cp\x00\x00\x00\x00\x00\x01\x00\x07\xc9\xa0\
\x00\x00\x01\x8f\xec\xcf\x12\xfa\
-\x00\x00\x060\x00\x00\x00\x00\x00\x01\x00\x06\xec\xdf\
+\x00\x00\x06T\x00\x00\x00\x00\x00\x01\x00\x06\xee\xb6\
\x00\x00\x01\x8f\xec\xcf\x12\xfa\
-\x00\x00\x09\x14\x00\x00\x00\x00\x00\x01\x00\x07Hx\
+\x00\x00\x09z\x00\x00\x00\x00\x00\x01\x00\x07P}\
\x00\x00\x01\x8f\xec\xcf\x12\xfa\
-\x00\x00\x09\x9a\x00\x00\x00\x00\x00\x01\x00\x07_J\
+\x00\x00\x08\xd8\x00\x00\x00\x00\x00\x01\x00\x07=|\
+\x00\x00\x01\x93IP\xaeN\
+\x00\x00\x0a\x00\x00\x00\x00\x00\x00\x01\x00\x07gO\
\x00\x00\x01\x8f\xec\xcf\x12\xfa\
-\x00\x00\x06\xf6\x00\x00\x00\x00\x00\x01\x00\x07\x08\x9c\
+\x00\x00\x076\x00\x00\x00\x00\x00\x01\x00\x07\x0f\x05\
\x00\x00\x01\x8f\xec\xcf\x12\xfa\
-\x00\x00\x08\x98\x00\x00\x00\x00\x00\x01\x00\x07B\xb4\
+\x00\x00\x08\xfe\x00\x00\x00\x00\x00\x01\x00\x07J\xb9\
\x00\x00\x01\x8f\xec\xcf\x12\xfa\
-\x00\x00\x09v\x00\x00\x00\x00\x00\x01\x00\x07]\x88\
+\x00\x00\x09\xdc\x00\x00\x00\x00\x00\x01\x00\x07e\x8d\
\x00\x00\x01\x8f\xec\xcf\x12\xfa\
-\x00\x00\x0a\xce\x00\x00\x00\x00\x00\x01\x00\x07\xa0\x8e\
+\x00\x00\x0bR\x00\x00\x00\x00\x00\x01\x00\x07\xaax\
\x00\x00\x01\x8f\xec\xcf\x12\xfa\
-\x00\x00\x07\xa0\x00\x00\x00\x00\x00\x01\x00\x07\x1ez\
+\x00\x00\x07\xe0\x00\x00\x00\x00\x00\x01\x00\x07#\xd4\
\x00\x00\x01\x8f\xec\xcf\x12\xfa\
-\x00\x00\x07\x16\x00\x00\x00\x00\x00\x01\x00\x07\x0e8\
+\x00\x00\x07V\x00\x00\x00\x00\x00\x01\x00\x07\x13\x92\
\x00\x00\x01\x8f\xec\xcf\x12\xfa\
-\x00\x00\x094\x00\x00\x00\x00\x00\x01\x00\x07ZV\
+\x00\x00\x09\x9a\x00\x00\x00\x00\x00\x01\x00\x07b[\
\x00\x00\x01\x8f\xec\xcf\x12\xfa\
-\x00\x00\x08x\x00\x00\x00\x00\x00\x01\x00\x07)\xa4\
+\x00\x00\x08\xb8\x00\x00\x00\x00\x00\x01\x00\x07.\xfe\
\x00\x00\x01\x8f\xec\xcf\x12\xfa\
-\x00\x00\x08\xba\x00\x00\x00\x00\x00\x01\x00\x07D\xc1\
+\x00\x00\x09 \x00\x00\x00\x00\x00\x01\x00\x07L\xc6\
\x00\x00\x01\x8f\xec\xcf\x12\xfa\
-\x00\x00\x07\xf2\x00\x00\x00\x00\x00\x01\x00\x07$u\
+\x00\x00\x082\x00\x00\x00\x00\x00\x01\x00\x07)\xcf\
\x00\x00\x01\x8f\xec\xcf\x12\xfa\
-\x00\x00\x08\xee\x00\x00\x00\x00\x00\x01\x00\x07F\x1d\
+\x00\x00\x09T\x00\x00\x00\x00\x00\x01\x00\x07N\x22\
\x00\x00\x01\x8f\xec\xcf\x12\xfa\
-\x00\x00\x06V\x00\x00\x00\x00\x00\x01\x00\x06\xee\xe8\
+\x00\x00\x06z\x00\x00\x00\x00\x00\x01\x00\x06\xf0\xbf\
\x00\x00\x01\x8f\xec\xcf\x12\xea\
-\x00\x00\x0a\x00\x00\x00\x00\x00\x00\x01\x00\x07~\x92\
+\x00\x00\x0af\x00\x00\x00\x00\x00\x01\x00\x07\x86\x97\
\x00\x00\x01\x8f\xec\xcf\x12\xfa\
-\x00\x00\x07\xb8\x00\x00\x00\x00\x00\x01\x00\x07 m\
+\x00\x00\x07\xf8\x00\x00\x00\x00\x00\x01\x00\x07%\xc7\
\x00\x00\x01\x8f\xec\xcf\x12\xfa\
-\x00\x00\x0b>\x00\x00\x00\x00\x00\x01\x00\x07\xa6\xd3\
+\x00\x00\x0b\xc2\x00\x00\x00\x00\x00\x01\x00\x07\xb0\xbd\
\x00\x00\x01\x8f\xec\xcf\x12\xfa\
-\x00\x00\x06\x1a\x00\x00\x00\x00\x00\x01\x00\x06\xeap\
+\x00\x00\x06>\x00\x00\x00\x00\x00\x01\x00\x06\xecG\
\x00\x00\x01\x8f\xec\xcf\x12\xfa\
-\x00\x00\x06\xd4\x00\x00\x00\x00\x00\x01\x00\x06\xfa\xbf\
+\x00\x00\x07\x14\x00\x00\x00\x00\x00\x01\x00\x07\x00\x19\
\x00\x00\x01\x8f\xec\xcf\x12\xfa\
-\x00\x00\x08T\x00\x00\x00\x00\x00\x01\x00\x07(B\
+\x00\x00\x08\x94\x00\x00\x00\x00\x00\x01\x00\x07-\x9c\
\x00\x00\x01\x8f\xec\xcf\x12\xfa\
-\x00\x00\x07X\x00\x00\x00\x00\x00\x01\x00\x07\x1a]\
+\x00\x00\x07\x98\x00\x00\x00\x00\x00\x01\x00\x07\x1f\xb7\
\x00\x00\x01\x8f\xec\xcf\x12\xea\
-\x00\x00\x0b\xa4\x00\x00\x00\x00\x00\x01\x00\x07\xad\xdf\
+\x00\x00\x0c(\x00\x00\x00\x00\x00\x01\x00\x07\xb7\xc9\
\x00\x00\x01\x8f\xec\xcf\x12\xfa\
-\x00\x00\x0b\x0e\x00\x00\x00\x00\x00\x01\x00\x07\xa5\xce\
+\x00\x00\x0b\x92\x00\x00\x00\x00\x00\x01\x00\x07\xaf\xb8\
\x00\x00\x01\x8f\xec\xcf\x12\xfa\
-\x00\x00\x05\xfe\x00\x00\x00\x00\x00\x01\x00\x06\xe7K\
+\x00\x00\x06\x22\x00\x00\x00\x00\x00\x01\x00\x06\xe9\x22\
\x00\x00\x01\x8f\xec\xcf\x12\xfa\
-\x00\x00\x07\xda\x00\x00\x00\x00\x00\x01\x00\x07!\x9a\
+\x00\x00\x08\x1a\x00\x00\x00\x00\x00\x01\x00\x07&\xf4\
\x00\x00\x01\x8f\xec\xcf\x12\xfa\
-\x00\x00\x09\xd2\x00\x00\x00\x00\x00\x01\x00\x07y\xdc\
+\x00\x00\x0a8\x00\x00\x00\x00\x00\x01\x00\x07\x81\xe1\
\x00\x00\x01\x8f\xec\xcf\x12\xfa\
-\x00\x00\x0b\xcc\x00\x00\x00\x00\x00\x01\x00\x07\xb0:\
+\x00\x00\x0cP\x00\x00\x00\x00\x00\x01\x00\x07\xba$\
\x00\x00\x01\x8f\xec\xcf\x12\xfa\
-\x00\x00\x07:\x00\x01\x00\x00\x00\x01\x00\x07\x18\xeb\
+\x00\x00\x07z\x00\x01\x00\x00\x00\x01\x00\x07\x1eE\
\x00\x00\x01\x8f\xec\xcf\x12\xfa\
-\x00\x00\x0aT\x00\x00\x00\x00\x00\x01\x00\x07\x8e%\
+\x00\x00\x0a\xba\x00\x00\x00\x00\x00\x01\x00\x07\x96*\
\x00\x00\x01\x8f\xec\xcf\x12\xfa\
-\x00\x00\x09^\x00\x00\x00\x00\x00\x01\x00\x07\x5ci\
+\x00\x00\x09\xc4\x00\x00\x00\x00\x00\x01\x00\x07dn\
\x00\x00\x01\x8f\xec\xcf\x12\xfa\
-\x00\x00\x09\xbc\x00\x00\x00\x00\x00\x01\x00\x07m\xb8\
+\x00\x00\x0a\x22\x00\x00\x00\x00\x00\x01\x00\x07u\xbd\
\x00\x00\x01\x8f\xec\xcf\x12\xfa\
-\x00\x00\x06\xc0\x00\x00\x00\x00\x00\x01\x00\x06\xf6%\
+\x00\x00\x06\xe4\x00\x00\x00\x00\x00\x01\x00\x06\xf7\xfc\
\x00\x00\x01\x8f\xec\xcf\x12\xfa\
-\x00\x00\x0a\xf2\x00\x00\x00\x00\x00\x01\x00\x07\xa2T\
+\x00\x00\x0bv\x00\x00\x00\x00\x00\x01\x00\x07\xac>\
\x00\x00\x01\x8f\xec\xcf\x12\xfa\
-\x00\x00\x0a\x80\x00\x00\x00\x00\x00\x01\x00\x07\x90\xe7\
+\x00\x00\x0a\xe6\x00\x00\x00\x00\x00\x01\x00\x07\x98\xec\
\x00\x00\x01\x8f\xec\xcf\x12\xfa\
-\x00\x00\x0a$\x00\x00\x00\x00\x00\x01\x00\x07\x8c\x8f\
+\x00\x00\x0a\x8a\x00\x00\x00\x00\x00\x01\x00\x07\x94\x94\
\x00\x00\x01\x8f\xec\xcf\x12\xfa\
-\x00\x00\x09\xe8\x00\x00\x00\x00\x00\x01\x00\x07{\x8f\
+\x00\x00\x0aN\x00\x00\x00\x00\x00\x01\x00\x07\x83\x94\
\x00\x00\x01\x8f\xec\xcf\x12\xfa\
-\x00\x00\x07\x8a\x00\x00\x00\x00\x00\x01\x00\x07\x1c+\
+\x00\x00\x07\xca\x00\x00\x00\x00\x00\x01\x00\x07!\x85\
\x00\x00\x01\x8f\xec\xcf\x12\xfa\
-\x00\x00\x0a\x98\x00\x00\x00\x00\x00\x01\x00\x07\x931\
+\x00\x00\x0b\x16\x00\x00\x00\x00\x00\x01\x00\x07\x9c\x9c\
+\x00\x00\x01\x93IP\xaeP\
+\x00\x00\x06\xf8\x00\x00\x00\x00\x00\x01\x00\x06\xfc\x96\
+\x00\x00\x01\x93IP\xaeO\
+\x00\x00\x0a\xfe\x00\x00\x00\x00\x00\x01\x00\x07\x9b6\
\x00\x00\x01\x8f\xec\xcf\x12\xfa\
-\x00\x00\x06\xaa\x00\x00\x00\x00\x00\x01\x00\x06\xf4{\
+\x00\x00\x06\xce\x00\x00\x00\x00\x00\x01\x00\x06\xf6R\
\x00\x00\x01\x8f\xec\xcf\x12\xfa\
-\x00\x00\x0a\xb0\x00\x00\x00\x00\x00\x01\x00\x07\x94\x97\
+\x00\x00\x0b4\x00\x00\x00\x00\x00\x01\x00\x07\x9e\x81\
\x00\x00\x01\x8f\xec\xcf\x12\xfa\
-\x00\x00\x0b\x88\x00\x00\x00\x00\x00\x01\x00\x07\xaa\x95\
+\x00\x00\x0c\x0c\x00\x00\x00\x00\x00\x01\x00\x07\xb4\x7f\
\x00\x00\x01\x8f\xec\xcf\x12\xfa\
-\x00\x00\x08&\x00\x01\x00\x00\x00\x01\x00\x07%\xca\
+\x00\x00\x08f\x00\x01\x00\x00\x00\x01\x00\x07+$\
\x00\x00\x01\x8f\xec\xcf\x12\xfa\
-\x00\x00\x08@\x00\x00\x00\x00\x00\x01\x00\x07&\xa4\
+\x00\x00\x08\x80\x00\x00\x00\x00\x00\x01\x00\x07+\xfe\
\x00\x00\x01\x8f\xec\xcf\x12\xfa\
-\x00\x00\x0bb\x00\x00\x00\x00\x00\x01\x00\x07\xa8\xb6\
+\x00\x00\x0b\xe6\x00\x00\x00\x00\x00\x01\x00\x07\xb2\xa0\
\x00\x00\x01\x8f\xec\xcf\x12\xfa\
-\x00\x00\x06\x86\x00\x00\x00\x00\x00\x01\x00\x06\xf0\xb4\
+\x00\x00\x06\xaa\x00\x00\x00\x00\x00\x01\x00\x06\xf2\x8b\
\x00\x00\x01\x8f\xec\xcf\x12\xfa\
-\x00\x00\x04\xf0\x00\x00\x00\x00\x00\x01\x00\x07\x0c\x07\
+\x00\x00\x05\x14\x00\x00\x00\x00\x00\x01\x00\x07\x11a\
\x00\x00\x01\x8f\xec\xcf\x12\xfa\
-\x00\x00\x05X\x00\x00\x00\x00\x00\x01\x00\x078\x22\
+\x00\x00\x05|\x00\x00\x00\x00\x00\x01\x00\x07@'\
\x00\x00\x01\x8f\xec\xcf\x12\xfa\
-\x00\x00\x05\x84\x00\x00\x00\x00\x00\x01\x00\x07o\x0c\
+\x00\x00\x05\xa8\x00\x00\x00\x00\x00\x01\x00\x07w\x11\
\x00\x00\x01\x8f\xec\xcf\x12\xfa\
-\x00\x00\x05\xb0\x00\x00\x00\x00\x00\x01\x00\x06\xe3:\
+\x00\x00\x05\xd4\x00\x00\x00\x00\x00\x01\x00\x06\xe5\x11\
\x00\x00\x01\x8f\xec\xcf\x13\x09\
-\x00\x00\x05\x0e\x00\x00\x00\x00\x00\x01\x00\x06\xca\xc1\
+\x00\x00\x052\x00\x00\x00\x00\x00\x01\x00\x06\xcc\x98\
\x00\x00\x01\x8f\xec\xcf\x13\x09\
-\x00\x00\x02\x80\x00\x00\x00\x00\x00\x01\x00\x06\xc6\xaf\
+\x00\x00\x02\x80\x00\x00\x00\x00\x00\x01\x00\x06\xc8\x86\
\x00\x00\x01\x8f\xec\xcf\x13\x09\
-\x00\x00\x04\xce\x00\x00\x00\x00\x00\x01\x00\x06\xc4\x9c\
+\x00\x00\x04\xf2\x00\x00\x00\x00\x00\x01\x00\x06\xc6s\
\x00\x00\x01\x8f\xec\xcf\x12\xfa\
-\x00\x00\x05\xe2\x00\x00\x00\x00\x00\x01\x00\x06\xe5\x0c\
+\x00\x00\x06\x06\x00\x00\x00\x00\x00\x01\x00\x06\xe6\xe3\
\x00\x00\x01\x8f\xec\xcf\x12\xfa\
-\x00\x00\x05(\x00\x00\x00\x00\x00\x01\x00\x06\xcdK\
+\x00\x00\x05L\x00\x00\x00\x00\x00\x01\x00\x06\xcf\x22\
\x00\x00\x01\x8f\xec\xcf\x13\x09\
-\x00\x00\x04\xf0\x00\x00\x00\x00\x00\x01\x00\x06\xc8\x90\
+\x00\x00\x05\x14\x00\x00\x00\x00\x00\x01\x00\x06\xcag\
\x00\x00\x01\x8f\xec\xcf\x13\x09\
-\x00\x00\x05X\x00\x00\x00\x00\x00\x01\x00\x06\xcf\xfe\
+\x00\x00\x05|\x00\x00\x00\x00\x00\x01\x00\x06\xd1\xd5\
\x00\x00\x01\x8f\xec\xcf\x12\xfa\
-\x00\x00\x05\x84\x00\x00\x00\x00\x00\x01\x00\x06\xd9\xb8\
+\x00\x00\x05\xa8\x00\x00\x00\x00\x00\x01\x00\x06\xdb\x8f\
\x00\x00\x01\x8f\xec\xcf\x12\xfa\
\x00\x00\x01&\x00\x01\x00\x00\x00\x01\x00\x03\x04\x82\
\x00\x00\x01\x8f\xec\xcf\x12\xea\
diff --git a/spinetoolbox/spine_db_editor/widgets/custom_qgraphicsviews.py b/spinetoolbox/spine_db_editor/widgets/custom_qgraphicsviews.py
index 66d781512..b1b061fac 100644
--- a/spinetoolbox/spine_db_editor/widgets/custom_qgraphicsviews.py
+++ b/spinetoolbox/spine_db_editor/widgets/custom_qgraphicsviews.py
@@ -854,7 +854,7 @@ def set_cross_hairs_items(self, entity_class, cross_hairs_items):
item.apply_zoom(self.zoom_factor)
cursor_pos = self.mapFromGlobal(QCursor.pos())
self._update_cross_hairs_pos(cursor_pos)
- self.viewport().setCursor(Qt.BlankCursor)
+ self.viewport().setCursor(Qt.CursorShape.BlankCursor)
def clear_cross_hairs_items(self):
self.entity_class = None
@@ -875,7 +875,7 @@ def mousePressEvent(self, event):
if not self.cross_hairs_items:
super().mousePressEvent(event)
return
- if event.buttons() & Qt.RightButton or not self._hovered_ent_item:
+ if event.buttons() & Qt.MouseButton.RightButton or not self._hovered_ent_item:
self.clear_cross_hairs_items()
return
if self._cross_hairs_has_valid_target():
@@ -937,7 +937,7 @@ def mouseReleaseEvent(self, event):
def keyPressEvent(self, event):
"""Aborts relationship creation if user presses ESC."""
super().keyPressEvent(event)
- if event.key() == Qt.Key_Escape and self.cross_hairs_items:
+ if event.key() == Qt.Key.Key_Escape and self.cross_hairs_items:
self._spine_db_editor.msg.emit("Relationship creation aborted.")
self.clear_cross_hairs_items()
diff --git a/spinetoolbox/spine_db_editor/widgets/multi_spine_db_editor.py b/spinetoolbox/spine_db_editor/widgets/multi_spine_db_editor.py
index d4027c267..d092a0787 100644
--- a/spinetoolbox/spine_db_editor/widgets/multi_spine_db_editor.py
+++ b/spinetoolbox/spine_db_editor/widgets/multi_spine_db_editor.py
@@ -97,7 +97,7 @@ def show_plus_button_context_menu(self, global_pos):
toolbox = self.db_mngr.parent()
if toolbox is None:
return
- data_stores = toolbox.project().get_items_by_type("Data Store")
+ data_stores = toolbox.project.get_items_by_type("Data Store")
ds_urls = {ds.name: ds.sql_alchemy_url() for ds in data_stores}
is_url_validated = {ds.name: ds.is_url_validated() for ds in data_stores}
if not ds_urls:
diff --git a/spinetoolbox/spine_engine_worker.py b/spinetoolbox/spine_engine_worker.py
index bf7c66f9f..1e1fdd536 100644
--- a/spinetoolbox/spine_engine_worker.py
+++ b/spinetoolbox/spine_engine_worker.py
@@ -37,6 +37,7 @@ def _handle_node_execution_started(item, direction):
icon = item.get_icon()
if direction == ExecutionDirection.FORWARD:
icon.execution_icon.mark_execution_started()
+ item.update_progress_bar()
if hasattr(icon, "animation_signaller"):
icon.animation_signaller.animation_started.emit()
@@ -46,6 +47,7 @@ def _handle_node_execution_finished(item, direction, item_state):
icon = item.get_icon()
if direction == ExecutionDirection.FORWARD:
icon.execution_icon.mark_execution_finished(item_state)
+ item.update_progress_bar()
if hasattr(icon, "animation_signaller"):
icon.animation_signaller.animation_stopped.emit()
@@ -60,7 +62,7 @@ def _handle_process_message_arrived(item, filter_id, msg_type, msg_text):
item.add_process_message(filter_id, msg_type, msg_text)
-@Slot(dict, object)
+@Slot(dict, object, object)
def _handle_prompt_arrived(prompt, engine_mngr, logger=None):
prompter_id = prompt["prompter_id"]
title, text, option_to_answer, notes, preferred = prompt["data"]
@@ -155,11 +157,11 @@ def set_engine_data(self, engine_data):
"""
self._engine_data = engine_data
- @Slot(object, str, str)
+ @Slot(object, str, str, str)
def _handle_event_message_arrived_silent(self, item, filter_id, msg_type, msg_text):
self.event_messages.setdefault(msg_type, []).append(msg_text)
- @Slot(object, str, str)
+ @Slot(object, str, str, str)
def _handle_process_message_arrived_silent(self, item, filter_id, msg_type, msg_text):
self.process_messages.setdefault(msg_type, []).append(msg_text)
diff --git a/spinetoolbox/ui/mainwindow.py b/spinetoolbox/ui/mainwindow.py
index 79c337f0b..6715360d0 100644
--- a/spinetoolbox/ui/mainwindow.py
+++ b/spinetoolbox/ui/mainwindow.py
@@ -192,6 +192,17 @@ def setupUi(self, MainWindow):
icon18 = QIcon()
icon18.addFile(u":/icons/menu_icons/github-mark.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
self.actionGitHub.setIcon(icon18)
+ self.actionSwitch_to_user_mode = QAction(MainWindow)
+ self.actionSwitch_to_user_mode.setObjectName(u"actionSwitch_to_user_mode")
+ icon19 = QIcon()
+ icon19.addFile(u":/icons/menu_icons/retweet.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+ self.actionSwitch_to_user_mode.setIcon(icon19)
+ self.actionGroup_items = QAction(MainWindow)
+ self.actionGroup_items.setObjectName(u"actionGroup_items")
+ icon20 = QIcon()
+ icon20.addFile(u":/icons/menu_icons/object-group.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+ self.actionGroup_items.setIcon(icon20)
+ self.actionGroup_items.setMenuRole(QAction.MenuRole.NoRole)
self.centralwidget = QWidget(MainWindow)
self.centralwidget.setObjectName(u"centralwidget")
MainWindow.setCentralWidget(self.centralwidget)
@@ -256,9 +267,9 @@ def setupUi(self, MainWindow):
self.toolButton_executions = QToolButton(self.dockWidgetContents)
self.toolButton_executions.setObjectName(u"toolButton_executions")
- icon19 = QIcon()
- icon19.addFile(u":/icons/check-circle.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
- self.toolButton_executions.setIcon(icon19)
+ icon21 = QIcon()
+ icon21.addFile(u":/icons/check-circle.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+ self.toolButton_executions.setIcon(icon21)
self.toolButton_executions.setPopupMode(QToolButton.ToolButtonPopupMode.InstantPopup)
self.toolButton_executions.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonTextBesideIcon)
@@ -376,6 +387,7 @@ def setupUi(self, MainWindow):
self.menuFile.addSeparator()
self.menuFile.addAction(self.actionNew_DB_editor)
self.menuFile.addSeparator()
+ self.menuFile.addAction(self.actionSwitch_to_user_mode)
self.menuFile.addAction(self.actionSettings)
self.menuFile.addSeparator()
self.menuFile.addAction(self.actionQuit)
@@ -413,7 +425,7 @@ def setupUi(self, MainWindow):
# setupUi
def retranslateUi(self, MainWindow):
- MainWindow.setWindowTitle(QCoreApplication.translate("MainWindow", u"Spine Toolbox", None))
+ MainWindow.setWindowTitle(QCoreApplication.translate("MainWindow", u"Spine Toolbox [design mode]", None))
self.actionQuit.setText(QCoreApplication.translate("MainWindow", u"Quit", None))
#if QT_CONFIG(tooltip)
self.actionQuit.setToolTip(QCoreApplication.translate("MainWindow", u"