diff --git a/Configuration.ui b/Configuration.ui index 4f8abcf..e04035b 100644 --- a/Configuration.ui +++ b/Configuration.ui @@ -269,6 +269,19 @@ + + + + Don't start decoding until the monitor button is clicked. + + + Mon&itor (RX) off at startup + + + false + + + @@ -283,19 +296,6 @@ - - - - Don't start decoding until the monitor button is clicked. - - - Mon&itor (RX) off at startup - - - false - - - @@ -309,13 +309,6 @@ - - - - Immediately transmit CQ, Reply, and Directed messages from the menu - - - @@ -349,6 +342,13 @@ + + + + Immediately transmit CQ, Reply, QTC, QTH, Saved, and Directed messages from the menu + + + @@ -3482,7 +3482,6 @@ soundcard changes use_dynamic_grid region_combo_box type_2_msg_gen_combo_box - monitor_off_check_box monitor_last_used_check_box quick_call_check_box tx_watchdog_spin_box diff --git a/mainwindow.cpp b/mainwindow.cpp index 687cecc..177a7a1 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -6292,6 +6292,7 @@ void MainWindow::on_cqMacroButton_clicked(){ } clearCallsignSelected(); + addMessageText(message); if(m_config.transmit_directed()) toggleTx(true); @@ -6313,7 +6314,10 @@ void MainWindow::on_qthMacroButton_clicked(){ if(qth.isEmpty()){ return; } + addMessageText(QString("QTH %1").arg(qth)); + + if(m_config.transmit_directed()) toggleTx(true); } void MainWindow::on_qtcMacroButton_clicked(){ @@ -6321,7 +6325,10 @@ void MainWindow::on_qtcMacroButton_clicked(){ if(qtc.isEmpty()){ return; } + addMessageText(QString("QTC %1").arg(qtc)); + + if(m_config.transmit_directed()) toggleTx(true); } void MainWindow::setShowColumn(QString tableKey, QString columnKey, bool value){ @@ -6835,7 +6842,11 @@ void MainWindow::buildEditMenu(QMenu *menu, QTextEdit *edit){ void MainWindow::buildSavedMessagesMenu(QMenu *menu){ foreach(QString macro, m_config.macros()->stringList()){ QAction *action = menu->addAction(macro); - connect(action, &QAction::triggered, this, [this, macro](){ addMessageText(macro); }); + connect(action, &QAction::triggered, this, [this, macro](){ + addMessageText(macro); + + if(m_config.transmit_directed()) toggleTx(true); + }); } menu->addSeparator();