chris/js8call
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix SELCALL and HB menu items toggle vs click

Browse Source
This commit is contained in:
Jordan Sherer 2018-11-16 15:36:02 -05:00
parent 22e4b0891e
commit 3a59599253
2 changed files with 27 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
mainwindow.cpp
View File

@ -2660,7 +2660,23 @@ void MainWindow::on_monitorTxButton_toggled(bool checked){
} }
void MainWindow::on_selcalButton_toggled(bool checked){ void MainWindow::on_selcalButton_toggled(bool checked){
if(checked){
if(callsignSelected() == "@ALLCALL"){
clearCallsignSelected();
}
if(ui->tableWidgetRXAll->isVisible()){
ui->tableWidgetRXAll->setVisible(false);
m_bandActivityWasVisible = true;
} else {
m_bandActivityWasVisible = false;
}
} else {
ui->tableWidgetRXAll->setVisible(m_bandActivityWasVisible);
}
resetPushButtonToggleText(ui->selcalButton); resetPushButtonToggleText(ui->selcalButton);
displayCallActivity();
} }
void MainWindow::on_tuneButton_toggled(bool checked){ void MainWindow::on_tuneButton_toggled(bool checked){
@ -2672,6 +2688,17 @@ void MainWindow::on_spotButton_toggled(bool checked){
} }
void MainWindow::on_heartbeatButton_toggled(bool checked){ void MainWindow::on_heartbeatButton_toggled(bool checked){
// clear the ping queue when you toggle the button
m_txHeartbeatQueue.clear();
displayBandActivity();
// then process the action
if(checked){
scheduleHeartbeat(false);
} else {
pauseHeartbeat();
}
resetPushButtonToggleText(ui->heartbeatButton); resetPushButtonToggleText(ui->heartbeatButton);
} }
@ -7458,37 +7485,6 @@ void MainWindow::on_pbT2R_clicked()
} }
} }
void MainWindow::on_heartbeatButton_clicked()
{
// clear the ping queue when you toggle the button
m_txHeartbeatQueue.clear();
displayBandActivity();
// then process the action
if(ui->heartbeatButton->isChecked()){
scheduleHeartbeat(false);
} else {
pauseHeartbeat();
}
}
void MainWindow::on_selcalButton_clicked(){
if(ui->selcalButton->isChecked()){
if(callsignSelected() == "@ALLCALL"){
clearCallsignSelected();
}
if(ui->tableWidgetRXAll->isVisible()){
ui->tableWidgetRXAll->setVisible(false);
m_bandActivityWasVisible = true;
} else {
m_bandActivityWasVisible = false;
}
} else {
ui->tableWidgetRXAll->setVisible(m_bandActivityWasVisible);
}
displayCallActivity();
}
void MainWindow::on_readFreq_clicked() void MainWindow::on_readFreq_clicked()
{ {
if (m_transmitting) return; if (m_transmitting) return;

2
mainwindow.h
View File

@ -326,8 +326,6 @@ private slots:
void on_tuneButton_clicked (bool); void on_tuneButton_clicked (bool);
void on_pbR2T_clicked(); void on_pbR2T_clicked();
void on_pbT2R_clicked(); void on_pbT2R_clicked();
void on_heartbeatButton_clicked();
void on_selcalButton_clicked();
void acceptQSO (QDateTime const&, QString const& call, QString const& grid void acceptQSO (QDateTime const&, QString const& call, QString const& grid
, Frequency dial_freq, QString const& mode , Frequency dial_freq, QString const& mode
, QString const& rpt_sent, QString const& rpt_received , QString const& rpt_sent, QString const& rpt_received