From d92a8fe26622c96e14ef791601d7402e69cd116b Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Sat, 23 Apr 2016 21:48:02 +0200
Subject: [PATCH] Enhance scope GUI display

---
 plugins/channel/chanalyzer/chanalyzergui.ui | 22 +++++--
 plugins/channel/demoddsd/dsddemodgui.ui     | 17 ++++--
 sdrbase/gui/glscopegui.ui                   | 68 ++++++++++++++++++---
 3 files changed, 91 insertions(+), 16 deletions(-)

diff --git a/plugins/channel/chanalyzer/chanalyzergui.ui b/plugins/channel/chanalyzer/chanalyzergui.ui
index e258a262c..d0c96d801 100644
--- a/plugins/channel/chanalyzer/chanalyzergui.ui
+++ b/plugins/channel/chanalyzer/chanalyzergui.ui
@@ -6,13 +6,13 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>310</width>
+    <width>640</width>
     <height>814</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
-    <width>302</width>
+    <width>640</width>
     <height>0</height>
    </size>
   </property>
@@ -380,10 +380,16 @@
     <rect>
      <x>10</x>
      <y>180</y>
-     <width>291</width>
+     <width>636</width>
      <height>284</height>
     </rect>
    </property>
+   <property name="minimumSize">
+    <size>
+     <width>636</width>
+     <height>0</height>
+    </size>
+   </property>
    <property name="windowTitle">
     <string>Channel Spectrum</string>
    </property>
@@ -392,7 +398,7 @@
      <number>2</number>
     </property>
     <property name="margin">
-     <number>3</number>
+     <number>2</number>
     </property>
     <item>
      <widget class="GLSpectrum" name="glSpectrum" native="true">
@@ -420,10 +426,16 @@
     <rect>
      <x>0</x>
      <y>470</y>
-     <width>291</width>
+     <width>636</width>
      <height>284</height>
     </rect>
    </property>
+   <property name="minimumSize">
+    <size>
+     <width>636</width>
+     <height>0</height>
+    </size>
+   </property>
    <property name="windowTitle">
     <string>Channel Scope</string>
    </property>
diff --git a/plugins/channel/demoddsd/dsddemodgui.ui b/plugins/channel/demoddsd/dsddemodgui.ui
index 31fe1b3b6..745351647 100644
--- a/plugins/channel/demoddsd/dsddemodgui.ui
+++ b/plugins/channel/demoddsd/dsddemodgui.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>600</width>
+    <width>640</width>
     <height>841</height>
    </rect>
   </property>
@@ -18,7 +18,7 @@
   </property>
   <property name="minimumSize">
    <size>
-    <width>600</width>
+    <width>640</width>
     <height>0</height>
    </size>
   </property>
@@ -36,7 +36,7 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>601</width>
+     <width>641</width>
      <height>171</height>
     </rect>
    </property>
@@ -647,14 +647,23 @@
     <rect>
      <x>10</x>
      <y>180</y>
-     <width>581</width>
+     <width>636</width>
      <height>651</height>
     </rect>
    </property>
+   <property name="minimumSize">
+    <size>
+     <width>636</width>
+     <height>0</height>
+    </size>
+   </property>
    <property name="windowTitle">
     <string>Discriminator Scope</string>
    </property>
    <layout class="QVBoxLayout" name="scopeContainer">
+    <property name="margin">
+     <number>2</number>
+    </property>
     <item>
      <widget class="GLScope" name="glScope" native="true">
       <property name="minimumSize">
diff --git a/sdrbase/gui/glscopegui.ui b/sdrbase/gui/glscopegui.ui
index 687bb1f44..135b1e0f6 100644
--- a/sdrbase/gui/glscopegui.ui
+++ b/sdrbase/gui/glscopegui.ui
@@ -10,6 +10,12 @@
     <height>115</height>
    </rect>
   </property>
+  <property name="minimumSize">
+   <size>
+    <width>634</width>
+    <height>0</height>
+   </size>
+  </property>
   <property name="font">
    <font>
     <family>Sans Serif</family>
