From 206f45922c850c6083041e7230f7c404e5dfceb9 Mon Sep 17 00:00:00 2001 From: ptsavol <43600314+ptsavol@users.noreply.github.com> Date: Wed, 20 Nov 2024 13:08:31 +0200 Subject: [PATCH] Fix main window and Properties widget resizing problems (#3013) - Add QScrollArea to Link and Jump Properties - Rebuild all UI files - Set some size related properties in mainwindow.ui and make it's default size a bit smaller - Remove some redundant code in ToolboxUI regarding properties widgets Fixes #3012 --- spinetoolbox/resources_icons_rc.py | 184 ++++----- spinetoolbox/resources_logos_rc.py | 2 +- .../ui/commit_viewer_affected_item_info.py | 2 +- .../spine_db_editor/ui/db_commit_viewer.py | 2 +- .../ui/parameter_type_editor.py | 2 +- .../spine_db_editor/ui/scenario_generator.py | 4 +- .../spine_db_editor/ui/select_databases.py | 4 +- .../ui/spine_db_editor_window.py | 74 ++-- spinetoolbox/ui/about.py | 20 +- spinetoolbox/ui/add_project_item.py | 2 +- spinetoolbox/ui/array_editor.py | 2 +- spinetoolbox/ui/datetime_editor.py | 2 +- spinetoolbox/ui/duration_editor.py | 2 +- spinetoolbox/ui/import_source_selector.py | 2 +- spinetoolbox/ui/jump_properties.py | 42 +- spinetoolbox/ui/jump_properties.ui | 308 +++++++++------ spinetoolbox/ui/link_properties.py | 40 +- spinetoolbox/ui/link_properties.ui | 366 ++++++++++-------- spinetoolbox/ui/mainwindow.py | 150 +++---- spinetoolbox/ui/mainwindow.ui | 202 +++++----- spinetoolbox/ui/map_editor.py | 2 +- spinetoolbox/ui/mini_kernel_editor_dialog.py | 16 +- spinetoolbox/ui/open_project_dialog.py | 12 +- spinetoolbox/ui/parameter_value_editor.py | 4 +- .../ui/plain_parameter_value_editor.py | 4 +- spinetoolbox/ui/select_database_items.py | 2 +- .../ui/select_database_items_dialog.py | 4 +- spinetoolbox/ui/settings.py | 34 +- spinetoolbox/ui/time_pattern_editor.py | 2 +- .../ui/time_series_fixed_resolution_editor.py | 2 +- .../time_series_variable_resolution_editor.py | 2 +- .../ui/tool_configuration_assistant.py | 6 +- spinetoolbox/ui_main.py | 24 +- tests/widgets/test_AddProjectItemWidget.py | 3 +- 34 files changed, 823 insertions(+), 706 deletions(-) diff --git a/spinetoolbox/resources_icons_rc.py b/spinetoolbox/resources_icons_rc.py index e09a7f10d..c2238df72 100644 --- a/spinetoolbox/resources_icons_rc.py +++ b/spinetoolbox/resources_icons_rc.py @@ -11,7 +11,7 @@ # this program. If not, see . ###################################################################################################################### # Created by: object code -# Created by: The Resource Compiler for Qt version 6.6.3 +# Created by: The Resource Compiler for Qt version 6.7.3 # WARNING! All changes made in this file will be lost! from PySide6 import QtCore @@ -32408,191 +32408,191 @@ \x00\x00\x004\x00\x02\x00\x00\x00\x01\x00\x00\x00\x05\ \x00\x00\x00\x00\x00\x00\x00\x00\ \x00\x00\x00T\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\ -\x00\x00\x01\x8aE\xfa\xa6?\ +\x00\x00\x01\x8f\xec\xcf\x12\xea\ \x00\x00\x00x\x00\x00\x00\x00\x00\x01\x00\x00\x09\xf5\ -\x00\x00\x01\x8aE\xfa\xa6>\ +\x00\x00\x01\x8f\xec\xcf\x12\xea\ \x00\x00\x00\xb2\x00\x00\x00\x00\x00\x01\x00\x008\x89\ -\x00\x00\x01\x8aE\xfa\xa6\xa3\ +\x00\x00\x01\x8f\xec\xcf\x13\x09\ \x00\x00\x00\x9e\x00\x01\x00\x00\x00\x01\x00\x00\x10N\ -\x00\x00\x01\x8aE\xfa\xa6?\ +\x00\x00\x01\x8f\xec\xcf\x12\xea\ \x00\x00\x02R\x00\x00\x00\x00\x00\x01\x00\x06A\x9c\ -\x00\x00\x01\x8aE\xfa\xa6P\ +\x00\x00\x01\x8f\xec\xcf\x12\xea\ \x00\x00\x01\xea\x00\x00\x00\x00\x00\x01\x00\x062\x92\ -\x00\x00\x01\x8aE\xfa\xa6\xa3\ +\x00\x00\x01\x8f\xec\xcf\x13\x09\ \x00\x00\x04p\x00\x00\x00\x00\x00\x01\x00\x06\xa8\xcd\ -\x00\x00\x01\x8aE\xfa\xa6P\ +\x00\x00\x01\x8f\xec\xcf\x12\xea\ \x00\x00\x04\xb8\x00\x00\x00\x00\x00\x01\x00\x06\xbd\xb7\ -\x00\x00\x01\x8aE\xfa\xa6\x82\ +\x00\x00\x01\x8f\xec\xcf\x12\xfa\ \x00\x00\x03D\x00\x00\x00\x00\x00\x01\x00\x06\x88\x1a\ -\x00\x00\x01\x8aE\xfa\xa6\xa3\ +\x00\x00\x01\x8f\xec\xcf\x13\x09\ \x00\x00\x04\x98\x00\x00\x00\x00\x00\x01\x00\x06\xaa\xa1\ -\x00\x00\x01\x8aE\xfa\xa6P\ +\x00\x00\x01\x8f\xec\xcf\x12\xea\ \x00\x00\x04\x0c\x00\x00\x00\x00\x00\x01\x00\x06\x99\xa7\ -\x00\x00\x01\x8aE\xfa\xa6\x82\ +\x00\x00\x01\x8f\xec\xcf\x12\xfa\ \x00\x00\x02\x80\x00\x00\x00\x00\x00\x01\x00\x06E\xb2\ -\x00\x00\x01\x8aE\xfa\xa6P\ +\x00\x00\x01\x8f\xec\xcf\x12\xea\ \x00\x00\x02h\x00\x00\x00\x00\x00\x01\x00\x06B\xab\ -\x00\x00\x01\x8aE\xfa\xa6\xa3\ +\x00\x00\x01\x8f\xec\xcf\x13\x09\ \x00\x00\x03\xf6\x00\x00\x00\x00\x00\x01\x00\x06\x978\ -\x00\x00\x01\x8aE\xfa\xa6_\ +\x00\x00\x01\x8f\xec\xcf\x12\xea\ \x00\x00\x03^\x00\x00\x00\x00\x00\x01\x00\x06\x8a3\ -\x00\x00\x01\x8aE\xfa\xa6P\ +\x00\x00\x01\x8f\xec\xcf\x12\xea\ \x00\x00\x02\xc4\x00\x00\x00\x00\x00\x01\x00\x06Q\xfb\ -\x00\x00\x01\x8aE\xfa\xa6?\ +\x00\x00\x01\x8f\xec\xcf\x12\xea\ \x00\x00\x02.\x00\x00\x00\x00\x00\x01\x00\x06?\xec\ -\x00\x00\x01\x8aE\xfa\xa6P\ +\x00\x00\x01\x8f\xec\xcf\x12\xea\ \x00\x00\x03(\x00\x00\x00\x00\x00\x01\x00\x06b\xb3\ -\x00\x00\x01\x8aE\xfa\xa6P\ +\x00\x00\x01\x8f\xec\xcf\x12\xea\ \x00\x00\x01\xbe\x00\x00\x00\x00\x00\x01\x00\x060\xaf\ -\x00\x00\x01\x8aE\xfa\xa6\x91\ +\x00\x00\x01\x8f\xec\xcf\x12\xfa\ \x00\x00\x03\x98\x00\x00\x00\x00\x00\x01\x00\x06\x94o\ -\x00\x00\x01\x91+\xd8Cg\ +\x00\x00\x01\x8f\xec\xcf\x13\x09\ \x00\x00\x01\xa6\x00\x00\x00\x00\x00\x01\x00\x06/\x9c\ -\x00\x00\x01\x8aE\xfa\xa6\x92\ +\x00\x00\x01\x8f\xec\xcf\x13\x09\ \x00\x00\x04$\x00\x00\x00\x00\x00\x01\x00\x06\xa0\x10\ -\x00\x00\x01\x8aE\xfa\xa6\x92\ +\x00\x00\x01\x8f\xec\xcf\x13\x09\ \x00\x00\x03\xb0\x00\x02\x00\x00\x00\x09\x00\x00\x00V\ \x00\x00\x00\x00\x00\x00\x00\x00\ \x00\x00\x03~\x00\x02\x00\x00\x003\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\x8aE\xfa\xa6\xa3\ +\x00\x00\x01\x8f\xec\xcf\x13\x09\ \x00\x00\x04T\x00\x00\x00\x00\x00\x01\x00\x06\xa3)\ -\x00\x00\x01\x8aE\xfa\xa6\xa3\ +\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\x8aE\xfa\xa6P\ +\x00\x00\x01\x8f\xec\xcf\x12\xea\ \x00\x00\x02\xda\x00\x00\x00\x00\x00\x01\x00\x06T\x05\ -\x00\x00\x01\x8aE\xfa\xa6P\ +\x00\x00\x01\x8f\xec\xcf\x12\xea\ \x00\x00\x02\x9e\x00\x00\x00\x00\x00\x01\x00\x06G\x93\ -\x00\x00\x01\x8aE\xfa\xa6\xa3\ +\x00\x00\x01\x8f\xec\xcf\x13\x09\ \x00\x00\x03\x02\x00\x00\x00\x00\x00\x01\x00\x06`G\ -\x00\x00\x01\x8aE\xfa\xa6P\ +\x00\x00\x01\x8f\xec\xcf\x12\xea\ \x00\x00\x02R\x00\x00\x00\x00\x00\x01\x00\x07\x0a\xf8\ -\x00\x00\x01\x8aE\xfa\xa6q\ +\x00\x00\x01\x8f\xec\xcf\x12\xfa\ \x00\x00\x0b\xec\x00\x00\x00\x00\x00\x01\x00\x07\xbf\xb6\ -\x00\x00\x01\x8aE\xfa\xa6\x82\ +\x00\x00\x01\x8f\xec\xcf\x12\xfa\ \x00\x00\x060\x00\x00\x00\x00\x00\x01\x00\x06\xec\xdf\ -\x00\x00\x01\x8aE\xfa\xa6\x82\ +\x00\x00\x01\x8f\xec\xcf\x12\xfa\ \x00\x00\x09\x14\x00\x00\x00\x00\x00\x01\x00\x07Hx\ -\x00\x00\x01\x8aE\xfa\xa6`\ +\x00\x00\x01\x8f\xec\xcf\x12\xfa\ \x00\x00\x09\x9a\x00\x00\x00\x00\x00\x01\x00\x07_J\ -\x00\x00\x01\x8aE\xfa\xa6`\ +\x00\x00\x01\x8f\xec\xcf\x12\xfa\ \x00\x00\x06\xf6\x00\x00\x00\x00\x00\x01\x00\x07\x08\x9c\ -\x00\x00\x01\x8aE\xfa\xa6\x82\ +\x00\x00\x01\x8f\xec\xcf\x12\xfa\ \x00\x00\x08\x98\x00\x00\x00\x00\x00\x01\x00\x07B\xb4\ -\x00\x00\x01\x8aE\xfa\xa6\x82\ +\x00\x00\x01\x8f\xec\xcf\x12\xfa\ \x00\x00\x09v\x00\x00\x00\x00\x00\x01\x00\x07]\x88\ -\x00\x00\x01\x8aE\xfa\xa6q\ +\x00\x00\x01\x8f\xec\xcf\x12\xfa\ \x00\x00\x0a\xce\x00\x00\x00\x00\x00\x01\x00\x07\xa0\x8e\ -\x00\x00\x01\x8aE\xfa\xa6q\ +\x00\x00\x01\x8f\xec\xcf\x12\xfa\ \x00\x00\x07\xa0\x00\x00\x00\x00\x00\x01\x00\x07\x1ez\ -\x00\x00\x01\x8aE\xfa\xa6\x82\ +\x00\x00\x01\x8f\xec\xcf\x12\xfa\ \x00\x00\x07\x16\x00\x00\x00\x00\x00\x01\x00\x07\x0e8\ -\x00\x00\x01\x8aE\xfa\xa6q\ +\x00\x00\x01\x8f\xec\xcf\x12\xfa\ \x00\x00\x094\x00\x00\x00\x00\x00\x01\x00\x07ZV\ -\x00\x00\x01\x91+\xd8C5\ +\x00\x00\x01\x8f\xec\xcf\x12\xfa\ \x00\x00\x08x\x00\x00\x00\x00\x00\x01\x00\x07)\xa4\ -\x00\x00\x01\x8aE\xfa\xa6`\ +\x00\x00\x01\x8f\xec\xcf\x12\xfa\ \x00\x00\x08\xba\x00\x00\x00\x00\x00\x01\x00\x07D\xc1\ -\x00\x00\x01\x8aE\xfa\xa6q\ +\x00\x00\x01\x8f\xec\xcf\x12\xfa\ \x00\x00\x07\xf2\x00\x00\x00\x00\x00\x01\x00\x07$u\ -\x00\x00\x01\x8aE\xfa\xa6\x82\ +\x00\x00\x01\x8f\xec\xcf\x12\xfa\ \x00\x00\x08\xee\x00\x00\x00\x00\x00\x01\x00\x07F\x1d\ -\x00\x00\x01\x8aE\xfa\xa6\x82\ +\x00\x00\x01\x8f\xec\xcf\x12\xfa\ \x00\x00\x06V\x00\x00\x00\x00\x00\x01\x00\x06\xee\xe8\ -\x00\x00\x01\x8aE\xfa\xa6`\ +\x00\x00\x01\x8f\xec\xcf\x12\xea\ \x00\x00\x0a\x00\x00\x00\x00\x00\x00\x01\x00\x07~\x92\ -\x00\x00\x01\x8aE\xfa\xa6`\ +\x00\x00\x01\x8f\xec\xcf\x12\xfa\ \x00\x00\x07\xb8\x00\x00\x00\x00\x00\x01\x00\x07 m\ -\x00\x00\x01\x8aE\xfa\xa6`\ +\x00\x00\x01\x8f\xec\xcf\x12\xfa\ \x00\x00\x0b>\x00\x00\x00\x00\x00\x01\x00\x07\xa6\xd3\ -\x00\x00\x01\x8aE\xfa\xa6q\ +\x00\x00\x01\x8f\xec\xcf\x12\xfa\ \x00\x00\x06\x1a\x00\x00\x00\x00\x00\x01\x00\x06\xeap\ -\x00\x00\x01\x8aE\xfa\xa6\x82\ +\x00\x00\x01\x8f\xec\xcf\x12\xfa\ \x00\x00\x06\xd4\x00\x00\x00\x00\x00\x01\x00\x06\xfa\xbf\ -\x00\x00\x01\x8aE\xfa\xa6`\ +\x00\x00\x01\x8f\xec\xcf\x12\xfa\ \x00\x00\x08T\x00\x00\x00\x00\x00\x01\x00\x07(B\ -\x00\x00\x01\x8aE\xfa\xa6`\ +\x00\x00\x01\x8f\xec\xcf\x12\xfa\ \x00\x00\x07X\x00\x00\x00\x00\x00\x01\x00\x07\x1a]\ -\x00\x00\x01\x8aE\xfa\xa6`\ +\x00\x00\x01\x8f\xec\xcf\x12\xea\ \x00\x00\x0b\xa4\x00\x00\x00\x00\x00\x01\x00\x07\xad\xdf\ -\x00\x00\x01\x8aE\xfa\xa6q\ +\x00\x00\x01\x8f\xec\xcf\x12\xfa\ \x00\x00\x0b\x0e\x00\x00\x00\x00\x00\x01\x00\x07\xa5\xce\ -\x00\x00\x01\x8aE\xfa\xa6\x81\ +\x00\x00\x01\x8f\xec\xcf\x12\xfa\ \x00\x00\x05\xfe\x00\x00\x00\x00\x00\x01\x00\x06\xe7K\ -\x00\x00\x01\x8aE\xfa\xa6q\ +\x00\x00\x01\x8f\xec\xcf\x12\xfa\ \x00\x00\x07\xda\x00\x00\x00\x00\x00\x01\x00\x07!\x9a\ -\x00\x00\x01\x8aE\xfa\xa6`\ +\x00\x00\x01\x8f\xec\xcf\x12\xfa\ \x00\x00\x09\xd2\x00\x00\x00\x00\x00\x01\x00\x07y\xdc\ -\x00\x00\x01\x8aE\xfa\xa6`\ +\x00\x00\x01\x8f\xec\xcf\x12\xfa\ \x00\x00\x0b\xcc\x00\x00\x00\x00\x00\x01\x00\x07\xb0:\ -\x00\x00\x01\x8aE\xfa\xa6`\ +\x00\x00\x01\x8f\xec\xcf\x12\xfa\ \x00\x00\x07:\x00\x01\x00\x00\x00\x01\x00\x07\x18\xeb\ -\x00\x00\x01\x91+\xd8CV\ +\x00\x00\x01\x8f\xec\xcf\x12\xfa\ \x00\x00\x0aT\x00\x00\x00\x00\x00\x01\x00\x07\x8e%\ -\x00\x00\x01\x8aE\xfa\xa6\x82\ +\x00\x00\x01\x8f\xec\xcf\x12\xfa\ \x00\x00\x09^\x00\x00\x00\x00\x00\x01\x00\x07\x5ci\ -\x00\x00\x01\x8aE\xfa\xa6\x82\ +\x00\x00\x01\x8f\xec\xcf\x12\xfa\ \x00\x00\x09\xbc\x00\x00\x00\x00\x00\x01\x00\x07m\xb8\ -\x00\x00\x01\x8aE\xfa\xa6\x82\ +\x00\x00\x01\x8f\xec\xcf\x12\xfa\ \x00\x00\x06\xc0\x00\x00\x00\x00\x00\x01\x00\x06\xf6%\ -\x00\x00\x01\x8aE\xfa\xa6`\ +\x00\x00\x01\x8f\xec\xcf\x12\xfa\ \x00\x00\x0a\xf2\x00\x00\x00\x00\x00\x01\x00\x07\xa2T\ -\x00\x00\x01\x91+\xd8CE\ +\x00\x00\x01\x8f\xec\xcf\x12\xfa\ \x00\x00\x0a\x80\x00\x00\x00\x00\x00\x01\x00\x07\x90\xe7\ -\x00\x00\x01\x8aE\xfa\xa6q\ +\x00\x00\x01\x8f\xec\xcf\x12\xfa\ \x00\x00\x0a$\x00\x00\x00\x00\x00\x01\x00\x07\x8c\x8f\ -\x00\x00\x01\x8aE\xfa\xa6q\ +\x00\x00\x01\x8f\xec\xcf\x12\xfa\ \x00\x00\x09\xe8\x00\x00\x00\x00\x00\x01\x00\x07{\x8f\ -\x00\x00\x01\x91+\xd8CV\ +\x00\x00\x01\x8f\xec\xcf\x12\xfa\ \x00\x00\x07\x8a\x00\x00\x00\x00\x00\x01\x00\x07\x1c+\ -\x00\x00\x01\x8aE\xfa\xa6`\ +\x00\x00\x01\x8f\xec\xcf\x12\xfa\ \x00\x00\x0a\x98\x00\x00\x00\x00\x00\x01\x00\x07\x931\ -\x00\x00\x01\x8aE\xfa\xa6`\ +\x00\x00\x01\x8f\xec\xcf\x12\xfa\ \x00\x00\x06\xaa\x00\x00\x00\x00\x00\x01\x00\x06\xf4{\ -\x00\x00\x01\x8aE\xfa\xa6\x82\ +\x00\x00\x01\x8f\xec\xcf\x12\xfa\ \x00\x00\x0a\xb0\x00\x00\x00\x00\x00\x01\x00\x07\x94\x97\ -\x00\x00\x01\x8aE\xfa\xa6`\ +\x00\x00\x01\x8f\xec\xcf\x12\xfa\ \x00\x00\x0b\x88\x00\x00\x00\x00\x00\x01\x00\x07\xaa\x95\ -\x00\x00\x01\x91+\xd8CE\ +\x00\x00\x01\x8f\xec\xcf\x12\xfa\ \x00\x00\x08&\x00\x01\x00\x00\x00\x01\x00\x07%\xca\ -\x00\x00\x01\x8aE\xfa\xa6\x82\ +\x00\x00\x01\x8f\xec\xcf\x12\xfa\ \x00\x00\x08@\x00\x00\x00\x00\x00\x01\x00\x07&\xa4\ -\x00\x00\x01\x8aE\xfa\xa6q\ +\x00\x00\x01\x8f\xec\xcf\x12\xfa\ \x00\x00\x0bb\x00\x00\x00\x00\x00\x01\x00\x07\xa8\xb6\ -\x00\x00\x01\x8aE\xfa\xa6p\ +\x00\x00\x01\x8f\xec\xcf\x12\xfa\ \x00\x00\x06\x86\x00\x00\x00\x00\x00\x01\x00\x06\xf0\xb4\ -\x00\x00\x01\x91+\xd8CE\ +\x00\x00\x01\x8f\xec\xcf\x12\xfa\ \x00\x00\x04\xf0\x00\x00\x00\x00\x00\x01\x00\x07\x0c\x07\ -\x00\x00\x01\x8aE\xfa\xa6q\ +\x00\x00\x01\x8f\xec\xcf\x12\xfa\ \x00\x00\x05X\x00\x00\x00\x00\x00\x01\x00\x078\x22\ -\x00\x00\x01\x8aE\xfa\xa6`\ +\x00\x00\x01\x8f\xec\xcf\x12\xfa\ \x00\x00\x05\x84\x00\x00\x00\x00\x00\x01\x00\x07o\x0c\ -\x00\x00\x01\x8aE\xfa\xa6`\ +\x00\x00\x01\x8f\xec\xcf\x12\xfa\ \x00\x00\x05\xb0\x00\x00\x00\x00\x00\x01\x00\x06\xe3:\ -\x00\x00\x01\x8aE\xfa\xa6\x92\ +\x00\x00\x01\x8f\xec\xcf\x13\x09\ \x00\x00\x05\x0e\x00\x00\x00\x00\x00\x01\x00\x06\xca\xc1\ -\x00\x00\x01\x8aE\xfa\xa6\x92\ +\x00\x00\x01\x8f\xec\xcf\x13\x09\ \x00\x00\x02\x80\x00\x00\x00\x00\x00\x01\x00\x06\xc6\xaf\ -\x00\x00\x01\x8aE\xfa\xa6\x92\ +\x00\x00\x01\x8f\xec\xcf\x13\x09\ \x00\x00\x04\xce\x00\x00\x00\x00\x00\x01\x00\x06\xc4\x9c\ -\x00\x00\x01\x8aE\xfa\xa6\x92\ +\x00\x00\x01\x8f\xec\xcf\x12\xfa\ \x00\x00\x05\xe2\x00\x00\x00\x00\x00\x01\x00\x06\xe5\x0c\ -\x00\x00\x01\x8aE\xfa\xa6\x92\ +\x00\x00\x01\x8f\xec\xcf\x12\xfa\ \x00\x00\x05(\x00\x00\x00\x00\x00\x01\x00\x06\xcdK\ -\x00\x00\x01\x8aE\xfa\xa6\x92\ +\x00\x00\x01\x8f\xec\xcf\x13\x09\ \x00\x00\x04\xf0\x00\x00\x00\x00\x00\x01\x00\x06\xc8\x90\ -\x00\x00\x01\x8aE\xfa\xa6\x92\ +\x00\x00\x01\x8f\xec\xcf\x13\x09\ \x00\x00\x05X\x00\x00\x00\x00\x00\x01\x00\x06\xcf\xfe\ -\x00\x00\x01\x8aE\xfa\xa6\x92\ +\x00\x00\x01\x8f\xec\xcf\x12\xfa\ \x00\x00\x05\x84\x00\x00\x00\x00\x00\x01\x00\x06\xd9\xb8\ -\x00\x00\x01\x8aE\xfa\xa6\x92\ +\x00\x00\x01\x8f\xec\xcf\x12\xfa\ \x00\x00\x01&\x00\x01\x00\x00\x00\x01\x00\x03\x04\x82\ -\x00\x00\x01\x8aE\xfa\xa6P\ +\x00\x00\x01\x8f\xec\xcf\x12\xea\ \x00\x00\x00\xe6\x00\x01\x00\x00\x00\x01\x00\x02\xbaN\ -\x00\x00\x01\x8aE\xfa\xa6P\ +\x00\x00\x01\x8f\xec\xcf\x12\xea\ \x00\x00\x01d\x00\x00\x00\x00\x00\x01\x00\x03\x10\xa8\ -\x00\x00\x01\x8aE\xfa\xa6P\ +\x00\x00\x01\x8f\xec\xcf\x12\xea\ " def qInitResources(): diff --git a/spinetoolbox/resources_logos_rc.py b/spinetoolbox/resources_logos_rc.py index 5a4ad7cd7..6cc3ebc57 100644 --- a/spinetoolbox/resources_logos_rc.py +++ b/spinetoolbox/resources_logos_rc.py @@ -11,7 +11,7 @@ # this program. If not, see . ###################################################################################################################### # Created by: object code -# Created by: The Resource Compiler for Qt version 6.7.1 +# Created by: The Resource Compiler for Qt version 6.7.3 # WARNING! All changes made in this file will be lost! from PySide6 import QtCore diff --git a/spinetoolbox/spine_db_editor/ui/commit_viewer_affected_item_info.py b/spinetoolbox/spine_db_editor/ui/commit_viewer_affected_item_info.py index b1ffe9be9..5c5787140 100644 --- a/spinetoolbox/spine_db_editor/ui/commit_viewer_affected_item_info.py +++ b/spinetoolbox/spine_db_editor/ui/commit_viewer_affected_item_info.py @@ -14,7 +14,7 @@ ################################################################################ ## Form generated from reading UI file 'commit_viewer_affected_item_info.ui' ## -## Created by: Qt User Interface Compiler version 6.7.0 +## Created by: Qt User Interface Compiler version 6.7.3 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ diff --git a/spinetoolbox/spine_db_editor/ui/db_commit_viewer.py b/spinetoolbox/spine_db_editor/ui/db_commit_viewer.py index a50a1e07b..c18d483ae 100644 --- a/spinetoolbox/spine_db_editor/ui/db_commit_viewer.py +++ b/spinetoolbox/spine_db_editor/ui/db_commit_viewer.py @@ -14,7 +14,7 @@ ################################################################################ ## Form generated from reading UI file 'db_commit_viewer.ui' ## -## Created by: Qt User Interface Compiler version 6.7.0 +## Created by: Qt User Interface Compiler version 6.7.3 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ diff --git a/spinetoolbox/spine_db_editor/ui/parameter_type_editor.py b/spinetoolbox/spine_db_editor/ui/parameter_type_editor.py index bbe5ad146..09c4c9f21 100644 --- a/spinetoolbox/spine_db_editor/ui/parameter_type_editor.py +++ b/spinetoolbox/spine_db_editor/ui/parameter_type_editor.py @@ -14,7 +14,7 @@ ################################################################################ ## Form generated from reading UI file 'parameter_type_editor.ui' ## -## Created by: Qt User Interface Compiler version 6.6.3 +## Created by: Qt User Interface Compiler version 6.7.3 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ diff --git a/spinetoolbox/spine_db_editor/ui/scenario_generator.py b/spinetoolbox/spine_db_editor/ui/scenario_generator.py index 44c1038b4..858da0526 100644 --- a/spinetoolbox/spine_db_editor/ui/scenario_generator.py +++ b/spinetoolbox/spine_db_editor/ui/scenario_generator.py @@ -14,7 +14,7 @@ ################################################################################ ## Form generated from reading UI file 'scenario_generator.ui' ## -## Created by: Qt User Interface Compiler version 6.5.2 +## Created by: Qt User Interface Compiler version 6.7.3 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ @@ -92,7 +92,7 @@ def setupUi(self, Form): self.horizontalLayout.addWidget(self.alternative_list) - self.horizontalSpacer = QSpacerItem(40, 20, QSizePolicy.Expanding, QSizePolicy.Minimum) + self.horizontalSpacer = QSpacerItem(40, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum) self.horizontalLayout.addItem(self.horizontalSpacer) diff --git a/spinetoolbox/spine_db_editor/ui/select_databases.py b/spinetoolbox/spine_db_editor/ui/select_databases.py index e7aae00ab..0b3c26c81 100644 --- a/spinetoolbox/spine_db_editor/ui/select_databases.py +++ b/spinetoolbox/spine_db_editor/ui/select_databases.py @@ -14,7 +14,7 @@ ################################################################################ ## Form generated from reading UI file 'select_databases.ui' ## -## Created by: Qt User Interface Compiler version 6.5.2 +## Created by: Qt User Interface Compiler version 6.7.3 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ @@ -58,7 +58,7 @@ def setupUi(self, Form): self.horizontalLayout.addWidget(self.deselect_all_button) - self.horizontalSpacer = QSpacerItem(40, 20, QSizePolicy.Expanding, QSizePolicy.Minimum) + self.horizontalSpacer = QSpacerItem(40, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum) self.horizontalLayout.addItem(self.horizontalSpacer) diff --git a/spinetoolbox/spine_db_editor/ui/spine_db_editor_window.py b/spinetoolbox/spine_db_editor/ui/spine_db_editor_window.py index fff8627f1..541bcadde 100644 --- a/spinetoolbox/spine_db_editor/ui/spine_db_editor_window.py +++ b/spinetoolbox/spine_db_editor/ui/spine_db_editor_window.py @@ -14,7 +14,7 @@ ################################################################################ ## Form generated from reading UI file 'spine_db_editor_window.ui' ## -## Created by: Qt User Interface Compiler version 6.6.3 +## Created by: Qt User Interface Compiler version 6.7.3 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ @@ -50,67 +50,67 @@ def setupUi(self, MainWindow): self.actionCommit.setObjectName(u"actionCommit") self.actionCommit.setEnabled(True) icon = QIcon() - icon.addFile(u":/icons/menu_icons/check.svg", QSize(), QIcon.Normal, QIcon.Off) + icon.addFile(u":/icons/menu_icons/check.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.actionCommit.setIcon(icon) self.actionRollback = QAction(MainWindow) self.actionRollback.setObjectName(u"actionRollback") self.actionRollback.setEnabled(False) icon1 = QIcon() - icon1.addFile(u":/icons/menu_icons/times.svg", QSize(), QIcon.Normal, QIcon.Off) + icon1.addFile(u":/icons/menu_icons/times.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.actionRollback.setIcon(icon1) self.actionClose = QAction(MainWindow) self.actionClose.setObjectName(u"actionClose") self.actionClose.setEnabled(True) icon2 = QIcon() - icon2.addFile(u":/icons/menu_icons/window-close.svg", QSize(), QIcon.Normal, QIcon.Off) + icon2.addFile(u":/icons/menu_icons/window-close.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.actionClose.setIcon(icon2) self.actionImport = QAction(MainWindow) self.actionImport.setObjectName(u"actionImport") self.actionImport.setEnabled(False) icon3 = QIcon() - icon3.addFile(u":/icons/menu_icons/database-import.svg", QSize(), QIcon.Normal, QIcon.Off) + icon3.addFile(u":/icons/menu_icons/database-import.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.actionImport.setIcon(icon3) self.actionExport = QAction(MainWindow) self.actionExport.setObjectName(u"actionExport") self.actionExport.setEnabled(False) icon4 = QIcon() - icon4.addFile(u":/icons/menu_icons/database-export.svg", QSize(), QIcon.Normal, QIcon.Off) + icon4.addFile(u":/icons/menu_icons/database-export.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.actionExport.setIcon(icon4) self.actionCopy = QAction(MainWindow) self.actionCopy.setObjectName(u"actionCopy") self.actionCopy.setEnabled(False) icon5 = QIcon() - icon5.addFile(u":/icons/menu_icons/copy.svg", QSize(), QIcon.Normal, QIcon.Off) + icon5.addFile(u":/icons/menu_icons/copy.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.actionCopy.setIcon(icon5) self.actionPaste = QAction(MainWindow) self.actionPaste.setObjectName(u"actionPaste") self.actionPaste.setEnabled(False) icon6 = QIcon() - icon6.addFile(u":/icons/menu_icons/paste.svg", QSize(), QIcon.Normal, QIcon.Off) + icon6.addFile(u":/icons/menu_icons/paste.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.actionPaste.setIcon(icon6) self.actionStacked_style = QAction(MainWindow) self.actionStacked_style.setObjectName(u"actionStacked_style") self.actionStacked_style.setEnabled(True) icon7 = QIcon() - icon7.addFile(u":/icons/menu_icons/table.svg", QSize(), QIcon.Normal, QIcon.Off) + icon7.addFile(u":/icons/menu_icons/table.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.actionStacked_style.setIcon(icon7) self.actionGraph_style = QAction(MainWindow) self.actionGraph_style.setObjectName(u"actionGraph_style") self.actionGraph_style.setEnabled(True) icon8 = QIcon() - icon8.addFile(u":/icons/project-diagram.svg", QSize(), QIcon.Normal, QIcon.Off) + icon8.addFile(u":/icons/project-diagram.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.actionGraph_style.setIcon(icon8) self.actionView_history = QAction(MainWindow) self.actionView_history.setObjectName(u"actionView_history") self.actionView_history.setEnabled(True) icon9 = QIcon() - icon9.addFile(u":/icons/menu_icons/history.svg", QSize(), QIcon.Normal, QIcon.Off) + icon9.addFile(u":/icons/menu_icons/history.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.actionView_history.setIcon(icon9) self.actionMass_remove_items = QAction(MainWindow) self.actionMass_remove_items.setObjectName(u"actionMass_remove_items") self.actionMass_remove_items.setEnabled(False) icon10 = QIcon() - icon10.addFile(u":/icons/menu_icons/bolt-lightning.svg", QSize(), QIcon.Normal, QIcon.Off) + icon10.addFile(u":/icons/menu_icons/bolt-lightning.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.actionMass_remove_items.setIcon(icon10) self.actionExport_session = QAction(MainWindow) self.actionExport_session.setObjectName(u"actionExport_session") @@ -119,34 +119,34 @@ def setupUi(self, MainWindow): self.actionSettings = QAction(MainWindow) self.actionSettings.setObjectName(u"actionSettings") icon11 = QIcon() - icon11.addFile(u":/icons/menu_icons/cog.svg", QSize(), QIcon.Normal, QIcon.Off) + icon11.addFile(u":/icons/menu_icons/cog.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.actionSettings.setIcon(icon11) self.actionUser_guide = QAction(MainWindow) self.actionUser_guide.setObjectName(u"actionUser_guide") icon12 = QIcon() - icon12.addFile(u":/icons/menu_icons/question-circle.svg", QSize(), QIcon.Normal, QIcon.Off) + icon12.addFile(u":/icons/menu_icons/question-circle.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.actionUser_guide.setIcon(icon12) self.actionUndo = QAction(MainWindow) self.actionUndo.setObjectName(u"actionUndo") self.actionUndo.setEnabled(False) icon13 = QIcon() - icon13.addFile(u":/icons/menu_icons/undo.svg", QSize(), QIcon.Normal, QIcon.Off) + icon13.addFile(u":/icons/menu_icons/undo.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.actionUndo.setIcon(icon13) self.actionRedo = QAction(MainWindow) self.actionRedo.setObjectName(u"actionRedo") self.actionRedo.setEnabled(False) icon14 = QIcon() - icon14.addFile(u":/icons/menu_icons/redo.svg", QSize(), QIcon.Normal, QIcon.Off) + icon14.addFile(u":/icons/menu_icons/redo.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.actionRedo.setIcon(icon14) self.actionNew_db_file = QAction(MainWindow) self.actionNew_db_file.setObjectName(u"actionNew_db_file") icon15 = QIcon() - icon15.addFile(u":/icons/menu_icons/file.svg", QSize(), QIcon.Normal, QIcon.Off) + icon15.addFile(u":/icons/menu_icons/file.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.actionNew_db_file.setIcon(icon15) self.actionOpen_db_file = QAction(MainWindow) self.actionOpen_db_file.setObjectName(u"actionOpen_db_file") icon16 = QIcon() - icon16.addFile(u":/icons/menu_icons/folder-open-solid.svg", QSize(), QIcon.Normal, QIcon.Off) + icon16.addFile(u":/icons/menu_icons/folder-open-solid.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.actionOpen_db_file.setIcon(icon16) self.actionAdd_db_file = QAction(MainWindow) self.actionAdd_db_file.setObjectName(u"actionAdd_db_file") @@ -154,31 +154,31 @@ def setupUi(self, MainWindow): self.actionVacuum = QAction(MainWindow) self.actionVacuum.setObjectName(u"actionVacuum") icon17 = QIcon() - icon17.addFile(u":/icons/menu_icons/broom.svg", QSize(), QIcon.Normal, QIcon.Off) + icon17.addFile(u":/icons/menu_icons/broom.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.actionVacuum.setIcon(icon17) self.actionValue = QAction(MainWindow) self.actionValue.setObjectName(u"actionValue") self.actionValue.setCheckable(True) icon18 = QIcon() - icon18.addFile(u":/icons/menu_icons/hashtag.svg", QSize(), QIcon.Normal, QIcon.Off) + icon18.addFile(u":/icons/menu_icons/hashtag.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.actionValue.setIcon(icon18) self.actionIndex = QAction(MainWindow) self.actionIndex.setObjectName(u"actionIndex") self.actionIndex.setCheckable(True) icon19 = QIcon() - icon19.addFile(u":/icons/menu_icons/index.svg", QSize(), QIcon.Normal, QIcon.Off) + icon19.addFile(u":/icons/menu_icons/index.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.actionIndex.setIcon(icon19) self.actionElement = QAction(MainWindow) self.actionElement.setObjectName(u"actionElement") self.actionElement.setCheckable(True) icon20 = QIcon() - icon20.addFile(u":/icons/menu_icons/element.svg", QSize(), QIcon.Normal, QIcon.Off) + icon20.addFile(u":/icons/menu_icons/element.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.actionElement.setIcon(icon20) self.actionScenario = QAction(MainWindow) self.actionScenario.setObjectName(u"actionScenario") self.actionScenario.setCheckable(True) icon21 = QIcon() - icon21.addFile(u":/icons/menu_icons/scenario.svg", QSize(), QIcon.Normal, QIcon.Off) + icon21.addFile(u":/icons/menu_icons/scenario.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.actionScenario.setIcon(icon21) self.actionOpen_recent = QAction(MainWindow) self.actionOpen_recent.setObjectName(u"actionOpen_recent") @@ -186,7 +186,7 @@ def setupUi(self, MainWindow): self.actionGitHub = QAction(MainWindow) self.actionGitHub.setObjectName(u"actionGitHub") icon22 = QIcon() - icon22.addFile(u":/icons/menu_icons/github-mark.svg", QSize(), QIcon.Normal, QIcon.Off) + icon22.addFile(u":/icons/menu_icons/github-mark.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.actionGitHub.setIcon(icon22) self.centralwidget = QWidget(MainWindow) self.centralwidget.setObjectName(u"centralwidget") @@ -216,7 +216,7 @@ def setupUi(self, MainWindow): self.verticalLayout_18.addWidget(self.alternative_tree_view) self.alternative_dock_widget.setWidget(self.dockWidgetContents_15) - MainWindow.addDockWidget(Qt.RightDockWidgetArea, self.alternative_dock_widget) + MainWindow.addDockWidget(Qt.DockWidgetArea.RightDockWidgetArea, self.alternative_dock_widget) self.dockWidget_parameter_value_list = QDockWidget(MainWindow) self.dockWidget_parameter_value_list.setObjectName(u"dockWidget_parameter_value_list") self.dockWidgetContents = QWidget() @@ -234,7 +234,7 @@ def setupUi(self, MainWindow): self.verticalLayout.addWidget(self.treeView_parameter_value_list) self.dockWidget_parameter_value_list.setWidget(self.dockWidgetContents) - MainWindow.addDockWidget(Qt.RightDockWidgetArea, self.dockWidget_parameter_value_list) + MainWindow.addDockWidget(Qt.DockWidgetArea.RightDockWidgetArea, self.dockWidget_parameter_value_list) self.dockWidget_parameter_value = QDockWidget(MainWindow) self.dockWidget_parameter_value.setObjectName(u"dockWidget_parameter_value") self.dockWidgetContents_2 = QWidget() @@ -260,7 +260,7 @@ def setupUi(self, MainWindow): self.verticalLayout_5.addWidget(self.tableView_parameter_value) self.dockWidget_parameter_value.setWidget(self.dockWidgetContents_2) - MainWindow.addDockWidget(Qt.RightDockWidgetArea, self.dockWidget_parameter_value) + MainWindow.addDockWidget(Qt.DockWidgetArea.RightDockWidgetArea, self.dockWidget_parameter_value) self.dockWidget_parameter_definition = QDockWidget(MainWindow) self.dockWidget_parameter_definition.setObjectName(u"dockWidget_parameter_definition") self.dockWidgetContents_5 = QWidget() @@ -284,7 +284,7 @@ def setupUi(self, MainWindow): self.verticalLayout_10.addWidget(self.tableView_parameter_definition) self.dockWidget_parameter_definition.setWidget(self.dockWidgetContents_5) - MainWindow.addDockWidget(Qt.RightDockWidgetArea, self.dockWidget_parameter_definition) + MainWindow.addDockWidget(Qt.DockWidgetArea.RightDockWidgetArea, self.dockWidget_parameter_definition) self.dockWidget_entity_tree = QDockWidget(MainWindow) self.dockWidget_entity_tree.setObjectName(u"dockWidget_entity_tree") self.dockWidget_entity_tree.setAllowedAreas(Qt.AllDockWidgetAreas) @@ -310,7 +310,7 @@ def setupUi(self, MainWindow): self.verticalLayout_4.addWidget(self.treeView_entity) self.dockWidget_entity_tree.setWidget(self.dockWidgetContents_6) - MainWindow.addDockWidget(Qt.LeftDockWidgetArea, self.dockWidget_entity_tree) + MainWindow.addDockWidget(Qt.DockWidgetArea.LeftDockWidgetArea, self.dockWidget_entity_tree) self.dockWidget_entity_graph = QDockWidget(MainWindow) self.dockWidget_entity_graph.setObjectName(u"dockWidget_entity_graph") self.dockWidgetContents_8 = QWidget() @@ -348,7 +348,7 @@ def setupUi(self, MainWindow): self.verticalLayout_7.addWidget(self.progress_bar_widget) self.dockWidget_entity_graph.setWidget(self.dockWidgetContents_8) - MainWindow.addDockWidget(Qt.LeftDockWidgetArea, self.dockWidget_entity_graph) + MainWindow.addDockWidget(Qt.DockWidgetArea.LeftDockWidgetArea, self.dockWidget_entity_graph) self.dockWidget_pivot_table = QDockWidget(MainWindow) self.dockWidget_pivot_table.setObjectName(u"dockWidget_pivot_table") self.dockWidgetContents_10 = QWidget() @@ -366,7 +366,7 @@ def setupUi(self, MainWindow): self.verticalLayout_13.addWidget(self.pivot_table) self.dockWidget_pivot_table.setWidget(self.dockWidgetContents_10) - MainWindow.addDockWidget(Qt.LeftDockWidgetArea, self.dockWidget_pivot_table) + MainWindow.addDockWidget(Qt.DockWidgetArea.LeftDockWidgetArea, self.dockWidget_pivot_table) self.dockWidget_frozen_table = QDockWidget(MainWindow) self.dockWidget_frozen_table.setObjectName(u"dockWidget_frozen_table") self.dockWidgetContents_11 = QWidget() @@ -387,7 +387,7 @@ def setupUi(self, MainWindow): self.verticalLayout_14.addWidget(self.frozen_table) self.dockWidget_frozen_table.setWidget(self.dockWidgetContents_11) - MainWindow.addDockWidget(Qt.LeftDockWidgetArea, self.dockWidget_frozen_table) + MainWindow.addDockWidget(Qt.DockWidgetArea.LeftDockWidgetArea, self.dockWidget_frozen_table) self.dockWidget_exports = QDockWidget(MainWindow) self.dockWidget_exports.setObjectName(u"dockWidget_exports") self.dockWidget_exports.setMaximumSize(QSize(524287, 64)) @@ -410,7 +410,7 @@ def setupUi(self, MainWindow): self.horizontalLayout_3.addLayout(self.horizontalLayout_exports) self.dockWidget_exports.setWidget(self.dockWidgetContents_12) - MainWindow.addDockWidget(Qt.BottomDockWidgetArea, self.dockWidget_exports) + MainWindow.addDockWidget(Qt.DockWidgetArea.BottomDockWidgetArea, self.dockWidget_exports) self.metadata_dock_widget = QDockWidget(MainWindow) self.metadata_dock_widget.setObjectName(u"metadata_dock_widget") self.metadata_dock_contents = QWidget() @@ -427,7 +427,7 @@ def setupUi(self, MainWindow): self.verticalLayout_11.addWidget(self.metadata_table_view) self.metadata_dock_widget.setWidget(self.metadata_dock_contents) - MainWindow.addDockWidget(Qt.LeftDockWidgetArea, self.metadata_dock_widget) + MainWindow.addDockWidget(Qt.DockWidgetArea.LeftDockWidgetArea, self.metadata_dock_widget) self.item_metadata_dock_widget = QDockWidget(MainWindow) self.item_metadata_dock_widget.setObjectName(u"item_metadata_dock_widget") self.item_metadata_dock_contents = QWidget() @@ -445,7 +445,7 @@ def setupUi(self, MainWindow): self.verticalLayout_9.addWidget(self.item_metadata_table_view) self.item_metadata_dock_widget.setWidget(self.item_metadata_dock_contents) - MainWindow.addDockWidget(Qt.LeftDockWidgetArea, self.item_metadata_dock_widget) + MainWindow.addDockWidget(Qt.DockWidgetArea.LeftDockWidgetArea, self.item_metadata_dock_widget) self.scenario_dock_widget = QDockWidget(MainWindow) self.scenario_dock_widget.setObjectName(u"scenario_dock_widget") self.dockWidgetContents_9 = QWidget() @@ -467,7 +467,7 @@ def setupUi(self, MainWindow): self.verticalLayout_12.addWidget(self.scenario_tree_view) self.scenario_dock_widget.setWidget(self.dockWidgetContents_9) - MainWindow.addDockWidget(Qt.LeftDockWidgetArea, self.scenario_dock_widget) + MainWindow.addDockWidget(Qt.DockWidgetArea.LeftDockWidgetArea, self.scenario_dock_widget) self.dockWidget_entity_alternative = QDockWidget(MainWindow) self.dockWidget_entity_alternative.setObjectName(u"dockWidget_entity_alternative") self.dockWidgetContents_3 = QWidget() @@ -488,7 +488,7 @@ def setupUi(self, MainWindow): self.verticalLayout_2.addWidget(self.tableView_entity_alternative) self.dockWidget_entity_alternative.setWidget(self.dockWidgetContents_3) - MainWindow.addDockWidget(Qt.RightDockWidgetArea, self.dockWidget_entity_alternative) + MainWindow.addDockWidget(Qt.DockWidgetArea.RightDockWidgetArea, self.dockWidget_entity_alternative) self.menuBar = QMenuBar(MainWindow) self.menuBar.setObjectName(u"menuBar") self.menuBar.setGeometry(QRect(0, 0, 965, 22)) diff --git a/spinetoolbox/ui/about.py b/spinetoolbox/ui/about.py index 4718db627..ee7658e75 100644 --- a/spinetoolbox/ui/about.py +++ b/spinetoolbox/ui/about.py @@ -14,7 +14,7 @@ ################################################################################ ## Form generated from reading UI file 'about.ui' ## -## Created by: Qt User Interface Compiler version 6.5.2 +## Created by: Qt User Interface Compiler version 6.7.3 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ @@ -38,7 +38,7 @@ def setupUi(self, Form): Form.setObjectName(u"Form") Form.setWindowModality(Qt.ApplicationModal) Form.resize(400, 614) - sizePolicy = QSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed) + sizePolicy = QSizePolicy(QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(Form.sizePolicy().hasHeightForWidth()) @@ -63,7 +63,7 @@ def setupUi(self, Form): self.horizontalLayout.setObjectName(u"horizontalLayout") self.label = QLabel(Form) self.label.setObjectName(u"label") - sizePolicy1 = QSizePolicy(QSizePolicy.Preferred, QSizePolicy.Preferred) + sizePolicy1 = QSizePolicy(QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Preferred) sizePolicy1.setHorizontalStretch(0) sizePolicy1.setVerticalStretch(0) sizePolicy1.setHeightForWidth(self.label.sizePolicy().hasHeightForWidth()) @@ -94,18 +94,18 @@ def setupUi(self, Form): palette1.setBrush(QPalette.Disabled, QPalette.Base, brush1) palette1.setBrush(QPalette.Disabled, QPalette.Window, brush1) self.frame_9.setPalette(palette1) - self.frame_9.setCursor(QCursor(Qt.ArrowCursor)) + self.frame_9.setCursor(QCursor(Qt.CursorShape.ArrowCursor)) self.frame_9.setAutoFillBackground(True) self.verticalLayout = QVBoxLayout(self.frame_9) self.verticalLayout.setObjectName(u"verticalLayout") self.verticalLayout.setContentsMargins(0, -1, 0, 0) - self.verticalSpacer = QSpacerItem(20, 40, QSizePolicy.Minimum, QSizePolicy.Expanding) + self.verticalSpacer = QSpacerItem(20, 40, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Expanding) self.verticalLayout.addItem(self.verticalSpacer) self.label_spine_toolbox = QLabel(self.frame_9) self.label_spine_toolbox.setObjectName(u"label_spine_toolbox") - sizePolicy2 = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding) + sizePolicy2 = QSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding) sizePolicy2.setHorizontalStretch(0) sizePolicy2.setVerticalStretch(0) sizePolicy2.setHeightForWidth(self.label_spine_toolbox.sizePolicy().hasHeightForWidth()) @@ -169,20 +169,20 @@ def setupUi(self, Form): self.verticalLayout.addWidget(self.label_python) - self.verticalSpacer_3 = QSpacerItem(20, 40, QSizePolicy.Minimum, QSizePolicy.Expanding) + self.verticalSpacer_3 = QSpacerItem(20, 40, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Expanding) self.verticalLayout.addItem(self.verticalSpacer_3) self.horizontalLayout_8 = QHBoxLayout() self.horizontalLayout_8.setObjectName(u"horizontalLayout_8") - self.horizontalSpacer = QSpacerItem(40, 20, QSizePolicy.Expanding, QSizePolicy.Minimum) + self.horizontalSpacer = QSpacerItem(40, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum) self.horizontalLayout_8.addItem(self.horizontalSpacer) self.toolButton_copy_to_clipboard = QToolButton(self.frame_9) self.toolButton_copy_to_clipboard.setObjectName(u"toolButton_copy_to_clipboard") icon = QIcon() - icon.addFile(u":/icons/menu_icons/copy.svg", QSize(), QIcon.Normal, QIcon.Off) + icon.addFile(u":/icons/menu_icons/copy.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.toolButton_copy_to_clipboard.setIcon(icon) self.horizontalLayout_8.addWidget(self.toolButton_copy_to_clipboard) @@ -267,7 +267,7 @@ def setupUi(self, Form): self.label_3 = QLabel(Form) self.label_3.setObjectName(u"label_3") - sizePolicy3 = QSizePolicy(QSizePolicy.Fixed, QSizePolicy.Preferred) + sizePolicy3 = QSizePolicy(QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Preferred) sizePolicy3.setHorizontalStretch(0) sizePolicy3.setVerticalStretch(0) sizePolicy3.setHeightForWidth(self.label_3.sizePolicy().hasHeightForWidth()) diff --git a/spinetoolbox/ui/add_project_item.py b/spinetoolbox/ui/add_project_item.py index ffa81ac01..2a3002a08 100644 --- a/spinetoolbox/ui/add_project_item.py +++ b/spinetoolbox/ui/add_project_item.py @@ -14,7 +14,7 @@ ################################################################################ ## Form generated from reading UI file 'add_project_item.ui' ## -## Created by: Qt User Interface Compiler version 6.7.0 +## Created by: Qt User Interface Compiler version 6.7.3 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ diff --git a/spinetoolbox/ui/array_editor.py b/spinetoolbox/ui/array_editor.py index c49e8be31..087987886 100644 --- a/spinetoolbox/ui/array_editor.py +++ b/spinetoolbox/ui/array_editor.py @@ -14,7 +14,7 @@ ################################################################################ ## Form generated from reading UI file 'array_editor.ui' ## -## Created by: Qt User Interface Compiler version 6.7.0 +## Created by: Qt User Interface Compiler version 6.7.3 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ diff --git a/spinetoolbox/ui/datetime_editor.py b/spinetoolbox/ui/datetime_editor.py index 8724c1000..5b903b9ef 100644 --- a/spinetoolbox/ui/datetime_editor.py +++ b/spinetoolbox/ui/datetime_editor.py @@ -14,7 +14,7 @@ ################################################################################ ## Form generated from reading UI file 'datetime_editor.ui' ## -## Created by: Qt User Interface Compiler version 6.6.3 +## Created by: Qt User Interface Compiler version 6.7.3 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ diff --git a/spinetoolbox/ui/duration_editor.py b/spinetoolbox/ui/duration_editor.py index 67b19f7c3..59bbb19dc 100644 --- a/spinetoolbox/ui/duration_editor.py +++ b/spinetoolbox/ui/duration_editor.py @@ -14,7 +14,7 @@ ################################################################################ ## Form generated from reading UI file 'duration_editor.ui' ## -## Created by: Qt User Interface Compiler version 6.5.2 +## Created by: Qt User Interface Compiler version 6.7.3 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ diff --git a/spinetoolbox/ui/import_source_selector.py b/spinetoolbox/ui/import_source_selector.py index 89876e5a7..db097f0ab 100644 --- a/spinetoolbox/ui/import_source_selector.py +++ b/spinetoolbox/ui/import_source_selector.py @@ -14,7 +14,7 @@ ################################################################################ ## Form generated from reading UI file 'import_source_selector.ui' ## -## Created by: Qt User Interface Compiler version 6.5.2 +## Created by: Qt User Interface Compiler version 6.7.3 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ diff --git a/spinetoolbox/ui/jump_properties.py b/spinetoolbox/ui/jump_properties.py index 7dcbff698..718f0d6e6 100644 --- a/spinetoolbox/ui/jump_properties.py +++ b/spinetoolbox/ui/jump_properties.py @@ -14,7 +14,7 @@ ################################################################################ ## Form generated from reading UI file 'jump_properties.ui' ## -## Created by: Qt User Interface Compiler version 6.7.2 +## Created by: Qt User Interface Compiler version 6.7.3 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ @@ -28,8 +28,8 @@ QPalette, QPixmap, QRadialGradient, QTransform) from PySide6.QtWidgets import (QAbstractItemView, QApplication, QComboBox, QGridLayout, QGroupBox, QHBoxLayout, QHeaderView, QPushButton, - QRadioButton, QSizePolicy, QSpacerItem, QToolButton, - QTreeView, QVBoxLayout, QWidget) + QRadioButton, QScrollArea, QSizePolicy, QSpacerItem, + QToolButton, QTreeView, QVBoxLayout, QWidget) from spinetoolbox.widgets.code_text_edit import CodeTextEdit from spinetoolbox import resources_icons_rc @@ -38,10 +38,22 @@ class Ui_Form(object): def setupUi(self, Form): if not Form.objectName(): Form.setObjectName(u"Form") - Form.resize(520, 628) - self.verticalLayout = QVBoxLayout(Form) + Form.resize(307, 400) + self.verticalLayout_3 = QVBoxLayout(Form) + self.verticalLayout_3.setSpacing(0) + self.verticalLayout_3.setObjectName(u"verticalLayout_3") + self.verticalLayout_3.setContentsMargins(0, 0, 0, 0) + self.scrollArea = QScrollArea(Form) + self.scrollArea.setObjectName(u"scrollArea") + self.scrollArea.setWidgetResizable(True) + self.scrollAreaWidgetContents = QWidget() + self.scrollAreaWidgetContents.setObjectName(u"scrollAreaWidgetContents") + self.scrollAreaWidgetContents.setGeometry(QRect(0, 0, 305, 398)) + self.verticalLayout = QVBoxLayout(self.scrollAreaWidgetContents) + self.verticalLayout.setSpacing(0) self.verticalLayout.setObjectName(u"verticalLayout") - self.groupBox_condition = QGroupBox(Form) + self.verticalLayout.setContentsMargins(0, 0, 0, 0) + self.groupBox_condition = QGroupBox(self.scrollAreaWidgetContents) self.groupBox_condition.setObjectName(u"groupBox_condition") self.verticalLayout_2 = QVBoxLayout(self.groupBox_condition) self.verticalLayout_2.setObjectName(u"verticalLayout_2") @@ -104,7 +116,7 @@ def setupUi(self, Form): self.gridLayout.setObjectName(u"gridLayout") self.horizontalLayout = QHBoxLayout() self.horizontalLayout.setObjectName(u"horizontalLayout") - self.toolButton_add_arg = QToolButton(Form) + self.toolButton_add_arg = QToolButton(self.scrollAreaWidgetContents) self.toolButton_add_arg.setObjectName(u"toolButton_add_arg") icon1 = QIcon() icon1.addFile(u":/icons/file-upload.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off) @@ -116,7 +128,7 @@ def setupUi(self, Form): self.horizontalLayout.addItem(self.horizontalSpacer_2) - self.toolButton_remove_arg = QToolButton(Form) + self.toolButton_remove_arg = QToolButton(self.scrollAreaWidgetContents) self.toolButton_remove_arg.setObjectName(u"toolButton_remove_arg") icon2 = QIcon() icon2.addFile(u":/icons/minus.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off) @@ -127,22 +139,26 @@ def setupUi(self, Form): self.gridLayout.addLayout(self.horizontalLayout, 1, 0, 1, 1) - self.treeView_input_files = QTreeView(Form) + self.treeView_input_files = QTreeView(self.scrollAreaWidgetContents) self.treeView_input_files.setObjectName(u"treeView_input_files") - self.treeView_input_files.setDragDropMode(QAbstractItemView.DragDrop) - self.treeView_input_files.setSelectionMode(QAbstractItemView.ExtendedSelection) + self.treeView_input_files.setDragDropMode(QAbstractItemView.DragDropMode.DragDrop) + self.treeView_input_files.setSelectionMode(QAbstractItemView.SelectionMode.ExtendedSelection) self.gridLayout.addWidget(self.treeView_input_files, 2, 0, 1, 1) - self.treeView_cmd_line_args = QTreeView(Form) + self.treeView_cmd_line_args = QTreeView(self.scrollAreaWidgetContents) self.treeView_cmd_line_args.setObjectName(u"treeView_cmd_line_args") - self.treeView_cmd_line_args.setDragDropMode(QAbstractItemView.DragDrop) + self.treeView_cmd_line_args.setDragDropMode(QAbstractItemView.DragDropMode.DragDrop) self.gridLayout.addWidget(self.treeView_cmd_line_args, 0, 0, 1, 1) self.verticalLayout.addLayout(self.gridLayout) + self.scrollArea.setWidget(self.scrollAreaWidgetContents) + + self.verticalLayout_3.addWidget(self.scrollArea) + self.retranslateUi(Form) diff --git a/spinetoolbox/ui/jump_properties.ui b/spinetoolbox/ui/jump_properties.ui index eceaee3af..562bfbfda 100644 --- a/spinetoolbox/ui/jump_properties.ui +++ b/spinetoolbox/ui/jump_properties.ui @@ -2,6 +2,7 @@