Merge pull request #1775 from willend/main

Reorder config dialogue for "small screens"
McStasMcXtrace · Nov 23, 2024 · 7ae2708 · 7ae2708
2 parents e705b64 + 5796730
commit 7ae2708
Showing 1 changed file with 55 additions and 47 deletions.
diff --git a/tools/Python/mcgui/widgets.py b/tools/Python/mcgui/widgets.py
@@ -864,7 +864,7 @@ def retranslateUi(self, dlgInsertComponent):
 class Ui_dlgConfig(object):
     def setupUi(self, dlgConfig):
         dlgConfig.setObjectName("dlgConfig")
-        dlgConfig.resize(328, 555)
+        dlgConfig.resize(600, 300)
         dlgConfig.setModal(True)
         self.verticalLayout = QtWidgets.QVBoxLayout(dlgConfig)
         self.verticalLayout.setObjectName("verticalLayout")
@@ -889,66 +889,74 @@ def setupUi(self, dlgConfig):
         self.cbxMcdisplay.setObjectName("cbxMcdisplay")
         self.gridApps.addWidget(self.cbxMcdisplay, 5, 0, 1, 1)
         self.verticalLayout.addLayout(self.gridApps)
-        self.gridFlags = QtWidgets.QGridLayout()
-        self.gridFlags.setObjectName("gridFlags")
-        self.edtCC = QtWidgets.QLineEdit(dlgConfig)
-        self.edtCC.setObjectName("edtCC")
-        self.gridFlags.addWidget(self.edtCC, 1, 0, 1, 1)
-        self.edtNumNodes = QtWidgets.QLineEdit(dlgConfig)
-        self.edtNumNodes.setObjectName("edtNumNodes")
-        self.gridFlags.addWidget(self.edtNumNodes, 11, 0, 1, 1)
-        self.lblCc = QtWidgets.QLabel(dlgConfig)
-        self.lblCc.setObjectName("lblCc")
-        self.gridFlags.addWidget(self.lblCc, 0, 0, 1, 1)
-        self.edtMpicc = QtWidgets.QLineEdit(dlgConfig)
-        self.edtMpicc.setObjectName("edtMpicc")
-        self.gridFlags.addWidget(self.edtMpicc, 5, 0, 1, 1)
-        self.lblCflags = QtWidgets.QLabel(dlgConfig)
-        self.lblCflags.setObjectName("lblCflags")
-        self.gridFlags.addWidget(self.lblCflags, 2, 0, 1, 1)
-        self.lblMpirun = QtWidgets.QLabel(dlgConfig)
-        self.lblMpirun.setObjectName("lblMpirun")
-        self.gridFlags.addWidget(self.lblMpirun, 6, 0, 1, 1)
-        self.edtCflags = QtWidgets.QLineEdit(dlgConfig)
-        self.edtCflags.setObjectName("edtCflags")
-        self.gridFlags.addWidget(self.edtCflags, 3, 0, 1, 1)
-        self.lblNumnodes = QtWidgets.QLabel(dlgConfig)
-        self.lblNumnodes.setObjectName("lblNumnodes")
-        self.gridFlags.addWidget(self.lblNumnodes, 10, 0, 1, 1)
-        self.edtMPIrun = QtWidgets.QLineEdit(dlgConfig)
-        self.edtMPIrun.setObjectName("edtMPIrun")
-        self.gridFlags.addWidget(self.edtMPIrun, 7, 0, 1, 1)
-        self.lblMpicc = QtWidgets.QLabel(dlgConfig)
-        self.lblMpicc.setObjectName("lblMpicc")
-        self.gridFlags.addWidget(self.lblMpicc, 4, 0, 1, 1)
+
+        self.lbleditor = QtWidgets.QLabel(dlgConfig)
+        self.lbleditor.setObjectName("lbleditor")
+        self.gridApps.addWidget(self.lbleditor, 6, 0, 1, 1)
+        self.editor = QtWidgets.QLineEdit(dlgConfig)
+        self.editor.setObjectName("editor")
+        self.gridApps.addWidget(self.editor, 7, 0, 1, 1)
+
         self.lblNumocols = QtWidgets.QLabel(dlgConfig)
         self.lblNumocols.setObjectName("lblNumocols")
-        self.gridFlags.addWidget(self.lblNumocols, 12, 0, 1, 1)
+        self.gridApps.addWidget(self.lblNumocols, 8, 0, 1, 1)
         self.edtNumCols = QtWidgets.QLineEdit(dlgConfig)
         self.edtNumCols.setObjectName("edtNumCols")
