From 25e171bf90ab882acd17cc3c4ca06d882ca6786a Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Wed, 7 Dec 2016 02:53:10 +0100
Subject: [PATCH] Signal meter: adjust font

---
 plugins/channelrx/demodam/amdemodgui.ui   | 19 ++++++--------
 plugins/channelrx/demodbfm/bfmdemodgui.ui |  8 +++++-
 plugins/channelrx/demoddsd/dsddemodgui.ui |  8 +++++-
 plugins/channelrx/demodnfm/nfmdemodgui.ui | 19 ++++++--------
 plugins/channelrx/demodssb/ssbdemodgui.ui | 30 +++++++----------------
 sdrbase/gui/levelmeter.cpp                |  3 ++-
 6 files changed, 41 insertions(+), 46 deletions(-)

diff --git a/plugins/channelrx/demodam/amdemodgui.ui b/plugins/channelrx/demodam/amdemodgui.ui
index 494460a61..b3324f56f 100644
--- a/plugins/channelrx/demodam/amdemodgui.ui
+++ b/plugins/channelrx/demodam/amdemodgui.ui
@@ -56,16 +56,7 @@
     <property name="spacing">
      <number>3</number>
     </property>
-    <property name="leftMargin">
-     <number>2</number>
-    </property>
-    <property name="topMargin">
-     <number>2</number>
-    </property>
-    <property name="rightMargin">
-     <number>2</number>
-    </property>
-    <property name="bottomMargin">
+    <property name="margin">
      <number>2</number>
     </property>
     <item>
@@ -208,9 +199,15 @@
         <property name="minimumSize">
          <size>
           <width>0</width>
-          <height>26</height>
+          <height>24</height>
          </size>
         </property>
+        <property name="font">
+         <font>
+          <family>Monospace</family>
+          <pointsize>8</pointsize>
+         </font>
+        </property>
         <property name="toolTip">
          <string>Level meter (dB) top trace: average, bottom trace: instantaneous peak, tip: peak hold</string>
         </property>
diff --git a/plugins/channelrx/demodbfm/bfmdemodgui.ui b/plugins/channelrx/demodbfm/bfmdemodgui.ui
index ed679c9b6..1b49ba3f2 100644
--- a/plugins/channelrx/demodbfm/bfmdemodgui.ui
+++ b/plugins/channelrx/demodbfm/bfmdemodgui.ui
@@ -279,9 +279,15 @@
         <property name="minimumSize">
          <size>
           <width>0</width>
-          <height>26</height>
+          <height>24</height>
          </size>
         </property>
+        <property name="font">
+         <font>
+          <family>Monospace</family>
+          <pointsize>8</pointsize>
+         </font>
+        </property>
         <property name="toolTip">
          <string>Level meter (dB) top trace: average, bottom trace: instantaneous peak, tip: peak hold</string>
         </property>
diff --git a/plugins/channelrx/demoddsd/dsddemodgui.ui b/plugins/channelrx/demoddsd/dsddemodgui.ui
index 4d592b6a4..57a2ef8e4 100644
--- a/plugins/channelrx/demoddsd/dsddemodgui.ui
+++ b/plugins/channelrx/demoddsd/dsddemodgui.ui
@@ -385,9 +385,15 @@
         <property name="minimumSize">
          <size>
           <width>0</width>
-          <height>26</height>
+          <height>24</height>
          </size>
         </property>
+        <property name="font">
+         <font>
+          <family>Monospace</family>
+          <pointsize>8</pointsize>
+         </font>
+        </property>
        </widget>
       </item>
      </layout>
diff --git a/plugins/channelrx/demodnfm/nfmdemodgui.ui b/plugins/channelrx/demodnfm/nfmdemodgui.ui
index f281ae5b0..e357c13ea 100644
--- a/plugins/channelrx/demodnfm/nfmdemodgui.ui
+++ b/plugins/channelrx/demodnfm/nfmdemodgui.ui
@@ -53,16 +53,7 @@
     <property name="spacing">
      <number>3</number>
     </property>
-    <property name="leftMargin">
-     <number>2</number>
-    </property>
-    <property name="topMargin">
-     <number>2</number>
-    </property>
-    <property name="rightMargin">
-     <number>2</number>
-    </property>
-    <property name="bottomMargin">
+    <property name="margin">
      <number>2</number>
     </property>
     <item>
@@ -190,9 +181,15 @@
         <property name="minimumSize">
          <size>
           <width>0</width>
-          <height>26</height>
+          <height>24</height>
          </size>
         </property>
+        <property name="font">
+         <font>
+          <family>Monospace</family>
+          <pointsize>8</pointsize>
+         </font>
+        </property>
         <property name="toolTip">
          <string>Level meter (dB) top trace: average, bottom trace: instantaneous peak, tip: peak hold</string>
         </property>
diff --git a/plugins/channelrx/demodssb/ssbdemodgui.ui b/plugins/channelrx/demodssb/ssbdemodgui.ui
index 95fcbf4f9..c00181e02 100644
--- a/plugins/channelrx/demodssb/ssbdemodgui.ui
+++ b/plugins/channelrx/demodssb/ssbdemodgui.ui
@@ -53,16 +53,7 @@
     <property name="spacing">
      <number>3</number>
     </property>
-    <property name="leftMargin">
-     <number>2</number>
-    </property>
-    <property name="topMargin">
-     <number>2</number>
-    </property>
-    <property name="rightMargin">
-     <number>2</number>
-    </property>
-    <property name="bottomMargin">
+    <property name="margin">
      <number>2</number>
     </property>
     <item>
@@ -248,9 +239,15 @@
         <property name="minimumSize">
          <size>
           <width>0</width>
-          <height>26</height>
+          <height>24</height>
          </size>
         </property>
+        <property name="font">
+         <font>
+          <family>Monospace</family>
+          <pointsize>8</pointsize>
+         </font>
+        </property>
        </widget>
       </item>
      </layout>
@@ -484,16 +481,7 @@
     <property name="spacing">
      <number>2</number>
     </property>
-    <property name="leftMargin">
-     <number>3</number>
-    </property>
-    <property name="topMargin">
-     <number>3</number>
-    </property>
-    <property name="rightMargin">
-     <number>3</number>
-    </property>
-    <property name="bottomMargin">
+    <property name="margin">
      <number>3</number>
     </property>
     <item>
diff --git a/sdrbase/gui/levelmeter.cpp b/sdrbase/gui/levelmeter.cpp
index 42ab1561a..8a2e4274f 100644
--- a/sdrbase/gui/levelmeter.cpp
+++ b/sdrbase/gui/levelmeter.cpp
@@ -291,6 +291,7 @@ void LevelMeterSignalDB::resized()
 
     // 100% full height white line
     painter.setPen(Qt::white);
+    painter.setFont(font());
 
     m_scaleEngine.setSize(bar.width());
     const ScaleEngine::TickList& scaleTickList = m_scaleEngine.getTickList();
@@ -310,7 +311,7 @@ void LevelMeterSignalDB::resized()
         {
             if ((tick.textSize > 0) && (tick.textPos > 0))
             {
-                painter.drawText(QPointF(tick.textPos - (tick.textSize/2) - 2, bar.height()/2), tick.text);
+                painter.drawText(QPointF(tick.textPos - (tick.textSize/2) - 2, bar.height()/2 - 1), tick.text);
             }
 
             painter.drawLine(tick.pos, 0, scaleTickList[i].pos, bar.height());