From 31f62fde671eb1c4fd9cda8876e5f843d8d0e579 Mon Sep 17 00:00:00 2001
From: Elliott Liggett <kilocharlie8@gmail.com>
Date: Tue, 23 Aug 2022 10:47:19 -0700
Subject: [PATCH] Moved some preset controls.

---
 wfmain.ui | 908 ++++++++++++++++++++++++++++--------------------------
 1 file changed, 465 insertions(+), 443 deletions(-)

diff --git a/wfmain.ui b/wfmain.ui
index acbeefb..bf5d5d7 100644
--- a/wfmain.ui
+++ b/wfmain.ui
@@ -3018,6 +3018,13 @@
               </item>
               <item>
                <layout class="QHBoxLayout" name="horizontalLayout_28">
+                <item>
+                 <widget class="QCheckBox" name="pttEnableChk">
+                  <property name="text">
+                   <string>Enable PTT Controls</string>
+                  </property>
+                 </widget>
+                </item>
                 <item>
                  <widget class="QLabel" name="secondaryMeterSelectionLabel">
                   <property name="text">
@@ -3068,14 +3075,108 @@
                  <number>0</number>
                 </property>
                 <item>
-                 <widget class="QCheckBox" name="pttEnableChk">
+                 <widget class="QLabel" name="label_43">
                   <property name="text">
-                   <string>Enable PTT Controls</string>
+                   <string>Color scheme</string>
                   </property>
                  </widget>
                 </item>
                 <item>
-                 <spacer name="horizontalSpacer_14">
+                 <widget class="QLabel" name="colorPresetLabel">
+                  <property name="text">
+                   <string>Preset:</string>
+                  </property>
+                  <property name="alignment">
+                   <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QComboBox" name="colorPresetCombo">
+                  <property name="minimumSize">
+                   <size>
+                    <width>90</width>
+                    <height>0</height>
+                   </size>
+                  </property>
+                  <property name="maximumSize">
+                   <size>
+                    <width>90</width>
+                    <height>16777215</height>
+                   </size>
+                  </property>
+                  <property name="toolTip">
+                   <string>Select a color preset here.</string>
+                  </property>
+                  <item>
+                   <property name="text">
+                    <string>1</string>
+                   </property>
+                  </item>
+                  <item>
+                   <property name="text">
+                    <string>2</string>
+                   </property>
+                  </item>
+                  <item>
+                   <property name="text">
+                    <string>3</string>
+                   </property>
+                  </item>
+                  <item>
+                   <property name="text">
+                    <string>4</string>
+                   </property>
+                  </item>
+                  <item>
+                   <property name="text">
+                    <string>5</string>
+                   </property>
+                  </item>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QPushButton" name="colorSavePresetBtn">
+                  <property name="toolTip">
+                   <string>Saves the current preset to the settings file.</string>
+                  </property>
+                  <property name="text">
+                   <string>Save Preset</string>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QPushButton" name="colorRevertPresetBtn">
+                  <property name="toolTip">
+                   <string>Revert the selected color preset to the default.</string>
+                  </property>
+                  <property name="text">
+                   <string>Revert</string>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QPushButton" name="colorRenamePresetBtn">
+                  <property name="toolTip">
+                   <string>Rename the selected color preset. Max length is 10 characters.</string>
+                  </property>
+                  <property name="text">
+                   <string>Rename Preset</string>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QPushButton" name="colorPopOutBtn">
+                  <property name="toolTip">
+                   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Pop out (or pop back in) the entire Settings tab. &lt;/p&gt;&lt;p&gt;NOTE: Press this button again to re-insert the tab when finished. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                  </property>
+                  <property name="text">
+                   <string>Pop-Out</string>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <spacer name="horizontalSpacer_29">
                   <property name="orientation">
                    <enum>Qt::Horizontal</enum>
                   </property>
@@ -3091,6 +3192,18 @@
               </item>
               <item>
                <widget class="QGroupBox" name="groupBox_9">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="minimumSize">
+                 <size>
+                  <width>0</width>
+                  <height>250</height>
+                 </size>
+                </property>
                 <property name="baseSize">
                  <size>
                   <width>0</width>
