From 548b0602fab3c77c5ef9d3848749fd43e94a63ab Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Fri, 6 Nov 2015 06:32:36 +0100
Subject: [PATCH] GLScope: reshuffling of trigger controls in the UI

---
 sdrbase/gui/glscopegui.ui | 129 ++++++++++++++++++++------------------
 1 file changed, 68 insertions(+), 61 deletions(-)

diff --git a/sdrbase/gui/glscopegui.ui b/sdrbase/gui/glscopegui.ui
index 15d11c939..e2aa4b519 100644
--- a/sdrbase/gui/glscopegui.ui
+++ b/sdrbase/gui/glscopegui.ui
@@ -793,6 +793,39 @@
        </property>
       </widget>
      </item>
+     <item>
+      <widget class="Line" name="trigLine1">
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QDial" name="trigCount">
+       <property name="maximumSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="toolTip">
+        <string>Control number of trigger events </string>
+       </property>
+       <property name="pageStep">
+        <number>1</number>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="trigCountText">
+       <property name="toolTip">
+        <string>Number of trigger events before trigger is kicked off</string>
+       </property>
+       <property name="text">
+        <string>00</string>
+       </property>
+      </widget>
+     </item>
      <item>
       <widget class="QComboBox" name="trigMode">
        <property name="font">
@@ -840,13 +873,6 @@
        </item>
       </widget>
      </item>
-     <item>
-      <widget class="Line" name="trigLine">
-       <property name="orientation">
-        <enum>Qt::Vertical</enum>
-       </property>
-      </widget>
-     </item>
      <item>
       <widget class="ButtonSwitch" name="slopePos">
        <property name="font">
@@ -971,33 +997,7 @@
       </widget>
      </item>
      <item>
-      <widget class="QDial" name="trigCount">
-       <property name="maximumSize">
-        <size>
-         <width>24</width>
-         <height>24</height>
-        </size>
-       </property>
-       <property name="toolTip">
-        <string>Control number of trigger events </string>
-       </property>
-       <property name="pageStep">
-        <number>1</number>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="trigCountText">
-       <property name="toolTip">
-        <string>Number of trigger events before trigger is kicked off</string>
-       </property>
-       <property name="text">
-        <string>00</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="Line" name="slopeLine">
+      <widget class="Line" name="trigLine2_2">
        <property name="orientation">
         <enum>Qt::Vertical</enum>
        </property>
@@ -1081,6 +1081,40 @@
        </property>
       </widget>
      </item>
+     <item>
+      <widget class="QLabel" name="trigDelayLabel">
+       <property name="text">
+        <string> Dly</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QSlider" name="trigDelay">
+       <property name="maximum">
+        <number>100</number>
+       </property>
+       <property name="pageStep">
+        <number>1</number>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="trigDelayText">
+       <property name="text">
+        <string>0</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="Line" name="trigLine2">
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
+       </property>
+      </widget>
+     </item>
      <item>
       <widget class="QLabel" name="trigPreLabel">
        <property name="font">
@@ -1121,33 +1155,6 @@
        </property>
       </widget>
      </item>
-     <item>
-      <widget class="QLabel" name="trigDelayLabel">
-       <property name="text">
-        <string> Dly</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QSlider" name="trigDelay">
-       <property name="maximum">
-        <number>100</number>
-       </property>
-       <property name="pageStep">
-        <number>1</number>
-       </property>
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="trigDelayText">
-       <property name="text">
-        <string>0</string>
-       </property>
-      </widget>
-     </item>
     </layout>
    </item>
   </layout>