diff --git a/WSJT-X_Users_Guide_v1.1.docx b/WSJT-X_Users_Guide_v1.1.docx index 47f654569..b3543728c 100644 Binary files a/WSJT-X_Users_Guide_v1.1.docx and b/WSJT-X_Users_Guide_v1.1.docx differ diff --git a/mainwindow.cpp b/mainwindow.cpp index c92b2cdf9..c96fb1da9 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -446,6 +446,7 @@ void MainWindow::writeSettings() settings.setValue("Fmin",m_fMin); settings.setValue("TxSplit",m_bSplit); settings.setValue("UseXIT",m_bXIT); + settings.setValue("Plus2kHz",m_plus2kHz); settings.endGroup(); } @@ -593,6 +594,8 @@ void MainWindow::readSettings() m_fMin=settings.value("fMin",2500).toInt(); m_bSplit=settings.value("TxSplit",false).toBool(); m_bXIT=settings.value("UseXit",false).toBool(); + m_plus2kHz=settings.value("Plus2kHz",false).toBool(); + ui->cbPlus2kHz->setChecked(m_plus2kHz); settings.endGroup(); if(!ui->actionLinrad->isChecked() && !ui->actionCuteSDR->isChecked() && @@ -2699,6 +2702,7 @@ void MainWindow::on_bandComboBox_activated(int index) m_band=index; QString t=m_dFreq[index]; m_dialFreq=t.toDouble(); + if(m_plus2kHz) m_dialFreq+=0.002; dialFreqChanged2(m_dialFreq); m_repeatMsg=0; m_secBandChanged=QDateTime::currentMSecsSinceEpoch()/1000; @@ -3034,3 +3038,9 @@ void MainWindow::on_actionTx2QSO_triggered(bool checked) { m_tx2QSO=checked; } + +void MainWindow::on_cbPlus2kHz_toggled(bool checked) +{ + m_plus2kHz=checked; + on_bandComboBox_activated(m_band); +} diff --git a/mainwindow.h b/mainwindow.h index 8dd1ed0e1..438834a15 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -156,7 +156,8 @@ private slots: void on_pbTxMode_clicked(); void on_RxFreqSpinBox_valueChanged(int n); void on_cbTxLock_clicked(bool checked); - void on_actionTx2QSO_triggered(bool checked); + void on_actionTx2QSO_triggered(bool checked); + void on_cbPlus2kHz_toggled(bool checked); private: Ui::MainWindow *ui; @@ -256,6 +257,7 @@ private: bool m_CATerror; bool m_bSplit; bool m_bXIT; + bool m_plus2kHz; char m_decoded[80]; diff --git a/mainwindow.ui b/mainwindow.ui index dac0b60e2..3856aa953 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -642,7 +642,7 @@ p, li { white-space: pre-wrap; } - 0 + 140 30 @@ -1493,71 +1493,10 @@ p, li { white-space: pre-wrap; } - - - - - 0 - 0 - - - - - 0 - 180 - - - - - 15 - 16777215 - - - - 60 - - - 0 - - - false - - - Qt::Vertical - - - - - - - - 0 - 0 - - - - - 0 - 180 - - - - - 20 - 180 - - - - Digital gain for audio input - - - -50 - - - 50 - - - Qt::Vertical + + + + +2 kHz @@ -1761,6 +1700,74 @@ p, li { white-space: pre-wrap; } + + + + + 0 + 0 + + + + + 0 + 160 + + + + + 15 + 160 + + + + 60 + + + 0 + + + false + + + Qt::Vertical + + + + + + + + 0 + 0 + + + + + 0 + 160 + + + + + 20 + 160 + + + + Digital gain for audio input + + + -50 + + + 50 + + + Qt::Vertical + + +