+        self.gridApps.addWidget(self.edtNumCols, 9, 0, 1, 1)
+
         self.lblFontSize = QtWidgets.QLabel(dlgConfig)
         self.lblFontSize.setObjectName("lblFontSize")
-        self.gridFlags.addWidget(self.lblFontSize, 14, 0, 1, 1)
+        self.gridApps.addWidget(self.lblFontSize, 10, 0, 1, 1)
         self.edtFontSize = QtWidgets.QLineEdit(dlgConfig)
         self.edtFontSize.setObjectName("edtFontSize")
-        self.editor = QtWidgets.QLineEdit(dlgConfig)
-        self.editor.setObjectName("editor")
-        self.gridFlags.addWidget(self.edtNumCols, 13, 0, 1, 1)
-        self.gridFlags.addWidget(self.edtFontSize, 15, 0, 1, 1)
-        self.lbleditor = QtWidgets.QLabel(dlgConfig)
-        self.lbleditor.setObjectName("lbleditor")
-        self.gridFlags.addWidget(self.lbleditor, 16, 0, 1, 1)
-        self.gridFlags.addWidget(self.editor, 17, 0, 1, 1)
+        self.gridApps.addWidget(self.edtFontSize, 11, 0, 1, 1)
+
+
+        self.lblCc = QtWidgets.QLabel(dlgConfig)
+        self.lblCc.setObjectName("lblCc")
+        self.gridApps.addWidget(self.lblCc, 0, 2, 1, 1)
+        self.edtCC = QtWidgets.QLineEdit(dlgConfig)
+        self.edtCC.setObjectName("edtCC")
+        self.gridApps.addWidget(self.edtCC, 1, 2, 1, 1)
+        self.lblCflags = QtWidgets.QLabel(dlgConfig)
+        self.lblCflags.setObjectName("lblCflags")
+        self.gridApps.addWidget(self.lblCflags, 2, 2, 1, 1)
+        self.edtCflags = QtWidgets.QLineEdit(dlgConfig)
+        self.edtCflags.setObjectName("edtCflags")
+        self.gridApps.addWidget(self.edtCflags, 3, 2, 1, 1)
+
+        self.lblMpicc = QtWidgets.QLabel(dlgConfig)
+        self.lblMpicc.setObjectName("lblMpicc")
+        self.gridApps.addWidget(self.lblMpicc, 4, 2, 1, 1)
+
+        self.edtMpicc = QtWidgets.QLineEdit(dlgConfig)
+        self.edtMpicc.setObjectName("edtMpicc")
+        self.gridApps.addWidget(self.edtMpicc, 5, 2, 1, 1)
+
+        self.lblMpirun = QtWidgets.QLabel(dlgConfig)
+        self.lblMpirun.setObjectName("lblMpirun")
+        self.gridApps.addWidget(self.lblMpirun, 6, 2, 1, 1)
+
+
+        self.edtMPIrun = QtWidgets.QLineEdit(dlgConfig)
+        self.edtMPIrun.setObjectName("edtMPIrun")
+        self.gridApps.addWidget(self.edtMPIrun, 7, 2, 1, 1)
+
+        self.lblNumnodes = QtWidgets.QLabel(dlgConfig)
+        self.lblNumnodes.setObjectName("lblNumnodes")
+        self.gridApps.addWidget(self.lblNumnodes, 8, 2, 1, 1)
+
+        self.edtNumNodes = QtWidgets.QLineEdit(dlgConfig)
+        self.edtNumNodes.setObjectName("edtNumNodes")
+        self.gridApps.addWidget(self.edtNumNodes, 9, 2, 1, 1)
 
         self.edtNDbufsiz = QtWidgets.QLineEdit(dlgConfig)
         self.edtNDbufsiz.setObjectName("edtNDbufsiz")
         self.lblNDbufsiz = QtWidgets.QLabel(dlgConfig)
         self.lblNDbufsiz.setObjectName("lblNDbufsiz")
-        self.gridFlags.addWidget(self.lblNDbufsiz, 18, 0, 1, 1)
-        self.gridFlags.addWidget(self.edtNDbufsiz, 19, 0, 1, 1)
+        self.gridApps.addWidget(self.lblNDbufsiz, 10, 2, 1, 1)
+        self.gridApps.addWidget(self.edtNDbufsiz, 11, 2, 1, 1)
 
-
-        self.verticalLayout.addLayout(self.gridFlags)
         self.hlayoutButtons = QtWidgets.QHBoxLayout()
         self.hlayoutButtons.setObjectName("hlayoutButtons")
         self.btnOk = QtWidgets.QPushButton(dlgConfig)