w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-05-29 21:02:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix Contest Name not correctly remembered.

Browse Source
This commit is contained in:
Uwe Risse 2023-02-15 17:22:44 +01:00
parent cbe674bedd
commit aef5c198bb
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Configuration.cpp
View File

@ -1542,6 +1542,8 @@ void Configuration::impl::read_settings ()
Contest_Name_ = settings_->value ("Contest_Name",QString {}).toString (); Contest_Name_ = settings_->value ("Contest_Name",QString {}).toString ();
ui_->Field_Day_Exchange->setText(FD_exchange_); ui_->Field_Day_Exchange->setText(FD_exchange_);
ui_->RTTY_Exchange->setText(RTTY_exchange_); ui_->RTTY_Exchange->setText(RTTY_exchange_);
ui_->Contest_Name->setText(Contest_Name_);
if (next_font_.fromString (settings_->value ("Font", QGuiApplication::font ().toString ()).toString ()) if (next_font_.fromString (settings_->value ("Font", QGuiApplication::font ().toString ()).toString ())
&& next_font_ != font_) && next_font_ != font_)
{ {

14
Configuration.ui
View File

@ -3076,13 +3076,13 @@ Right click for insert and delete options.</string>
</size> </size>
</property> </property>
<property name="text"> <property name="text">
<string>PACC</string> <string/>
</property> </property>
<property name="maxLength"> <property name="maxLength">
<number>4</number> <number>4</number>
</property> </property>
<property name="cursorPosition"> <property name="cursorPosition">
<number>2</number> <number>0</number>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -3336,13 +3336,13 @@ Right click for insert and delete options.</string>
</connection> </connection>
</connections> </connections>
<buttongroups> <buttongroups>
<buttongroup name="CAT_stop_bits_button_group"/> <buttongroup name="split_mode_button_group"/>
<buttongroup name="CAT_handshake_button_group"/> <buttongroup name="TX_audio_source_button_group"/>
<buttongroup name="special_op_activity_button_group"/>
<buttongroup name="TX_mode_button_group"/> <buttongroup name="TX_mode_button_group"/>
<buttongroup name="CAT_handshake_button_group"/>
<buttongroup name="CAT_data_bits_button_group"/> <buttongroup name="CAT_data_bits_button_group"/>
<buttongroup name="PTT_method_button_group"/> <buttongroup name="PTT_method_button_group"/>
<buttongroup name="split_mode_button_group"/> <buttongroup name="CAT_stop_bits_button_group"/>
<buttongroup name="special_op_activity_button_group"/>
<buttongroup name="TX_audio_source_button_group"/>
</buttongroups> </buttongroups>
</ui> </ui>

2
widgets/mainwindow.cpp
View File

@ -5771,7 +5771,7 @@ void MainWindow::genCQMsg ()
( tlist.at(1)==my_callsign or ( tlist.at(1)==my_callsign or
tlist.at(2)==my_callsign ) and tlist.at(2)==my_callsign ) and
stdCall(my_callsign)) { stdCall(my_callsign)) {
if(m_config.Individual_Contest_Name()) { if(m_config.Individual_Contest_Name() && m_config.Contest_Name() != "") {
m_cqStr = m_config.Contest_Name(); m_cqStr = m_config.Contest_Name();
} else { } else {
if(SpecOp::NA_VHF == m_specOp) m_cqStr="TEST"; if(SpecOp::NA_VHF == m_specOp) m_cqStr="TEST";