Clean QT Other Removable Devices UI

src/qt/qt_settingsotherremovable.hpp

@@ -21,33 +21,19 @@ public:
 signals:
     void moChannelChanged();
     void zipChannelChanged();
-private slots:
-    void on_checkBoxZIP250_stateChanged(int arg1);
-
-private slots:
-    void on_comboBoxZIPChannel_activated(int index);
-
-private slots:
-    void on_comboBoxZIPBus_activated(int index);
-
-private slots:
-    void on_comboBoxZIPBus_currentIndexChanged(int index);
-
-private slots:
-    void on_comboBoxMOType_activated(int index);
-
-private slots:
-    void on_comboBoxMOChannel_activated(int index);
-
-private slots:
-    void on_comboBoxMOBus_activated(int index);
-
-private slots:
-    void on_comboBoxMOBus_currentIndexChanged(int index);
 
 private slots:
     void onMORowChanged(const QModelIndex &current);
+    void on_comboBoxMOBus_currentIndexChanged(int index);
+    void on_comboBoxMOBus_activated(int index);
+    void on_comboBoxMOChannel_activated(int index);
+    void on_comboBoxMOType_activated(int index);
+
     void onZIPRowChanged(const QModelIndex &current);
+    void on_comboBoxZIPBus_currentIndexChanged(int index);
+    void on_comboBoxZIPBus_activated(int index);
+    void on_comboBoxZIPChannel_activated(int index);
+    void on_checkBoxZIP250_stateChanged(int arg1);
 
 private:
     Ui::SettingsOtherRemovable *ui;

src/qt/qt_settingsotherremovable.ui

@@ -27,7 +27,7 @@
     <number>0</number>
    </property>
    <item>
-    <widget class="QLabel" name="label">
+    <widget class="QLabel" name="labelMO">
      <property name="text">
       <string>MO drives:</string>
      </property>
@@ -68,19 +68,12 @@
     <widget class="QWidget" name="moControls" native="true">
      <layout class="QGridLayout" name="gridLayout">
       <item row="0" column="0">
-       <widget class="QLabel" name="label_2">
+       <widget class="QLabel" name="labelMOBus">
         <property name="text">
          <string>Bus:</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="2">
-       <widget class="QLabel" name="label_7">
-        <property name="text">
-         <string>Channel:</string>
-        </property>
-       </widget>
-      </item>
       <item row="0" column="1">
        <widget class="QComboBox" name="comboBoxMOBus">
         <property name="maxVisibleItems">
@@ -88,6 +81,13 @@
         </property>
        </widget>
       </item>
+      <item row="0" column="2">
+       <widget class="QLabel" name="labelMOChannel">
+        <property name="text">
+         <string>Channel:</string>
+        </property>
+       </widget>
+      </item>
       <item row="0" column="3">
        <widget class="QComboBox" name="comboBoxMOChannel">
         <property name="maxVisibleItems">
@@ -96,7 +96,7 @@
        </widget>
       </item>
       <item row="1" column="0">
-       <widget class="QLabel" name="label_4">
+       <widget class="QLabel" name="labelMOType">
         <property name="text">
          <string>Type:</string>
         </property>
@@ -113,7 +113,7 @@
     </widget>
    </item>
    <item>
-    <widget class="QLabel" name="label_6">
+    <widget class="QLabel" name="labelZIP">
      <property name="text">
       <string>ZIP drives:</string>
      </property>
@@ -154,7 +154,7 @@
     <widget class="QWidget" name="zipControls" native="true">
      <layout class="QHBoxLayout" name="horizontalLayout">
       <item>
-       <widget class="QLabel" name="label_3">
+       <widget class="QLabel" name="labelZIPBus">
         <property name="text">
          <string>Bus:</string>
         </property>
@@ -168,7 +168,7 @@
        </widget>
       </item>
       <item>
-       <widget class="QLabel" name="label_5">
+       <widget class="QLabel" name="labelZIPChannel">
         <property name="text">
          <string>Channel:</string>
         </property>