diff --git a/Configuration.cpp b/Configuration.cpp index bd579d4..d641d2f 100644 --- a/Configuration.cpp +++ b/Configuration.cpp @@ -431,6 +431,7 @@ private: Q_SLOT void on_delete_macro_push_button_clicked (bool = false); Q_SLOT void on_PTT_method_button_group_buttonClicked (int); Q_SLOT void on_station_message_line_edit_textChanged(QString const&); + Q_SLOT void on_qth_message_line_edit_textChanged(QString const&); Q_SLOT void on_add_macro_line_edit_editingFinished (); Q_SLOT void delete_macro (); void delete_selected_macros (QModelIndexList); @@ -531,6 +532,7 @@ private: QString my_callsign_; QString my_grid_; QString my_station_; + QString my_qth_; QColor color_CQ_; QColor next_color_CQ_; QColor color_MyCall_; @@ -824,6 +826,11 @@ QString Configuration::my_station() const return m_->my_station_; } +QString Configuration::my_qth() const +{ + return m_->my_qth_; +} + void Configuration::set_location (QString const& grid_descriptor) { // change the dynamic grid @@ -963,6 +970,7 @@ Configuration::impl::impl (Configuration * self, QDir const& temp_directory, ui_->grid_line_edit->setValidator (new MaidenheadLocatorValidator {this}); ui_->add_macro_line_edit->setValidator (new QRegExpValidator {message_alphabet, this}); ui_->station_message_line_edit->setValidator (new QRegExpValidator {message_alphabet, this}); + ui_->qth_message_line_edit->setValidator (new QRegExpValidator {message_alphabet, this}); ui_->udp_server_port_spin_box->setMinimum (1); ui_->udp_server_port_spin_box->setMaximum (std::numeric_limits::max ()); @@ -1138,6 +1146,7 @@ void Configuration::impl::initialize_models () ui_->callsign_line_edit->setText (my_callsign_); ui_->grid_line_edit->setText (my_grid_); ui_->station_message_line_edit->setText (my_station_.toUpper()); + ui_->qth_message_line_edit->setText (my_qth_.toUpper()); ui_->use_dynamic_grid->setChecked(use_dynamic_grid_); ui_->labCQ->setStyleSheet(QString("background: %1").arg(color_CQ_.name())); ui_->labMyCall->setStyleSheet(QString("background: %1").arg(color_MyCall_.name())); @@ -1257,6 +1266,7 @@ void Configuration::impl::read_settings () my_callsign_ = settings_->value ("MyCall", QString {}).toString (); my_grid_ = settings_->value ("MyGrid", QString {}).toString (); my_station_ = settings_->value("MyStation", QString {}).toString(); + my_qth_ = settings_->value("MyQTH", QString {}).toString(); 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(); @@ -1444,6 +1454,7 @@ void Configuration::impl::write_settings () settings_->setValue ("MyCall", my_callsign_); settings_->setValue ("MyGrid", my_grid_); settings_->setValue ("MyStation", my_station_); + settings_->setValue ("MyQTH", my_qth_); settings_->setValue("colorCQ",color_CQ_); settings_->setValue("colorMyCall",color_MyCall_); settings_->setValue("colorTxMsg",color_TxMsg_); @@ -1896,6 +1907,7 @@ void Configuration::impl::accept () my_callsign_ = ui_->callsign_line_edit->text (); my_grid_ = ui_->grid_line_edit->text (); my_station_ = ui_->station_message_line_edit->text().toUpper(); + my_qth_ = ui_->qth_message_line_edit->text().toUpper(); spot_to_psk_reporter_ = ui_->psk_reporter_check_box->isChecked (); id_interval_ = ui_->CW_id_interval_spin_box->value (); ntrials_ = ui_->sbNtrials->value (); @@ -2187,6 +2199,14 @@ void Configuration::impl::on_station_message_line_edit_textChanged(QString const } } +void Configuration::impl::on_qth_message_line_edit_textChanged(QString const &text) +{ + QString upper = text.toUpper(); + if(text != upper){ + ui_->qth_message_line_edit->setText (upper); + } +} + void Configuration::impl::on_add_macro_line_edit_editingFinished () { ui_->add_macro_line_edit->setText (ui_->add_macro_line_edit->text ().toUpper ()); diff --git a/Configuration.hpp b/Configuration.hpp index dd81812..684dd4f 100644 --- a/Configuration.hpp +++ b/Configuration.hpp @@ -97,6 +97,7 @@ public: QString my_callsign () const; QString my_grid () const; QString my_station () const; + QString my_qth () const; QFont text_font () const; QFont decoded_text_font () const; qint32 id_interval () const; diff --git a/Configuration.ui b/Configuration.ui index e1e9e51..69cb4d1 100644 --- a/Configuration.ui +++ b/Configuration.ui @@ -171,18 +171,33 @@ - - - - - Station Message: - - - - - - - + + + + 0 + + + + + QTH Message: + + + + + + + + + + Station Message: + + + + + + + +