@@ -3112,86 +3225,14 @@
                       <x>0</x>
                       <y>0</y>
                       <width>767</width>
-                      <height>612</height>
+                      <height>582</height>
                      </rect>
                     </property>
                     <layout class="QGridLayout" name="gridLayout_2">
-                     <item row="20" column="1">
-                      <widget class="QLineEdit" name="colorEditMeterText">
-                       <property name="maximumSize">
-                        <size>
-                         <width>90</width>
-                         <height>16777215</height>
-                        </size>
-                       </property>
-                       <property name="text">
-                        <string>#AARRGGBB</string>
-                       </property>
-                      </widget>
+                     <item row="19" column="2">
+                      <widget class="QLedLabel" name="colorSwatchMeterText" native="true"/>
                      </item>
-                     <item row="4" column="0">
-                      <widget class="QPushButton" name="colorSetBtnText">
-                       <property name="text">
-                        <string>Text</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="1" column="1">
-                      <widget class="QComboBox" name="colorPresetCombo">
-                       <property name="maximumSize">
-                        <size>
-                         <width>90</width>
-                         <height>16777215</height>
-                        </size>
-                       </property>
-                       <property name="toolTip">
-                        <string>Select a color preset here.</string>
-                       </property>
-                       <item>
-                        <property name="text">
-                         <string>1</string>
-                        </property>
-                       </item>
-                       <item>
-                        <property name="text">
-                         <string>2</string>
-                        </property>
-                       </item>
-                       <item>
-                        <property name="text">
-                         <string>3</string>
-                        </property>
-                       </item>
-                       <item>
-                        <property name="text">
-                         <string>4</string>
-                        </property>
-                       </item>
-                       <item>
-                        <property name="text">
-                         <string>5</string>
-                        </property>
-                       </item>
-                      </widget>
-                     </item>
-                     <item row="1" column="6">
-                      <widget class="QPushButton" name="colorRenamePresetBtn">
-                       <property name="toolTip">
-                        <string>Rename the selected color preset. Max length is 10 characters.</string>
-                       </property>
-                       <property name="text">
-                        <string>Rename Preset</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="15" column="0">
-                      <widget class="QPushButton" name="colorSetBtnMeterLevel">
-                       <property name="text">
-                        <string>Meter Level</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="8" column="1">
+                     <item row="7" column="1">
                       <widget class="QLineEdit" name="colorEditUnderlayLine">
                        <property name="maximumSize">
                         <size>
@@ -3204,8 +3245,11 @@
                        </property>
                       </widget>
                      </item>
-                     <item row="10" column="1">
-                      <widget class="QLineEdit" name="colorEditWfBackground">
+                     <item row="6" column="2">
+                      <widget class="QLedLabel" name="colorSwatchSpecFill" native="true"/>
+                     </item>
+                     <item row="3" column="1">
+                      <widget class="QLineEdit" name="colorEditText">
                        <property name="maximumSize">
                         <size>
                          <width>90</width>
@@ -3217,60 +3261,49 @@
                        </property>
                       </widget>
                      </item>
-                     <item row="13" column="2">
-                      <widget class="QLedLabel" name="colorSwatchWfText" native="true"/>
-                     </item>
-                     <item row="8" column="0">
-                      <widget class="QPushButton" name="colorSetBtnUnderlayLine">
+                     <item row="10" column="0">
+                      <widget class="QPushButton" name="colorSetBtnWfGrid">
                        <property name="text">
-                        <string>Underlay Line</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="1" column="5">
-                      <widget class="QPushButton" name="colorRevertPresetBtn">
-                       <property name="toolTip">
-                        <string>Revert the selected color preset to the default.</string>
-                       </property>
-                       <property name="text">
-                        <string>Revert</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="5" column="2">
-                      <widget class="QLedLabel" name="colorSwatchPlotBackground" native="true"/>
-                     </item>
-                     <item row="3" column="2">
-                      <widget class="QLedLabel" name="colorSwatchAxis" native="true"/>
-                     </item>
-                     <item row="17" column="0">
-                      <widget class="QPushButton" name="colorSetBtnMeterPeakLevel">
-                       <property name="text">
-                        <string>Meter Peak Level</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="12" column="1">
-                      <widget class="QLineEdit" name="colorEditWfAxis">
-                       <property name="maximumSize">
-                        <size>
-                         <width>90</width>
-                         <height>16777215</height>
-                        </size>
-                       </property>
-                       <property name="text">
-                        <string>#AARRGGBB</string>
+                        <string>Waterfall Grid</string>
                        </property>
                       </widget>
                      </item>
                      <item row="4" column="2">
