From 8a50237a3536a5c33c7dc4f540e8e9466a375527 Mon Sep 17 00:00:00 2001 From: Elliott Liggett Date: Sun, 23 May 2021 13:41:18 -0700 Subject: [PATCH 1/4] Minor change to clarify roll of Server Setup --- udpserversetup.ui | 7 +++++++ wfmain.ui | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/udpserversetup.ui b/udpserversetup.ui index edab45b..28c0e8f 100644 --- a/udpserversetup.ui +++ b/udpserversetup.ui @@ -341,6 +341,13 @@ + + + + Note: This allows other computers to connect to this computer's radio + + + diff --git a/wfmain.ui b/wfmain.ui index 330242d..33f5c64 100644 --- a/wfmain.ui +++ b/wfmain.ui @@ -18,7 +18,7 @@ - 0 + 3 From e1a4ca1614141eb20b29dfcec15fa051427080a4 Mon Sep 17 00:00:00 2001 From: Elliott Liggett Date: Sun, 23 May 2021 13:43:15 -0700 Subject: [PATCH 2/4] Allow entry to Server Setup for either radio connection type. --- wfmain.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wfmain.cpp b/wfmain.cpp index aeeb708..50b674c 100644 --- a/wfmain.cpp +++ b/wfmain.cpp @@ -1043,11 +1043,11 @@ void wfmain::loadSettings() { ui->baudRateCombo->setEnabled(false); ui->serialDeviceListCombo->setEnabled(false); - ui->udpServerSetupBtn->setEnabled(false); + //ui->udpServerSetupBtn->setEnabled(false); } else { ui->baudRateCombo->setEnabled(true); ui->serialDeviceListCombo->setEnabled(true); - ui->udpServerSetupBtn->setEnabled(true); + //ui->udpServerSetupBtn->setEnabled(true); } ui->lanEnableBtn->setChecked(prefs.enableLAN); @@ -3481,7 +3481,7 @@ void wfmain::on_serialEnableBtn_clicked(bool checked) ui->txLatencyValue->setEnabled(!checked); ui->baudRateCombo->setEnabled(checked); ui->serialDeviceListCombo->setEnabled(checked); - ui->udpServerSetupBtn->setEnabled(true); + //ui->udpServerSetupBtn->setEnabled(true); } void wfmain::on_lanEnableBtn_clicked(bool checked) @@ -3494,7 +3494,7 @@ void wfmain::on_lanEnableBtn_clicked(bool checked) ui->passwordTxt->setEnabled(checked); ui->baudRateCombo->setEnabled(!checked); ui->serialDeviceListCombo->setEnabled(!checked); - ui->udpServerSetupBtn->setEnabled(false); + //ui->udpServerSetupBtn->setEnabled(false); if(checked) { showStatusBarText("After filling in values, press Save Settings and re-start wfview."); From fa74fd319315899416b9a6d24a17c4c38d81b8e0 Mon Sep 17 00:00:00 2001 From: Elliott Liggett Date: Sun, 23 May 2021 13:56:44 -0700 Subject: [PATCH 3/4] Added helpful text to settings tab. --- wfmain.ui | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/wfmain.ui b/wfmain.ui index 33f5c64..239f99c 100644 --- a/wfmain.ui +++ b/wfmain.ui @@ -2600,6 +2600,37 @@ + + + + 0 + + + + + Please note: Changing CI-V Address, Serial Device, and Baud rate requires pressing "Save Settings", closing wfview, and re-opening. + + + + + + + + + 0 + + + + + <html><head></head><body><p>Please see the <a href="https://wfview.org/wfview-user-manual/settings-tab/">User Manual</a> for more information. </p></body></html> + + + Qt::RichText + + + + + From eb3f5bb2cc8daca775ee84b1d0e4c40a8538c354 Mon Sep 17 00:00:00 2001 From: Elliott Liggett Date: Sun, 23 May 2021 13:59:11 -0700 Subject: [PATCH 4/4] Link can now be clicked. --- wfmain.ui | 3 +++ 1 file changed, 3 insertions(+) diff --git a/wfmain.ui b/wfmain.ui index 239f99c..33cf6f9 100644 --- a/wfmain.ui +++ b/wfmain.ui @@ -2627,6 +2627,9 @@ Qt::RichText + + true +