Merge pull request #114 from hsorby/main

Update generated user interface files

res/pyinstaller/create_application.py

@@ -61,7 +61,7 @@ def main(variant):
         rcc_exe = os.path.join(pyside_dir, "rcc.exe")
         uic_exe = os.path.join(pyside_dir, "uic.exe")
 
-        win_icon = os.path.join('..', 'win', 'MAP-Client.ico')
+        win_icon = os.path.join(here, '..', 'win', 'MAP-Client.ico')
         run_command.append(f'--icon={win_icon}')
     else:
         raise NotImplementedError("Platform is not supported for creating a MAP Client application.")

res/win/nsis.nsi.template

@@ -60,6 +60,7 @@
 
 ;-------------------------------------------------------------------------------
 ; Uninstaller Pages
+    !define MUI_FINISHPAGE_TITLE_3LINES
     !insertmacro MUI_UNPAGE_CONFIRM
     !insertmacro MUI_UNPAGE_INSTFILES
 

src/mapclient/core/managers/workflowmanager.py

@@ -290,6 +290,8 @@ def save(self):
 
         if 'version' not in wf.allKeys():
             wf.setValue('version', info.VERSION_STRING)
+        if 'id' not in wf.allKeys():
+            wf.setValue('id', info.DEFAULT_WORKFLOW_PROJECT_IDENTIFIER)
         workflow_version = version.parse(wf.value('version'))
         application_version = version.parse(info.VERSION_STRING)
         if workflow_version < application_version:

src/mapclient/tools/annotation/ui/ui_annotationdialog.py

@@ -3,7 +3,7 @@
 ################################################################################
 ## Form generated from reading UI file 'annotationdialog.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.4.1
+## Created by: Qt User Interface Compiler version 6.7.0
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################
@@ -52,7 +52,7 @@ def setupUi(self, AnnotationDialog):
         self.horizontalLayout.setObjectName(u"horizontalLayout")
         self.subjectComboBox = QComboBox(self.groupBox)
         self.subjectComboBox.setObjectName(u"subjectComboBox")
-        sizePolicy = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed)
+        sizePolicy = QSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Fixed)
         sizePolicy.setHorizontalStretch(1)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.subjectComboBox.sizePolicy().hasHeightForWidth())
@@ -87,7 +87,7 @@ def setupUi(self, AnnotationDialog):
 
         self.label = QLabel(self.groupBox)
         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())
@@ -103,7 +103,7 @@ def setupUi(self, AnnotationDialog):
 
         self.annotationListWidget = QListWidget(self.groupBox)
         self.annotationListWidget.setObjectName(u"annotationListWidget")
-        sizePolicy2 = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
+        sizePolicy2 = QSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding)
         sizePolicy2.setHorizontalStretch(1)
         sizePolicy2.setVerticalStretch(0)
         sizePolicy2.setHeightForWidth(self.annotationListWidget.sizePolicy().hasHeightForWidth())
@@ -118,7 +118,7 @@ def setupUi(self, AnnotationDialog):
 
         self.verticalLayout.addWidget(self.removeButton)
 
-        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)
 

src/mapclient/tools/mapicon/ui/ui_mapicondialog.py

@@ -3,7 +3,7 @@
 ################################################################################
 ## Form generated from reading UI file 'mapicondialog.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.4.1
+## Created by: Qt User Interface Compiler version 6.7.0
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################
@@ -87,7 +87,7 @@ def setupUi(self, MAPIconDialog):
         self.gridLayout_2.setObjectName(u"gridLayout_2")
         self.labelIconPicture = QLabel(self.frame)
         self.labelIconPicture.setObjectName(u"labelIconPicture")
-        sizePolicy = QSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
+        sizePolicy = QSizePolicy(QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.labelIconPicture.sizePolicy().hasHeightForWidth())
@@ -98,18 +98,18 @@ def setupUi(self, MAPIconDialog):
 
         self.gridLayout_2.addWidget(self.labelIconPicture, 1, 0, 1, 1)
 
-        self.verticalSpacer_2 = QSpacerItem(20, 40, QSizePolicy.Minimum, QSizePolicy.Expanding)
+        self.verticalSpacer_2 = QSpacerItem(20, 40, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Expanding)
 
         self.gridLayout_2.addItem(self.verticalSpacer_2, 2, 0, 1, 1)
 