@@ -252,7 +258,7 @@
      <item>
       <widget class="QSlider" name="time">
        <property name="sizePolicy">
-        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
@@ -289,7 +295,7 @@
       <widget class="QLabel" name="timeText">
        <property name="minimumSize">
         <size>
-         <width>40</width>
+         <width>32</width>
          <height>0</height>
         </size>
        </property>
@@ -309,7 +315,7 @@
      <item>
       <widget class="QSlider" name="timeOfs">
        <property name="sizePolicy">
-        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
@@ -339,6 +345,12 @@
      </item>
      <item>
       <widget class="QLabel" name="timeOfsText">
+       <property name="minimumSize">
+        <size>
+         <width>32</width>
+         <height>0</height>
+        </size>
+       </property>
        <property name="font">
         <font>
          <pointsize>8</pointsize>
@@ -395,6 +407,12 @@
      </item>
      <item>
       <widget class="QLabel" name="traceLenText">
+       <property name="minimumSize">
+        <size>
+         <width>32</width>
+         <height>0</height>
+        </size>
+       </property>
        <property name="font">
         <font>
          <pointsize>8</pointsize>
@@ -513,7 +531,7 @@ kS/s</string>
      <item>
       <widget class="QSlider" name="amp1">
        <property name="sizePolicy">
-        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
@@ -548,7 +566,7 @@ kS/s</string>
       <widget class="QLabel" name="amp1Text">
        <property name="minimumSize">
         <size>
-         <width>40</width>
+         <width>32</width>
          <height>0</height>
         </size>
        </property>
@@ -558,7 +576,7 @@ kS/s</string>
         </font>
        </property>
        <property name="text">
-        <string>0</string>
+        <string>000</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -570,7 +588,7 @@ kS/s</string>
        <item>
         <widget class="QSlider" name="amp1OfsCoarse">
          <property name="sizePolicy">
-          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
@@ -618,6 +636,12 @@ kS/s</string>
      </item>
      <item>
       <widget class="QLabel" name="amp1OfsText">
+       <property name="minimumSize">
+        <size>
+         <width>32</width>
+         <height>0</height>
+        </size>
+       </property>
        <property name="font">
         <font>
          <pointsize>8</pointsize>
@@ -663,6 +687,12 @@ kS/s</string>
      </item>
      <item>
       <widget class="QLabel" name="amp2Text">
+       <property name="minimumSize">
+        <size>
+         <width>32</width>
+         <height>0</height>
+        </size>
+       </property>
        <property name="text">
         <string>0</string>
        </property>
@@ -709,6 +739,12 @@ kS/s</string>
      </item>
      <item>
       <widget class="QLabel" name="amp2OfsText">
+       <property name="minimumSize">
+        <size>
+         <width>32</width>
+         <height>0</height>
+        </size>
+       </property>
        <property name="text">
         <string>0</string>
        </property>
@@ -1110,6 +1146,12 @@ kS/s</string>
      </item>
      <item>
       <widget class="QLabel" name="trigText">
+       <property name="minimumSize">
+        <size>
+         <width>32</width>
+         <height>0</height>
+        </size>
+       </property>
        <property name="font">
         <font>
          <pointsize>8</pointsize>
@@ -1148,6 +1190,12 @@ kS/s</string>
      </item>
      <item>
       <widget class="QLabel" name="trigDelayText">
+       <property name="minimumSize">
+        <size>
+         <width>32</width>
+         <height>0</height>
+        </size>
+       </property>
        <property name="text">
         <string>0</string>
        </property>
@@ -1193,6 +1241,12 @@ kS/s</string>
      </item>
      <item>
       <widget class="QLabel" name="trigPreText">
+       <property name="minimumSize">
+        <size>
+         <width>32</width>
+         <height>0</height>
+        </size>
+       </property>
        <property name="font">
         <font>
          <pointsize>8</pointsize>