kopia lustrzana https://gitlab.com/eliggett/wfview
Additional connect button
rodzic
07fa675bb6
commit
7c3dd56baa
|
@ -2723,6 +2723,18 @@ void settingswidget::connectionStatus(bool conn)
|
|||
ui->serverRXAudioInputCombo->setEnabled(!conn);
|
||||
ui->serverTXAudioOutputCombo->setEnabled(!conn);
|
||||
ui->audioSystemServerCombo->setEnabled(!conn);
|
||||
|
||||
if(conn) {
|
||||
ui->connectBtn->setText("Disconnect from radio");
|
||||
} else {
|
||||
ui->connectBtn->setText("Connect to radio");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
void settingswidget::on_connectBtn_clicked()
|
||||
{
|
||||
emit connectButtonPressed();
|
||||
}
|
||||
|
||||
|
|
|
@ -96,6 +96,7 @@ signals:
|
|||
void changedClusterPref(prefClusterItem i);
|
||||
void changedUdpPref(prefUDPItem i);
|
||||
void changedServerPref(prefServerItem i);
|
||||
void connectButtonPressed();
|
||||
|
||||
private slots:
|
||||
void on_settingsList_currentRowChanged(int currentRow);
|
||||
|
@ -240,6 +241,8 @@ private slots:
|
|||
|
||||
void on_revCompMeterBtn_clicked(bool checked);
|
||||
|
||||
void on_connectBtn_clicked();
|
||||
|
||||
private:
|
||||
Ui::settingswidget *ui;
|
||||
void createSettingsListItems();
|
||||
|
|
|
@ -41,7 +41,7 @@
|
|||
<item>
|
||||
<widget class="QStackedWidget" name="settingsStack">
|
||||
<property name="currentIndex">
|
||||
<number>1</number>
|
||||
<number>0</number>
|
||||
</property>
|
||||
<widget class="QWidget" name="radioAccess">
|
||||
<layout class="QVBoxLayout" name="verticalLayout_21">
|
||||
|
@ -734,6 +734,13 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
|
|||
<property name="topMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="QPushButton" name="connectBtn">
|
||||
<property name="text">
|
||||
<string>Connect To Radio</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="horizontalSpacer_5">
|
||||
<property name="orientation">
|
||||
|
|
|
@ -886,6 +886,7 @@ void wfmain::connectSettingsWidget()
|
|||
//connect(setupui, SIGNAL(changedServerTXAudioOutputCombo(int)), this, SLOT(changedServerTXAudioOutput(int)));
|
||||
|
||||
connect(this, SIGNAL(connectionStatus(bool)), setupui, SLOT(connectionStatus(bool)));
|
||||
connect(setupui, SIGNAL(connectButtonPressed()), this, SLOT(handleExtConnectBtn()));
|
||||
}
|
||||
|
||||
// NOT Migrated, EHL TODO, carefully remove this function
|
||||
|
@ -4398,6 +4399,11 @@ void wfmain::receiveATUStatus(unsigned char atustatus)
|
|||
}
|
||||
}
|
||||
|
||||
void wfmain::handleExtConnectBtn() {
|
||||
// from settings widget
|
||||
on_connectBtn_clicked();
|
||||
}
|
||||
|
||||
void wfmain::on_connectBtn_clicked()
|
||||
{
|
||||
this->rigStatus->setText(""); // Clear status
|
||||
|
|
2
wfmain.h
2
wfmain.h
|
@ -329,6 +329,8 @@ private slots:
|
|||
void extChangedUdpPref(prefUDPItem i);
|
||||
void extChangedServerPref(prefServerItem i);
|
||||
|
||||
void handleExtConnectBtn();
|
||||
|
||||
void receiveScopeSettings(uchar vfo, int theme, quint16 len, int floor, int ceiling);
|
||||
void receiveValue(cacheItem val);
|
||||
void setAudioDevicesUI();
|
||||
|
|
Ładowanie…
Reference in New Issue