Remove checkboxes for "Clear DX Call / DX Grid after QSO" and update Release_Notes and NEWS.

This commit is contained in:
Uwe Risse 2022-06-01 10:14:18 +02:00
parent f1497fbabb
commit fa111e6e87
6 changed files with 72 additions and 95 deletions

View File

@ -673,9 +673,7 @@ private:
bool pwrBandTxMemory_; bool pwrBandTxMemory_;
bool pwrBandTuneMemory_; bool pwrBandTuneMemory_;
bool highlight_DXcall_; bool highlight_DXcall_;
bool clear_DXcall_;
bool highlight_DXgrid_; bool highlight_DXgrid_;
bool clear_DXgrid_;
QAudioDeviceInfo audio_input_device_; QAudioDeviceInfo audio_input_device_;
QAudioDeviceInfo next_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::include_WAE_entities () const {return m_->include_WAE_entities_;}
bool Configuration::highlight_73 () const {return m_->highlight_73_;} bool Configuration::highlight_73 () const {return m_->highlight_73_;}
bool Configuration::highlight_DXcall () const {return m_->highlight_DXcall_;} 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::highlight_DXgrid () const {return m_->highlight_DXgrid_;}
bool Configuration::clear_DXgrid () const {return m_->clear_DXgrid_;}
void Configuration::set_calibration (CalibrationParams params) void Configuration::set_calibration (CalibrationParams params)
{ {
@ -1440,9 +1436,7 @@ void Configuration::impl::initialize_models ()
ui_->highlight_73_check_box->setChecked (highlight_73_); ui_->highlight_73_check_box->setChecked (highlight_73_);
ui_->LotW_days_since_upload_spin_box->setValue (LotW_days_since_upload_); ui_->LotW_days_since_upload_spin_box->setValue (LotW_days_since_upload_);
ui_->cbHighlightDXcall->setChecked(highlight_DXcall_); ui_->cbHighlightDXcall->setChecked(highlight_DXcall_);
ui_->cbClearDXcall->setChecked(clear_DXcall_);
ui_->cbHighlightDXgrid->setChecked(highlight_DXgrid_); ui_->cbHighlightDXgrid->setChecked(highlight_DXgrid_);
ui_->cbClearDXgrid->setChecked(clear_DXgrid_);
set_rig_invariants (); set_rig_invariants ();
} }
@ -1602,9 +1596,7 @@ void Configuration::impl::read_settings ()
pwrBandTxMemory_ = settings_->value("pwrBandTxMemory",false).toBool (); pwrBandTxMemory_ = settings_->value("pwrBandTxMemory",false).toBool ();
pwrBandTuneMemory_ = settings_->value("pwrBandTuneMemory",false).toBool (); pwrBandTuneMemory_ = settings_->value("pwrBandTuneMemory",false).toBool ();
highlight_DXcall_ = settings_->value("highlight_DXcall",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 (); highlight_DXgrid_ = settings_->value("highlight_DXgrid",false).toBool ();
clear_DXgrid_ = settings_->value("clear_DXgrid",false).toBool ();
} }
void Configuration::impl::find_audio_devices () void Configuration::impl::find_audio_devices ()
@ -1739,9 +1731,7 @@ void Configuration::impl::write_settings ()
settings_->setValue ("Region", QVariant::fromValue (region_)); settings_->setValue ("Region", QVariant::fromValue (region_));
settings_->setValue ("AutoGrid", use_dynamic_grid_); settings_->setValue ("AutoGrid", use_dynamic_grid_);
settings_->setValue ("highlight_DXcall", highlight_DXcall_); settings_->setValue ("highlight_DXcall", highlight_DXcall_);
settings_->setValue ("clear_DXcall", clear_DXcall_);
settings_->setValue ("highlight_DXgrid", highlight_DXgrid_); settings_->setValue ("highlight_DXgrid", highlight_DXgrid_);
settings_->setValue ("clear_DXgrid", clear_DXgrid_);
settings_->sync (); settings_->sync ();
} }
@ -2232,9 +2222,7 @@ void Configuration::impl::accept ()
} }
use_dynamic_grid_ = ui_->use_dynamic_grid->isChecked(); use_dynamic_grid_ = ui_->use_dynamic_grid->isChecked();
highlight_DXcall_ = ui_->cbHighlightDXcall->isChecked(); highlight_DXcall_ = ui_->cbHighlightDXcall->isChecked();
clear_DXcall_ = ui_->cbClearDXcall->isChecked();
highlight_DXgrid_ = ui_->cbHighlightDXgrid->isChecked(); highlight_DXgrid_ = ui_->cbHighlightDXgrid->isChecked();
clear_DXgrid_ = ui_->cbClearDXgrid->isChecked();
write_settings (); // make visible to all write_settings (); // make visible to all
} }

