From 205fd4d1657227cf68a4687b935c903db1e51098 Mon Sep 17 00:00:00 2001 From: Pekka T Savolainen Date: Mon, 7 Oct 2024 13:37:12 +0300 Subject: [PATCH] Update keyboard shortcuts - Execute Project is Shift+F9 - Execute Selected is F9 - Stop is F10 Re #2887 --- spinetoolbox/ui/jump_properties.py | 14 +++++++------- spinetoolbox/ui/link_properties.py | 2 +- spinetoolbox/ui/mainwindow.py | 6 +++--- spinetoolbox/ui/mainwindow.ui | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/spinetoolbox/ui/jump_properties.py b/spinetoolbox/ui/jump_properties.py index 9c6f6c6db..7dcbff698 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.5.2 +## Created by: Qt User Interface Compiler version 6.7.2 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ @@ -54,7 +54,7 @@ def setupUi(self, Form): self.comboBox_tool_spec = QComboBox(self.groupBox_condition) self.comboBox_tool_spec.setObjectName(u"comboBox_tool_spec") - sizePolicy = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed) + sizePolicy = QSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.comboBox_tool_spec.sizePolicy().hasHeightForWidth()) @@ -65,7 +65,7 @@ def setupUi(self, Form): self.toolButton_edit_tool_spec = QToolButton(self.groupBox_condition) self.toolButton_edit_tool_spec.setObjectName(u"toolButton_edit_tool_spec") icon = QIcon() - icon.addFile(u":/icons/wrench.svg", QSize(), QIcon.Normal, QIcon.Off) + icon.addFile(u":/icons/wrench.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.toolButton_edit_tool_spec.setIcon(icon) self.horizontalLayout_2.addWidget(self.toolButton_edit_tool_spec) @@ -85,7 +85,7 @@ def setupUi(self, Form): self.horizontalLayout_3 = QHBoxLayout() self.horizontalLayout_3.setObjectName(u"horizontalLayout_3") - self.horizontalSpacer_3 = QSpacerItem(40, 20, QSizePolicy.Expanding, QSizePolicy.Minimum) + self.horizontalSpacer_3 = QSpacerItem(40, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum) self.horizontalLayout_3.addItem(self.horizontalSpacer_3) @@ -107,19 +107,19 @@ def setupUi(self, Form): self.toolButton_add_arg = QToolButton(Form) self.toolButton_add_arg.setObjectName(u"toolButton_add_arg") icon1 = QIcon() - icon1.addFile(u":/icons/file-upload.svg", QSize(), QIcon.Normal, QIcon.Off) + icon1.addFile(u":/icons/file-upload.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.toolButton_add_arg.setIcon(icon1) self.horizontalLayout.addWidget(self.toolButton_add_arg) - self.horizontalSpacer_2 = QSpacerItem(40, 20, QSizePolicy.Expanding, QSizePolicy.Minimum) + self.horizontalSpacer_2 = QSpacerItem(40, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum) self.horizontalLayout.addItem(self.horizontalSpacer_2) self.toolButton_remove_arg = QToolButton(Form) self.toolButton_remove_arg.setObjectName(u"toolButton_remove_arg") icon2 = QIcon() - icon2.addFile(u":/icons/minus.svg", QSize(), QIcon.Normal, QIcon.Off) + icon2.addFile(u":/icons/minus.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off) self.toolButton_remove_arg.setIcon(icon2) self.horizontalLayout.addWidget(self.toolButton_remove_arg) diff --git a/spinetoolbox/ui/link_properties.py b/spinetoolbox/ui/link_properties.py index f2e584711..43bd63568 100644 --- a/spinetoolbox/ui/link_properties.py +++ b/spinetoolbox/ui/link_properties.py @@ -14,7 +14,7 @@ ################################################################################ ## Form generated from reading UI file 'link_properties.ui' ## -## Created by: Qt User Interface Compiler version 6.7.1 +## Created by: Qt User Interface Compiler version 6.7.2 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ diff --git a/spinetoolbox/ui/mainwindow.py b/spinetoolbox/ui/mainwindow.py index b198436da..c557f9147 100644 --- a/spinetoolbox/ui/mainwindow.py +++ b/spinetoolbox/ui/mainwindow.py @@ -583,21 +583,21 @@ def retranslateUi(self, MainWindow): self.actionExecute_project.setToolTip(QCoreApplication.translate("MainWindow", u"Execute all items in project.", None)) #endif // QT_CONFIG(tooltip) #if QT_CONFIG(shortcut) - self.actionExecute_project.setShortcut(QCoreApplication.translate("MainWindow", u"F5", None)) + self.actionExecute_project.setShortcut(QCoreApplication.translate("MainWindow", u"Shift+F9", None)) #endif // QT_CONFIG(shortcut) self.actionExecute_selection.setText(QCoreApplication.translate("MainWindow", u"Selection", None)) #if QT_CONFIG(tooltip) self.actionExecute_selection.setToolTip(QCoreApplication.translate("MainWindow", u"Execute selected items.", None)) #endif // QT_CONFIG(tooltip) #if QT_CONFIG(shortcut) - self.actionExecute_selection.setShortcut(QCoreApplication.translate("MainWindow", u"F6", None)) + self.actionExecute_selection.setShortcut(QCoreApplication.translate("MainWindow", u"F9", None)) #endif // QT_CONFIG(shortcut) self.actionStop_execution.setText(QCoreApplication.translate("MainWindow", u"Stop", None)) #if QT_CONFIG(tooltip) self.actionStop_execution.setToolTip(QCoreApplication.translate("MainWindow", u"Stop execution.", None)) #endif // QT_CONFIG(tooltip) #if QT_CONFIG(shortcut) - self.actionStop_execution.setShortcut(QCoreApplication.translate("MainWindow", u"F7", None)) + self.actionStop_execution.setShortcut(QCoreApplication.translate("MainWindow", u"F10", None)) #endif // QT_CONFIG(shortcut) self.actionTake_link.setText(QCoreApplication.translate("MainWindow", u"Take link", None)) #if QT_CONFIG(tooltip) diff --git a/spinetoolbox/ui/mainwindow.ui b/spinetoolbox/ui/mainwindow.ui index d364e09b6..9957265cd 100644 --- a/spinetoolbox/ui/mainwindow.ui +++ b/spinetoolbox/ui/mainwindow.ui @@ -815,7 +815,7 @@ Execute all items in project. - F5 + Shift+F9 @@ -830,7 +830,7 @@ Execute selected items. - F6 + F9 @@ -845,7 +845,7 @@ Stop execution. - F7 + F10