-        self.verticalSpacer_3 = QSpacerItem(20, 40, QSizePolicy.Minimum, QSizePolicy.Expanding)
+        self.verticalSpacer_3 = QSpacerItem(20, 40, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Expanding)
 
         self.gridLayout_2.addItem(self.verticalSpacer_3, 0, 0, 1, 1)
 
 
         self.gridLayout.addWidget(self.frame, 3, 1, 1, 1)
 
-        self.verticalSpacer = QSpacerItem(20, 40, QSizePolicy.Minimum, QSizePolicy.Expanding)
+        self.verticalSpacer = QSpacerItem(20, 40, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Expanding)
 
         self.gridLayout.addItem(self.verticalSpacer, 4, 1, 1, 1)
 

src/mapclient/tools/pluginfinder/ui/ui_downloadtodirectorydialog.py

@@ -3,7 +3,7 @@
 ################################################################################
 ## Form generated from reading UI file 'downloadtodirectorydialog.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.5.1
+## Created by: Qt User Interface Compiler version 6.7.0
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################
@@ -28,7 +28,7 @@ def setupUi(self, DownloadToDirectoryDialog):
         self.verticalLayout.setObjectName(u"verticalLayout")
         self.groupBox = QGroupBox(DownloadToDirectoryDialog)
         self.groupBox.setObjectName(u"groupBox")