View File

@ -187,9 +187,7 @@ public:
void setSpecial_Fox(); void setSpecial_Fox();
void setSpecial_None(); void setSpecial_None();
bool highlight_DXcall () const; bool highlight_DXcall () const;
bool clear_DXcall () const;
bool highlight_DXgrid () 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}; enum class SpecialOperatingActivity {NONE, NA_VHF, EU_VHF, FIELD_DAY, RTTY, WW_DIGI, ARRL_DIGI, FOX, HOUND};
SpecialOperatingActivity special_op_id () const; SpecialOperatingActivity special_op_id () const;

View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>554</width> <width>588</width>
<height>599</height> <height>642</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -171,23 +171,6 @@
<string>Display</string> <string>Display</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_4"> <layout class="QGridLayout" name="gridLayout_4">
<item row="3" column="0">
<widget class="QCheckBox" name="TX_messages_check_box">
<property name="toolTip">
<string>Show outgoing transmitted messages in the Rx frequency window.</string>
</property>
<property name="text">
<string>&amp;Tx messages to Rx frequency window</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QCheckBox" name="ppfx_check_box">
<property name="text">
<string>Show principal prefix instead of country name</string>
</property>
</widget>
</item>
<item row="0" column="1" rowspan="4"> <item row="0" column="1" rowspan="4">
<layout class="QHBoxLayout" name="horizontalLayout_21"> <layout class="QHBoxLayout" name="horizontalLayout_21">
<item> <item>
@ -242,10 +225,13 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="5" column="0"> <item row="1" column="0">
<widget class="QCheckBox" name="cbHighlightDXcall"> <widget class="QCheckBox" name="insert_blank_check_box">
<property name="toolTip">
<string>Include a separator line between periods in the band activity window.</string>
</property>
<property name="text"> <property name="text">
<string>Highlight DX Call in message</string> <string>&amp;Blank line between decoding periods</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -259,16 +245,24 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0"> <item row="5" column="1">
<widget class="QCheckBox" name="DXCC_check_box"> <widget class="QCheckBox" name="cbHighlightDXgrid">
<property name="toolTip">
<string>Show if decoded stations are new DXCC entities or worked before.</string>
</property>
<property name="text"> <property name="text">
<string>Show &amp;DXCC, grid, and worked-before status</string> <string>Highlight DX Grid in message</string>
</property> </property>
<property name="checked"> </widget>
<bool>false</bool> </item>
<item row="4" column="1">
<widget class="QCheckBox" name="ppfx_check_box">
<property name="text">
<string>Show principal prefix instead of country name</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QCheckBox" name="cbHighlightDXcall">
<property name="text">
<string>Highlight DX Call in message</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -282,34 +276,26 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="1"> <item row="3" column="0">
<widget class="QCheckBox" name="cbClearDXgrid"> <widget class="QCheckBox" name="TX_messages_check_box">
<property name="text">
<string>Clear DX Grid after QSO</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QCheckBox" name="insert_blank_check_box">
<property name="toolTip"> <property name="toolTip">
<string>Include a separator line between periods in the band activity window.</string> <string>Show outgoing transmitted messages in the Rx frequency window.</string>
</property> </property>
<property name="text"> <property name="text">
<string>&amp;Blank line between decoding periods</string> <string>&amp;Tx messages to Rx frequency window</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="1"> <item row="4" column="0">
<widget class="QCheckBox" name="cbHighlightDXgrid"> <widget class="QCheckBox" name="DXCC_check_box">
<property name="text"> <property name="toolTip">
<string>Highlight DX Grid in message</string> <string>Show if decoded stations are new DXCC entities or worked before.</string>
</property> </property>
</widget>
</item>
<item row="6" column="0">
<widget class="QCheckBox" name="cbClearDXcall">
<property name="text"> <property name="text">
<string>Clear DX Call after QSO</string> <string>Show &amp;DXCC, grid, and worked-before status</string>
</property>
<property name="checked">
<bool>false</bool>
</property> </property>
</widget> </widget>
</item> </item>
@ -3291,13 +3277,13 @@ Right click for insert and delete options.</string>
</connection> </connection>
</connections> </connections>
<buttongroups> <buttongroups>
<buttongroup name="special_op_activity_button_group"/>
<buttongroup name="CAT_stop_bits_button_group"/> <buttongroup name="CAT_stop_bits_button_group"/>
<buttongroup name="CAT_data_bits_button_group"/> <buttongroup name="special_op_activity_button_group"/>
<buttongroup name="TX_mode_button_group"/>
<buttongroup name="TX_audio_source_button_group"/>
<buttongroup name="split_mode_button_group"/> <buttongroup name="split_mode_button_group"/>
<buttongroup name="PTT_method_button_group"/>
<buttongroup name="CAT_handshake_button_group"/> <buttongroup name="CAT_handshake_button_group"/>
<buttongroup name="TX_audio_source_button_group"/>
<buttongroup name="TX_mode_button_group"/>
<buttongroup name="CAT_data_bits_button_group"/>
<buttongroup name="PTT_method_button_group"/>
</buttongroups> </buttongroups>
</ui> </ui>

