mirror
/
wfview
kopia lustrzana https://gitlab.com/eliggett/wfview
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Move connect button

knobtest
Phil Taylor 2022-09-17 22:31:43 +01:00
rodzic 77f48f5f0c
commit 4dcc7c4753
2 zmienionych plików z 28 dodań i 15 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

10
wfmain.cpp
Wyświetl plik

@ -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");
}
}
}

33
wfmain.ui
Wyświetl plik

@ -18,7 +18,7 @@
<item>
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
<number>0</number>
<number>3</number>
</property>
<widget class="QWidget" name="mainTab">
<attribute name="title">
@ -2861,13 +2861,6 @@
<property name="topMargin">
<number>0</number>
</property>
<item>
<widget class="QPushButton" name="connectBtn">
<property name="text">
<string>Connect</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_5">
<property name="orientation">
@ -3340,8 +3333,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>204</width>
<height>582</height>
<width>194</width>
<height>563</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_2">
@ -4720,6 +4713,26 @@
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_32">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="connectBtn">
<property name="text">
<string>Connect to Radio</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_9">
<property name="orientation">