diff --git a/Configuration.cpp b/Configuration.cpp index e7b9882ad..108994a94 100644 --- a/Configuration.cpp +++ b/Configuration.cpp @@ -553,6 +553,7 @@ private: bool clear_DX_; bool miles_; bool quick_call_; + bool default_simplex_; bool disable_TX_on_73_; int watchdog_; bool TX_messages_; @@ -643,6 +644,7 @@ bool Configuration::DXCC () const {return m_->DXCC_;} bool Configuration::clear_DX () const {return m_->clear_DX_;} bool Configuration::miles () const {return m_->miles_;} bool Configuration::quick_call () const {return m_->quick_call_;} +bool Configuration::default_simplex () const {return m_->default_simplex_;} bool Configuration::disable_TX_on_73 () const {return m_->disable_TX_on_73_;} int Configuration::watchdog () const {return m_->watchdog_;} bool Configuration::TX_messages () const {return m_->TX_messages_;} @@ -1082,6 +1084,7 @@ void Configuration::impl::initialize_models () ui_->clear_DX_check_box->setChecked (clear_DX_); ui_->miles_check_box->setChecked (miles_); ui_->quick_call_check_box->setChecked (quick_call_); + ui_->cbDefaultSimplex->setChecked (default_simplex_); ui_->disable_TX_on_73_check_box->setChecked (disable_TX_on_73_); ui_->tx_watchdog_spin_box->setValue (watchdog_); ui_->TX_messages_check_box->setChecked (TX_messages_); @@ -1312,6 +1315,7 @@ void Configuration::impl::read_settings () clear_DX_ = settings_->value ("ClearCallGrid", false).toBool (); miles_ = settings_->value ("Miles", false).toBool (); quick_call_ = settings_->value ("QuickCall", false).toBool (); + default_simplex_ = settings_->value ("DefaultSimplex", false).toBool (); disable_TX_on_73_ = settings_->value ("73TxDisable", false).toBool (); watchdog_ = settings_->value ("TxWatchdog", 6).toInt (); TX_messages_ = settings_->value ("Tx2QSO", true).toBool (); @@ -1403,6 +1407,7 @@ void Configuration::impl::write_settings () settings_->setValue ("ClearCallGrid", clear_DX_); settings_->setValue ("Miles", miles_); settings_->setValue ("QuickCall", quick_call_); + settings_->setValue ("DefaultSimplex", default_simplex_); settings_->setValue ("73TxDisable", disable_TX_on_73_); settings_->setValue ("TxWatchdog", watchdog_); settings_->setValue ("Tx2QSO", TX_messages_); @@ -1802,6 +1807,7 @@ void Configuration::impl::accept () clear_DX_ = ui_->clear_DX_check_box->isChecked (); miles_ = ui_->miles_check_box->isChecked (); quick_call_ = ui_->quick_call_check_box->isChecked (); + default_simplex_ = ui_->cbDefaultSimplex->isChecked (); disable_TX_on_73_ = ui_->disable_TX_on_73_check_box->isChecked (); watchdog_ = ui_->tx_watchdog_spin_box->value (); TX_messages_ = ui_->TX_messages_check_box->isChecked (); diff --git a/Configuration.hpp b/Configuration.hpp index b0c219167..5e07dba3d 100644 --- a/Configuration.hpp +++ b/Configuration.hpp @@ -117,6 +117,7 @@ public: bool clear_DX () const; bool miles () const; bool quick_call () const; + bool default_simplex() const; bool disable_TX_on_73 () const; int watchdog () const; bool TX_messages () const; diff --git a/Configuration.ui b/Configuration.ui index 07878ec9c..ae3608bb2 100644 --- a/Configuration.ui +++ b/Configuration.ui @@ -269,12 +269,51 @@ Behavior - - - - Enable VHF/UHF/Microwave features - - + + + + + + Qt::Horizontal + + + + 0 + 0 + + + + + + + + Tx watchdog: + + + tx_watchdog_spin_box + + + + + + + <html><head/><body><p>Number of minutes before unattended transmissions are aborted</p></body></html> + + + Disabled + + + minutes + + + + + + 6 + + + + @@ -289,6 +328,13 @@ + + + + Enable VHF/UHF/Microwave features + + + @@ -296,6 +342,23 @@ + + + + Single decode + + + + + + + <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 + + + @@ -355,69 +418,6 @@ quiet period when decoding is done. - - - - Single decode - - - - - - - <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 - - - - - - - - - Tx watchdog: - - - tx_watchdog_spin_box - - - - - - - <html><head/><body><p>Number of minutes before unattended transmissions are aborted</p></body></html> - - - Disabled - - - minutes - - - - - - 6 - - - - - - - Qt::Horizontal - - - - 0 - 0 - - - - - - @@ -438,7 +438,7 @@ quiet period when decoding is done. - + Turns off automatic transmissions after sending a 73 or any other free @@ -449,6 +449,13 @@ text message. + + + + Double-click on call sets Tx and Rx freqs + + + @@ -2479,7 +2486,6 @@ soundcard changes monitor_off_check_box monitor_last_used_check_box quick_call_check_box - disable_TX_on_73_check_box tx_watchdog_spin_box CW_id_after_73_check_box enable_VHF_features_check_box @@ -2623,12 +2629,12 @@ soundcard changes - + + + - - diff --git a/doc/user_guide/en/images/settings-general.png b/doc/user_guide/en/images/settings-general.png index 9678ab39d..6caa98836 100644 Binary files a/doc/user_guide/en/images/settings-general.png and b/doc/user_guide/en/images/settings-general.png differ diff --git a/doc/user_guide/en/tutorial-example1.adoc b/doc/user_guide/en/tutorial-example1.adoc index 30ea9f930..6fd50870b 100644 --- a/doc/user_guide/en/tutorial-example1.adoc +++ b/doc/user_guide/en/tutorial-example1.adoc @@ -72,7 +72,11 @@ down. Messages highlighted in red are usually in response to your own CQ or from a tail-ender, and you probably want your Tx frequency to stay where it was. -- You can prevent your Tx frequency from being changed by checking the +NOTE: Double-clicking on decoded messages can be defaulted to simplex +operation by checking *Double click on call sets Tx and Rx freqs* on +the *Settings -> General* tab. + +NOTE: You can prevent your Tx frequency from being changed by checking the box *Lock Tx Freq*. - Click somewhere on the waterfall to set Rx frequency (green marker diff --git a/mainwindow.cpp b/mainwindow.cpp index 90d38a572..41f7d1fff 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -3732,6 +3732,7 @@ void MainWindow::processMessage(DecodedText const& message, bool shift, bool ctr return; } + if(m_config.default_simplex()) ctrl=true; if(m_bFastMode or m_mode=="FT8") { auto i1=message.string ().indexOf(" CQ "); if(i1>10) {