-                      <widget class="QLedLabel" name="colorSwatchText" native="true"/>
+                      <widget class="QLedLabel" name="colorSwatchPlotBackground" native="true"/>
                      </item>
-                     <item row="8" column="2">
+                     <item row="6" column="0">
+                      <widget class="QPushButton" name="colorSetBtnSpecFill">
+                       <property name="text">
+                        <string>Spectrum Fill</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="8" column="0">
+                      <widget class="QPushButton" name="colorSetBtnUnderlayFill">
+                       <property name="text">
+                        <string>Underlay Fill</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="7" column="2">
                       <widget class="QLedLabel" name="colorSwatchUnderlayLine" native="true"/>
                      </item>
-                     <item row="3" column="1">
-                      <widget class="QLineEdit" name="colorEditAxis">
+                     <item row="15" column="0">
+                      <widget class="QPushButton" name="colorSetBtnMeterAvg">
+                       <property name="text">
+                        <string>Meter Average</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="17" column="0">
+                      <widget class="QPushButton" name="colorSetBtnMeterPeakScale">
+                       <property name="text">
+                        <string>Meter High Scale</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="14" column="1">
+                      <widget class="QLineEdit" name="colorEditMeterLevel">
                        <property name="maximumSize">
                         <size>
                          <width>90</width>
@@ -3282,7 +3315,24 @@
                        </property>
                       </widget>
                      </item>
-                     <item row="2" column="1">
+                     <item row="11" column="2">
+                      <widget class="QLedLabel" name="colorSwatchWfAxis" native="true"/>
+                     </item>
+                     <item row="9" column="0">
+                      <widget class="QPushButton" name="colorSetBtnwfBackground">
+                       <property name="text">
+                        <string>Waterfall Back</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="4" column="0">
+                      <widget class="QPushButton" name="colorSetBtnPlotBackground">
+                       <property name="text">
+                        <string>Plot Background</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="1" column="1">
                       <widget class="QLineEdit" name="colorEditGrid">
                        <property name="maximumSize">
                         <size>
@@ -3298,89 +3348,8 @@
                        </property>
                       </widget>
                      </item>
-                     <item row="16" column="0">
-                      <widget class="QPushButton" name="colorSetBtnMeterAvg">
-                       <property name="text">
-                        <string>Meter Average</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="19" column="1">
-                      <widget class="QLineEdit" name="colorEditMeterScale">
-                       <property name="maximumSize">
-                        <size>
-                         <width>90</width>
-                         <height>16777215</height>
-                        </size>
-                       </property>
-                       <property name="text">
-                        <string>#AARRGGBB</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="12" column="0">
-                      <widget class="QPushButton" name="colorSetBtnWfAxis">
-                       <property name="text">
-                        <string>Waterfall Axis</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="3" column="0">
-                      <widget class="QPushButton" name="colorSetBtnAxis">
-                       <property name="text">
-                        <string>Axis</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="9" column="0">
-                      <widget class="QPushButton" name="colorSetBtnUnderlayFill">
-                       <property name="text">
-                        <string>Underlay Fill</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="19" column="0">
-                      <widget class="QPushButton" name="colorSetBtnMeterScale">
-                       <property name="text">
-                        <string>Meter Scale</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="14" column="1">
-                      <widget class="QLineEdit" name="colorEditTuningLine">
-                       <property name="maximumSize">
-                        <size>
-                         <width>90</width>
-                         <height>16777215</height>
-                        </size>
-                       </property>
-                       <property name="text">
-                        <string>#AARRGGBB</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="1" column="2">
-                      <widget class="QWidget" name="colorDummyLed" native="true"/>
-                     </item>
-                     <item row="20" column="0">
-                      <widget class="QPushButton" name="colorSetBtnMeterText">
-                       <property name="text">
-                        <string>Meter Text</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="6" column="2">
-                      <widget class="QLedLabel" name="colorSwatchSpecLine" native="true"/>
-                     </item>
-                     <item row="6" column="0">
-                      <widget class="QPushButton" name="colorSetBtnSpecLine">
-                       <property name="text">
-                        <string>Spectrum Line</string>
-                       </property>
-                      </widget>
-                     </item>
                      <item row="9" column="1">