-        sizePolicy = QSizePolicy(QSizePolicy.Preferred, QSizePolicy.Preferred)
+        sizePolicy = QSizePolicy(QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(2)
         sizePolicy.setHeightForWidth(self.groupBox.sizePolicy().hasHeightForWidth())
@@ -66,7 +66,7 @@ def setupUi(self, DownloadToDirectoryDialog):
 
         self.horizontalLayout_2.addWidget(self.pushButtonDownload)
 
-        self.horizontalSpacer = QSpacerItem(40, 20, QSizePolicy.Expanding, QSizePolicy.Minimum)
+        self.horizontalSpacer = QSpacerItem(40, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
 
         self.horizontalLayout_2.addItem(self.horizontalSpacer)
 

src/mapclient/tools/pluginfinder/ui/ui_pluginfinderdialog.py

@@ -3,7 +3,7 @@
 ################################################################################
 ## Form generated from reading UI file 'pluginfinderdialog.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.5.1
+## Created by: Qt User Interface Compiler version 6.7.0
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################

src/mapclient/tools/pluginwizard/ui/ui_config.py

@@ -3,7 +3,7 @@
 ################################################################################
 ## Form generated from reading UI file 'config.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.4.1
+## Created by: Qt User Interface Compiler version 6.7.0
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################

src/mapclient/tools/pluginwizard/ui/ui_misc.py

@@ -3,7 +3,7 @@
 ################################################################################
 ## Form generated from reading UI file 'misc.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.4.1
+## Created by: Qt User Interface Compiler version 6.7.0
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################

src/mapclient/tools/pluginwizard/ui/ui_name.py

@@ -3,7 +3,7 @@
 ################################################################################
 ## Form generated from reading UI file 'name.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.4.1
+## Created by: Qt User Interface Compiler version 6.7.0
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################
@@ -48,7 +48,7 @@ def setupUi(self, Name):
 
         self.gridLayout.addWidget(self.iconLabel, 2, 0, 1, 1)
 
-        self.verticalSpacer = QSpacerItem(20, 40, QSizePolicy.Minimum, QSizePolicy.Expanding)
+        self.verticalSpacer = QSpacerItem(20, 40, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Expanding)
 
         self.gridLayout.addItem(self.verticalSpacer, 7, 1, 1, 1)
 
@@ -79,7 +79,7 @@ def setupUi(self, Name):
         self.gridLayout_2.setObjectName(u"gridLayout_2")
         self.iconPictureLabel = QLabel(self.frame)
         self.iconPictureLabel.setObjectName(u"iconPictureLabel")
-        sizePolicy = QSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
+        sizePolicy = QSizePolicy(QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.iconPictureLabel.sizePolicy().hasHeightForWidth())
@@ -90,11 +90,11 @@ def setupUi(self, Name):
 
         self.gridLayout_2.addWidget(self.iconPictureLabel, 1, 0, 1, 1)
 
-        self.verticalSpacer_2 = QSpacerItem(20, 40, QSizePolicy.Minimum, QSizePolicy.Expanding)
+        self.verticalSpacer_2 = QSpacerItem(20, 40, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Expanding)
 
         self.gridLayout_2.addItem(self.verticalSpacer_2, 2, 0, 1, 1)
 
-        self.verticalSpacer_3 = QSpacerItem(20, 40, QSizePolicy.Minimum, QSizePolicy.Expanding)
+        self.verticalSpacer_3 = QSpacerItem(20, 40, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Expanding)
 
         self.gridLayout_2.addItem(self.verticalSpacer_3, 0, 0, 1, 1)
 

src/mapclient/tools/pluginwizard/ui/ui_output.py

@@ -3,7 +3,7 @@
 ################################################################################
 ## Form generated from reading UI file 'output.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.4.1
+## Created by: Qt User Interface Compiler version 6.7.0
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################
@@ -47,7 +47,7 @@ def setupUi(self, Output):
 
         self.verticalLayout.addLayout(self.horizontalLayout)
 
-        self.verticalSpacer = QSpacerItem(20, 252, QSizePolicy.Minimum, QSizePolicy.Expanding)
+        self.verticalSpacer = QSpacerItem(20, 252, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Expanding)
 
         self.verticalLayout.addItem(self.verticalSpacer)
 

src/mapclient/tools/pluginwizard/ui/ui_ports.py

@@ -3,7 +3,7 @@
 ################################################################################
 ## Form generated from reading UI file 'ports.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.4.1
+## Created by: Qt User Interface Compiler version 6.7.0
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################

src/mapclient/tools/pmr/ui/ui_addhostdialog.py

@@ -3,7 +3,7 @@
 ################################################################################
 ## Form generated from reading UI file 'addhostdialog.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.4.1
+## Created by: Qt User Interface Compiler version 6.7.0
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################

src/mapclient/tools/pmr/ui/ui_authoriseapplicationdialog.py

@@ -3,7 +3,7 @@
 ################################################################################
 ## Form generated from reading UI file 'authoriseapplicationdialog.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.4.1
+## Created by: Qt User Interface Compiler version 6.7.0
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################
@@ -40,7 +40,7 @@ def setupUi(self, AuthoriseApplicationDialog):
 
         self.verticalLayout_2.addWidget(self.tokenLineEdit)
 
-        self.verticalSpacer = QSpacerItem(20, 122, QSizePolicy.Minimum, QSizePolicy.Expanding)
+        self.verticalSpacer = QSpacerItem(20, 122, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Expanding)
 
         self.verticalLayout_2.addItem(self.verticalSpacer)
 

src/mapclient/tools/pmr/ui/ui_importworkflowdialog.py

@@ -3,7 +3,7 @@
 ################################################################################
 ## Form generated from reading UI file 'importworkflowdialog.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.5.1
+## Created by: Qt User Interface Compiler version 6.7.0
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################
@@ -35,7 +35,7 @@ def setupUi(self, ImportWorkflowDialog):
 
         self.lineEditLocation = QLineEdit(ImportWorkflowDialog)
         self.lineEditLocation.setObjectName(u"lineEditLocation")
-        sizePolicy = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed)
+        sizePolicy = QSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Fixed)
         sizePolicy.setHorizontalStretch(2)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.lineEditLocation.sizePolicy().hasHeightForWidth())

src/mapclient/tools/pmr/ui/ui_oauthcheckdialog.py

@@ -3,7 +3,7 @@
 ################################################################################
 ## Form generated from reading UI file 'oauthcheckdialog.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.4.1
+## Created by: Qt User Interface Compiler version 6.7.0
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################

src/mapclient/tools/pmr/ui/ui_pmrdvcscommitdialog.py

@@ -3,7 +3,7 @@
 ################################################################################
 ## Form generated from reading UI file 'pmrdvcscommitdialog.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.4.1
+## Created by: Qt User Interface Compiler version 6.7.0
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################

src/mapclient/tools/pmr/ui/ui_pmrsearchdialog.py

@@ -3,7 +3,7 @@
 ################################################################################
 ## Form generated from reading UI file 'pmrsearchdialog.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.4.1
+## Created by: Qt User Interface Compiler version 6.7.0
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################
@@ -34,21 +34,21 @@ def setupUi(self, PMRSearchDialog):
         self.loginHorizontalLayout.setObjectName(u"loginHorizontalLayout")
         self.label = QLabel(PMRSearchDialog)
         self.label.setObjectName(u"label")
