diff --git a/Configuration.cpp b/Configuration.cpp
index ac1ac425c..cca0b4221 100644
--- a/Configuration.cpp
+++ b/Configuration.cpp
@@ -529,6 +529,8 @@ private:
// configuration fields that we publish
QString my_callsign_;
QString my_grid_;
+ QString FD_exchange_;
+ QString RTTY_exchange_;
QColor color_CQ_;
QColor next_color_CQ_;
QColor color_MyCall_;
@@ -821,6 +823,16 @@ QString Configuration::my_grid() const
return the_grid;
}
+QString Configuration::FieldDayExchange() const
+{
+ return m_->FD_exchange_;
+}
+
+QString Configuration::RTTYExchange() const
+{
+ return m_->RTTY_exchange_;
+}
+
void Configuration::set_location (QString const& grid_descriptor)
{
// change the dynamic grid
@@ -1260,6 +1272,10 @@ void Configuration::impl::read_settings ()
my_callsign_ = settings_->value ("MyCall", QString {}).toString ();
my_grid_ = settings_->value ("MyGrid", QString {}).toString ();
+ FD_exchange_ = settings_->value ("FieldDayExchange",QString {}).toString ();
+ RTTY_exchange_ = settings_->value ("RTTYExchange",QString {}).toString ();
+ ui_->FieldDay_Exchange->setText(FD_exchange_);
+ ui_->RTTY_Exchange->setText(RTTY_exchange_);
next_color_CQ_ = color_CQ_ = settings_->value("colorCQ","#66ff66").toString();
next_color_MyCall_ = color_MyCall_ = settings_->value("colorMyCall","#ff6666").toString();
next_color_TxMsg_ = color_TxMsg_ = settings_->value("colorTxMsg","#ffff00").toString();
@@ -1450,6 +1466,8 @@ void Configuration::impl::write_settings ()
settings_->setValue ("MyCall", my_callsign_);
settings_->setValue ("MyGrid", my_grid_);
+ settings_->setValue ("FieldDayExchange", FD_exchange_);
+ settings_->setValue ("RTTYExchange", RTTY_exchange_);
settings_->setValue("colorCQ",color_CQ_);
settings_->setValue("colorMyCall",color_MyCall_);
settings_->setValue("colorTxMsg",color_TxMsg_);
@@ -1907,6 +1925,8 @@ void Configuration::impl::accept ()
my_callsign_ = ui_->callsign_line_edit->text ();
my_grid_ = ui_->grid_line_edit->text ();
+ FD_exchange_= ui_->FieldDay_Exchange->text ();
+ RTTY_exchange_= ui_->RTTY_Exchange->text ();
spot_to_psk_reporter_ = ui_->psk_reporter_check_box->isChecked ();
id_interval_ = ui_->CW_id_interval_spin_box->value ();
ntrials_ = ui_->sbNtrials->value ();
diff --git a/Configuration.hpp b/Configuration.hpp
index a81774254..8fc8e53a2 100644
--- a/Configuration.hpp
+++ b/Configuration.hpp
@@ -96,6 +96,8 @@ public:
QString my_callsign () const;
QString my_grid () const;
+ QString FieldDayExchange() const;
+ QString RTTYExchange() const;
QFont text_font () const;
QFont decoded_text_font () const;
qint32 id_interval () const;
diff --git a/Configuration.ui b/Configuration.ui
index aa3d03dec..cdc287e5d 100644
--- a/Configuration.ui
+++ b/Configuration.ui
@@ -2703,11 +2703,25 @@ Right click for insert and delete options.
10
20
- 341
- 71
+ 451
+ 78
+ -
+
+
+ NA VHF Contest
+
+
+
+ -
+
+
+ EU VHF Contest
+
+
+
-
@@ -2719,32 +2733,111 @@ Right click for insert and delete options.
-
-
-
- ARRL Field Day
-
-
+
+
-
+
+
+ ARRL Field Day
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ Exch:
+
+
+
+ -
+
+
+
+ 60
+ 16777215
+
+
+
+ 6A SNJ
+
+
+ Qt::AlignCenter
+
+
+
+
-
-
-
- ARRL RTTY Roundup
-
-
+
+
-
+
+
+ ARRL RTTY Roundup
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 10
+ 20
+
+
+
+
+ -
+
+
+ Exch:
+
+
+
+ -
+
+
+
+ 60
+ 16777215
+
+
+
+ NJ
+
+
+ Qt::AlignCenter
+
+
+
+
-
-
-
- NA VHF Contest
+
+
+ Qt::Horizontal
-
-
- -
-
-
- EU VHF Contest
+
+
+ 40
+ 20
+
-
+
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 396b7357f..626f10630 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -3677,7 +3677,8 @@ void MainWindow::guiUpdate()
//Once per second:
if(nsec != m_sec0) {
-// qDebug() << "OneSec:" << m_config.bGenerate77() << m_config.bDecode77();
+// qDebug() << "OneSec:" << m_config.bGenerate77() << m_config.bDecode77()
+// << m_config.FieldDayExchange() << m_config.RTTYExchange();
if(m_freqNominal!=0 and m_freqNominal<50000000 and m_config.enable_VHF_features()) {
if(!m_bVHFwarned) vhfWarning();
} else {
@@ -5042,6 +5043,8 @@ void MainWindow::displayWidgets(qint64 n)
if(i==32) ui->cbCQonly->setVisible(b);
j=j>>1;
}
+ b=m_config.bEU_VHF_Contest() or (m_config.bRTTYroundup() and m_config.RTTYExchange()=="DX");
+ ui->sbSerialNumber->setVisible(b);
m_lastCallsign.clear (); // ensures Tx5 is updated for new modes
genStdMsgs (m_rpt, true);
}
diff --git a/mainwindow.ui b/mainwindow.ui
index 75ae7d1a7..d10ed95df 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -1013,6 +1013,22 @@ QLabel[oob="true"] {
+ -
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+
+
+ 1
+
+
+ 4095
+
+
+
-