-                      <widget class="QLineEdit" name="colorEditUnderlayFill">
+                      <widget class="QLineEdit" name="colorEditWfBackground">
                        <property name="maximumSize">
                         <size>
                          <width>90</width>
@@ -3392,229 +3361,7 @@
                        </property>
                       </widget>
                      </item>
-                     <item row="15" column="2">
-                      <widget class="QLedLabel" name="colorSwatchMeterLevel" native="true"/>
-                     </item>
-                     <item row="16" column="1">
-                      <widget class="QLineEdit" name="colorEditMeterAvg">
-                       <property name="maximumSize">
-                        <size>
-                         <width>90</width>
-                         <height>16777215</height>
-                        </size>
-                       </property>
-                       <property name="text">
-                        <string>#AARRGGBB</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="1" column="8">
-                      <spacer name="colorHorizSpacerTopLine">
-                       <property name="orientation">
-                        <enum>Qt::Horizontal</enum>
-                       </property>
-                       <property name="sizeHint" stdset="0">
-                        <size>
-                         <width>40</width>
-                         <height>20</height>
-                        </size>
-                       </property>
-                      </spacer>
-                     </item>
-                     <item row="15" column="1">
-                      <widget class="QLineEdit" name="colorEditMeterLevel">
-                       <property name="maximumSize">
-                        <size>
-                         <width>90</width>
-                         <height>16777215</height>
-                        </size>
-                       </property>
-                       <property name="text">
-                        <string>#AARRGGBB</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="11" column="0">
-                      <widget class="QPushButton" name="colorSetBtnWfGrid">
-                       <property name="text">
-                        <string>Waterfall Grid</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="17" column="2">
-                      <widget class="QLedLabel" name="colorSwatchMeterPeakLevel" native="true"/>
-                     </item>
-                     <item row="10" column="0">
-                      <widget class="QPushButton" name="colorSetBtnwfBackground">
-                       <property name="text">
-                        <string>Waterfall Back</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="7" column="2">
-                      <widget class="QLedLabel" name="colorSwatchSpecFill" native="true"/>
-                     </item>
-                     <item row="14" column="2">
-                      <widget class="QLedLabel" name="colorSwatchTuningLine" native="true"/>
-                     </item>
-                     <item row="4" column="1">
-                      <widget class="QLineEdit" name="colorEditText">
-                       <property name="maximumSize">
-                        <size>
-                         <width>90</width>
-                         <height>16777215</height>
-                        </size>
-                       </property>
-                       <property name="text">
-                        <string>#AARRGGBB</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="11" column="1">
-                      <widget class="QLineEdit" name="colorEditWfGrid">
-                       <property name="maximumSize">
-                        <size>
-                         <width>90</width>
-                         <height>16777215</height>
-                        </size>
-                       </property>
-                       <property name="text">
-                        <string>#AARRGGBB</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="10" column="2">
-                      <widget class="QLedLabel" name="colorSwatchWfBackground" native="true"/>
-                     </item>
-                     <item row="13" column="0">
-                      <widget class="QPushButton" name="colorSetBtnWfText">
-                       <property name="text">
-                        <string>Waterfall Text</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="13" column="1">
-                      <widget class="QLineEdit" name="colorEditWfText">
-                       <property name="maximumSize">
-                        <size>
-                         <width>90</width>
-                         <height>16777215</height>
-                        </size>
-                       </property>
-                       <property name="text">
-                        <string>#AARRGGBB</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="1" column="4">
-                      <widget class="QPushButton" name="colorSavePresetBtn">
-                       <property name="toolTip">
-                        <string>Saves the current preset to the settings file.</string>
-                       </property>
-                       <property name="text">
-                        <string>Save Preset</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="11" column="2">
-                      <widget class="QLedLabel" name="colorSwatchWfGrid" native="true"/>
-                     </item>
-                     <item row="16" column="2">
-                      <widget class="QLedLabel" name="colorSwatchMeterAverage" native="true"/>
-                     </item>
-                     <item row="19" column="2">
-                      <widget class="QLedLabel" name="colorSwatchMeterScale" native="true"/>
-                     </item>
-                     <item row="1" column="0">
-                      <widget class="QLabel" name="colorPresetLabel">
-                       <property name="text">
-                        <string>Preset:</string>
-                       </property>
-                       <property name="alignment">
-                        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                       </property>
-                      </widget>
-                     </item>
                      <item row="6" column="1">
