diff --git a/wfmain.cpp b/wfmain.cpp index 2b33db3..55b937e 100644 --- a/wfmain.cpp +++ b/wfmain.cpp @@ -198,7 +198,7 @@ void wfmain::openRig() ui->audioSystemServerCombo->setEnabled(false); ui->audioSystemCombo->setEnabled(false); - ui->connectBtn->setText("Cancel"); // We are attempting to connect + ui->connectBtn->setText("Cancel connection"); // We are attempting to connect // TODO: Use these if they are found if(!serialPortCL.isEmpty()) @@ -3481,7 +3481,7 @@ void wfmain::receiveRigID(rigCapabilities rigCaps) ui->audioSystemCombo->setEnabled(false); ui->audioSystemServerCombo->setEnabled(false); - ui->connectBtn->setText("Disconnect"); // We must be connected now. + ui->connectBtn->setText("Disconnect from Radio"); // We must be connected now. prepareWf(ui->wfLengthSlider->value()); if(usingLAN) @@ -4864,7 +4864,7 @@ void wfmain::on_connectBtn_clicked() if (haveRigCaps) { emit sendCloseComm(); - ui->connectBtn->setText("Connect"); + ui->connectBtn->setText("Connect to Radio"); ui->audioSystemCombo->setEnabled(true); ui->audioSystemServerCombo->setEnabled(true); haveRigCaps = false; @@ -4873,11 +4873,11 @@ void wfmain::on_connectBtn_clicked() else { emit sendCloseComm(); // Just in case there is a failed connection open. - if (ui->connectBtn->text() != "Cancel") { + if (ui->connectBtn->text() != "Cancel connection") { openRig(); } else { - ui->connectBtn->setText("Connect"); + ui->connectBtn->setText("Connect to Radio"); } } } diff --git a/wfmain.ui b/wfmain.ui index bff4683..3ac271b 100644 --- a/wfmain.ui +++ b/wfmain.ui @@ -18,7 +18,7 @@ - 0 + 3 @@ -2861,13 +2861,6 @@ 0 - - - - Connect - - - @@ -3340,8 +3333,8 @@ 0 0 - 204 - 582 + 194 + 563 @@ -4720,6 +4713,26 @@ + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Connect to Radio + + +