From 2641601ea21a52ce31d10c4ec40e5a1f46268d6c Mon Sep 17 00:00:00 2001
From: Jasmine Iwanek <jasmine@iwanek.co.uk>
Date: Fri, 9 May 2025 21:09:53 -0400
Subject: [PATCH] Clean QT Ports UI

---
 src/qt/qt_settingsports.cpp |   6 +-
 src/qt/qt_settingsports.hpp |  21 ++--
 src/qt/qt_settingsports.ui  | 192 ++++++++++++++++++------------------
 3 files changed, 111 insertions(+), 108 deletions(-)

diff --git a/src/qt/qt_settingsports.cpp b/src/qt/qt_settingsports.cpp
index 7e8f2aeda..ddebd28e8 100644
--- a/src/qt/qt_settingsports.cpp
+++ b/src/qt/qt_settingsports.cpp
@@ -51,7 +51,7 @@ SettingsPorts::save()
 {
     for (int i = 0; i < PARALLEL_MAX; i++) {
         auto *cbox     = findChild<QComboBox *>(QString("comboBoxLpt%1").arg(i + 1));
-        auto *checkBox       = findChild<QCheckBox *>(QString("checkBoxParallel%1").arg(i + 1));
+        auto *checkBox = findChild<QCheckBox *>(QString("checkBoxParallel%1").arg(i + 1));
         if (cbox != NULL)
             lpt_ports[i].device  = cbox->currentData().toInt();
         if (checkBox != NULL)
@@ -73,7 +73,7 @@ SettingsPorts::onCurrentMachineChanged(int machineId)
 {
     this->machineId = machineId;
 
-    int                 c                          = 0;
+    int c = 0;
 
     // LPT Device
     QComboBox *         cbox[PARALLEL_MAX]         = { 0 };
@@ -93,7 +93,7 @@ SettingsPorts::onCurrentMachineChanged(int machineId)
         if (lptName == nullptr)
             break;
 
-        const QString  name    = tr(lptName);
+        const QString  name = tr(lptName);
 
         for (uint8_t i = 0; i < PARALLEL_MAX; ++i) {
             int row = Models::AddEntry(models[i], name, c);
diff --git a/src/qt/qt_settingsports.hpp b/src/qt/qt_settingsports.hpp
index 83560914f..8be1f0491 100644
--- a/src/qt/qt_settingsports.hpp
+++ b/src/qt/qt_settingsports.hpp
@@ -35,22 +35,25 @@ private slots:
     void on_checkBoxSerial7_stateChanged(int state);
 #endif
     void on_checkBoxSerialPassThru1_stateChanged(int state);
+    void on_pushButtonSerialPassThru1_clicked();
+
     void on_checkBoxSerialPassThru2_stateChanged(int state);
+    void on_pushButtonSerialPassThru2_clicked();
+
     void on_checkBoxSerialPassThru3_stateChanged(int state);
+    void on_pushButtonSerialPassThru3_clicked();
+
     void on_checkBoxSerialPassThru4_stateChanged(int state);
+    void on_pushButtonSerialPassThru4_clicked();
+
 #if 0
     void on_checkBoxSerialPassThru5_stateChanged(int state);
-    void on_checkBoxSerialPassThru6_stateChanged(int state);
-    void on_checkBoxSerialPassThru7_stateChanged(int state);
-#endif
-
-    void on_pushButtonSerialPassThru1_clicked();
-    void on_pushButtonSerialPassThru2_clicked();
-    void on_pushButtonSerialPassThru3_clicked();
-    void on_pushButtonSerialPassThru4_clicked();
-#if 0
     void on_pushButtonSerialPassThru5_clicked();
+
+    void on_checkBoxSerialPassThru6_stateChanged(int state);
     void on_pushButtonSerialPassThru6_clicked();
+
+    void on_checkBoxSerialPassThru7_stateChanged(int state);
     void on_pushButtonSerialPassThru7_clicked();
 #endif
 
diff --git a/src/qt/qt_settingsports.ui b/src/qt/qt_settingsports.ui
index bca870e5d..92420f2df 100644
--- a/src/qt/qt_settingsports.ui
+++ b/src/qt/qt_settingsports.ui
@@ -29,7 +29,7 @@
    <item row="0" column="0">
     <layout class="QFormLayout" name="formLayout">
      <item row="0" column="0">
-      <widget class="QLabel" name="label">
+      <widget class="QLabel" name="labelLpt1">
        <property name="text">
         <string>LPT1 Device:</string>
        </property>
@@ -43,7 +43,7 @@
       </widget>
      </item>
      <item row="1" column="0">
-      <widget class="QLabel" name="label_2">
+      <widget class="QLabel" name="labelLpt2">
        <property name="text">
         <string>LPT2 Device:</string>
        </property>
@@ -57,7 +57,7 @@
       </widget>
      </item>
      <item row="2" column="0">
-      <widget class="QLabel" name="label_3">
+      <widget class="QLabel" name="labelLpt3">
        <property name="text">
         <string>LPT3 Device:</string>
        </property>
@@ -71,7 +71,7 @@
       </widget>
      </item>
      <item row="3" column="0">
-      <widget class="QLabel" name="label_4">
+      <widget class="QLabel" name="labelLpt4">
        <property name="text">
         <string>LPT4 Device:</string>
        </property>
@@ -88,27 +88,6 @@
    </item>
    <item row="1" column="0">
     <layout class="QGridLayout" name="gridLayout">
-     <item row="1" column="1">
-      <widget class="QCheckBox" name="checkBoxParallel2">
-       <property name="text">
-        <string>Parallel port 2</string>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="1">
-      <widget class="QCheckBox" name="checkBoxParallel3">
-       <property name="text">
-        <string>Parallel port 3</string>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="0">
-      <widget class="QCheckBox" name="checkBoxSerial3">
-       <property name="text">
-        <string>Serial port 3</string>
-       </property>
-      </widget>
-     </item>
      <item row="0" column="0">
       <widget class="QCheckBox" name="checkBoxSerial1">
        <property name="text">
@@ -116,20 +95,6 @@
        </property>
       </widget>
      </item>
-     <item row="3" column="1">
-      <widget class="QCheckBox" name="checkBoxParallel4">
-       <property name="text">
-        <string>Parallel port 4</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="0">
-      <widget class="QCheckBox" name="checkBoxSerial2">
-       <property name="text">
-        <string>Serial port 2</string>
-       </property>
-      </widget>
-     </item>
      <item row="0" column="1">
       <widget class="QCheckBox" name="checkBoxParallel1">
        <property name="text">
@@ -137,6 +102,34 @@
        </property>
       </widget>
      </item>
+     <item row="1" column="0">
+      <widget class="QCheckBox" name="checkBoxSerial2">
+       <property name="text">
+        <string>Serial port 2</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QCheckBox" name="checkBoxParallel2">
+       <property name="text">
+        <string>Parallel port 2</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0">
+      <widget class="QCheckBox" name="checkBoxSerial3">
+       <property name="text">
+        <string>Serial port 3</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="QCheckBox" name="checkBoxParallel3">
+       <property name="text">
+        <string>Parallel port 3</string>
+       </property>
+      </widget>
+     </item>
      <item row="3" column="0">
       <widget class="QCheckBox" name="checkBoxSerial4">
        <property name="text">
@@ -144,13 +137,76 @@
        </property>
       </widget>
      </item>
+     <item row="3" column="1">
+      <widget class="QCheckBox" name="checkBoxParallel4">
+       <property name="text">
+        <string>Parallel port 4</string>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
    <item row="3" column="0">
-    <layout class="QGridLayout" name="gridLayout_5">
+    <layout class="QGridLayout" name="gridLayoutPassThru">
      <property name="sizeConstraint">
       <enum>QLayout::SetDefaultConstraint</enum>
      </property>
+     <item row="0" column="0">
+      <widget class="QCheckBox" name="checkBoxSerialPassThru1">
+       <property name="text">
+        <string>Serial port passthrough 1</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QPushButton" name="pushButtonSerialPassThru1">
+       <property name="text">
+        <string>Configure</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QCheckBox" name="checkBoxSerialPassThru2">
+       <property name="text">
+        <string>Serial port passthrough 2</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QPushButton" name="pushButtonSerialPassThru2">
+       <property name="text">
+        <string>Configure</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0">
+      <widget class="QCheckBox" name="checkBoxSerialPassThru3">
+       <property name="text">
+        <string>Serial port passthrough 3</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="QPushButton" name="pushButtonSerialPassThru3">
+       <property name="text">
+        <string>Configure</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="0">
+      <widget class="QCheckBox" name="checkBoxSerialPassThru4">
+       <property name="text">
+        <string>Serial port passthrough 4</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1">
+      <widget class="QPushButton" name="pushButtonSerialPassThru4">
+       <property name="text">
+        <string>Configure</string>
+       </property>
+      </widget>
+     </item>
      <item row="4" column="0">
       <spacer name="horizontalSpacer">
        <property name="orientation">
@@ -164,13 +220,6 @@
        </property>
       </spacer>
      </item>
-     <item row="2" column="0">
-      <widget class="QCheckBox" name="checkBoxSerialPassThru3">
-       <property name="text">
-        <string>Serial port passthrough 3</string>
-       </property>
-      </widget>
-     </item>
      <item row="5" column="0" colspan="2">
       <spacer name="verticalSpacer">
        <property name="orientation">
@@ -184,55 +233,6 @@
        </property>
       </spacer>
      </item>
-     <item row="0" column="1">
-      <widget class="QPushButton" name="pushButtonSerialPassThru1">
-       <property name="text">
-        <string>Configure</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="0">
-      <widget class="QCheckBox" name="checkBoxSerialPassThru1">
-       <property name="text">
-        <string>Serial port passthrough 1</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="0">
-      <widget class="QCheckBox" name="checkBoxSerialPassThru2">
-       <property name="text">
-        <string>Serial port passthrough 2</string>
-       </property>
-      </widget>
-     </item>
-     <item row="3" column="0">
-      <widget class="QCheckBox" name="checkBoxSerialPassThru4">
-       <property name="text">
-        <string>Serial port passthrough 4</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="1">
-      <widget class="QPushButton" name="pushButtonSerialPassThru2">
-       <property name="text">
-        <string>Configure</string>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="1">
-      <widget class="QPushButton" name="pushButtonSerialPassThru3">
-       <property name="text">
-        <string>Configure</string>
-       </property>
-      </widget>
-     </item>
-     <item row="3" column="1">
-      <widget class="QPushButton" name="pushButtonSerialPassThru4">
-       <property name="text">
-        <string>Configure</string>
-       </property>
-      </widget>
-     </item>
     </layout>
    </item>
   </layout>