From d0f95e22894716b5bfcb1910a53dd2b158a76a59 Mon Sep 17 00:00:00 2001
From: Elliott Liggett <kilocharlie8@gmail.com>
Date: Thu, 20 May 2021 15:17:10 -0700
Subject: [PATCH] Cleaned up warning and UI help text.

---
 wfmain.cpp |  3 ++-
 wfmain.h   |  2 +-
 wfmain.ui  | 19 ++++++++++++-------
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/wfmain.cpp b/wfmain.cpp
index 86e6994..a21b4d5 100644
--- a/wfmain.cpp
+++ b/wfmain.cpp
@@ -4308,7 +4308,7 @@ void wfmain::on_rigCIVaddrHexLine_editingFinished()
     }
 
 }
-void wfmain::on_baudRateCombo_activated()
+void wfmain::on_baudRateCombo_activated(int index)
 {
     bool ok = false;
     quint32 baud = ui->baudRateCombo->currentData().toUInt(&ok);
@@ -4317,6 +4317,7 @@ void wfmain::on_baudRateCombo_activated()
         prefs.serialPortBaud = baud;
         showStatusBarText(QString("Changed baud rate to %1 bps. Press Save Settings to retain.").arg(baud));
     }
+    (void)index;
 }
 
 // --- DEBUG FUNCTION ---
diff --git a/wfmain.h b/wfmain.h
index 737ccf7..804fda4 100644
--- a/wfmain.h
+++ b/wfmain.h
@@ -440,7 +440,7 @@ private slots:
 
     void on_rigCIVaddrHexLine_editingFinished();
 
-    void on_baudRateCombo_activated();
+    void on_baudRateCombo_activated(int);
 
 private:
     Ui::wfmain *ui;
diff --git a/wfmain.ui b/wfmain.ui
index e8182a7..33f5c64 100644
--- a/wfmain.ui
+++ b/wfmain.ui
@@ -2168,7 +2168,7 @@
           <item>
            <widget class="QComboBox" name="serialDeviceListCombo">
             <property name="toolTip">
-             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select a serial port here. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Once selected, check &amp;quot;Enable USB(serial),  press &amp;quot;Save Settings&amp;quot;, exit, and re-start wfview. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select a serial port here. &lt;/p&gt;&lt;p&gt;Once selected, check &amp;quot;Enable USB(serial), press &amp;quot;Save Settings&amp;quot;, exit, and re-start wfview. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
             </property>
             <property name="accessibleName">
              <string>Serial Device Selector</string>
@@ -2185,7 +2185,7 @@
           <item>
            <widget class="QComboBox" name="baudRateCombo">
             <property name="toolTip">
-             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Baud rate selection menu. &lt;/p&gt;&lt;p&gt;For the IC-7300 select 115200. &lt;/p&gt;&lt;p&gt;Older rigs may require other settings. &lt;/p&gt;&lt;p&gt;Be sure to match what baud rate the rig is set to. Using the highese supported baud rate for the radio is recommended. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Baud rate selection menu. &lt;/p&gt;&lt;p&gt;For the IC-7300 select 115200. &lt;/p&gt;&lt;p&gt;Older rigs may require other settings. &lt;/p&gt;&lt;p&gt;Be sure to match what baud rate the rig is set to. Using the highese supported baud rate for the radio is recommended. &lt;/p&gt;&lt;p&gt;Please press &amp;quot;Save Settings&amp;quot; and re-launc wfview for this to take effect.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
             </property>
             <property name="accessibleName">
              <string>baud rate</string>
@@ -2208,7 +2208,7 @@
           <item>
            <widget class="QCheckBox" name="rigCIVManualAddrChk">
             <property name="toolTip">
-             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If you are using an older (year 2010) radio, you may need to enable this option to manually specify the CI-V address. This option is also useful for radios that do not have CI-V Transceive enabled and thus will not answer our broadcast query for connected rigs on the CI-V bus.&lt;/p&gt;&lt;p&gt;If you have a modern radio with CI-V Transceive enabled, you should not need to check this box. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If you are using an older (year 2010) radio, you may need to enable this option to manually specify the CI-V address. This option is also useful for radios that do not have CI-V Transceive enabled and thus will not answer our broadcast query for connected rigs on the CI-V bus.&lt;/p&gt;&lt;p&gt;If you have a modern radio with CI-V Transceive enabled, you should not need to check this box. &lt;/p&gt;&lt;p&gt;You will need to Save Settings and re-launch wfview for this to take effect. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
             </property>
             <property name="text">
              <string>Manual Radio CI-V Address:</string>
@@ -2234,12 +2234,17 @@
             </property>
             <property name="toolTip">
              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter the address in as hexidecimal, without any prefix, just as the radio presents the address in the menu. &lt;/p&gt;&lt;p&gt;Here are some common examples:&lt;/p&gt;
-IC-706: 58
-&lt;br/&gt;IC-756: 6E
+&lt;p&gt;IC-706: 58 
+&lt;br/&gt;IC-756: 50
+&lt;br/&gt;IC-756 Pro: 5C
+&lt;br/&gt;IC-756 Pro II: 64
+&lt;br/&gt;IC-756 Pro III: 6E
 &lt;br/&gt;IC-7000: 70
 &lt;br/&gt;IC-7100: 88
-&lt;br/&gt;IC-7200: 76
-&lt;p&gt;This setting is typically needed for older radios and for radios that do not have CI-V Transceive enabled. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;br/&gt;IC-7200: 76 
+&lt;br/&gt;IC-7300: 94
+&lt;/p&gt;&lt;p&gt;This setting is typically needed for older radios and for radios that do not have CI-V Transceive enabled. &lt;/p&gt;
+&lt;p&gt;After changing, press Save Settings and re-launch wfview.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
             </property>
             <property name="text">
              <string>auto</string>