diff --git a/Configuration.cpp b/Configuration.cpp
index 01020027a..d313d5bb2 100644
--- a/Configuration.cpp
+++ b/Configuration.cpp
@@ -673,9 +673,7 @@ private:
bool pwrBandTxMemory_;
bool pwrBandTuneMemory_;
bool highlight_DXcall_;
- bool clear_DXcall_;
bool highlight_DXgrid_;
- bool clear_DXgrid_;
QAudioDeviceInfo audio_input_device_;
QAudioDeviceInfo next_audio_input_device_;
@@ -796,9 +794,7 @@ bool Configuration::highlight_only_fields () const {return m_->highlight_only_fi
bool Configuration::include_WAE_entities () const {return m_->include_WAE_entities_;}
bool Configuration::highlight_73 () const {return m_->highlight_73_;}
bool Configuration::highlight_DXcall () const {return m_->highlight_DXcall_;}
-bool Configuration::clear_DXcall () const {return m_->clear_DXcall_;}
bool Configuration::highlight_DXgrid () const {return m_->highlight_DXgrid_;}
-bool Configuration::clear_DXgrid () const {return m_->clear_DXgrid_;}
void Configuration::set_calibration (CalibrationParams params)
{
@@ -1440,9 +1436,7 @@ void Configuration::impl::initialize_models ()
ui_->highlight_73_check_box->setChecked (highlight_73_);
ui_->LotW_days_since_upload_spin_box->setValue (LotW_days_since_upload_);
ui_->cbHighlightDXcall->setChecked(highlight_DXcall_);
- ui_->cbClearDXcall->setChecked(clear_DXcall_);
ui_->cbHighlightDXgrid->setChecked(highlight_DXgrid_);
- ui_->cbClearDXgrid->setChecked(clear_DXgrid_);
set_rig_invariants ();
}
@@ -1602,9 +1596,7 @@ void Configuration::impl::read_settings ()
pwrBandTxMemory_ = settings_->value("pwrBandTxMemory",false).toBool ();
pwrBandTuneMemory_ = settings_->value("pwrBandTuneMemory",false).toBool ();
highlight_DXcall_ = settings_->value("highlight_DXcall",false).toBool ();
- clear_DXcall_ = settings_->value("clear_DXcall",false).toBool ();
highlight_DXgrid_ = settings_->value("highlight_DXgrid",false).toBool ();
- clear_DXgrid_ = settings_->value("clear_DXgrid",false).toBool ();
}
void Configuration::impl::find_audio_devices ()
@@ -1739,9 +1731,7 @@ void Configuration::impl::write_settings ()
settings_->setValue ("Region", QVariant::fromValue (region_));
settings_->setValue ("AutoGrid", use_dynamic_grid_);
settings_->setValue ("highlight_DXcall", highlight_DXcall_);
- settings_->setValue ("clear_DXcall", clear_DXcall_);
settings_->setValue ("highlight_DXgrid", highlight_DXgrid_);
- settings_->setValue ("clear_DXgrid", clear_DXgrid_);
settings_->sync ();
}
@@ -2232,9 +2222,7 @@ void Configuration::impl::accept ()
}
use_dynamic_grid_ = ui_->use_dynamic_grid->isChecked();
highlight_DXcall_ = ui_->cbHighlightDXcall->isChecked();
- clear_DXcall_ = ui_->cbClearDXcall->isChecked();
highlight_DXgrid_ = ui_->cbHighlightDXgrid->isChecked();
- clear_DXgrid_ = ui_->cbClearDXgrid->isChecked();
write_settings (); // make visible to all
}
diff --git a/Configuration.hpp b/Configuration.hpp
index bd31d8695..8d76040b8 100644
--- a/Configuration.hpp
+++ b/Configuration.hpp
@@ -187,9 +187,7 @@ public:
void setSpecial_Fox();
void setSpecial_None();
bool highlight_DXcall () const;
- bool clear_DXcall () const;
bool highlight_DXgrid () const;
- bool clear_DXgrid () const;
enum class SpecialOperatingActivity {NONE, NA_VHF, EU_VHF, FIELD_DAY, RTTY, WW_DIGI, ARRL_DIGI, FOX, HOUND};
SpecialOperatingActivity special_op_id () const;
diff --git a/Configuration.ui b/Configuration.ui
index ad62f515e..b8205968c 100644
--- a/Configuration.ui
+++ b/Configuration.ui
@@ -6,8 +6,8 @@
0
0
- 554
- 599
+ 588
+ 642
@@ -171,23 +171,6 @@
Display
- -
-
-
- Show outgoing transmitted messages in the Rx frequency window.
-
-
- &Tx messages to Rx frequency window
-
-
-
- -
-
-
- Show principal prefix instead of country name
-
-
-
-
-
@@ -242,10 +225,13 @@
- -
-
+
-
+
+
+ Include a separator line between periods in the band activity window.
+
- Highlight DX Call in message
+ &Blank line between decoding periods
@@ -259,16 +245,24 @@
- -
-
-
- Show if decoded stations are new DXCC entities or worked before.
-
+
-
+
- Show &DXCC, grid, and worked-before status
+ Highlight DX Grid in message
-
- false
+
+
+ -
+
+
+ Show principal prefix instead of country name
+
+
+
+ -
+
+
+ Highlight DX Call in message
@@ -282,34 +276,26 @@
- -
-
-
- Clear DX Grid after QSO
-
-
-
- -
-
+
-
+
- Include a separator line between periods in the band activity window.
+ Show outgoing transmitted messages in the Rx frequency window.
- &Blank line between decoding periods
+ &Tx messages to Rx frequency window
- -
-
-
- Highlight DX Grid in message
+
-
+
+
+ Show if decoded stations are new DXCC entities or worked before.
-
-
- -
-
- Clear DX Call after QSO
+ Show &DXCC, grid, and worked-before status
+
+
+ false
@@ -3291,13 +3277,13 @@ Right click for insert and delete options.
-
-
-
-
+
-
+
+
+
+
diff --git a/NEWS b/NEWS
index f3b41ea6c..ef1435a1b 100644
--- a/NEWS
+++ b/NEWS
@@ -12,40 +12,46 @@
Copyright 2001 - 2021 by Joe Taylor, K1JT.
Release: WSJT-X 2.6.0-rc1
- Jun 15, 2022
+ June 16, 2022
----------------------
-This release introduces some enhancements to the GUI as well as a
-couple of useful new features and fixes:
+WSJT-X 2.6.0 Release Candidate 1 introduces support for the ARRL
+International Digital Contest; performance enhancements for FT8, Q65,
+and EME Echo mode; new controls and options on the GUI; and several
+bug fixes.
In program WSJT-X:
- - Improved decoding for FT8, additional messages are marked 'a7'
+ - Improved decoding for FT8; additional messages are marked 'a7'
- Improved decoding for Q65 when AP is in use
+ - Optional new "Active Stations" window and other features
+ supporting the ARRL International Digital Contest
+
+ - Accurate SNR measurements in EME Echo mode, even for large Doppler
+ spreads
+
- Add mode-select buttons on main window for FT4, FT8, MSK144, Q65,
- JT65, and FT8 DXpedition Hound mode
+ JT65, and FT8
+
+ - Add a button to toggle FT8's Hound mode ON or OFF
+
+ - Add a "Clr Avg" button for EME Echo mode
- Add optional highlighting of DX Call and DX Grid
- - Add "Clear DX call and grid after logging"
-
- Add optional highlighting of messages containing RR73 or 73
- New options for writing to ALL.TXT: split the file yearly, monthly,
- or disable altogether
+ or disable writing altogether
- Add Russian to available translations of the user interface
- - Optional new "Active Stations" window and other features
- supporting ARRL International Digital Contest
+ - Add a Tune watchdog, defaulting to 90 s
- - Accurate SNR measurements in EME Echo mode, including Measure mode
-
- - Add a "Clr Avg" button for EME Echo mode
-
- - Correct a flaw that could cause Windows to drop audio samples
+ - Allow auto reply for non-CQ messages via UDP (JTAlert, etc.) when
+ Hold Tx Freq is enabled
- Suppress transmission of blank messages
@@ -53,6 +59,8 @@ In program WSJT-X:
- Correct the handling of messages starting with "CQ xxxx ..."
+ - Correct a flaw that could cause Windows to drop audio samples
+
- Correct a flaw that could send incorrect frequencies to ALL.TXT
and PSK Reporter, following a band change
@@ -60,21 +68,19 @@ In program WSJT-X:
- Correct a flaw in WSPR mode when handling three-character callsigns
- - Add a Tune watchdog, default 90 s
-
- - Allow auto reply for non-CQ messages via UDP (JTAlert, etc.) when
- Hold Tx Freq is enabled
+ - Correct a flaw that could cause Omnirig 1.19 or later to set
+ incorrect frequencies after initialization
- Clean up some ToolTips
- - Fix an inconsistancy in the installation package for MacOS that
- caused the pwr slider to behave incorrectly on macOS 12
+ - Fix an inconsistancy in the macOS installation package that caused
+ the pwr slider to behave incorrectly on macOS 12
In program MAP65 (Windows only):
- Additional information now sent to file azel.dat
- - Optional scaling of input I/Q data
+ - Optional digital scaling of input I/Q data
- Suppress a bounds error caused by user setting a display bandwidth
that is too wide
diff --git a/Release_Notes.txt b/Release_Notes.txt
index 12be9a0ff..6ca23c2ee 100644
--- a/Release_Notes.txt
+++ b/Release_Notes.txt
@@ -41,8 +41,6 @@ In program WSJT-X:
- Add optional highlighting of DX Call and DX Grid
- - Add "Clear DX call and grid after logging"
-
- Add optional highlighting of messages containing RR73 or 73
- New options for writing to ALL.TXT: split the file yearly, monthly,
@@ -70,6 +68,9 @@ In program WSJT-X:
- Correct a flaw in WSPR mode when handling three-character callsigns
+ - Correct a flaw that could cause Omnirig 1.19 or later to set
+ incorrect frequencies after initialization
+
- Clean up some ToolTips
- Fix an inconsistancy in the macOS installation package that caused
diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp
index 6f14f9fd9..c0944b042 100644
--- a/widgets/mainwindow.cpp
+++ b/widgets/mainwindow.cpp
@@ -6356,8 +6356,6 @@ void MainWindow::acceptQSO (QDateTime const& QSO_date_off, QString const& call,
m_xSent.clear ();
m_xRcvd.clear ();
- if (m_config.clear_DXcall ()) ui->dxCallEntry->clear ();
- if (m_config.clear_DXgrid ()) ui->dxGridEntry->clear ();
}
void MainWindow::updateRate()