50
NEWS
View File

@ -12,40 +12,46 @@
Copyright 2001 - 2021 by Joe Taylor, K1JT. Copyright 2001 - 2021 by Joe Taylor, K1JT.
Release: WSJT-X 2.6.0-rc1 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 WSJT-X 2.6.0 Release Candidate 1 introduces support for the ARRL
couple of useful new features and fixes: 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: 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 - 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, - 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 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 - Add optional highlighting of messages containing RR73 or 73
- New options for writing to ALL.TXT: split the file yearly, monthly, - 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 - Add Russian to available translations of the user interface
- Optional new "Active Stations" window and other features - Add a Tune watchdog, defaulting to 90 s
supporting ARRL International Digital Contest
- Accurate SNR measurements in EME Echo mode, including Measure mode - Allow auto reply for non-CQ messages via UDP (JTAlert, etc.) when
Hold Tx Freq is enabled
- Add a "Clr Avg" button for EME Echo mode
- Correct a flaw that could cause Windows to drop audio samples
- Suppress transmission of blank messages - Suppress transmission of blank messages
@ -53,6 +59,8 @@ In program WSJT-X:
- Correct the handling of messages starting with "CQ xxxx ..." - 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 - Correct a flaw that could send incorrect frequencies to ALL.TXT
and PSK Reporter, following a band change 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 - Correct a flaw in WSPR mode when handling three-character callsigns
- Add a Tune watchdog, default 90 s - Correct a flaw that could cause Omnirig 1.19 or later to set
incorrect frequencies after initialization
- Allow auto reply for non-CQ messages via UDP (JTAlert, etc.) when
Hold Tx Freq is enabled
- Clean up some ToolTips - Clean up some ToolTips
- Fix an inconsistancy in the installation package for MacOS that - Fix an inconsistancy in the macOS installation package that caused
caused the pwr slider to behave incorrectly on macOS 12 the pwr slider to behave incorrectly on macOS 12
In program MAP65 (Windows only): In program MAP65 (Windows only):
- Additional information now sent to file azel.dat - 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 - Suppress a bounds error caused by user setting a display bandwidth
that is too wide that is too wide

View File

@ -41,8 +41,6 @@ In program WSJT-X:
- Add optional highlighting of DX Call and DX Grid - 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 - Add optional highlighting of messages containing RR73 or 73
- New options for writing to ALL.TXT: split the file yearly, monthly, - 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 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 - Clean up some ToolTips
- Fix an inconsistancy in the macOS installation package that caused - Fix an inconsistancy in the macOS installation package that caused

View File

@ -6356,8 +6356,6 @@ void MainWindow::acceptQSO (QDateTime const& QSO_date_off, QString const& call,
m_xSent.clear (); m_xSent.clear ();
m_xRcvd.clear (); m_xRcvd.clear ();
if (m_config.clear_DXcall ()) ui->dxCallEntry->clear ();
if (m_config.clear_DXgrid ()) ui->dxGridEntry->clear ();
} }
void MainWindow::updateRate() void MainWindow::updateRate()