w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-09-05 22:57:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use ShowOTP instead of HideOTP, and reverse the logic of this checkbox.

Browse Source
This commit is contained in:
Uwe Risse 2024-09-18 16:52:11 +02:00
parent 8eb0f8a50c
commit 463f655236
4 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Configuration.cpp
View File

@ -598,7 +598,7 @@ private:
Q_SLOT void on_cbSuperFox_clicked (bool); Q_SLOT void on_cbSuperFox_clicked (bool);
Q_SLOT void on_cbContestName_clicked (bool); Q_SLOT void on_cbContestName_clicked (bool);
Q_SLOT void on_cbOTP_clicked (bool); Q_SLOT void on_cbOTP_clicked (bool);
Q_SLOT void on_cbHideOTP_clicked (bool); Q_SLOT void on_cbShowOTP_clicked (bool);
void error_during_hamlib_download (QString const& reason); void error_during_hamlib_download (QString const& reason);
void after_hamlib_downloaded(); void after_hamlib_downloaded();
@ -715,7 +715,7 @@ private:
QString OTPUrl_; QString OTPUrl_;
QString OTPSeed_; QString OTPSeed_;
bool OTPEnabled_; bool OTPEnabled_;
bool HideOTP_; bool ShowOTP_;
qint32 OTPinterval_; qint32 OTPinterval_;
qint32 id_interval_; qint32 id_interval_;
@ -1129,9 +1129,9 @@ bool Configuration::OTPEnabled() const
return m_->OTPSeed_.size() == 16 && m_->OTPEnabled_; return m_->OTPSeed_.size() == 16 && m_->OTPEnabled_;
} }
bool Configuration::HideOTP () const bool Configuration::ShowOTP () const
{ {
return m_->HideOTP_; return m_->ShowOTP_;
} }
namespace namespace
@ -1673,13 +1673,13 @@ void Configuration::impl::read_settings ()
OTPUrl_ = settings_->value ("OTPUrl", FoxVerifier::default_url()).toString (); OTPUrl_ = settings_->value ("OTPUrl", FoxVerifier::default_url()).toString ();
OTPSeed_ = settings_->value ("OTPSeed", QString {}).toString (); OTPSeed_ = settings_->value ("OTPSeed", QString {}).toString ();
OTPEnabled_ = settings_->value ("OTPEnabled", false).toBool (); OTPEnabled_ = settings_->value ("OTPEnabled", false).toBool ();
HideOTP_ = settings_->value ("HideOTP", true).toBool (); ShowOTP_ = settings_->value ("ShowOTP", false).toBool ();
ui_->sbOTPinterval->setValue(OTPinterval_); ui_->sbOTPinterval->setValue(OTPinterval_);
ui_->OTPUrl->setText(OTPUrl_); ui_->OTPUrl->setText(OTPUrl_);
ui_->OTPSeed->setText(OTPSeed_); ui_->OTPSeed->setText(OTPSeed_);
ui_->cbOTP->setChecked(OTPEnabled_); ui_->cbOTP->setChecked(OTPEnabled_);
ui_->cbHideOTP->setChecked(HideOTP_); ui_->cbShowOTP->setChecked(ShowOTP_);
if (next_font_.fromString (settings_->value ("Font", QGuiApplication::font ().toString ()).toString ()) if (next_font_.fromString (settings_->value ("Font", QGuiApplication::font ().toString ()).toString ())
@ -2011,7 +2011,7 @@ void Configuration::impl::write_settings ()
settings_->setValue ("OTPUrl", OTPUrl_); settings_->setValue ("OTPUrl", OTPUrl_);
settings_->setValue ("OTPSeed", OTPSeed_); settings_->setValue ("OTPSeed", OTPSeed_);
settings_->setValue ("OTPEnabled", OTPEnabled_); settings_->setValue ("OTPEnabled", OTPEnabled_);
settings_->setValue ("HideOTP", HideOTP_); settings_->setValue ("ShowOTP", ShowOTP_);
settings_->sync (); settings_->sync ();
} }
@ -2432,7 +2432,7 @@ void Configuration::impl::accept ()
OTPSeed_=ui_->OTPSeed->text(); OTPSeed_=ui_->OTPSeed->text();
OTPUrl_=ui_->OTPUrl->text(); OTPUrl_=ui_->OTPUrl->text();
OTPEnabled_=ui_->cbOTP->isChecked(); OTPEnabled_=ui_->cbOTP->isChecked();
HideOTP_=ui_->cbHideOTP->isChecked(); ShowOTP_=ui_->cbShowOTP->isChecked();
auto new_server = ui_->udp_server_line_edit->text ().trimmed (); auto new_server = ui_->udp_server_line_edit->text ().trimmed ();
auto new_interfaces = get_selected_network_interfaces (ui_->udp_interfaces_combo_box); auto new_interfaces = get_selected_network_interfaces (ui_->udp_interfaces_combo_box);
@ -3287,7 +3287,7 @@ void Configuration::impl::on_cbOTP_clicked(bool)
check_visibility(); check_visibility();
} }
void Configuration::impl::on_cbHideOTP_clicked(bool) void Configuration::impl::on_cbShowOTP_clicked(bool)
{ {
check_visibility(); check_visibility();
} }
@ -3322,7 +3322,7 @@ void Configuration::impl::check_visibility ()
} else { } else {
ui_->cbSuperFox->setEnabled (false); ui_->cbSuperFox->setEnabled (false);
ui_->cbOTP->setEnabled (false); ui_->cbOTP->setEnabled (false);
ui_->cbHideOTP->setEnabled(false); ui_->cbShowOTP->setEnabled(false);
} }
if (!ui_->rbFox->isChecked() and !ui_->rbHound->isChecked() and !ui_->rbQ65pileup->isChecked() if (!ui_->rbFox->isChecked() and !ui_->rbHound->isChecked() and !ui_->rbQ65pileup->isChecked()
and ui_->gbSpecialOpActivity->isChecked()) { and ui_->gbSpecialOpActivity->isChecked()) {
@ -3337,7 +3337,7 @@ void Configuration::impl::check_visibility ()
ui_->lblOTPSeed->setEnabled(false); ui_->lblOTPSeed->setEnabled(false);
ui_->lblOTPUrl->setEnabled(false); ui_->lblOTPUrl->setEnabled(false);
ui_->lblOTPEvery->setEnabled(false); ui_->lblOTPEvery->setEnabled(false);
ui_->cbHideOTP->setEnabled(false); ui_->cbShowOTP->setEnabled(false);
} else { } else {
if (ui_->rbHound->isChecked()) { if (ui_->rbHound->isChecked()) {
if (ui_->OTPUrl->text().isEmpty()) if (ui_->OTPUrl->text().isEmpty())
@ -3346,7 +3346,7 @@ void Configuration::impl::check_visibility ()
} }
ui_->OTPUrl->setEnabled(true); ui_->OTPUrl->setEnabled(true);
ui_->lblOTPUrl->setEnabled(true); ui_->lblOTPUrl->setEnabled(true);
ui_->cbHideOTP->setEnabled(true); ui_->cbShowOTP->setEnabled(true);
} else { } else {
ui_->OTPUrl->setEnabled(false); ui_->OTPUrl->setEnabled(false);
ui_->lblOTPUrl->setEnabled(false); ui_->lblOTPUrl->setEnabled(false);
@ -3356,7 +3356,7 @@ void Configuration::impl::check_visibility ()
ui_->OTPSeed->setEnabled(true); ui_->OTPSeed->setEnabled(true);
ui_->lblOTPSeed->setEnabled(true); ui_->lblOTPSeed->setEnabled(true);
ui_->lblOTPEvery->setEnabled(true); ui_->lblOTPEvery->setEnabled(true);
ui_->cbHideOTP->setEnabled(false); ui_->cbShowOTP->setEnabled(false);
} else { } else {
ui_->OTPSeed->setEnabled(false); ui_->OTPSeed->setEnabled(false);
ui_->lblOTPSeed->setEnabled(false); ui_->lblOTPSeed->setEnabled(false);

2
Configuration.hpp
View File

@ -197,7 +197,7 @@ public:
QString OTPSeed() const; QString OTPSeed() const;
QString OTPUrl() const; QString OTPUrl() const;
bool OTPEnabled() const; bool OTPEnabled() const;
bool HideOTP() const; bool ShowOTP() const;
unsigned int OTPinterval() const; unsigned int OTPinterval() const;
// 0 1 2 3 4 5 6 7 8 9 // 0 1 2 3 4 5 6 7 8 9
enum class SpecialOperatingActivity {NONE, NA_VHF, EU_VHF, FIELD_DAY, RTTY, WW_DIGI, FOX, HOUND, ARRL_DIGI, Q65_PILEUP}; enum class SpecialOperatingActivity {NONE, NA_VHF, EU_VHF, FIELD_DAY, RTTY, WW_DIGI, FOX, HOUND, ARRL_DIGI, Q65_PILEUP};

20
Configuration.ui
View File

@ -2980,15 +2980,15 @@ Right click for insert and delete options.</string>
<item row="1" column="3"> <item row="1" column="3">
<layout class="QHBoxLayout" name="OTP_Layout_2" stretch="0,0,0,1"> <layout class="QHBoxLayout" name="OTP_Layout_2" stretch="0,0,0,1">
<item> <item>
<widget class="QCheckBox" name="cbHideOTP"> <widget class="QCheckBox" name="cbShowOTP">
<property name="toolTip"> <property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Hide OTP messages in the Band Activity window.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Show OTP messages in the Band Activity window.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="text"> <property name="text">
<string>Hide OTP messages</string> <string>Show OTP messages</string>
</property> </property>
<property name="checked"> <property name="checked">
<bool>true</bool> <bool>false</bool>
</property> </property>
</widget> </widget>
</item> </item>
@ -3668,13 +3668,13 @@ Right click for insert and delete options.</string>
</connection> </connection>
</connections> </connections>
<buttongroups> <buttongroups>
<buttongroup name="TX_audio_source_button_group"/>
<buttongroup name="TX_mode_button_group"/>
<buttongroup name="CAT_stop_bits_button_group"/>
<buttongroup name="split_mode_button_group"/>
<buttongroup name="PTT_method_button_group"/>
<buttongroup name="CAT_data_bits_button_group"/>
<buttongroup name="CAT_handshake_button_group"/> <buttongroup name="CAT_handshake_button_group"/>
<buttongroup name="special_op_activity_button_group"/> <buttongroup name="special_op_activity_button_group"/>
<buttongroup name="TX_audio_source_button_group"/>
<buttongroup name="PTT_method_button_group"/>
<buttongroup name="TX_mode_button_group"/>
<buttongroup name="CAT_stop_bits_button_group"/>
<buttongroup name="CAT_data_bits_button_group"/>
<buttongroup name="split_mode_button_group"/>
</buttongroups> </buttongroups>
</ui> </ui>

4
widgets/mainwindow.cpp
View File

@ -4350,14 +4350,14 @@ void MainWindow::readFromStdout() //readFromStdout
callsign = otp_parts[0]; callsign = otp_parts[0];
otp = otp_parts[1]; otp = otp_parts[1];
hz = lineparts[3].toInt(); hz = lineparts[3].toInt();
if (m_config.HideOTP()) filtered = true; if (!m_config.ShowOTP()) filtered = true;
} else } else
{ {
// split $VERIFY$ K8R 920749 into K8R and 920749 // split $VERIFY$ K8R 920749 into K8R and 920749
callsign = lineparts[6]; callsign = lineparts[6];
otp = lineparts[7]; otp = lineparts[7];
hz = 750; // SF is 750 hz = 750; // SF is 750
if (m_config.HideOTP()) filtered = true; if (!m_config.ShowOTP()) filtered = true;
} }
QDateTime verifyDateTime; QDateTime verifyDateTime;
if (m_diskData) { if (m_diskData) {