Skip to content

Commit

Permalink
Merge pull request #1 from DanielFaulkner/AutoGenFixes
Browse files Browse the repository at this point in the history 
Auto gen fixes
  • Loading branch information
@DanielFaulkner
DanielFaulkner authored Oct 28, 2020
2 parents fea0685 + 5ce98e9 commit fd98840
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion scripts/Manual.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def setupUi(self, Manual):
font.setWeight(75)
self.label.setFont(font)
self.label.setObjectName(_fromUtf8("label"))
self.manual_bn = QtGui.QPushButton(Manual)
self.manual_bn = QtWidgets.QPushButton(Manual)
self.manual_bn.setGeometry(QtCore.QRect(650, 420, 75, 23))
font = QtGui.QFont()
font.setFamily(_fromUtf8("Arial"))
Expand Down
36 changes: 18 additions & 18 deletions scripts/Settings.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def setupUi(self, Settings):
Settings.resize(430, 356)
Settings.setMinimumSize(QtCore.QSize(430, 356))
Settings.setMaximumSize(QtCore.QSize(430, 356))
self.verticalLayout = QtGui.QVBoxLayout(Settings)
self.verticalLayout = QtWidgets.QVBoxLayout(Settings)
self.verticalLayout.setObjectName(_fromUtf8("verticalLayout"))
self.tools_frame = QtWidgets.QFrame(Settings)
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
Expand All @@ -43,7 +43,7 @@ def setupUi(self, Settings):
self.tools_frame.setFrameShadow(QtWidgets.QFrame.Sunken)
self.tools_frame.setLineWidth(2)
self.tools_frame.setObjectName(_fromUtf8("tools_frame"))
self.gridLayout = QtGui.QGridLayout(self.tools_frame)
self.gridLayout = QtWidgets.QGridLayout(self.tools_frame)
self.gridLayout.setObjectName(_fromUtf8("gridLayout"))
self.tools_location_label = QtWidgets.QLabel(self.tools_frame)
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed)
Expand All @@ -53,10 +53,10 @@ def setupUi(self, Settings):
self.tools_location_label.setSizePolicy(sizePolicy)
self.tools_location_label.setObjectName(_fromUtf8("tools_location_label"))
self.gridLayout.addWidget(self.tools_location_label, 1, 0, 1, 1)
self.tools_location_selecet_bn = QtGui.QPushButton(self.tools_frame)
self.tools_location_selecet_bn = QtWidgets.QPushButton(self.tools_frame)
self.tools_location_selecet_bn.setObjectName(_fromUtf8("tools_location_selecet_bn"))
self.gridLayout.addWidget(self.tools_location_selecet_bn, 1, 2, 1, 1)
self.tools_location_input = QtGui.QLineEdit(self.tools_frame)
self.tools_location_input = QtWidgets.QLineEdit(self.tools_frame)
self.tools_location_input.setObjectName(_fromUtf8("tools_location_input"))
self.gridLayout.addWidget(self.tools_location_input, 1, 1, 1, 1)
self.tools_label = QtWidgets.QLabel(self.tools_frame)
Expand All @@ -73,7 +73,7 @@ def setupUi(self, Settings):
self.tools_label.setFont(font)
self.tools_label.setObjectName(_fromUtf8("tools_label"))
self.gridLayout.addWidget(self.tools_label, 0, 0, 1, 1)
self.tools_location_clear_bn = QtGui.QPushButton(self.tools_frame)
self.tools_location_clear_bn = QtWidgets.QPushButton(self.tools_frame)
self.tools_location_clear_bn.setObjectName(_fromUtf8("tools_location_clear_bn"))
self.gridLayout.addWidget(self.tools_location_clear_bn, 1, 3, 1, 1)
self.verticalLayout.addWidget(self.tools_frame)
Expand Down Expand Up @@ -103,13 +103,13 @@ def setupUi(self, Settings):
sizePolicy.setHeightForWidth(self.scripts_location_label.sizePolicy().hasHeightForWidth())
self.scripts_location_label.setSizePolicy(sizePolicy)
self.scripts_location_label.setObjectName(_fromUtf8("scripts_location_label"))
self.scripts_location_input = QtGui.QLineEdit(self.frame)
self.scripts_location_input = QtWidgets.QLineEdit(self.frame)
self.scripts_location_input.setGeometry(QtCore.QRect(80, 40, 141, 27))
self.scripts_location_input.setObjectName(_fromUtf8("scripts_location_input"))
self.scripts_location_selecet_bn = QtGui.QPushButton(self.frame)
self.scripts_location_selecet_bn = QtWidgets.QPushButton(self.frame)
self.scripts_location_selecet_bn.setGeometry(QtCore.QRect(230, 40, 85, 27))
self.scripts_location_selecet_bn.setObjectName(_fromUtf8("scripts_location_selecet_bn"))
self.scripts_location_clear_bn = QtGui.QPushButton(self.frame)
self.scripts_location_clear_bn = QtWidgets.QPushButton(self.frame)
self.scripts_location_clear_bn.setGeometry(QtCore.QRect(320, 40, 85, 27))
self.scripts_location_clear_bn.setObjectName(_fromUtf8("scripts_location_clear_bn"))
self.scripts_label.raise_()
Expand All @@ -128,41 +128,41 @@ def setupUi(self, Settings):
self.assembly_frame.setFrameShadow(QtWidgets.QFrame.Sunken)
self.assembly_frame.setLineWidth(2)
self.assembly_frame.setObjectName(_fromUtf8("assembly_frame"))
self.gridLayout_2 = QtGui.QGridLayout(self.assembly_frame)
self.gridLayout_2 = QtWidgets.QGridLayout(self.assembly_frame)
self.gridLayout_2.setObjectName(_fromUtf8("gridLayout_2"))
self.iteration_label = QtWidgets.QLabel(self.assembly_frame)
self.iteration_label.setObjectName(_fromUtf8("iteration_label"))
self.gridLayout_2.addWidget(self.iteration_label, 3, 0, 1, 1)
self.threads_label = QtWidgets.QLabel(self.assembly_frame)
self.threads_label.setObjectName(_fromUtf8("threads_label"))
self.gridLayout_2.addWidget(self.threads_label, 1, 0, 1, 1)
self.threads_spinBox = QtGui.QSpinBox(self.assembly_frame)
self.threads_spinBox = QtWidgets.QSpinBox(self.assembly_frame)
self.threads_spinBox.setObjectName(_fromUtf8("threads_spinBox"))
self.gridLayout_2.addWidget(self.threads_spinBox, 1, 2, 1, 1)
self.iteration_spinBox = QtGui.QSpinBox(self.assembly_frame)
self.iteration_spinBox = QtWidgets.QSpinBox(self.assembly_frame)
self.iteration_spinBox.setObjectName(_fromUtf8("iteration_spinBox"))
self.gridLayout_2.addWidget(self.iteration_spinBox, 3, 2, 1, 1)
self.output_clear_bn = QtGui.QPushButton(self.assembly_frame)
self.output_clear_bn = QtWidgets.QPushButton(self.assembly_frame)
self.output_clear_bn.setObjectName(_fromUtf8("output_clear_bn"))
self.gridLayout_2.addWidget(self.output_clear_bn, 5, 5, 1, 1)
self.output_select_bn = QtGui.QPushButton(self.assembly_frame)
self.output_select_bn = QtWidgets.QPushButton(self.assembly_frame)
self.output_select_bn.setObjectName(_fromUtf8("output_select_bn"))
self.gridLayout_2.addWidget(self.output_select_bn, 5, 4, 1, 1)
self.jobs_spinBox = QtGui.QSpinBox(self.assembly_frame)
self.jobs_spinBox = QtWidgets.QSpinBox(self.assembly_frame)
self.jobs_spinBox.setMaximumSize(QtCore.QSize(61, 16777215))
self.jobs_spinBox.setObjectName(_fromUtf8("jobs_spinBox"))
self.gridLayout_2.addWidget(self.jobs_spinBox, 1, 5, 1, 1)
self.gs_label = QtWidgets.QLabel(self.assembly_frame)
self.gs_label.setObjectName(_fromUtf8("gs_label"))
self.gridLayout_2.addWidget(self.gs_label, 3, 3, 1, 2)
self.gs_input = QtGui.QLineEdit(self.assembly_frame)
self.gs_input = QtWidgets.QLineEdit(self.assembly_frame)
self.gs_input.setMaximumSize(QtCore.QSize(61, 16777215))
self.gs_input.setObjectName(_fromUtf8("gs_input"))
self.gridLayout_2.addWidget(self.gs_input, 3, 5, 1, 1)
self.jobs_label = QtWidgets.QLabel(self.assembly_frame)
self.jobs_label.setObjectName(_fromUtf8("jobs_label"))
self.gridLayout_2.addWidget(self.jobs_label, 1, 3, 1, 1)
self.output_input = QtGui.QLineEdit(self.assembly_frame)
self.output_input = QtWidgets.QLineEdit(self.assembly_frame)
self.output_input.setObjectName(_fromUtf8("output_input"))
self.gridLayout_2.addWidget(self.output_input, 5, 2, 1, 2)
self.output_label = QtWidgets.QLabel(self.assembly_frame)
Expand All @@ -188,8 +188,8 @@ def setupUi(self, Settings):
self.assembly_label.setObjectName(_fromUtf8("assembly_label"))
self.gridLayout_2.addWidget(self.assembly_label, 0, 0, 1, 2)
self.verticalLayout.addWidget(self.assembly_frame)
self.setting_confirm_frame = QtGui.QDialogButtonBox(Settings)
self.setting_confirm_frame.setStandardButtons(QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Ok)
self.setting_confirm_frame = QtWidgets.QDialogButtonBox(Settings)
self.setting_confirm_frame.setStandardButtons(QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Ok)
self.setting_confirm_frame.setObjectName(_fromUtf8("setting_confirm_frame"))
self.verticalLayout.addWidget(self.setting_confirm_frame)

Expand Down

0 comments on commit fd98840

Please sign in to comment.