From af5193014efa648a4867eb5f798922ce1b31988a Mon Sep 17 00:00:00 2001 From: Joe Taylor <joe@princeton.edu> Date: Tue, 24 Jan 2023 12:21:40 -0500 Subject: [PATCH] Remove the Stop button. Toggle Monitoring Off, instead. --- q65w/mainwindow.cpp | 22 +++++++++++----------- q65w/mainwindow.h | 1 - 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/q65w/mainwindow.cpp b/q65w/mainwindow.cpp index 8ba90c53b..4cf7170a2 100644 --- a/q65w/mainwindow.cpp +++ b/q65w/mainwindow.cpp @@ -484,10 +484,17 @@ void MainWindow::on_actionSettings_triggered() void MainWindow::on_monitorButton_clicked() //Monitor { - m_monitoring=true; - soundInThread.setMonitoring(true); - m_diskData=false; + if(m_monitoring) { + m_monitoring=false; + soundInThread.setMonitoring(false); + m_loopall=false; + } else { + m_monitoring=true; + soundInThread.setMonitoring(true); + m_diskData=false; + } } + void MainWindow::on_actionLinrad_triggered() //Linrad palette { if(m_wide_graph_window) m_wide_graph_window->setPalette("Linrad"); @@ -631,13 +638,6 @@ void MainWindow::closeEvent (QCloseEvent * e) QMainWindow::closeEvent (e); } -void MainWindow::on_stopButton_clicked() //stopButton -{ - m_monitoring=false; - soundInThread.setMonitoring(m_monitoring); - m_loopall=false; -} - void MainWindow::msgBox(QString t) //msgBox { msgBox0.setText(t); @@ -669,7 +669,7 @@ void MainWindow::on_actionOpen_triggered() //Open File lab1->setStyleSheet("QLabel{background-color: #66ff66}"); lab1->setText(" " + fname.mid(i,15) + " "); } - on_stopButton_clicked(); + if(m_monitoring) on_monitorButton_clicked(); m_diskData=true; int dbDgrd=0; if(m_myCall=="K1JT" and m_idInt<0) dbDgrd=m_idInt; diff --git a/q65w/mainwindow.h b/q65w/mainwindow.h index e04e960fb..e30fdc0f5 100644 --- a/q65w/mainwindow.h +++ b/q65w/mainwindow.h @@ -58,7 +58,6 @@ private slots: void on_actionCuteSDR_triggered(); void on_tolSpinBox_valueChanged(int arg1); void on_actionAstro_Data_triggered(); - void on_stopButton_clicked(); void on_actionWide_Waterfall_triggered(); void on_actionOpen_triggered(); void on_actionOpen_next_in_directory_triggered();