-                      <widget class="QLineEdit" name="colorEditSpecLine">
-                       <property name="maximumSize">
-                        <size>
-                         <width>90</width>
-                         <height>16777215</height>
-                        </size>
-                       </property>
-                       <property name="text">
-                        <string>#AARRGGBB</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="2" column="0">
-                      <widget class="QPushButton" name="colorSetBtnGrid">
-                       <property name="text">
-                        <string>Grid</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="9" column="2">
-                      <widget class="QLedLabel" name="colorSwatchUnderlayFill" native="true"/>
-                     </item>
-                     <item row="5" column="0">
-                      <widget class="QPushButton" name="colorSetBtnPlotBackground">
-                       <property name="text">
-                        <string>Plot Background</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="2" column="2">
-                      <widget class="QLedLabel" name="colorSwatchGrid" native="true"/>
-                     </item>
-                     <item row="17" column="1">
-                      <widget class="QLineEdit" name="colorEditMeterPeakLevel">
-                       <property name="maximumSize">
-                        <size>
-                         <width>90</width>
-                         <height>16777215</height>
-                        </size>
-                       </property>
-                       <property name="text">
-                        <string>#AARRGGBB</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="5" column="1">
-                      <widget class="QLineEdit" name="colorEditPlotBackground">
-                       <property name="maximumSize">
-                        <size>
-                         <width>90</width>
-                         <height>16777215</height>
-                        </size>
-                       </property>
-                       <property name="text">
-                        <string>#AARRGGBB</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="20" column="2">
-                      <widget class="QLedLabel" name="colorSwatchMeterText" native="true"/>
-                     </item>
-                     <item row="12" column="2">
-                      <widget class="QLedLabel" name="colorSwatchWfAxis" native="true"/>
-                     </item>
-                     <item row="14" column="0">
-                      <widget class="QPushButton" name="colorSetBtnTuningLine">
-                       <property name="text">
-                        <string>Tuning Line</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="7" column="0">
-                      <widget class="QPushButton" name="colorSetBtnSpecFill">
-                       <property name="text">
-                        <string>Spectrum Fill</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="7" column="1">
                       <widget class="QLineEdit" name="colorEditSpecFill">
                        <property name="maximumSize">
                         <size>
@@ -3627,24 +3374,193 @@
                        </property>
                       </widget>
                      </item>
-                     <item row="1" column="7">
-                      <widget class="QPushButton" name="colorPopOutBtn">
-                       <property name="toolTip">
-                        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Pop out (or pop back in) the entire Settings tab. &lt;/p&gt;&lt;p&gt;NOTE: Press this button again to re-insert the tab when finished. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-                       </property>
+                     <item row="12" column="0">
+                      <widget class="QPushButton" name="colorSetBtnWfText">
                        <property name="text">
-                        <string>Pop-Out</string>
+                        <string>Waterfall Text</string>
                        </property>
                       </widget>
                      </item>
-                     <item row="18" column="0">
-                      <widget class="QPushButton" name="colorSetBtnMeterPeakScale">
+                     <item row="8" column="2">
+                      <widget class="QLedLabel" name="colorSwatchUnderlayFill" native="true"/>
+                     </item>
+                     <item row="2" column="0">
+                      <widget class="QPushButton" name="colorSetBtnAxis">
                        <property name="text">
