From 0071aa56ef2ea70a2669161554cc1f79463f83a1 Mon Sep 17 00:00:00 2001
From: Joe Taylor <k1jt@arrl.org>
Date: Mon, 25 Mar 2013 12:45:37 +0000
Subject: [PATCH] Connected the commanded dial frequency to the label, and
 increased the font size.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3094 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
 mainwindow.cpp | 19 ++++++++++++++-----
 mainwindow.ui  | 32 ++++++++++++++++++--------------
 2 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/mainwindow.cpp b/mainwindow.cpp
index c44d0d0a0..7836525b5 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -37,11 +37,12 @@ MainWindow::MainWindow(QWidget *parent) :
   on_EraseButton_clicked();
   ui->labUTC->setStyleSheet( \
         "QLabel { background-color : black; color : yellow; }");
-  //ui->labTol1->setStyleSheet( \
-  //      "QLabel { background-color : white; color : black; }");
-  //ui->labTol1->setFrameStyle(QFrame::Panel | QFrame::Sunken);
-  //ui->dxStationGroupBox->setStyleSheet("QFrame{border: 5px groove red}");
-
+/*
+  ui->labTol1->setStyleSheet( \
+        "QLabel { background-color : white; color : black; }");
+  ui->labTol1->setFrameStyle(QFrame::Panel | QFrame::Sunken);
+  ui->dxStationGroupBox->setStyleSheet("QFrame{border: 5px groove red}");
+*/
   QActionGroup* paletteGroup = new QActionGroup(this);
   ui->actionCuteSDR->setActionGroup(paletteGroup);
   ui->actionLinrad->setActionGroup(paletteGroup);
@@ -325,6 +326,7 @@ void MainWindow::writeSettings()
   settings.setValue("MonitorOFF",m_monitorStartOFF);
   settings.setValue("NB",m_NB);
   settings.setValue("NBslider",m_NBslider);
+  settings.setValue("DialFreq",m_dialFreq);
   settings.setValue("TxFreq",m_txFreq);
   settings.setValue("Tol",m_tol);
   settings.setValue("InGain",m_inGain);
@@ -398,6 +400,8 @@ void MainWindow::readSettings()
   ui->NBcheckBox->setChecked(m_NB);
   m_NBslider=settings.value("NBslider",40).toInt();
   ui->NBslider->setValue(m_NBslider);
+  m_dialFreq=settings.value("DialFreq",14.078).toDouble();
+  dialFreqChanged2(m_dialFreq);
   m_txFreq=settings.value("TxFreq",1500).toInt();
   ui->TxFreqSpinBox->setValue(m_txFreq);
   soundOutThread.setTxFreq(m_txFreq);
@@ -719,6 +723,11 @@ void MainWindow::bumpFqso(int n)                                 //bumpFqso()
 void MainWindow::dialFreqChanged2(double f)
 {
   m_dialFreq=f;
+  QString t;
+  t.sprintf("%.6f",m_dialFreq);
+  int n=t.length();
+  t=t.mid(0,n-3) + " " + t.mid(n-3,3) + "   MHz";
+  ui->labDialFreq->setText(t);
   statusChanged();
 }
 
diff --git a/mainwindow.ui b/mainwindow.ui
index 54e5b24dd..198079f81 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -304,6 +304,11 @@ p, li { white-space: pre-wrap; }
        <layout class="QGridLayout" name="gridLayout_2">
         <item row="0" column="4" colspan="2">
          <widget class="QLabel" name="labDialFreq">
+          <property name="font">
+           <font>
+            <pointsize>12</pointsize>
+           </font>
+          </property>
           <property name="text">
            <string>Dial Frequency</string>
           </property>
@@ -394,7 +399,7 @@ p, li { white-space: pre-wrap; }
            <string/>
           </property>
           <attribute name="buttonGroup">
-           <string notr="true">buttonGroup</string>
+           <string>buttonGroup</string>
           </attribute>
          </widget>
         </item>
@@ -425,7 +430,7 @@ p, li { white-space: pre-wrap; }
            <bool>true</bool>
           </property>
           <attribute name="buttonGroup">
-           <string notr="true">buttonGroup</string>
+           <string>buttonGroup</string>
           </attribute>
          </widget>
         </item>
@@ -725,7 +730,7 @@ p, li { white-space: pre-wrap; }
            <string/>
           </property>
           <attribute name="buttonGroup">
-           <string notr="true">buttonGroup</string>
+           <string>buttonGroup</string>
           </attribute>
          </widget>
         </item>
@@ -766,7 +771,7 @@ p, li { white-space: pre-wrap; }
            <string/>
           </property>
           <attribute name="buttonGroup">
-           <string notr="true">buttonGroup</string>
+           <string>buttonGroup</string>
           </attribute>
          </widget>
         </item>
@@ -829,7 +834,7 @@ p, li { white-space: pre-wrap; }
            <string/>
           </property>
           <attribute name="buttonGroup">
-           <string notr="true">buttonGroup</string>
+           <string>buttonGroup</string>
           </attribute>
          </widget>
         </item>
@@ -857,7 +862,7 @@ p, li { white-space: pre-wrap; }
            <string/>
           </property>
           <attribute name="buttonGroup">
-           <string notr="true">buttonGroup</string>
+           <string>buttonGroup</string>
           </attribute>
          </widget>
         </item>
@@ -1008,7 +1013,7 @@ p, li { white-space: pre-wrap; }
          </widget>
         </item>
         <item row="1" column="1" rowspan="6">
-         <widget class="QwtThermo" name="xThermo">
+         <widget class="QwtThermo" name="xThermo" native="true">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
             <horstretch>0</horstretch>
@@ -1021,19 +1026,19 @@ p, li { white-space: pre-wrap; }
             <height>180</height>
            </size>
           </property>
-          <property name="borderWidth">
+          <property name="borderWidth" stdset="0">
            <number>1</number>
           </property>
-          <property name="maxValue">
+          <property name="maxValue" stdset="0">
            <double>60.000000000000000</double>
           </property>
-          <property name="minValue">
+          <property name="minValue" stdset="0">
            <double>0.000000000000000</double>
           </property>
-          <property name="pipeWidth">
+          <property name="pipeWidth" stdset="0">
            <number>8</number>
           </property>
-          <property name="value">
+          <property name="value" stdset="0">
            <double>0.000000000000000</double>
           </property>
          </widget>
@@ -1616,7 +1621,6 @@ p, li { white-space: pre-wrap; }
      </layout>
     </item>
    </layout>
-   <zorder>labAz</zorder>
   </widget>
   <widget class="QMenuBar" name="menuBar">
    <property name="geometry">
@@ -1624,7 +1628,7 @@ p, li { white-space: pre-wrap; }
      <x>0</x>
      <y>0</y>
      <width>686</width>
-     <height>25</height>
+     <height>21</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">