diff --git a/tools/Python/mcgui/mcgui.py b/tools/Python/mcgui/mcgui.py index 9490942652..f94efd4f3c 100755 --- a/tools/Python/mcgui/mcgui.py +++ b/tools/Python/mcgui/mcgui.py @@ -13,10 +13,18 @@ import re import pathlib import shutil -from PyQt5 import QtCore, QtWidgets -import PyQt5 try: - from PyQt5 import Qsci + from PyQt6 import QtWidgets, QtCore + from PyQt6.QtWidgets import QApplication, QWidget + import PyQt6 as PyQt + +except ImportError: + from PyQt5 import QtWidgets, QtCore + from PyQt5.QtWidgets import QApplication, QWidget + import PyQt5 as PyQt + +try: + from PyQt import Qsci except ImportError: Qsci = None @@ -221,7 +229,7 @@ def compile(self, mpi=False): self.__cFile = '' # that wait cursor - QtWidgets.QApplication.setOverrideCursor(QtCore.Qt.WaitCursor) + QtWidgets.QApplication.setOverrideCursor(QtCore.Qt.CursorShape.WaitCursor) def compile_complete(): self.__emitter.message('compile thread done\n') QtWidgets.QApplication.restoreOverrideCursor() @@ -571,7 +579,7 @@ def handleRunOrInterruptSim(self): self.view.ew.save() self.emitter.status("Getting instrument params...") - QtWidgets.QApplication.setOverrideCursor(QtCore.Qt.WaitCursor) + QtWidgets.QApplication.setOverrideCursor(QtCore.Qt.CursorShape.WaitCursor) self.view.disableRunBtn() try: class ThreadInfoHandler(): @@ -969,10 +977,10 @@ def main(): mccode_config.load_config("user") mccode_config.check_env_vars() - mcguiApp = PyQt5.QtWidgets.QApplication(sys.argv) + mcguiApp = QtWidgets.QApplication(sys.argv) mcguiApp.ctr = McGuiAppController() - sys.exit(mcguiApp.exec_()) + sys.exit(mcguiApp.exec()) except Exception as e: print(e) diff --git a/tools/Python/mcgui/viewclasses.py b/tools/Python/mcgui/viewclasses.py index 967b24d98b..05b7be45c5 100644 --- a/tools/Python/mcgui/viewclasses.py +++ b/tools/Python/mcgui/viewclasses.py @@ -6,10 +6,21 @@ import re import pathlib from widgets import * -from PyQt5 import QtWidgets try: - from PyQt5 import Qsci + from PyQt6 import QtGui, QtWidgets, QtCore + from PyQt6.QtWidgets import QApplication, QWidget + from PyQt6.QtGui import QAction + import PyQt6 as PyQt + +except ImportError: + from PyQt5 import QtGui, QtWidgets, QtCore + from PyQt5.QtWidgets import QApplication, QWidget, QAction + from PyQt5.QtWidgets import QAction + import PyQt5 as PyQt + +try: + from PyQt import Qsci except ImportError: Qsci = None @@ -45,7 +56,7 @@ def showErrorDialogue(self, title, message): msg.setIcon(QtWidgets.QMessageBox.Critical) msg.setWindowTitle(title) msg.setText(message) - msg.exec_() + msg.exec() def showCodeEditorWindow(self, instr): self.ew.initCodeEditor(instr) @@ -144,7 +155,7 @@ def showOpenInstrumentDlg(self, lookDir): dlg.setNameFilters([mccode_config.configuration["MCCODE"]+" instruments (*.instr)", "All files (*)"]); dlg.selectNameFilter(mccode_config.configuration["MCCODE"]+" instruments (*.instr)") - if dlg.exec_(): + if dlg.exec(): return dlg.selectedFiles()[0] def showOpenPlotDirDlg(self, lookDir): @@ -157,7 +168,7 @@ def showChangeWorkDirDlg(self, lookDir): dlg = QtWidgets.QFileDialog() dlg.setFileMode(QtWidgets.QFileDialog.Directory) dlg.setDirectory(lookDir) - if dlg.exec_(): + if dlg.exec(): return dlg.selectedFiles()[0] def showStartSimDialog(self, params, comps, mcdisplays, mcplots, formats): @@ -168,7 +179,7 @@ def showStartSimDialog(self, params, comps, mcdisplays, mcplots, formats): self.__ssd.set_mcdisplays(mcdisplays) self.__ssd.set_mcplots(mcplots) self.__ssd.set_formats(formats) - if self.__ssd.exec_(): + if self.__ssd.exec(): return self.__ssd.getValues() else: return None, None, None, None, None, None @@ -191,7 +202,7 @@ def showSaveAsDialog(self, instr): def showConfigDialog(self): dlg = McConfigDialog() dlg.initConfigData(None) - dlg.exec_() + dlg.exec() def showAboutBox(self, text): if mccode_config.configuration["MCCODE"] == "mcstas": @@ -256,10 +267,10 @@ def handle(self): action.triggered.connect(h.handle) def add_conf_menu(self,label): - confmenu = QtWidgets.QAction(self) + confmenu = QAction(self) self.ui.menuFile.addAction(confmenu) - confmenu.setText(QtWidgets.QApplication.translate("MainWindow", label, None)) - confmenu.setToolTip(QtWidgets.QApplication.translate("MainWindow", "mccode " + label, None)) + confmenu.setText(QApplication.translate("MainWindow", label, None)) + confmenu.setToolTip(QApplication.translate("MainWindow", "mccode " + label, None)) return confmenu def closeEvent(self, event): @@ -280,7 +291,7 @@ def __init__(self, parent=None): self.ui = Ui_EditorWindow() self.ui.setupUi(self) - sheight = QtWidgets.QDesktopWidget().availableGeometry().height() + sheight = QtGui.QGuiApplication.primaryScreen().availableGeometry().height() if sheight < 1080: self.resize(920, sheight) @@ -447,7 +458,7 @@ def closeEvent(self, event): def __handleComponentClicked(self, comp_parser): dlg = McInsertComponentDialog() dlg.initComponentData(comp_parser) - if dlg.exec_(): + if dlg.exec(): comp_type, inst_name, params, atrel = dlg.getValues() else: return @@ -599,7 +610,7 @@ def __handleComponentBrowser(self): dlg = QtWidgets.QFileDialog() dlg.setDirectory(mccode_config.configuration["MCCODE_LIB_DIR"]) dlg.setNameFilter(mccode_config.configuration["MCCODE"]+"component files (*.comp)"); - if dlg.exec_(): + if dlg.exec(): comp_file = dlg.selectedFiles()[0] parser = ComponentParser(comp_file) self.__handleComponentClicked(parser) @@ -842,7 +853,7 @@ def createParamsWidgets(self, params): y = i // (int(mccode_config.configuration["GUICOLS"])*2) lbl = QtWidgets.QLabel(self.ui.gbxGrid) - lbl.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + lbl.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignmentFlag.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) lbl.setObjectName("lbl" + name) lbl.setText(name + ':') self.ui.gridGrid.addWidget(lbl, y, x, 1, 1) @@ -851,7 +862,7 @@ def createParamsWidgets(self, params): x = i % (int(mccode_config.configuration["GUICOLS"])*2) edt = QtWidgets.QLineEdit(self.ui.gbxGrid) - edt.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + edt.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignmentFlag.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) edt.setObjectName("edt" + name) edt.setText(value) self.ui.gridGrid.addWidget(edt, y, x, 1, 1) @@ -961,7 +972,7 @@ def initComponentData(self, comp_parser): # parameter value line-edit x = 1 edt = QtWidgets.QLineEdit() - edt.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + edt.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignmentFlag.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) edt.setObjectName("edt" + par.par_name) edt.defval = par.default_value self._initTbwFocusEvents(edt) diff --git a/tools/Python/mcgui/widgets.py b/tools/Python/mcgui/widgets.py index 3f12238eb3..e2c4751ffa 100644 --- a/tools/Python/mcgui/widgets.py +++ b/tools/Python/mcgui/widgets.py @@ -5,8 +5,17 @@ Dot ui files are created and edited using qtcreator, then transformed using pyuic5 from pyqt5-dev-tools. ''' -from PyQt5 import QtGui, QtCore, QtWidgets -import PyQt5 +try: + from PyQt6 import QtGui, QtWidgets, QtCore + from PyQt6.QtWidgets import QApplication, QWidget + from PyQt6.QtGui import QAction + import PyQt6 as PyQt + +except ImportError: + from PyQt5 import QtGui, QtWidgets, QtCore + from PyQt5.QtWidgets import QApplication, QWidget, QAction + from PyQt5.QtWidgets import QAction + import PyQt5 as PyQt ''' Main window. @@ -38,10 +47,10 @@ def setupUi(self, MainWindow): self.lblInstrument = QtWidgets.QLabel(self.gbxInstrument) self.lblInstrument.setObjectName("lblInstrument") self.grdInstrument.addWidget(self.lblInstrument, 2, 1, 1, 1) - spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) self.grdInstrument.addItem(spacerItem, 0, 1, 1, 5) self.btnDoc = QtWidgets.QPushButton(self.gbxInstrument) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Fixed, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.btnDoc.sizePolicy().hasHeightForWidth()) @@ -49,7 +58,7 @@ def setupUi(self, MainWindow): self.btnDoc.setObjectName("btnDoc") self.grdInstrument.addWidget(self.btnDoc, 0, 5, 1, 1) self.btnRun = QtWidgets.QPushButton(self.gbxInstrument) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Fixed, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.btnRun.sizePolicy().hasHeightForWidth()) @@ -57,7 +66,7 @@ def setupUi(self, MainWindow): self.btnRun.setObjectName("btnRun") self.grdInstrument.addWidget(self.btnRun, 0, 6, 1, 1) self.btnPlot = QtWidgets.QPushButton(self.gbxInstrument) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Fixed, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.btnPlot.sizePolicy().hasHeightForWidth()) @@ -65,7 +74,7 @@ def setupUi(self, MainWindow): self.btnPlot.setObjectName("btnPlot") self.grdInstrument.addWidget(self.btnPlot, 0, 7, 1, 1) self.btnEdit = QtWidgets.QPushButton(self.gbxInstrument) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Fixed, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.btnEdit.sizePolicy().hasHeightForWidth()) @@ -73,14 +82,14 @@ def setupUi(self, MainWindow): self.btnEdit.setObjectName("btnEdit") self.grdInstrument.addWidget(self.btnEdit, 2, 7, 1, 1) self.btnOpenInstrument = QtWidgets.QPushButton(self.gbxInstrument) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Fixed, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.btnOpenInstrument.sizePolicy().hasHeightForWidth()) self.btnOpenInstrument.setSizePolicy(sizePolicy) self.btnOpenInstrument.setObjectName("btnOpenInstrument") self.grdInstrument.addWidget(self.btnOpenInstrument, 2, 6, 1, 1) - spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) self.grdInstrument.addItem(spacerItem1, 2, 2, 1, 4) self.horizontalLayout_3.addLayout(self.grdInstrument) self.hlayoutInstrument.addWidget(self.gbxInstrument) @@ -109,51 +118,51 @@ def setupUi(self, MainWindow): self.statusbar = QtWidgets.QStatusBar(MainWindow) self.statusbar.setObjectName("statusbar") MainWindow.setStatusBar(self.statusbar) - self.actionOpen_instrument = QtWidgets.QAction(MainWindow) + self.actionOpen_instrument = QAction(MainWindow) self.actionOpen_instrument.setObjectName("actionOpen_instrument") - self.actionQuit = QtWidgets.QAction(MainWindow) + self.actionQuit = QAction(MainWindow) self.actionQuit.setObjectName("actionQuit") - self.actionRun_Simulation = QtWidgets.QAction(MainWindow) + self.actionRun_Simulation = QAction(MainWindow) self.actionRun_Simulation.setObjectName("actionRun_Simulation") - self.actionCompile_Instrument = QtWidgets.QAction(MainWindow) + self.actionCompile_Instrument = QAction(MainWindow) self.actionCompile_Instrument.setObjectName("actionCompile_Instrument") - self.actionMcstas_User_Manual = QtWidgets.QAction(MainWindow) + self.actionMcstas_User_Manual = QAction(MainWindow) self.actionMcstas_User_Manual.setObjectName("actionMcstas_User_Manual") - self.actionMcstas_Web_Page = QtWidgets.QAction(MainWindow) + self.actionMcstas_Web_Page = QAction(MainWindow) self.actionMcstas_Web_Page.setObjectName("actionMcstas_Web_Page") - self.actionAbout = QtWidgets.QAction(MainWindow) + self.actionAbout = QAction(MainWindow) self.actionAbout.setObjectName("actionAbout") - self.actionMcstas_Component_Manual = QtWidgets.QAction(MainWindow) + self.actionMcstas_Component_Manual = QAction(MainWindow) self.actionMcstas_Component_Manual.setObjectName("actionMcstas_Component_Manual") - self.actionNew_Instrument = QtWidgets.QAction(MainWindow) + self.actionNew_Instrument = QAction(MainWindow) self.actionNew_Instrument.setObjectName("actionNew_Instrument") - self.actionEdit_Instrument = QtWidgets.QAction(MainWindow) + self.actionEdit_Instrument = QAction(MainWindow) self.actionEdit_Instrument.setObjectName("actionEdit_Instrument") - self.actionEditExt_Instrument = QtWidgets.QAction(MainWindow) + self.actionEditExt_Instrument = QAction(MainWindow) self.actionEditExt_Instrument.setObjectName("actionEditExt_Instrument") - self.actionClose_Instrument = QtWidgets.QAction(MainWindow) + self.actionClose_Instrument = QAction(MainWindow) self.actionClose_Instrument.setObjectName("actionClose_Instrument") - self.actionPlot = QtWidgets.QAction(MainWindow) + self.actionPlot = QAction(MainWindow) self.actionPlot.setObjectName("actionPlot") - self.actionSave_As = QtWidgets.QAction(MainWindow) + self.actionSave_As = QAction(MainWindow) self.actionSave_As.setObjectName("actionSave_As") - self.actionTempl_submenu = QtWidgets.QAction(MainWindow) + self.actionTempl_submenu = QAction(MainWindow) self.actionTempl_submenu.setObjectName("actionTempl_submenu") - self.actionConfiguration = QtWidgets.QAction(MainWindow) + self.actionConfiguration = QAction(MainWindow) self.actionConfiguration.setObjectName("actionConfiguration") - self.actionClear_Console = QtWidgets.QAction(MainWindow) + self.actionClear_Console = QAction(MainWindow) self.actionClear_Console.setObjectName("actionClear_Console") - self.actionCompile_Instrument_MPI = QtWidgets.QAction(MainWindow) + self.actionCompile_Instrument_MPI = QAction(MainWindow) self.actionCompile_Instrument_MPI.setObjectName("actionCompile_Instrument_MPI") - self.actionMcdoc = QtWidgets.QAction(MainWindow) + self.actionMcdoc = QAction(MainWindow) self.actionMcdoc.setObjectName("actionMcdoc") - self.actionDisplay = QtWidgets.QAction(MainWindow) + self.actionDisplay = QAction(MainWindow) self.actionDisplay.setObjectName("actionDisplay") - self.actionDisplay_2d = QtWidgets.QAction(MainWindow) + self.actionDisplay_2d = QAction(MainWindow) self.actionDisplay_2d.setObjectName("actionDisplay_2d") - self.actionPlotOther = QtWidgets.QAction(MainWindow) + self.actionPlotOther = QAction(MainWindow) self.actionPlotOther.setObjectName("actionPlotOther") - self.actionMcDocCurrent = QtWidgets.QAction(MainWindow) + self.actionMcDocCurrent = QAction(MainWindow) self.actionMcDocCurrent.setObjectName("actionMcDocCurrent") self.menuNew_From_Template.addAction(self.actionTempl_submenu) self.menuFile.addAction(self.actionNew_Instrument) @@ -281,43 +290,43 @@ def setupUi(self, EditorWindow): self.menuInsert = QtWidgets.QMenu(self.menubar) self.menuInsert.setObjectName("menuInsert") EditorWindow.setMenuBar(self.menubar) - self.actionComponent_Browser = QtWidgets.QAction(EditorWindow) + self.actionComponent_Browser = QAction(EditorWindow) self.actionComponent_Browser.setObjectName("actionComponent_Browser") - self.actionCompDummy = QtWidgets.QAction(EditorWindow) + self.actionCompDummy = QAction(EditorWindow) self.actionCompDummy.setObjectName("actionCompDummy") - self.actionSource_Optimize = QtWidgets.QAction(EditorWindow) + self.actionSource_Optimize = QAction(EditorWindow) self.actionSource_Optimize.setObjectName("actionSource_Optimize") - self.actionGuide = QtWidgets.QAction(EditorWindow) + self.actionGuide = QAction(EditorWindow) self.actionGuide.setObjectName("actionGuide") - self.actionMirror = QtWidgets.QAction(EditorWindow) + self.actionMirror = QAction(EditorWindow) self.actionMirror.setObjectName("actionMirror") - self.actionV_Selector = QtWidgets.QAction(EditorWindow) + self.actionV_Selector = QAction(EditorWindow) self.actionV_Selector.setObjectName("actionV_Selector") - self.actionUndo = QtWidgets.QAction(EditorWindow) + self.actionUndo = QAction(EditorWindow) self.actionUndo.setObjectName("actionUndo") - self.actionRedo = QtWidgets.QAction(EditorWindow) + self.actionRedo = QAction(EditorWindow) self.actionRedo.setObjectName("actionRedo") - self.actionCopy = QtWidgets.QAction(EditorWindow) + self.actionCopy = QAction(EditorWindow) self.actionCopy.setObjectName("actionCopy") - self.actionCut = QtWidgets.QAction(EditorWindow) + self.actionCut = QAction(EditorWindow) self.actionCut.setObjectName("actionCut") - self.actionPaste = QtWidgets.QAction(EditorWindow) + self.actionPaste = QAction(EditorWindow) self.actionPaste.setObjectName("actionPaste") - self.actionSelect_All = QtWidgets.QAction(EditorWindow) + self.actionSelect_All = QAction(EditorWindow) self.actionSelect_All.setObjectName("actionSelect_All") - self.actionSave = QtWidgets.QAction(EditorWindow) + self.actionSave = QAction(EditorWindow) self.actionSave.setObjectName("actionSave") - self.actionClose_Instrument_Editor = QtWidgets.QAction(EditorWindow) + self.actionClose_Instrument_Editor = QAction(EditorWindow) self.actionClose_Instrument_Editor.setObjectName("actionClose_Instrument_Editor") - self.actionInsert_Header = QtWidgets.QAction(EditorWindow) + self.actionInsert_Header = QAction(EditorWindow) self.actionInsert_Header.setObjectName("actionInsert_Header") - self.actionInsert_Body = QtWidgets.QAction(EditorWindow) + self.actionInsert_Body = QAction(EditorWindow) self.actionInsert_Body.setObjectName("actionInsert_Body") - self.actionFind = QtWidgets.QAction(EditorWindow) + self.actionFind = QAction(EditorWindow) self.actionFind.setObjectName("actionFind") - self.actionSave_As = QtWidgets.QAction(EditorWindow) + self.actionSave_As = QAction(EditorWindow) self.actionSave_As.setObjectName("actionSave_As") - self.actionQuit = QtWidgets.QAction(EditorWindow) + self.actionQuit = QAction(EditorWindow) self.actionQuit.setObjectName("actionQuit") self.menuFile.addAction(self.actionSave) self.menuFile.addAction(self.actionSave_As) @@ -402,7 +411,8 @@ def setupUi(self, dlgStartSim): self.lblGridDummy.setObjectName("lblGridDummy") self.gridGrid.addWidget(self.lblGridDummy, 0, 0, 1, 1) self.edtGridDummy2 = QtWidgets.QLineEdit(self.gbxGrid) - self.edtGridDummy2.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + #QtCore.Qt.AlignmentFlag.Align + self.edtGridDummy2.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignmentFlag.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.edtGridDummy2.setObjectName("edtGridDummy2") self.gridGrid.addWidget(self.edtGridDummy2, 0, 3, 1, 1) self.lblGridDummy2 = QtWidgets.QLabel(self.gbxGrid) @@ -412,11 +422,11 @@ def setupUi(self, dlgStartSim): self.lblGridDummy3.setObjectName("lblGridDummy3") self.gridGrid.addWidget(self.lblGridDummy3, 0, 4, 1, 1) self.edtGridDummy = QtWidgets.QLineEdit(self.gbxGrid) - self.edtGridDummy.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.edtGridDummy.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignmentFlag.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.edtGridDummy.setObjectName("edtGridDummy") self.gridGrid.addWidget(self.edtGridDummy, 0, 1, 1, 1) self.edtGridDummy3 = QtWidgets.QLineEdit(self.gbxGrid) - self.edtGridDummy3.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.edtGridDummy3.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignmentFlag.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.edtGridDummy3.setObjectName("edtGridDummy3") self.gridGrid.addWidget(self.edtGridDummy3, 0, 5, 1, 1) self.verticalLayout_2.addLayout(self.gridGrid) @@ -428,7 +438,7 @@ def setupUi(self, dlgStartSim): self.gridSim = QtWidgets.QGridLayout() self.gridSim.setObjectName("gridSim") self.cbxSimTrace = QtWidgets.QComboBox(self.gbxSim) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.cbxSimTrace.sizePolicy().hasHeightForWidth()) @@ -440,15 +450,15 @@ def setupUi(self, dlgStartSim): self.gridSim.addWidget(self.cbxSimTrace, 0, 2, 1, 1) self.edtSteps = QtWidgets.QLineEdit(self.gbxSim) self.edtSteps.setText("") - self.edtSteps.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.edtSteps.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignmentFlag.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.edtSteps.setObjectName("edtSteps") self.gridSim.addWidget(self.edtSteps, 7, 2, 1, 1) self.edtNeutronCnt = QtWidgets.QLineEdit(self.gbxSim) - self.edtNeutronCnt.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.edtNeutronCnt.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignmentFlag.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.edtNeutronCnt.setObjectName("edtNeutronCnt") self.gridSim.addWidget(self.edtNeutronCnt, 5, 2, 1, 1) self.edtNodes = QtWidgets.QLineEdit(self.gbxSim) - self.edtNodes.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.edtNodes.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignmentFlag.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.edtNodes.setObjectName("edtNodes") self.gridSim.addWidget(self.edtNodes, 12, 2, 1, 1) self.lblSimTrace = QtWidgets.QLabel(self.gbxSim) @@ -477,7 +487,7 @@ def setupUi(self, dlgStartSim): self.cbxInspect.setObjectName("cbxInspect") self.gridSim.addWidget(self.cbxInspect, 1, 2, 1, 1) self.cbxClustering = QtWidgets.QComboBox(self.gbxSim) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.cbxClustering.sizePolicy().hasHeightForWidth()) @@ -525,7 +535,7 @@ def setupUi(self, dlgStartSim): self.lblRandomSeed.setObjectName("lblRandomSeed") self.gridAdvanced.addWidget(self.lblRandomSeed, 0, 0, 1, 1) self.edtRandomSeed = QtWidgets.QLineEdit(self.gbxAdvanced) - self.edtRandomSeed.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.edtRandomSeed.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignmentFlag.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.edtRandomSeed.setObjectName("edtRandomSeed") self.gridAdvanced.addWidget(self.edtRandomSeed, 0, 1, 1, 1) self.lblGravity = QtWidgets.QLabel(self.gbxAdvanced) @@ -538,7 +548,7 @@ def setupUi(self, dlgStartSim): self.gridAdvanced.addWidget(self.cbxGravity, 1, 1, 1, 1) self.verticalLayout_4.addLayout(self.gridAdvanced) self.verticalLayout_5.addWidget(self.gbxAdvanced) - spacerItem = QtWidgets.QSpacerItem(20, 73, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + spacerItem = QtWidgets.QSpacerItem(20, 73, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding) self.verticalLayout_5.addItem(spacerItem) self.hloAll = QtWidgets.QHBoxLayout() self.hloAll.setObjectName("hloAll") @@ -546,7 +556,7 @@ def setupUi(self, dlgStartSim): self.btnStart.setDefault(True) self.btnStart.setObjectName("btnStart") self.hloAll.addWidget(self.btnStart) - spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) self.hloAll.addItem(spacerItem1) self.btnCancel = QtWidgets.QPushButton(dlgStartSim) self.btnCancel.setObjectName("btnCancel") @@ -634,7 +644,7 @@ def setupUi(self, dlgInsertComponent): self.lblDescr.setWordWrap(True) self.lblDescr.setObjectName("lblDescr") self.verticalLayout_4.addWidget(self.lblDescr) - spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding) self.verticalLayout_4.addItem(spacerItem) self.scrlaDescription.setWidget(self.vlayoutscrlaDescription) self.vlayoutDescription.addWidget(self.scrlaDescription) @@ -651,7 +661,7 @@ def setupUi(self, dlgInsertComponent): self.hlayoutInstanceName.addWidget(self.cbxVerbose) self.vlayoutParameters.addLayout(self.hlayoutInstanceName) self.scrlaParameters = QtWidgets.QScrollArea(dlgInsertComponent) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Expanding) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.scrlaParameters.sizePolicy().hasHeightForWidth()) @@ -667,7 +677,7 @@ def setupUi(self, dlgInsertComponent): self.gridParameters = QtWidgets.QGridLayout() self.gridParameters.setObjectName("gridParameters") self.tbxParValDummy = QtWidgets.QLineEdit(self.vlayoutscrlaParameters) - self.tbxParValDummy.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.tbxParValDummy.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignmentFlag.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.tbxParValDummy.setObjectName("tbxParValDummy") self.gridParameters.addWidget(self.tbxParValDummy, 0, 1, 1, 1) self.lblParDummy = QtWidgets.QLabel(self.vlayoutscrlaParameters) @@ -677,7 +687,7 @@ def setupUi(self, dlgInsertComponent): self.lblParDocstringDummy.setObjectName("lblParDocstringDummy") self.gridParameters.addWidget(self.lblParDocstringDummy, 0, 2, 1, 1) self.verticalLayout.addLayout(self.gridParameters) - spacerItem1 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + spacerItem1 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding) self.verticalLayout.addItem(spacerItem1) self.scrlaParameters.setWidget(self.vlayoutscrlaParameters) self.vlayoutParameters.addWidget(self.scrlaParameters) @@ -693,14 +703,14 @@ def setupUi(self, dlgInsertComponent): self.label_9.setObjectName("label_9") self.gridAtRotated.addWidget(self.label_9, 0, 7, 1, 1) self.edtAtRel = QtWidgets.QLineEdit(dlgInsertComponent) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.edtAtRel.sizePolicy().hasHeightForWidth()) self.edtAtRel.setSizePolicy(sizePolicy) self.edtAtRel.setMinimumSize(QtCore.QSize(0, 0)) self.edtAtRel.setLayoutDirection(QtCore.Qt.LeftToRight) - self.edtAtRel.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter) + self.edtAtRel.setAlignment(QtCore.Qt.AlignmentFlag.AlignLeading|QtCore.Qt.AlignmentFlag.AlignLeft|QtCore.Qt.AlignmentFlag.AlignVCenter) self.edtAtRel.setObjectName("edtAtRel") self.gridAtRotated.addWidget(self.edtAtRel, 0, 8, 1, 1) self.label_6 = QtWidgets.QLabel(dlgInsertComponent) @@ -708,12 +718,12 @@ def setupUi(self, dlgInsertComponent): self.gridAtRotated.addWidget(self.label_6, 0, 0, 1, 1) self.edtAtY = QtWidgets.QLineEdit(dlgInsertComponent) self.edtAtY.setLayoutDirection(QtCore.Qt.LeftToRight) - self.edtAtY.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.edtAtY.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignmentFlag.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.edtAtY.setObjectName("edtAtY") self.gridAtRotated.addWidget(self.edtAtY, 0, 4, 1, 1) self.edtAtZ = QtWidgets.QLineEdit(dlgInsertComponent) self.edtAtZ.setLayoutDirection(QtCore.Qt.LeftToRight) - self.edtAtZ.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.edtAtZ.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignmentFlag.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.edtAtZ.setObjectName("edtAtZ") self.gridAtRotated.addWidget(self.edtAtZ, 0, 6, 1, 1) self.label_8 = QtWidgets.QLabel(dlgInsertComponent) @@ -721,7 +731,7 @@ def setupUi(self, dlgInsertComponent): self.gridAtRotated.addWidget(self.label_8, 0, 5, 1, 1) self.edtAtX = QtWidgets.QLineEdit(dlgInsertComponent) self.edtAtX.setLayoutDirection(QtCore.Qt.LeftToRight) - self.edtAtX.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.edtAtX.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignmentFlag.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.edtAtX.setObjectName("edtAtX") self.gridAtRotated.addWidget(self.edtAtX, 0, 2, 1, 1) self.label_2 = QtWidgets.QLabel(dlgInsertComponent) @@ -729,17 +739,17 @@ def setupUi(self, dlgInsertComponent): self.gridAtRotated.addWidget(self.label_2, 1, 0, 1, 1) self.edtRotX = QtWidgets.QLineEdit(dlgInsertComponent) self.edtRotX.setLayoutDirection(QtCore.Qt.LeftToRight) - self.edtRotX.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.edtRotX.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignmentFlag.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.edtRotX.setObjectName("edtRotX") self.gridAtRotated.addWidget(self.edtRotX, 1, 2, 1, 1) self.edtRotY = QtWidgets.QLineEdit(dlgInsertComponent) self.edtRotY.setLayoutDirection(QtCore.Qt.LeftToRight) - self.edtRotY.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.edtRotY.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignmentFlag.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.edtRotY.setObjectName("edtRotY") self.gridAtRotated.addWidget(self.edtRotY, 1, 4, 1, 1) self.edtRotZ = QtWidgets.QLineEdit(dlgInsertComponent) self.edtRotZ.setLayoutDirection(QtCore.Qt.LeftToRight) - self.edtRotZ.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.edtRotZ.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignmentFlag.AlignTrailing|QtCore.Qt.AlignmentFlag.AligVCenter) self.edtRotZ.setObjectName("edtRotZ") self.gridAtRotated.addWidget(self.edtRotZ, 1, 6, 1, 1) self.edtRotRel = QtWidgets.QLineEdit(dlgInsertComponent) @@ -763,7 +773,7 @@ def setupUi(self, dlgInsertComponent): self.verticalLayout_2.addLayout(self.hlayoutNonButtons) self.hlayoutButtons = QtWidgets.QHBoxLayout() self.hlayoutButtons.setObjectName("hlayoutButtons") - spacerItem2 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + spacerItem2 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) self.hlayoutButtons.addItem(spacerItem2) self.btnInsert = QtWidgets.QPushButton(dlgInsertComponent) self.btnInsert.setDefault(True) @@ -914,7 +924,7 @@ def setupUi(self, dlgConfig): self.btnSave.setDefault(False) self.btnSave.setObjectName("btnSave") self.hlayoutButtons.addWidget(self.btnSave) - spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) self.hlayoutButtons.addItem(spacerItem) self.btnCancel = QtWidgets.QPushButton(dlgConfig) self.btnCancel.setObjectName("btnCancel")