From 5ba3dc89e868578c84ec82a05b0c8a5a06c1762b Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Sun, 2 Apr 2017 03:42:16 +0200
Subject: [PATCH] HackRF input: GUI updates

---
 .../hackrfinput/hackrfinputgui.cpp            |  2 +-
 .../hackrfinput/hackrfinputgui.ui             | 79 ++++++++++---------
 2 files changed, 44 insertions(+), 37 deletions(-)

diff --git a/plugins/samplesource/hackrfinput/hackrfinputgui.cpp b/plugins/samplesource/hackrfinput/hackrfinputgui.cpp
index 617e7fdf4..2c1d0c67f 100644
--- a/plugins/samplesource/hackrfinput/hackrfinputgui.cpp
+++ b/plugins/samplesource/hackrfinput/hackrfinputgui.cpp
@@ -167,7 +167,7 @@ void HackRFInputGui::updateSampleRateAndFrequency()
 {
     m_deviceAPI->getSpectrum()->setSampleRate(m_sampleRate);
     m_deviceAPI->getSpectrum()->setCenterFrequency(m_deviceCenterFrequency);
-    ui->deviceRateText->setText(QString("%1k").arg(QString::number(m_sampleRate/1000.0, 'f', 0)));
+    ui->deviceRateText->setText(QString("%1k").arg(QString::number(m_sampleRate/1000.0, 'g', 5)));
 }
 
 void HackRFInputGui::displaySettings()
diff --git a/plugins/samplesource/hackrfinput/hackrfinputgui.ui b/plugins/samplesource/hackrfinput/hackrfinputgui.ui
index ba0a5deb3..6481ecc35 100644
--- a/plugins/samplesource/hackrfinput/hackrfinputgui.ui
+++ b/plugins/samplesource/hackrfinput/hackrfinputgui.ui
@@ -2,6 +2,14 @@
 <ui version="4.0">
  <class>HackRFInputGui</class>
  <widget class="QWidget" name="HackRFInputGui">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>310</width>
+    <height>300</height>
+   </rect>
+  </property>
   <property name="sizePolicy">
    <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
     <horstretch>0</horstretch>
@@ -334,7 +342,6 @@
        <property name="toolTip">
         <string>Device sample rate</string>
        </property>
-       <zorder>sampleRateLabel</zorder>
       </widget>
      </item>
      <item>
@@ -358,47 +365,13 @@
       </spacer>
      </item>
      <item>
-      <widget class="QLabel" name="bbFiltLabel">
-       <property name="text">
-        <string>BBF</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QComboBox" name="bbFilter">
-       <property name="toolTip">
-        <string>RF bandpas filter</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QGridLayout" name="gridLayout_decim" columnstretch="0,0,0,0,0">
-     <property name="topMargin">
-      <number>2</number>
-     </property>
-     <property name="bottomMargin">
-      <number>2</number>
-     </property>
-     <property name="spacing">
-      <number>3</number>
-     </property>
-     <item row="0" column="0">
       <widget class="QLabel" name="label_decim">
        <property name="text">
         <string>Dec.</string>
        </property>
       </widget>
      </item>
-     <item row="0" column="3">
-      <widget class="QLabel" name="label_fcPos">
-       <property name="text">
-        <string>Fc pos</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="1">
+     <item>
       <widget class="QComboBox" name="decim">
        <property name="maximumSize">
         <size>
@@ -449,7 +422,34 @@
        </item>
       </widget>
      </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QGridLayout" name="gridLayout_decim" columnstretch="0,0,0,0,0,0">
+     <property name="topMargin">
+      <number>2</number>
+     </property>
+     <property name="bottomMargin">
+      <number>2</number>
+     </property>
+     <property name="spacing">
+      <number>3</number>
+     </property>
      <item row="0" column="4">
+      <widget class="QComboBox" name="bbFilter">
+       <property name="toolTip">
+        <string>RF bandpas filter</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="0">
+      <widget class="QLabel" name="label_fcPos">
+       <property name="text">
+        <string>Fc pos</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
       <widget class="QComboBox" name="fcPos">
        <property name="maximumSize">
         <size>
@@ -490,6 +490,13 @@
        </property>
       </spacer>
      </item>
+     <item row="0" column="3">
+      <widget class="QLabel" name="bbFiltLabel">
+       <property name="text">
+        <string>BBF</string>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
    <item>