From dfe1a424a61c09b15fd94a1baacdb7b6ca522846 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Sat, 9 Apr 2022 22:05:02 +0200
Subject: [PATCH] Update spectrum GUI layout

---
 sdrgui/gui/glspectrumgui.cpp |   4 +-
 sdrgui/gui/glspectrumgui.ui  | 217 ++++++++++++++++++++++-------------
 2 files changed, 138 insertions(+), 83 deletions(-)

diff --git a/sdrgui/gui/glspectrumgui.cpp b/sdrgui/gui/glspectrumgui.cpp
index fd0d9390d..8ac0916c8 100644
--- a/sdrgui/gui/glspectrumgui.cpp
+++ b/sdrgui/gui/glspectrumgui.cpp
@@ -48,13 +48,15 @@ GLSpectrumGUI::GLSpectrumGUI(QWidget* parent) :
     ui->setupUi(this);
 
     // Use the custom flow layout for the 3 main horizontal layouts (lines)
+    ui->verticalLayout->removeItem(ui->Line4Layout);
     ui->verticalLayout->removeItem(ui->Line3Layout);
     ui->verticalLayout->removeItem(ui->Line2Layout);
     ui->verticalLayout->removeItem(ui->Line1Layout);
     FlowLayout *flowLayout = new FlowLayout(nullptr, 1, 1, 1);
+    flowLayout->addItem(ui->Line3Layout);
     flowLayout->addItem(ui->Line1Layout);
     flowLayout->addItem(ui->Line2Layout);
-    flowLayout->addItem(ui->Line3Layout);
+    flowLayout->addItem(ui->Line4Layout);
     ui->verticalLayout->addItem(flowLayout);
 
     on_linscale_toggled(false);
diff --git a/sdrgui/gui/glspectrumgui.ui b/sdrgui/gui/glspectrumgui.ui
index 28b87aa85..68fa381d2 100644
--- a/sdrgui/gui/glspectrumgui.ui
+++ b/sdrgui/gui/glspectrumgui.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>359</width>
-    <height>106</height>
+    <width>364</width>
+    <height>137</height>
    </rect>
   </property>
   <property name="font">
@@ -357,32 +357,23 @@
       </widget>
      </item>
      <item>
-      <widget class="ButtonSwitch" name="freeze">
-       <property name="toolTip">
-        <string>Play/Pause spectrum display</string>
+      <widget class="QLabel" name="fillLabel1">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
        </property>
-       <property name="icon">
-        <iconset resource="../resources/res.qrc">
-         <normaloff>:/pause.png</normaloff>
-         <normalon>:/play.png</normalon>:/pause.png</iconset>
-       </property>
-       <property name="checkable">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
+       <property name="minimumSize">
         <size>
-         <width>40</width>
-         <height>20</height>
+         <width>5</width>
+         <height>22</height>
         </size>
        </property>
-      </spacer>
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
      </item>
     </layout>
    </item>
@@ -539,61 +530,23 @@
       </widget>
      </item>
      <item>
-      <widget class="ButtonSwitch" name="wsSpectrum">
-       <property name="toolTip">
-        <string>Left: toggle websocket spectrum - Right: websocket spectrum parameters</string>
+      <widget class="QLabel" name="fillLabel2">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
        </property>
-       <property name="icon">
-        <iconset>
-         <normalon>:/stream.png</normalon>
-        </iconset>
-       </property>
-       <property name="checkable">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="markers">
-       <property name="toolTip">
-        <string>Open spectrum markers dialog</string>
-       </property>
-       <property name="icon">
-        <iconset>
-         <normalon>:/gridpolar.png</normalon>
-        </iconset>
-       </property>
-       <property name="checkable">
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="ButtonSwitch" name="calibration">
-       <property name="toolTip">
-        <string>Left: toggle relative / calibrated power - Right: open calibration dialog</string>
-       </property>
-       <property name="icon">
-        <iconset resource="../resources/res.qrc">
-         <normaloff>:/ruler.png</normaloff>:/ruler.png</iconset>
-       </property>
-       <property name="checkable">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer_3">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
+       <property name="minimumSize">
         <size>
-         <width>40</width>
-         <height>20</height>
+         <width>5</width>
+         <height>22</height>
         </size>
        </property>
-      </spacer>
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
      </item>
     </layout>
    </item>
@@ -604,6 +557,12 @@
      </property>
      <item>
       <widget class="QPushButton" name="clearSpectrum">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
        <property name="toolTip">
         <string>Clear spectrum histogram</string>
        </property>
@@ -874,17 +833,111 @@
       </widget>
      </item>
      <item>
-      <spacer name="horizontalSpacer_2">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
+      <widget class="QLabel" name="fillLabel3">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
        </property>
-       <property name="sizeHint" stdset="0">
+       <property name="minimumSize">
         <size>
-         <width>40</width>
-         <height>20</height>
+         <width>5</width>
+         <height>22</height>
         </size>
        </property>
-      </spacer>
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="Line4Layout">
+     <item>
+      <widget class="ButtonSwitch" name="freeze">
+       <property name="toolTip">
+        <string>Play/Pause spectrum display</string>
+       </property>
+       <property name="icon">
+        <iconset resource="../resources/res.qrc">
+         <normaloff>:/pause.png</normaloff>
+         <normalon>:/play.png</normalon>:/pause.png</iconset>
+       </property>
+       <property name="checkable">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="ButtonSwitch" name="wsSpectrum">
+       <property name="toolTip">
+        <string>Left: toggle websocket spectrum - Right: websocket spectrum parameters</string>
+       </property>
+       <property name="icon">
+        <iconset>
+         <normalon>:/stream.png</normalon>
+        </iconset>
+       </property>
+       <property name="checkable">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="markers">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="toolTip">
+        <string>Open spectrum markers dialog</string>
+       </property>
+       <property name="icon">
+        <iconset>
+         <normalon>:/gridpolar.png</normalon>
+        </iconset>
+       </property>
+       <property name="checkable">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="ButtonSwitch" name="calibration">
+       <property name="toolTip">
+        <string>Left: toggle relative / calibrated power - Right: open calibration dialog</string>
+       </property>
+       <property name="icon">
+        <iconset resource="../resources/res.qrc">
+         <normaloff>:/ruler.png</normaloff>:/ruler.png</iconset>
+       </property>
+       <property name="checkable">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="fillLabel4">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>5</width>
+         <height>22</height>
+        </size>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
      </item>
     </layout>
    </item>