diff --git a/devsetup.cpp b/devsetup.cpp index 9e4b8da5d..fa63ad21f 100644 --- a/devsetup.cpp +++ b/devsetup.cpp @@ -126,8 +126,17 @@ void DevSetup::initDlg() p4.start("rigctl -l"); p4.waitForFinished(1000); + QPalette pal(ui.myCallEntry->palette()); + if(m_myCall=="") { + pal.setColor(QPalette::Base,"#ffccff"); + } else { + pal.setColor(QPalette::Base,Qt::white); + } + ui.myCallEntry->setPalette(pal); + ui.myGridEntry->setPalette(pal); ui.myCallEntry->setText(m_myCall); ui.myGridEntry->setText(m_myGrid); + ui.idIntSpinBox->setValue(m_idInt); ui.pttMethodComboBox->setCurrentIndex(m_pttMethodIndex); ui.pttComboBox->setCurrentIndex(m_pttPort); @@ -402,14 +411,19 @@ void DevSetup::on_testCATButton_clicked() rig->setConf("rts_state","OFF"); rig->setConf("dtr_state","OFF"); } +// qDebug() << "B6"; rig->open(); + rig->getVFO(); +// qDebug() << "B7" << rig->getVFO(); m_bRigOpen=true; } catch (const RigException &Ex) { +// qDebug() << "B8"; m_bRigOpen=false; msgBox("Failed to open rig (devsetup)"); return; } +// qDebug() << "B9"; double fMHz=rig->getFreq(RIG_VFO_CURR)/1000000.0; QString t; t.sprintf("Rig control working.\nDial Frequency: %.6f",fMHz); diff --git a/mainwindow.cpp b/mainwindow.cpp index 018921b0a..97a5c2631 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -2589,10 +2589,8 @@ void MainWindow::on_actionTx2QSO_triggered(bool checked) void MainWindow::on_tuneButton_clicked() { if(m_tune) { - m_tune=false; - soundOutThread.setTune(m_tune); nc1=1; //disable the countdown timer - tuneButtonTimer->start(1000); + tuneButtonTimer->start(250); } else { m_tune=true; m_sent73=false; @@ -2605,7 +2603,8 @@ void MainWindow::on_tuneButton_clicked() void MainWindow::on_stopTxButton_clicked() //Stop Tx { if(m_tune) { - on_tuneButton_clicked(); + m_tune=false; + soundOutThread.setTune(m_tune); } if(m_auto) on_autoButton_clicked(); btxok=false; @@ -2631,6 +2630,7 @@ void MainWindow::rigOpen() rig->setConf("dtr_state","OFF"); } rig->open(); + rig->getVFO(); m_bRigOpen=true; } catch (const RigException &Ex) { diff --git a/mainwindow.ui b/mainwindow.ui index e1e64d875..7a9220d2c 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -6,8 +6,8 @@ 0 0 - 730 - 702 + 711 + 475 @@ -718,7 +718,7 @@ p, li { white-space: pre-wrap; } - buttonGroup + buttonGroup @@ -749,7 +749,7 @@ p, li { white-space: pre-wrap; } true - buttonGroup + buttonGroup @@ -777,7 +777,7 @@ p, li { white-space: pre-wrap; } - buttonGroup + buttonGroup @@ -927,7 +927,7 @@ p, li { white-space: pre-wrap; } - buttonGroup + buttonGroup @@ -1060,7 +1060,7 @@ p, li { white-space: pre-wrap; } - buttonGroup + buttonGroup @@ -1088,7 +1088,7 @@ p, li { white-space: pre-wrap; } - buttonGroup + buttonGroup @@ -1324,7 +1324,7 @@ p, li { white-space: pre-wrap; } - + 0 @@ -1337,19 +1337,19 @@ p, li { white-space: pre-wrap; } 180 - + 1 - + 60.000000000000000 - + 0.000000000000000 - + 8 - + 0.000000000000000 @@ -1936,7 +1936,7 @@ p, li { white-space: pre-wrap; } - 16777215 + 72 16777215 @@ -2094,8 +2094,8 @@ p, li { white-space: pre-wrap; } 0 0 - 730 - 25 + 711 + 21