From 701c853cff7ce942138cb02c1e7d7e83ab132cc1 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Thu, 16 Mar 2017 18:00:18 +0100
Subject: [PATCH] ATV Demod: GUI: new RF settings layout

---
 plugins/channelrx/demodatv/atvdemodgui.ui | 291 +++++++++++++++-------
 sdrbase/resources/filter_bandpass.png     | Bin 0 -> 742 bytes
 sdrbase/resources/res.qrc                 |   1 +
 3 files changed, 199 insertions(+), 93 deletions(-)
 create mode 100644 sdrbase/resources/filter_bandpass.png

diff --git a/plugins/channelrx/demodatv/atvdemodgui.ui b/plugins/channelrx/demodatv/atvdemodgui.ui
index 302c2221a..38b9afcba 100644
--- a/plugins/channelrx/demodatv/atvdemodgui.ui
+++ b/plugins/channelrx/demodatv/atvdemodgui.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>520</width>
-    <height>480</height>
+    <height>539</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -34,127 +34,225 @@
   <property name="windowTitle">
    <string>ATV Demodulator</string>
   </property>
-  <widget class="QWidget" name="layoutWidget">
+  <widget class="QWidget" name="layoutWidget 1">
    <property name="geometry">
     <rect>
      <x>10</x>
      <y>10</y>
      <width>501</width>
-     <height>27</height>
+     <height>71</height>
     </rect>
    </property>
    <property name="windowTitle">
     <string>RF Settings</string>
    </property>
-   <layout class="QHBoxLayout" name="rfSettingsLayout">
+   <layout class="QVBoxLayout" name="rfSettingsLayout">
+    <property name="spacing">
+     <number>2</number>
+    </property>
     <item>
-     <layout class="QHBoxLayout" name="deltaFrequencyLayout">
+     <layout class="QHBoxLayout" name="rfSettings1Layout">
       <item>
-       <widget class="QToolButton" name="deltaFrequencyMinus">
-        <property name="text">
-         <string/>
-        </property>
-        <property name="icon">
-         <iconset>
-          <selectedoff>:/plus.png</selectedoff>
-          <selectedon>:/minus.png</selectedon>
-         </iconset>
+       <layout class="QHBoxLayout" name="deltaFrequencyLayout">
+        <item>
+         <widget class="QToolButton" name="deltaFrequencyMinus">
+          <property name="text">
+           <string/>
+          </property>
+          <property name="icon">
+           <iconset>
+            <selectedoff>:/plus.png</selectedoff>
+            <selectedon>:/minus.png</selectedon>
+           </iconset>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="ValueDial" name="deltaFrequency" native="true">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>32</width>
+            <height>16</height>
+           </size>
+          </property>
+          <property name="font">
+           <font>
+            <family>Monospace</family>
+            <pointsize>12</pointsize>
+           </font>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="deltaFrequencyUnits">
+          <property name="text">
+           <string>Hz</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <widget class="Line" name="line">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="ValueDial" name="deltaFrequency" native="true">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
+       <widget class="QLabel" name="channelSampleRateText">
         <property name="minimumSize">
          <size>
-          <width>32</width>
-          <height>16</height>
+          <width>52</width>
+          <height>0</height>
          </size>
         </property>
-        <property name="font">
-         <font>
-          <family>Monospace</family>
-          <pointsize>12</pointsize>
-         </font>
+        <property name="text">
+         <string> 00000k</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QLabel" name="deltaFrequencyUnits">
+       <widget class="QComboBox" name="modulation">
+        <property name="toolTip">
+         <string>Modulation type</string>
+        </property>
+        <item>
+         <property name="text">
+          <string>FM 1</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>FM 2</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>AM</string>
+         </property>
+        </item>
+       </widget>
+      </item>
+      <item>
+       <spacer name="horizontalSpacer_3">
+        <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>
+       <widget class="QLabel" name="channePowerText">
+        <property name="minimumSize">
+         <size>
+          <width>54</width>
+          <height>0</height>
+         </size>
+        </property>
         <property name="text">
-         <string>Hz</string>
+         <string>-100.0 dB</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
        </widget>
       </item>
      </layout>
     </item>
     <item>
-     <widget class="QComboBox" name="modulation">
-      <property name="toolTip">
-       <string>Modulation type</string>
-      </property>
+     <layout class="QHBoxLayout" name="rfSettings2Layout">
       <item>
-       <property name="text">
-        <string>FM 1</string>
-       </property>
+       <widget class="ButtonSwitch" name="toolButton">
+        <property name="text">
+         <string/>
+        </property>
+        <property name="icon">
+         <iconset resource="../../../sdrbase/resources/res.qrc">
+          <normaloff>:/filter_bandpass.png</normaloff>:/filter_bandpass.png</iconset>
+        </property>
+       </widget>
       </item>
       <item>
-       <property name="text">
-        <string>FM 2</string>
-       </property>
+       <widget class="QLabel" name="rfBWLabel">
+        <property name="text">
+         <string>BW</string>
+        </property>
+       </widget>
       </item>
       <item>
-       <property name="text">
-        <string>AM</string>
-       </property>
+       <widget class="QLabel" name="rfOppBWText">
+        <property name="text">
+         <string>10.0</string>
+        </property>
+       </widget>
       </item>
