From 1f2ed5d8d8c48e318dfd7de792b0835e66459a7b Mon Sep 17 00:00:00 2001
From: Joe Taylor <k1jt@arrl.org>
Date: Thu, 25 Apr 2013 17:30:20 +0000
Subject: [PATCH] 1. Better (and faster) logic for Tune button ON/OFF actions.
 2. Pink highlighting for empty MyCall and MyGrid fields on Setup screen. 3.
 Working on better diagnostics for users trying to set up CAT control.

(More progress still needed, on rig control.)


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3219 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
 devsetup.cpp   | 14 ++++++++++++++
 mainwindow.cpp |  8 ++++----
 mainwindow.ui  | 34 +++++++++++++++++-----------------
 3 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/devsetup.cpp b/devsetup.cpp
index 9e4b8da5d..fa63ad21f 100644
--- a/devsetup.cpp
+++ b/devsetup.cpp
@@ -126,8 +126,17 @@ void DevSetup::initDlg()
   p4.start("rigctl -l");
   p4.waitForFinished(1000);
 
+  QPalette pal(ui.myCallEntry->palette());
+  if(m_myCall=="") {
+    pal.setColor(QPalette::Base,"#ffccff");
+  } else {
+    pal.setColor(QPalette::Base,Qt::white);
+  }
+  ui.myCallEntry->setPalette(pal);
+  ui.myGridEntry->setPalette(pal);
   ui.myCallEntry->setText(m_myCall);
   ui.myGridEntry->setText(m_myGrid);
+
   ui.idIntSpinBox->setValue(m_idInt);
   ui.pttMethodComboBox->setCurrentIndex(m_pttMethodIndex);
   ui.pttComboBox->setCurrentIndex(m_pttPort);
@@ -402,14 +411,19 @@ void DevSetup::on_testCATButton_clicked()
       rig->setConf("rts_state","OFF");
       rig->setConf("dtr_state","OFF");
     }
+//    qDebug() << "B6";
     rig->open();
+    rig->getVFO();
+//    qDebug() << "B7" << rig->getVFO();
     m_bRigOpen=true;
   }
   catch (const RigException &Ex) {
+//    qDebug() << "B8";
     m_bRigOpen=false;
     msgBox("Failed to open rig (devsetup)");
     return;
   }
+//  qDebug() << "B9";
   double fMHz=rig->getFreq(RIG_VFO_CURR)/1000000.0;
   QString t;
   t.sprintf("Rig control working.\nDial Frequency: %.6f",fMHz);
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 018921b0a..97a5c2631 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -2589,10 +2589,8 @@ void MainWindow::on_actionTx2QSO_triggered(bool checked)
 void MainWindow::on_tuneButton_clicked()
 {
   if(m_tune) {
-    m_tune=false;
-    soundOutThread.setTune(m_tune);
     nc1=1;                                 //disable the countdown timer
-    tuneButtonTimer->start(1000);
+    tuneButtonTimer->start(250);
   } else {
     m_tune=true;
     m_sent73=false;
@@ -2605,7 +2603,8 @@ void MainWindow::on_tuneButton_clicked()
 void MainWindow::on_stopTxButton_clicked()                    //Stop Tx
 {
   if(m_tune) {
-    on_tuneButton_clicked();
+    m_tune=false;
+    soundOutThread.setTune(m_tune);
   }
   if(m_auto) on_autoButton_clicked();
   btxok=false;
@@ -2631,6 +2630,7 @@ void MainWindow::rigOpen()
       rig->setConf("dtr_state","OFF");
     }
     rig->open();
+    rig->getVFO();
     m_bRigOpen=true;
   }
   catch (const RigException &Ex) {
diff --git a/mainwindow.ui b/mainwindow.ui
index e1e64d875..7a9220d2c 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>730</width>
-    <height>702</height>
+    <width>711</width>
+    <height>475</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -718,7 +718,7 @@ p, li { white-space: pre-wrap; }
                  <string/>
                 </property>
                 <attribute name="buttonGroup">
-                 <string notr="true">buttonGroup</string>
+                 <string>buttonGroup</string>
                 </attribute>
                </widget>
               </item>
@@ -749,7 +749,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>
@@ -777,7 +777,7 @@ p, li { white-space: pre-wrap; }
                  <string/>
                 </property>
                 <attribute name="buttonGroup">
-                 <string notr="true">buttonGroup</string>
+                 <string>buttonGroup</string>
                 </attribute>
                </widget>
               </item>
@@ -927,7 +927,7 @@ p, li { white-space: pre-wrap; }
                  <string/>
                 </property>
                 <attribute name="buttonGroup">
-                 <string notr="true">buttonGroup</string>
+                 <string>buttonGroup</string>
                 </attribute>
                </widget>
               </item>
@@ -1060,7 +1060,7 @@ p, li { white-space: pre-wrap; }
                  <string/>
                 </property>
                 <attribute name="buttonGroup">
-                 <string notr="true">buttonGroup</string>
+                 <string>buttonGroup</string>
                 </attribute>
                </widget>
               </item>
@@ -1088,7 +1088,7 @@ p, li { white-space: pre-wrap; }
                  <string/>
                 </property>
                 <attribute name="buttonGroup">
-                 <string notr="true">buttonGroup</string>
+                 <string>buttonGroup</string>
                 </attribute>
                </widget>
               </item>
@@ -1324,7 +1324,7 @@ p, li { white-space: pre-wrap; }
          </widget>
         </item>
         <item row="1" column="1" rowspan="5">
-         <widget class="QwtThermo" name="xThermo">
+         <widget class="QwtThermo" name="xThermo" native="true">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
             <horstretch>0</horstretch>
@@ -1337,19 +1337,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>
@@ -1936,7 +1936,7 @@ p, li { white-space: pre-wrap; }
          <widget class="QFrame" name="frame_4">
           <property name="maximumSize">
            <size>
-            <width>16777215</width>
+            <width>72</width>
             <height>16777215</height>
            </size>
           </property>
@@ -2094,8 +2094,8 @@ p, li { white-space: pre-wrap; }
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>730</width>
-     <height>25</height>
+     <width>711</width>
+     <height>21</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">