diff --git a/src/revpicommander/revpiprogram.py b/src/revpicommander/revpiprogram.py index 3fcca6c..13b2089 100644 --- a/src/revpicommander/revpiprogram.py +++ b/src/revpicommander/revpiprogram.py @@ -41,8 +41,6 @@ class RevPiProgram(QtWidgets.QDialog, Ui_diag_program): # Setting properties require level 4 self.cbb_plcprogram.setEnabled(helper.cm.xml_mode >= 4) self.txt_plcarguments.setEnabled(helper.cm.xml_mode >= 4) - self.rbn_pythonversion_2.setEnabled(helper.cm.xml_mode >= 4) - self.rbn_pythonversion_3.setEnabled(helper.cm.xml_mode >= 4) self.cbx_plcworkdir_set_uid.setEnabled(helper.cm.xml_mode >= 4) # Downloads require level 2 @@ -62,8 +60,6 @@ class RevPiProgram(QtWidgets.QDialog, Ui_diag_program): """ return self.cbb_plcprogram.currentText() != self.dc.get("plcprogram", "") or \ self.txt_plcarguments.text() != self.dc.get("plcarguments", "") or \ - self.rbn_pythonversion_2.isChecked() != (self.dc.get("pythonversion", 3) == 2) or \ - self.rbn_pythonversion_3.isChecked() != (self.dc.get("pythonversion", 3) == 3) or \ int(self.cbx_plcworkdir_set_uid.isChecked()) != self.dc.get("plcworkdir_set_uid", 0) or \ self.sbx_plcprogram_watchdog.value() != self.dc.get("plcprogram_watchdog", 0) @@ -97,8 +93,6 @@ class RevPiProgram(QtWidgets.QDialog, Ui_diag_program): else: self.cbb_plcprogram.setCurrentText(self.dc.get("plcprogram", "")) self.txt_plcarguments.setText(self.dc.get("plcarguments", "")) - self.rbn_pythonversion_2.setChecked(self.dc.get("pythonversion", 3) == 2) - self.rbn_pythonversion_3.setChecked(self.dc.get("pythonversion", 3) == 3) self.cbx_plcworkdir_set_uid.setChecked(bool(self.dc.get("plcworkdir_set_uid", 0))) self.sbx_plcprogram_watchdog.setValue(self.dc.get("plcprogram_watchdog", 0)) @@ -130,7 +124,6 @@ class RevPiProgram(QtWidgets.QDialog, Ui_diag_program): self.dc["plcprogram"] = self.cbb_plcprogram.currentText() self.dc["plcarguments"] = self.txt_plcarguments.text() - self.dc["pythonversion"] = 2 if self.rbn_pythonversion_2.isChecked() else 3 self.dc["plcworkdir_set_uid"] = int(self.cbx_plcworkdir_set_uid.isChecked()) self.dc["plcprogram_watchdog"] = self.sbx_plcprogram_watchdog.value() diff --git a/src/revpicommander/ui/revpiprogram_ui.py b/src/revpicommander/ui/revpiprogram_ui.py index 56d25cd..4b57bf6 100644 --- a/src/revpicommander/ui/revpiprogram_ui.py +++ b/src/revpicommander/ui/revpiprogram_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'revpiprogram.ui' # -# Created by: PyQt5 UI code generator 5.15.7 +# Created by: PyQt5 UI code generator 5.15.9 # # WARNING: Any manual changes made to this file will be lost when pyuic5 is # run again. Do not edit this file unless you know what you are doing. @@ -14,44 +14,35 @@ from PyQt5 import QtCore, QtGui, QtWidgets class Ui_diag_program(object): def setupUi(self, diag_program): diag_program.setObjectName("diag_program") - diag_program.resize(400, 501) + diag_program.resize(434, 509) self.verticalLayout = QtWidgets.QVBoxLayout(diag_program) self.verticalLayout.setObjectName("verticalLayout") self.gb_plc = QtWidgets.QGroupBox(diag_program) self.gb_plc.setObjectName("gb_plc") self.gridLayout = QtWidgets.QGridLayout(self.gb_plc) self.gridLayout.setObjectName("gridLayout") - self.cbb_plcprogram = QtWidgets.QComboBox(self.gb_plc) - self.cbb_plcprogram.setObjectName("cbb_plcprogram") - self.gridLayout.addWidget(self.cbb_plcprogram, 1, 0, 1, 3) - self.rbn_pythonversion_3 = QtWidgets.QRadioButton(self.gb_plc) - self.rbn_pythonversion_3.setObjectName("rbn_pythonversion_3") - self.gridLayout.addWidget(self.rbn_pythonversion_3, 3, 2, 1, 1) - self.cbx_plcworkdir_set_uid = QtWidgets.QCheckBox(self.gb_plc) - self.cbx_plcworkdir_set_uid.setObjectName("cbx_plcworkdir_set_uid") - self.gridLayout.addWidget(self.cbx_plcworkdir_set_uid, 4, 0, 1, 3) - self.lbl_plcprogram = QtWidgets.QLabel(self.gb_plc) - self.lbl_plcprogram.setObjectName("lbl_plcprogram") - self.gridLayout.addWidget(self.lbl_plcprogram, 0, 0, 1, 3) - self.lbl_pythonversion = QtWidgets.QLabel(self.gb_plc) - self.lbl_pythonversion.setObjectName("lbl_pythonversion") - self.gridLayout.addWidget(self.lbl_pythonversion, 3, 0, 1, 1) - self.rbn_pythonversion_2 = QtWidgets.QRadioButton(self.gb_plc) - self.rbn_pythonversion_2.setObjectName("rbn_pythonversion_2") - self.gridLayout.addWidget(self.rbn_pythonversion_2, 3, 1, 1, 1) self.lbl_plcarguments = QtWidgets.QLabel(self.gb_plc) self.lbl_plcarguments.setObjectName("lbl_plcarguments") self.gridLayout.addWidget(self.lbl_plcarguments, 2, 0, 1, 1) + self.lbl_plcprogram_watchdog = QtWidgets.QLabel(self.gb_plc) + self.lbl_plcprogram_watchdog.setObjectName("lbl_plcprogram_watchdog") + self.gridLayout.addWidget(self.lbl_plcprogram_watchdog, 4, 0, 1, 2) + self.cbx_plcworkdir_set_uid = QtWidgets.QCheckBox(self.gb_plc) + self.cbx_plcworkdir_set_uid.setObjectName("cbx_plcworkdir_set_uid") + self.gridLayout.addWidget(self.cbx_plcworkdir_set_uid, 3, 0, 1, 3) + self.lbl_plcprogram = QtWidgets.QLabel(self.gb_plc) + self.lbl_plcprogram.setObjectName("lbl_plcprogram") + self.gridLayout.addWidget(self.lbl_plcprogram, 0, 0, 1, 3) self.txt_plcarguments = QtWidgets.QLineEdit(self.gb_plc) self.txt_plcarguments.setObjectName("txt_plcarguments") self.gridLayout.addWidget(self.txt_plcarguments, 2, 1, 1, 2) + self.cbb_plcprogram = QtWidgets.QComboBox(self.gb_plc) + self.cbb_plcprogram.setObjectName("cbb_plcprogram") + self.gridLayout.addWidget(self.cbb_plcprogram, 1, 0, 1, 3) self.sbx_plcprogram_watchdog = QtWidgets.QSpinBox(self.gb_plc) self.sbx_plcprogram_watchdog.setMaximum(600) self.sbx_plcprogram_watchdog.setObjectName("sbx_plcprogram_watchdog") - self.gridLayout.addWidget(self.sbx_plcprogram_watchdog, 5, 2, 1, 1) - self.lbl_plcprogram_watchdog = QtWidgets.QLabel(self.gb_plc) - self.lbl_plcprogram_watchdog.setObjectName("lbl_plcprogram_watchdog") - self.gridLayout.addWidget(self.lbl_plcprogram_watchdog, 5, 0, 1, 2) + self.gridLayout.addWidget(self.sbx_plcprogram_watchdog, 4, 2, 1, 1) self.verticalLayout.addWidget(self.gb_plc) self.cb_transfair = QtWidgets.QGroupBox(diag_program) self.cb_transfair.setObjectName("cb_transfair") @@ -109,9 +100,7 @@ class Ui_diag_program(object): self.btn_box.rejected.connect(diag_program.reject) # type: ignore QtCore.QMetaObject.connectSlotsByName(diag_program) diag_program.setTabOrder(self.cbb_plcprogram, self.txt_plcarguments) - diag_program.setTabOrder(self.txt_plcarguments, self.rbn_pythonversion_2) - diag_program.setTabOrder(self.rbn_pythonversion_2, self.rbn_pythonversion_3) - diag_program.setTabOrder(self.rbn_pythonversion_3, self.cbx_plcworkdir_set_uid) + diag_program.setTabOrder(self.txt_plcarguments, self.cbx_plcworkdir_set_uid) diag_program.setTabOrder(self.cbx_plcworkdir_set_uid, self.cbb_format) diag_program.setTabOrder(self.cbb_format, self.cbx_pictory) diag_program.setTabOrder(self.cbx_pictory, self.cbx_clear) @@ -125,14 +114,11 @@ class Ui_diag_program(object): _translate = QtCore.QCoreApplication.translate diag_program.setWindowTitle(_translate("diag_program", "PLC program")) self.gb_plc.setTitle(_translate("diag_program", "PLC program")) - self.rbn_pythonversion_3.setText(_translate("diag_program", "Python 3")) + self.lbl_plcarguments.setText(_translate("diag_program", "Program arguments:")) + self.lbl_plcprogram_watchdog.setText(_translate("diag_program", "Software watchdog (0=disabled):")) self.cbx_plcworkdir_set_uid.setText(_translate("diag_program", "Set write permissions for plc program to workdirectory")) self.lbl_plcprogram.setText(_translate("diag_program", "Python PLC start program:")) - self.lbl_pythonversion.setText(_translate("diag_program", "Python version:")) - self.rbn_pythonversion_2.setText(_translate("diag_program", "Python 2")) - self.lbl_plcarguments.setText(_translate("diag_program", "Program arguments:")) self.sbx_plcprogram_watchdog.setSuffix(_translate("diag_program", " sec.")) - self.lbl_plcprogram_watchdog.setText(_translate("diag_program", "Software watchdog (0=disabled):")) self.cb_transfair.setTitle(_translate("diag_program", "Transfair PLC program")) self.cbb_format.setItemText(0, _translate("diag_program", "ZIP archive")) self.cbb_format.setItemText(1, _translate("diag_program", "TGZ archive")) diff --git a/ui_dev/revpiprogram.ui b/ui_dev/revpiprogram.ui index f6dccb1..1d67d19 100644 --- a/ui_dev/revpiprogram.ui +++ b/ui_dev/revpiprogram.ui @@ -6,8 +6,8 @@ 0 0 - 400 - 501 + 434 + 509 @@ -20,17 +20,21 @@ PLC program - - - - - + + - Python 3 + Program arguments: - + + + + Software watchdog (0=disabled): + + + + Set write permissions for plc program to workdirectory @@ -44,31 +48,13 @@ - - - - Python version: - - - - - - - Python 2 - - - - - - - Program arguments: - - - - + + + + sec. @@ -78,13 +64,6 @@ - - - - Software watchdog (0=disabled): - - - @@ -205,8 +184,6 @@ cbb_plcprogram txt_plcarguments - rbn_pythonversion_2 - rbn_pythonversion_3 cbx_plcworkdir_set_uid cbb_format cbx_pictory