-                        <string>Meter High Scale</string>
+                        <string>Axis</string>
                        </property>
                       </widget>
                      </item>
-                     <item row="18" column="1">
+                     <item row="10" column="2">
+                      <widget class="QLedLabel" name="colorSwatchWfGrid" native="true"/>
+                     </item>
+                     <item row="2" column="2">
+                      <widget class="QLedLabel" name="colorSwatchAxis" native="true"/>
+                     </item>
+                     <item row="11" column="0">
+                      <widget class="QPushButton" name="colorSetBtnWfAxis">
+                       <property name="text">
+                        <string>Waterfall Axis</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="15" column="2">
+                      <widget class="QLedLabel" name="colorSwatchMeterAverage" native="true"/>
+                     </item>
+                     <item row="1" column="0">
+                      <widget class="QPushButton" name="colorSetBtnGrid">
+                       <property name="text">
+                        <string>Grid</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="3" column="2">
+                      <widget class="QLedLabel" name="colorSwatchText" native="true"/>
+                     </item>
+                     <item row="13" column="2">
+                      <widget class="QLedLabel" name="colorSwatchTuningLine" native="true"/>
+                     </item>
+                     <item row="14" column="2">
+                      <widget class="QLedLabel" name="colorSwatchMeterLevel" native="true"/>
+                     </item>
+                     <item row="13" column="0">
+                      <widget class="QPushButton" name="colorSetBtnTuningLine">
+                       <property name="text">
+                        <string>Tuning Line</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="19" column="1">
+                      <widget class="QLineEdit" name="colorEditMeterText">
+                       <property name="maximumSize">
+                        <size>
+                         <width>90</width>
+                         <height>16777215</height>
+                        </size>
+                       </property>
+                       <property name="text">
+                        <string>#AARRGGBB</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="12" column="1">
+                      <widget class="QLineEdit" name="colorEditWfText">
+                       <property name="maximumSize">
+                        <size>
+                         <width>90</width>
+                         <height>16777215</height>
+                        </size>
+                       </property>
+                       <property name="text">
+                        <string>#AARRGGBB</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="3" column="0">
+                      <widget class="QPushButton" name="colorSetBtnText">
+                       <property name="text">
+                        <string>Text</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="5" column="1">
+                      <widget class="QLineEdit" name="colorEditSpecLine">
+                       <property name="maximumSize">
+                        <size>
+                         <width>90</width>
+                         <height>16777215</height>
+                        </size>
+                       </property>
+                       <property name="text">
+                        <string>#AARRGGBB</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="2" column="1">
+                      <widget class="QLineEdit" name="colorEditAxis">
+                       <property name="maximumSize">
+                        <size>
+                         <width>90</width>
+                         <height>16777215</height>
+                        </size>
+                       </property>
+                       <property name="text">
+                        <string>#AARRGGBB</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="10" column="1">
+                      <widget class="QLineEdit" name="colorEditWfGrid">
+                       <property name="maximumSize">
+                        <size>
+                         <width>90</width>
+                         <height>16777215</height>
+                        </size>
+                       </property>
+                       <property name="text">
+                        <string>#AARRGGBB</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="16" column="1">
+                      <widget class="QLineEdit" name="colorEditMeterPeakLevel">
+                       <property name="maximumSize">
+                        <size>
+                         <width>90</width>
+                         <height>16777215</height>
+                        </size>
+                       </property>
+                       <property name="text">
+                        <string>#AARRGGBB</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="12" column="2">
+                      <widget class="QLedLabel" name="colorSwatchWfText" native="true"/>
+                     </item>
+                     <item row="13" column="1">
+                      <widget class="QLineEdit" name="colorEditTuningLine">
+                       <property name="maximumSize">
+                        <size>
+                         <width>90</width>
+                         <height>16777215</height>
+                        </size>
+                       </property>
+                       <property name="text">
+                        <string>#AARRGGBB</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="5" column="2">
+                      <widget class="QLedLabel" name="colorSwatchSpecLine" native="true"/>
+                     </item>
+                     <item row="9" column="2">
+                      <widget class="QLedLabel" name="colorSwatchWfBackground" native="true"/>
+                     </item>
+                     <item row="15" column="1">
+                      <widget class="QLineEdit" name="colorEditMeterAvg">
+                       <property name="maximumSize">
+                        <size>
+                         <width>90</width>
+                         <height>16777215</height>
+                        </size>
+                       </property>
+                       <property name="text">
+                        <string>#AARRGGBB</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="16" column="0">
+                      <widget class="QPushButton" name="colorSetBtnMeterPeakLevel">
+                       <property name="text">
+                        <string>Meter Peak Level</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="18" column="2">
+                      <widget class="QLedLabel" name="colorSwatchMeterScale" native="true"/>
+                     </item>
+                     <item row="17" column="1">
                       <widget class="QLineEdit" name="colorEditMeterPeakScale">
                        <property name="maximumSize">
                         <size>
