Merge branch 'morecontrols'

repeatersetup.cpp

@@ -366,11 +366,14 @@ void repeaterSetup::handleUpdateCurrentMainFrequency(freqt mainfreq)
         if(currentMainFrequency.Hz != mainfreq.Hz)
         {
             this->currentMainFrequency = mainfreq;
-            if(usedPlusSplit)
+            if(!ui->splitTransmitFreqEdit->hasFocus())
             {
-                on_splitPlusButton_clicked();
-            } else {
-                on_splitMinusBtn_clicked();
+                if(usedPlusSplit)
+                {
+                    on_splitPlusButton_clicked();
+                } else {
+                    on_splitMinusBtn_clicked();
+                }
             }
         }
         if(ui->setSplitRptrToneChk->isChecked())
@@ -398,8 +401,14 @@ void repeaterSetup::handleUpdateCurrentMainMode(mode_info m)
 
 void repeaterSetup::handleRptOffsetFrequency(freqt f)
 {
+    // Called when a new offset is available from the radio.
     QString offsetstr = QString::number(f.Hz / double(1E6), 'f', 4);
-    ui->rptrOffsetEdit->setText(offsetstr);
+
+    if(!ui->rptrOffsetEdit->hasFocus())
+    {
+        ui->rptrOffsetEdit->setText(offsetstr);
+        currentOffset = f;
+    }
 }
 
 void repeaterSetup::handleTransmitStatus(bool amTransmitting)
@@ -721,6 +730,7 @@ void repeaterSetup::on_splitTxFreqSetBtn_clicked()
 void repeaterSetup::on_splitTransmitFreqEdit_returnPressed()
 {
     this->on_splitTxFreqSetBtn_clicked();
+    ui->splitTransmitFreqEdit->clearFocus();
 }
 
 void repeaterSetup::on_selABtn_clicked()
@@ -805,6 +815,7 @@ void repeaterSetup::on_rptrOffsetSetBtn_clicked()
     {
         emit setRptDuplexOffset(f);
     }
+    ui->rptrOffsetEdit->clearFocus();
 }
 
 void repeaterSetup::on_rptrOffsetEdit_returnPressed()

repeatersetup.h

@@ -121,6 +121,7 @@ private:
     duplexMode currentdm;
     mode_info currentModeMain;
     mode_info modeTransmitVFO;
+    freqt currentOffset;
     bool usedPlusSplit = false;
     bool amTransmitting = false;
 };

wfmain.cpp

@@ -5663,54 +5663,46 @@ void wfmain::on_f2btn_clicked()
 {
     checkFreqSel();
     ui->freqMhzLineEdit->setText(ui->freqMhzLineEdit->text().append("2"));
-
 }
 void wfmain::on_f3btn_clicked()
 {
+    checkFreqSel();
     ui->freqMhzLineEdit->setText(ui->freqMhzLineEdit->text().append("3"));
-
 }
 void wfmain::on_f4btn_clicked()
 {
     checkFreqSel();
     ui->freqMhzLineEdit->setText(ui->freqMhzLineEdit->text().append("4"));
-
 }
 void wfmain::on_f5btn_clicked()
 {
     checkFreqSel();
     ui->freqMhzLineEdit->setText(ui->freqMhzLineEdit->text().append("5"));
-
 }
 void wfmain::on_f6btn_clicked()
 {
     checkFreqSel();
     ui->freqMhzLineEdit->setText(ui->freqMhzLineEdit->text().append("6"));
-
 }
 void wfmain::on_f7btn_clicked()
 {
     checkFreqSel();
     ui->freqMhzLineEdit->setText(ui->freqMhzLineEdit->text().append("7"));
-
 }
 void wfmain::on_f8btn_clicked()
 {
     checkFreqSel();
     ui->freqMhzLineEdit->setText(ui->freqMhzLineEdit->text().append("8"));
-
 }
 void wfmain::on_f9btn_clicked()
 {
     checkFreqSel();
     ui->freqMhzLineEdit->setText(ui->freqMhzLineEdit->text().append("9"));
-
 }
 void wfmain::on_fDotbtn_clicked()
 {
     checkFreqSel();
     ui->freqMhzLineEdit->setText(ui->freqMhzLineEdit->text().append("."));
-
 }