-     </widget>
-    </item>
-    <item>
-     <widget class="QLabel" name="rfBWLabel">
-      <property name="text">
-       <string>BW</string>
-      </property>
-     </widget>
-    </item>
-    <item>
-     <widget class="QSlider" name="rfBW">
-      <property name="orientation">
-       <enum>Qt::Horizontal</enum>
-      </property>
-     </widget>
-    </item>
-    <item>
-     <widget class="QLabel" name="rfBWText">
-      <property name="text">
-       <string>10.0</string>
-      </property>
-     </widget>
-    </item>
-    <item>
-     <spacer name="horizontalSpacer_3">
-      <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>
-     <widget class="QLabel" name="channelSampleRateText">
-      <property name="text">
-       <string>00000k</string>
-      </property>
-     </widget>
+      <item>
+       <widget class="QSlider" name="rfOppBW">
+        <property name="layoutDirection">
+         <enum>Qt::RightToLeft</enum>
+        </property>
+        <property name="maximum">
+         <number>100</number>
+        </property>
+        <property name="pageStep">
+         <number>1</number>
+        </property>
+        <property name="value">
+         <number>10</number>
+        </property>
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QSlider" name="rfBW">
+        <property name="minimum">
+         <number>1</number>
+        </property>
+        <property name="maximum">
+         <number>100</number>
+        </property>
+        <property name="value">
+         <number>10</number>
+        </property>
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLabel" name="rfBWText">
+        <property name="minimumSize">
+         <size>
+          <width>54</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>10.0 MHz</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+     </layout>
     </item>
    </layout>
   </widget>
@@ -162,13 +260,13 @@
    <property name="geometry">
     <rect>
      <x>10</x>
-     <y>40</y>
+     <y>80</y>
      <width>501</width>
-     <height>347</height>
+     <height>348</height>
     </rect>
    </property>
    <property name="windowTitle">
-    <string>TV Monitor</string>
+    <string>Video</string>
    </property>
    <layout class="QHBoxLayout" name="screenTVLayout">
     <property name="sizeConstraint">
@@ -185,13 +283,13 @@
       <property name="minimumSize">
        <size>
         <width>495</width>
-        <height>345</height>
+        <height>346</height>
        </size>
       </property>
       <property name="maximumSize">
        <size>
         <width>495</width>
-        <height>345</height>
+        <height>346</height>
        </size>
       </property>
       <property name="styleSheet">
@@ -205,9 +303,9 @@
    <property name="geometry">
     <rect>
      <x>10</x>
-     <y>390</y>
+     <y>430</y>
      <width>501</width>
-     <height>80</height>
+     <height>81</height>
     </rect>
    </property>
    <property name="windowTitle">
@@ -498,7 +596,14 @@
    <header>atvscreen.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>ButtonSwitch</class>
+   <extends>QToolButton</extends>
+   <header>gui/buttonswitch.h</header>
+  </customwidget>
  </customwidgets>
- <resources/>
+ <resources>
+  <include location="../../../sdrbase/resources/res.qrc"/>
+ </resources>
  <connections/>
 </ui>
diff --git a/sdrbase/resources/filter_bandpass.png b/sdrbase/resources/filter_bandpass.png
new file mode 100644
index 0000000000000000000000000000000000000000..572a2d8b7b4e822fe17f6fe9de012411ff520ebc
GIT binary patch
literal 742
zcmV<C0vY{@P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru;R6s5BLUO>t4{y`02y>e
zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00K@)L_t(Y$CcJiNR(j^2k>o`
z^rB=59mMFSCVA<D(CQL(FmEYXLV<^_fj23PAP71H5uG9e3!(yV9qQ0Uf=&f}5MmLO
z1sQ!PRAwK)4$acz+q=8=!1C_S%=4ew|IB}O3xzl+B=0*hfuHz=D`8)e#1v61{O>^*
zW-yOuc<#@cK}QnTkD=v)mY!_^I**>je<_mOL^Jkd0T=Ta$hBb=t_M(WHV|j=3HLFD
z6NxX4?ZZ~oWV3bS3r?Umr!U(v8wH%qskR1#;XjSKY(QfqS)Hvcz+d1tUSkp~GxWAZ
zzb3IE9f*JU%Yg3+zQ^P9SWMQfB)$&!@FQ(}USG1bY>Ve;Cgx0lEn+li`HGRU;2Gd{
zy!ZFaqCG>&LCoPBK4PqF)fIGbIbQQ&>#78@g!c+Mn2yR)9rQ$!hiEO=x8>;IT2Qht
zCwL%y=g^QTES<yy*iudhpK(3~NG>-7I1J<zP{iTzpQ@yTrV13U!-G(Cca9FG@G5Ys
z^0z)JYRlOBL-7mP9JcyI2g6lIHN-R*f?A9P*pkF`;BAa(DcM3<9b_~x5|`j;tOs~f
znxKdqkGL;*gTAUdz)*laLVaT28}_Tw`0*Hs&DDMaQbQ~51||LJn8gI$z=zPnbV(<f
zNo&F$H0Nd9851yAhPoZe>KMxDTP==<e|KJj#!zxiPG!gNI9BmAo?>I>es6$JrUOx^
zCVL#gcMM|<4h4-blLc5>CDYjSzkdSOrnH6aLR9-MK$k4TWo^|Azr`}&>`o+_KxZEK
YZ<C`u*e9W41ONa407*qoM6N<$g1XN@lK=n!

literal 0
HcmV?d00001

diff --git a/sdrbase/resources/res.qrc b/sdrbase/resources/res.qrc
index 98db68f8f..af6b107e1 100644
--- a/sdrbase/resources/res.qrc
+++ b/sdrbase/resources/res.qrc
@@ -75,5 +75,6 @@
         <file>film.png</file>
         <file>picture.png</file>
         <file>camera.png</file>
+        <file>filter_bandpass.png</file>
     </qresource>
 </RCC>