@@ -3657,9 +3573,115 @@
                        </property>
                       </widget>
                      </item>
-                     <item row="18" column="2">
+                     <item row="17" column="2">
                       <widget class="QLedLabel" name="colorSwatchMeterPeakScale" native="true"/>
                      </item>
+                     <item row="18" column="1">
+                      <widget class="QLineEdit" name="colorEditMeterScale">
+                       <property name="maximumSize">
+                        <size>
+                         <width>90</width>
+                         <height>16777215</height>
+                        </size>
+                       </property>
+                       <property name="text">
+                        <string>#AARRGGBB</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="16" column="2">
+                      <widget class="QLedLabel" name="colorSwatchMeterPeakLevel" native="true"/>
+                     </item>
+                     <item row="8" column="1">
+                      <widget class="QLineEdit" name="colorEditUnderlayFill">
+                       <property name="maximumSize">
+                        <size>
+                         <width>90</width>
+                         <height>16777215</height>
+                        </size>
+                       </property>
+                       <property name="text">
+                        <string>#AARRGGBB</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="1" column="3">
+                      <spacer name="horizontalSpacer_14">
+                       <property name="orientation">
+                        <enum>Qt::Horizontal</enum>
+                       </property>
+                       <property name="sizeHint" stdset="0">
+                        <size>
+                         <width>40</width>
+                         <height>20</height>
+                        </size>
+                       </property>
+                      </spacer>
+                     </item>
+                     <item row="11" column="1">
+                      <widget class="QLineEdit" name="colorEditWfAxis">
+                       <property name="maximumSize">
+                        <size>
+                         <width>90</width>
+                         <height>16777215</height>
+                        </size>
+                       </property>
+                       <property name="text">
+                        <string>#AARRGGBB</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="4" column="1">
+                      <widget class="QLineEdit" name="colorEditPlotBackground">
+                       <property name="maximumSize">
+                        <size>
+                         <width>90</width>
+                         <height>16777215</height>
+                        </size>
+                       </property>
+                       <property name="text">
+                        <string>#AARRGGBB</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="5" column="0">
+                      <widget class="QPushButton" name="colorSetBtnSpecLine">
+                       <property name="text">
+                        <string>Spectrum Line</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="1" column="2">
+                      <widget class="QLedLabel" name="colorSwatchGrid" native="true"/>
+                     </item>
+                     <item row="19" column="0">
+                      <widget class="QPushButton" name="colorSetBtnMeterText">
+                       <property name="text">
+                        <string>Meter Text</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="7" column="0">
+                      <widget class="QPushButton" name="colorSetBtnUnderlayLine">
+                       <property name="text">
+                        <string>Underlay Line</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="18" column="0">
+                      <widget class="QPushButton" name="colorSetBtnMeterScale">
+                       <property name="text">
+                        <string>Meter Scale</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="14" column="0">
+                      <widget class="QPushButton" name="colorSetBtnMeterLevel">
+                       <property name="text">
+                        <string>Meter Level</string>
+                       </property>
+                      </widget>
+                     </item>
                     </layout>
                    </widget>
                   </widget>