-        sizePolicy = QSizePolicy(QSizePolicy.Preferred, QSizePolicy.Preferred)
+        sizePolicy = QSizePolicy(QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Preferred)
         sizePolicy.setHorizontalStretch(10)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.label.sizePolicy().hasHeightForWidth())
         self.label.setSizePolicy(sizePolicy)
 
         self.loginHorizontalLayout.addWidget(self.label)
 
-        self.horizontalSpacer = QSpacerItem(40, 20, QSizePolicy.Expanding, QSizePolicy.Minimum)
+        self.horizontalSpacer = QSpacerItem(40, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
 
         self.loginHorizontalLayout.addItem(self.horizontalSpacer)
 
         self.loginStackedWidget = QStackedWidget(PMRSearchDialog)
         self.loginStackedWidget.setObjectName(u"loginStackedWidget")
-        sizePolicy1 = QSizePolicy(QSizePolicy.Minimum, QSizePolicy.Minimum)
+        sizePolicy1 = QSizePolicy(QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Minimum)
         sizePolicy1.setHorizontalStretch(0)
         sizePolicy1.setVerticalStretch(0)
         sizePolicy1.setHeightForWidth(self.loginStackedWidget.sizePolicy().hasHeightForWidth())
@@ -88,7 +88,7 @@ def setupUi(self, PMRSearchDialog):
 
         self.pmrGroupBox = QGroupBox(PMRSearchDialog)
         self.pmrGroupBox.setObjectName(u"pmrGroupBox")
-        sizePolicy2 = QSizePolicy(QSizePolicy.Preferred, QSizePolicy.Preferred)
+        sizePolicy2 = QSizePolicy(QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Preferred)
         sizePolicy2.setHorizontalStretch(0)
         sizePolicy2.setVerticalStretch(1)
         sizePolicy2.setHeightForWidth(self.pmrGroupBox.sizePolicy().hasHeightForWidth())

src/mapclient/tools/pmr/ui/ui_pmrwidget.py

@@ -3,7 +3,7 @@
 ################################################################################
 ## Form generated from reading UI file 'pmrwidget.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.4.1
+## Created by: Qt User Interface Compiler version 6.7.0
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################
@@ -32,7 +32,7 @@ def setupUi(self, PMRWidget):
         self.gridLayout = QGridLayout()
         self.gridLayout.setObjectName(u"gridLayout")
         self.gridLayout.setVerticalSpacing(0)
-        self.horizontalSpacer = QSpacerItem(40, 20, QSizePolicy.Expanding, QSizePolicy.Minimum)
+        self.horizontalSpacer = QSpacerItem(40, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
 
         self.gridLayout.addItem(self.horizontalSpacer, 0, 0, 1, 1)
 
@@ -100,7 +100,7 @@ def setupUi(self, PMRWidget):
 
         self.horizontalLayout_3.addWidget(self.pushButtonExport)
 
-        self.horizontalSpacer_2 = QSpacerItem(40, 20, QSizePolicy.Expanding, QSizePolicy.Minimum)
+        self.horizontalSpacer_2 = QSpacerItem(40, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
 
         self.horizontalLayout_3.addItem(self.horizontalSpacer_2)
 

src/mapclient/tools/pmr/ui/ui_pmrworkflowwidget.py

@@ -3,7 +3,7 @@
 ################################################################################
 ## Form generated from reading UI file 'pmrworkflowwidget.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.5.1
+## Created by: Qt User Interface Compiler version 6.7.0
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################
@@ -32,7 +32,7 @@ def setupUi(self, PMRWorkflowWidget):
         self.gridLayout = QGridLayout()
         self.gridLayout.setObjectName(u"gridLayout")
         self.gridLayout.setVerticalSpacing(0)
-        self.horizontalSpacer = QSpacerItem(40, 20, QSizePolicy.Expanding, QSizePolicy.Minimum)
+        self.horizontalSpacer = QSpacerItem(40, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
 
         self.gridLayout.addItem(self.horizontalSpacer, 0, 0, 1, 1)
 
@@ -106,7 +106,7 @@ def setupUi(self, PMRWorkflowWidget):
 
         self.horizontalLayout_3.addWidget(self.pushButtonExport)
 
-        self.horizontalSpacer_2 = QSpacerItem(40, 20, QSizePolicy.Expanding, QSizePolicy.Minimum)
+        self.horizontalSpacer_2 = QSpacerItem(40, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
 
         self.horizontalLayout_3.addItem(self.horizontalSpacer_2)