w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-03-26 14:08:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix some more initalization errors and simplify the code.

Browse Source
This commit is contained in:
Uwe Risse 2023-03-09 10:56:04 +01:00
parent 67301c8402
commit 7a6dbf60a5
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
widgets/mainwindow.cpp
View File

@ -2493,6 +2493,18 @@ void MainWindow::statusChanged()
.arg (f.fileName ()).arg (f.errorString ())); .arg (f.fileName ()).arg (f.errorString ()));
} }
on_dxGridEntry_textChanged(m_hisGrid); on_dxGridEntry_textChanged(m_hisGrid);
if(m_specOp!=SpecOp::HOUND) {
ui->txb2->setEnabled(true);
ui->txrb2->setEnabled(true);
ui->txb4->setEnabled(true);
ui->txrb4->setEnabled(true);
ui->txb5->setEnabled(true);
ui->txrb5->setEnabled(true);
ui->txb6->setEnabled(true);
ui->txrb6->setEnabled(true);
ui->houndButton->setChecked(false);
ui->houndButton->setStyleSheet("");
}
} }
bool MainWindow::eventFilter (QObject * object, QEvent * event) bool MainWindow::eventFilter (QObject * object, QEvent * event)
@ -6517,8 +6529,6 @@ void MainWindow::mousePressEvent(QMouseEvent *event)
ui->txb1->setEnabled(true); ui->txb1->setEnabled(true);
} else { } else {
m_config.setSpecial_Q65_Pileup(); m_config.setSpecial_Q65_Pileup();
ui->houndButton->setChecked(false);
ui->houndButton->setStyleSheet("");
} }
m_specOp=m_config.special_op_id(); m_specOp=m_config.special_op_id();
on_actionQ65_triggered(); on_actionQ65_triggered();
@ -7273,7 +7283,6 @@ void MainWindow::on_actionQ65_triggered()
ui->rh_decodes_title_label->setText(tr ("Average Decodes")); ui->rh_decodes_title_label->setText(tr ("Average Decodes"));
ui->lh_decodes_headings_label->setText("UTC dB DT Freq " + tr ("Message")); ui->lh_decodes_headings_label->setText("UTC dB DT Freq " + tr ("Message"));
ui->rh_decodes_headings_label->setText("UTC dB DT Freq " + tr ("Message")); ui->rh_decodes_headings_label->setText("UTC dB DT Freq " + tr ("Message"));
statusChanged();
m_specOp=m_config.special_op_id(); m_specOp=m_config.special_op_id();
if(m_specOp!=SpecOp::NONE and m_specOp!=SpecOp::FOX and m_specOp!=SpecOp::HOUND) { if(m_specOp!=SpecOp::NONE and m_specOp!=SpecOp::FOX and m_specOp!=SpecOp::HOUND) {
@ -7291,8 +7300,15 @@ void MainWindow::on_actionQ65_triggered()
ui->labDXped->setVisible(true); ui->labDXped->setVisible(true);
ui->labDXped->setText(t0); ui->labDXped->setText(t0);
} }
if(m_specOp!=SpecOp::Q65_PILEUP) on_contest_log_action_triggered(); if(m_specOp!=SpecOp::Q65_PILEUP) {
on_contest_log_action_triggered();
} else {
if(ui->txrb1->isChecked()) on_txb2_clicked();
ui->tx1->setEnabled(true);
ui->txb1->setEnabled(true);
}
} }
statusChanged();
} }
void MainWindow::on_actionMSK144_triggered() void MainWindow::on_actionMSK144_triggered()
@ -10554,8 +10570,6 @@ void MainWindow::on_houndButton_clicked (bool checked)
void MainWindow::on_ft8Button_clicked() void MainWindow::on_ft8Button_clicked()
{ {
ui->houndButton->setChecked(false);
ui->houndButton->setStyleSheet("");
if(m_specOp==SpecOp::HOUND) { if(m_specOp==SpecOp::HOUND) {
m_config.setSpecial_None(); m_config.setSpecial_None();
m_specOp=m_config.special_op_id(); m_specOp=m_config.special_op_id();
@ -10565,8 +10579,6 @@ void MainWindow::on_ft8Button_clicked()
void MainWindow::on_ft4Button_clicked() void MainWindow::on_ft4Button_clicked()
{ {
ui->houndButton->setChecked(false);
ui->houndButton->setStyleSheet("");
if(m_specOp==SpecOp::HOUND) { if(m_specOp==SpecOp::HOUND) {
m_config.setSpecial_None(); m_config.setSpecial_None();
m_specOp=m_config.special_op_id(); m_specOp=m_config.special_op_id();
@ -10576,8 +10588,6 @@ void MainWindow::on_ft4Button_clicked()
void MainWindow::on_msk144Button_clicked() void MainWindow::on_msk144Button_clicked()
{ {
ui->houndButton->setChecked(false);
ui->houndButton->setStyleSheet("");
if(m_specOp==SpecOp::HOUND) { if(m_specOp==SpecOp::HOUND) {
m_config.setSpecial_None(); m_config.setSpecial_None();
m_specOp=m_config.special_op_id(); m_specOp=m_config.special_op_id();
@ -10587,8 +10597,6 @@ void MainWindow::on_msk144Button_clicked()
void MainWindow::on_q65Button_clicked() void MainWindow::on_q65Button_clicked()
{ {
ui->houndButton->setChecked(false);
ui->houndButton->setStyleSheet("");
if(m_specOp==SpecOp::HOUND) { if(m_specOp==SpecOp::HOUND) {
m_config.setSpecial_None(); m_config.setSpecial_None();
m_specOp=m_config.special_op_id(); m_specOp=m_config.special_op_id();
@ -10598,8 +10606,6 @@ void MainWindow::on_q65Button_clicked()
void MainWindow::on_jt65Button_clicked() void MainWindow::on_jt65Button_clicked()
{ {
ui->houndButton->setChecked(false);
ui->houndButton->setStyleSheet("");
if(m_specOp==SpecOp::HOUND) { if(m_specOp==SpecOp::HOUND) {
m_config.setSpecial_None(); m_config.setSpecial_None();
m_specOp=m_config.special_op_id(); m_specOp=m_config.special_op_id();