diff --git a/mainwindow.cpp b/mainwindow.cpp index ac12f1d37..b9c472639 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -2295,7 +2295,7 @@ void MainWindow::on_actionAstronomical_data_toggled (bool checked) } } -void MainWindow::on_actionFox_Callers_triggered() +void MainWindow::on_actionFox_Log_triggered() { on_actionMessage_averaging_triggered(); m_msgAvgWidget->foxLogSetup(); @@ -2854,7 +2854,7 @@ void MainWindow::readFromStdout() //readFromStdout (decodedtext.string().contains("R+") or decodedtext.string().contains("R-"))) { QString houndCall,houndGrid; decodedtext.deCallAndGrid(/*out*/houndCall,houndGrid); - foxRxSequencer(decodedtext,houndCall,houndGrid); + foxRxSequencer(houndCall,houndGrid); } //Left (Band activity) window @@ -3721,6 +3721,7 @@ void MainWindow::on_txrb1_toggled (bool status) void MainWindow::on_txrb1_doubleClicked () { + if(m_mode=="FT8" and m_config.bHound()) return; // skip Tx1, only allowed if not a type 2 compound callsign auto const& my_callsign = m_config.my_callsign (); auto is_compound = my_callsign != m_baseCall; @@ -7063,8 +7064,8 @@ void MainWindow::on_cbMenus_toggled(bool b) void MainWindow::on_cbCQonly_toggled(bool b) { - QFile {m_config.temp_dir ().absoluteFilePath (".lock")}.remove (); // Allow jt9 to start - decodeBusy(true); + QFile {m_config.temp_dir().absoluteFilePath(".lock")}.remove(); // Allow jt9 to start + decodeBusy(true or b); //"or b" to silence compiler warning } void MainWindow::on_cbFirst_toggled(bool b) @@ -7343,7 +7344,7 @@ void MainWindow::houndCallers() } } -void MainWindow::foxRxSequencer(DecodedText decodedtext, QString houndCall, QString houndGrid) +void MainWindow::foxRxSequencer(QString houndCall, QString houndGrid) { /* Called from "readFromStdOut()" to process decoded messages of the form * "myCall houndCall R+rpt". @@ -7501,6 +7502,7 @@ void MainWindow::rm_tb4(QString houndCall) void MainWindow::doubleClickOnFoxQueue(Qt::KeyboardModifiers modifiers) { + if(modifiers==9999) return; //Silence compiler warning QTextCursor cursor=ui->textBrowser4->textCursor(); cursor.setPosition(cursor.selectionStart()); QString houndCall=cursor.block().text().mid(0,6).trimmed(); diff --git a/mainwindow.h b/mainwindow.h index 0d1fd1d17..e628f676d 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -240,7 +240,7 @@ private slots: void stopTuneATU(); void auto_tx_mode(bool); void on_actionMessage_averaging_triggered(); - void on_actionFox_Callers_triggered(); + void on_actionFox_Log_triggered(); void on_actionInclude_averaging_toggled (bool); void on_actionInclude_correlation_toggled (bool); void on_actionEnable_AP_DXcall_toggled (bool); @@ -678,7 +678,7 @@ private: void write_transmit_entry (QString const& file_name); void selectHound(QString t); void houndCallers(); - void foxRxSequencer(DecodedText decodedtext, QString houndCall, QString houndGrid); + void foxRxSequencer(QString houndCall, QString houndGrid); void foxTxSequencer(); }; diff --git a/mainwindow.ui b/mainwindow.ui index 70aa253cd..d44499a6a 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -2669,7 +2669,7 @@ QPushButton[state="ok"] { - + @@ -3315,9 +3315,15 @@ QPushButton[state="ok"] { Shift+F1 - + - Fox Callers + Fox Log + + + Fox Log + + + Fox Log