diff --git a/Configuration.cpp b/Configuration.cpp index 3b5682e..bd579d4 100644 --- a/Configuration.cpp +++ b/Configuration.cpp @@ -140,6 +140,7 @@ #include #include #include +#include #include #include #include @@ -160,7 +161,6 @@ #include #include #include -#include #include "pimpl_impl.hpp" #include "qt_helpers.hpp" @@ -430,6 +430,7 @@ private: Q_SLOT void on_add_macro_push_button_clicked (bool = false); 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_add_macro_line_edit_editingFinished (); Q_SLOT void delete_macro (); void delete_selected_macros (QModelIndexList); @@ -529,6 +530,7 @@ private: // configuration fields that we publish QString my_callsign_; QString my_grid_; + QString my_station_; QColor color_CQ_; QColor next_color_CQ_; QColor color_MyCall_; @@ -817,6 +819,11 @@ QString Configuration::my_grid() const return the_grid; } +QString Configuration::my_station() const +{ + return m_->my_station_; +} + void Configuration::set_location (QString const& grid_descriptor) { // change the dynamic grid @@ -955,6 +962,7 @@ Configuration::impl::impl (Configuration * self, QDir const& temp_directory, ui_->callsign_line_edit->setValidator (new CallsignValidator {this}); 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_->udp_server_port_spin_box->setMinimum (1); ui_->udp_server_port_spin_box->setMaximum (std::numeric_limits::max ()); @@ -1129,6 +1137,7 @@ void Configuration::impl::initialize_models () ui_->grid_line_edit->setPalette (pal); ui_->callsign_line_edit->setText (my_callsign_); ui_->grid_line_edit->setText (my_grid_); + ui_->station_message_line_edit->setText (my_station_.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())); @@ -1247,6 +1256,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(); 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(); @@ -1433,6 +1443,7 @@ void Configuration::impl::write_settings () settings_->setValue ("MyCall", my_callsign_); settings_->setValue ("MyGrid", my_grid_); + settings_->setValue ("MyStation", my_station_); settings_->setValue("colorCQ",color_CQ_); settings_->setValue("colorMyCall",color_MyCall_); settings_->setValue("colorTxMsg",color_TxMsg_); @@ -1884,6 +1895,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(); spot_to_psk_reporter_ = ui_->psk_reporter_check_box->isChecked (); id_interval_ = ui_->CW_id_interval_spin_box->value (); ntrials_ = ui_->sbNtrials->value (); @@ -2167,6 +2179,14 @@ void Configuration::impl::on_sound_output_combo_box_currentTextChanged (QString default_audio_output_device_selected_ = QAudioDeviceInfo::defaultOutputDevice ().deviceName () == text; } +void Configuration::impl::on_station_message_line_edit_textChanged(QString const &text) +{ + QString upper = text.toUpper(); + if(text != upper){ + ui_->station_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 50c40b1..dd81812 100644 --- a/Configuration.hpp +++ b/Configuration.hpp @@ -96,6 +96,7 @@ public: QString my_callsign () const; QString my_grid () const; + QString my_station () const; QFont text_font () const; QFont decoded_text_font () const; qint32 id_interval () const; diff --git a/Configuration.ui b/Configuration.ui index 6a72d55..e1e9e51 100644 --- a/Configuration.ui +++ b/Configuration.ui @@ -123,6 +123,9 @@ false + + false + Message generation for type 2 compound callsign holders: @@ -139,6 +142,9 @@ false + + false + <html><head/><body><p>Type 2 compound callsigns are those with prefixes or suffixes not included in the allowed shortlist (See Help-&gt;Add-on prefixes and suffixes).</p><p>This option determines which generated messages should contain your full type 2 compound call sign rather than your base callsign. It only applies if you have a type 2 compound callsign.</p><p>This option controls the way the messages that are used to answer CQ calls are generated. Generated messages 6 (CQ) and 5 (73) will always contain your full callsign. The JT65 and JT9 protocols allow for some standard messages with your full call at the expense of another piece of information such as the DX call or your locator.</p><p>Choosing message 1 omits the DX callsign which may be an issue when replying to CQ calls. Choosing message 3 also omits the DX callsign and many versions of this and other software will not extract the report. Choosing neither means that your full callsign only goes in your message 5 (73) so your QSO partner may log the wrong callsign.</p><p>None of these options are perfect, message 3 is usually best but be aware your QSO partner may not log the report you send them.</p></body></html> @@ -164,6 +170,20 @@ + + + + + + Station Message: + + + + + + + + @@ -180,22 +200,12 @@ Display - - + + false - - Include a separator line between periods in the band activity window. - - - &Blank line between decoding periods - - - - - - + false @@ -209,19 +219,6 @@ - - - - Qt::Horizontal - - - - 0 - 0 - - - - @@ -235,11 +232,14 @@ - + false + + false + Show outgoing transmitted messages in the Rx frequency window. @@ -248,59 +248,35 @@ - - - - - - false - - - Set the font characteristics for the application. - - - Font... - - - - - - - false - - - Set the font characteristics for the Band Activity and Rx Frequency areas. - - - Decoded Text Font... - - - - - - - Qt::Vertical - - - - 0 - 0 - - - - - - - + false + + false + Show principal prefix instead of country name + + + + false + + + false + + + Include a separator line between periods in the band activity window. + + + &Blank line between decoding periods + + + @@ -316,9 +292,52 @@ Behavior - - - + + + + + Don't start decoding until the monitor button is clicked. + + + Mon&itor off at startup + + + false + + + + + + + <html><head/><body><p>Check this if you wish to automatically return to the last monitored frequency when monitor is enabled, leave it unchecked if you wish to have the current rig frequency maintained.</p></body></html> + + + Monitor returns to last used frequency + + + + + + + true + + + <html><head/><body><p>Some rigs are not able to process CAT commands while transmitting. This means that if you are operating in split mode you may have to uncheck this option.</p></body></html> + + + Allow Tx frequency changes while transmitting + + + + + + + Single decode + + + + + @@ -354,22 +373,10 @@ - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 40 - 0 - - - - + + + + @@ -401,66 +408,16 @@ - - - - Don't start decoding until the monitor button is clicked. - - - Mon&itor off at startup - - - false - - - - - - - false - - - Enable VHF/UHF/Microwave features - - - - - - - false - - - Decode after EME delay - - - - - - - Single decode - - - - - - - false - - - <html><head/><body><p>Some rigs are not able to process CAT commands while transmitting. This means that if you are operating in split mode you may have to uncheck this option.</p></body></html> - - - Allow Tx frequency changes while transmitting - - - - + false + + false + Send a CW ID after every 73 or free text message. @@ -469,23 +426,10 @@ - - - - Qt::Horizontal - - - - 0 - 0 - - - - - false + true @@ -504,7 +448,7 @@ - false + true @@ -522,44 +466,90 @@ quiet period when decoding is done. - - - - <html><head/><body><p>Check this if you wish to automatically return to the last monitored frequency when monitor is enabled, leave it unchecked if you wish to have the current rig frequency maintained.</p></body></html> - - - Monitor returns to last used frequency - - - - - - - false - - - Automatic transmission mode. - - - Doubl&e-click on call sets Tx enable - - - - - - - false - - - Turns off automatic transmissions after sending a 73 or any other free -text message. - - - Di&sable Tx after sending 73 - - - + + + false + + + + 0 + 0 + 100 + 30 + + + + false + + + Enable VHF/UHF/Microwave features + + + + + false + + + + 0 + 0 + 100 + 30 + + + + false + + + Decode after EME delay + + + + + false + + + + 0 + 0 + 100 + 30 + + + + false + + + Automatic transmission mode. + + + Doubl&e-click on call sets Tx enable + + + + + false + + + + 0 + 0 + 100 + 30 + + + + false + + + Turns off automatic transmissions after sending a 73 or any other free +text message. + + + Di&sable Tx after sending 73 + + @@ -1736,6 +1726,9 @@ QListView::item:hover { false + + false + The program will pop up a partially completed Log QSO dialog when you send a 73 or free text message. @@ -2227,244 +2220,301 @@ Right click for insert and delete options. - Colors + UI - - - - - - - - 80 - 20 - - - - QLabel{background-color: #66ff66} - - - K1ABC - - - Qt::AlignCenter - - - - - - - - 140 - 0 - - - - CQ in message - - - - - - - - 140 - 0 - - - - My Call in message - - - - - - - - 80 - 20 - - - - QLabel{background-color: #ff6666} - - - K1ABC - - - Qt::AlignCenter - - - - - - - false - - - - 140 - 0 - - - - Transmitted message - - - - - - - false - - - - 80 - 20 - - - - QLabel{background-color: yellow} - - - K1ABC - - - Qt::AlignCenter - - - - - - - false - - - - 80 - 20 - - - - QLabel{background-color: #ff66ff} - - - K1ABC - - - Qt::AlignCenter - - - - - - - false - - - - 140 - 0 - - - - New Call - - - - - - - false - - - - 140 - 0 - - - - New DXCC - - - - - - - false - - - - 80 - 20 - - - - QLabel{background-color: #66ffff} - - - K1ABC - - - Qt::AlignCenter - - - - - - - - - Qt::Vertical - - - - 0 - 0 - - - - - - - - Qt::Horizontal - - - - 0 - 0 - - - - - - - - Qt::Vertical - - - - 0 - 0 - - - - - - - - Qt::Horizontal - - - - 0 - 0 - - - - - + + + + 0 + 0 + 430 + 183 + + + + + + + + + + + + 80 + 20 + + + + QLabel{background-color: #66ff66} + + + K1ABC + + + Qt::AlignCenter + + + + + + + + 140 + 0 + + + + CQ in message + + + + + + + + 140 + 0 + + + + My Call in message + + + + + + + + 80 + 20 + + + + QLabel{background-color: #ff6666} + + + K1ABC + + + Qt::AlignCenter + + + + + + + false + + + + 140 + 0 + + + + Transmitted message + + + + + + + false + + + + 80 + 20 + + + + QLabel{background-color: yellow} + + + K1ABC + + + Qt::AlignCenter + + + + + + + false + + + + 80 + 20 + + + + QLabel{background-color: #ff66ff} + + + K1ABC + + + Qt::AlignCenter + + + + + + + false + + + + 140 + 0 + + + + New Call + + + + + + + false + + + + 140 + 0 + + + + New DXCC + + + + + + + false + + + + 80 + 20 + + + + QLabel{background-color: #66ffff} + + + K1ABC + + + Qt::AlignCenter + + + + + + + + + Qt::Vertical + + + + 0 + 0 + + + + + + + + Qt::Horizontal + + + + 0 + 0 + + + + + + + + Qt::Vertical + + + + 0 + 0 + + + + + + + + Qt::Horizontal + + + + 0 + 0 + + + + + + + + + + + + false + + + Set the font characteristics for the application. + + + Font... + + + + + + + false + + + Set the font characteristics for the Band Activity and Rx Frequency areas. + + + Decoded Text Font... + + + + + + + Qt::Vertical + + + + 0 + 0 + + + + + + + + @@ -2741,7 +2791,6 @@ soundcard changes use_dynamic_grid region_combo_box type_2_msg_gen_combo_box - insert_blank_check_box miles_check_box TX_messages_check_box DXCC_check_box @@ -2753,8 +2802,6 @@ soundcard changes tx_watchdog_spin_box CW_id_after_73_check_box enable_VHF_features_check_box - tx_QSY_check_box - single_decode_check_box decode_at_52s_check_box CW_id_interval_spin_box rig_combo_box @@ -2893,12 +2940,12 @@ soundcard changes - - - - - + + + + +