Merge pull request #631 from ncssar/628-add-nxdn-support

Add NXDN support (Kenwood NEXEDGE)
ncssar · Jul 12, 2023 · f0ee366 · f0ee366
2 parents f807437 + e8fe961
commit f0ee366
Show file tree

Hide file tree

Showing 7 changed files with 781 additions and 397 deletions.
diff --git a/designer/changeCallsignDialog.ui b/designer/changeCallsignDialog.ui
@@ -40,15 +40,15 @@
     <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
    </property>
   </widget>
-  <widget class="QLineEdit" name="fleetField">
+  <widget class="QLineEdit" name="idField1">
    <property name="enabled">
     <bool>false</bool>
    </property>
    <property name="geometry">
     <rect>
      <x>210</x>
      <y>20</y>
-     <width>111</width>
+     <width>141</width>
      <height>41</height>
     </rect>
    </property>
@@ -62,15 +62,15 @@
     <bool>true</bool>
    </property>
   </widget>
-  <widget class="QLineEdit" name="deviceField">
+  <widget class="QLineEdit" name="idField2">
    <property name="enabled">
     <bool>false</bool>
    </property>
    <property name="geometry">
     <rect>
-     <x>390</x>
+     <x>380</x>
      <y>20</y>
-     <width>131</width>
+     <width>141</width>
      <height>41</height>
     </rect>
    </property>
@@ -128,12 +128,12 @@
     <bool>false</bool>
    </property>
   </widget>
-  <widget class="QLabel" name="label">
+  <widget class="QLabel" name="idLabel1">
    <property name="geometry">
     <rect>
      <x>220</x>
      <y>60</y>
-     <width>55</width>
+     <width>101</width>
      <height>21</height>
     </rect>
    </property>
@@ -147,12 +147,12 @@
     <string>Fleet</string>
    </property>
   </widget>
-  <widget class="QLabel" name="label_2">
+  <widget class="QLabel" name="idLabel2">
    <property name="geometry">
     <rect>
-     <x>400</x>
+     <x>390</x>
      <y>60</y>
-     <width>61</width>
+     <width>111</width>
      <height>21</height>
     </rect>
    </property>
@@ -210,7 +210,7 @@
     <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
    </property>
   </widget>
-  <widget class="QLabel" name="label_5">
+  <widget class="QLabel" name="idLabel">
    <property name="geometry">
     <rect>
      <x>10</x>

diff --git a/designer/fsFilterDialog.ui b/designer/fsFilterDialog.ui
@@ -17,7 +17,7 @@
    </sizepolicy>
   </property>
   <property name="windowTitle">
-   <string>Radio Log - FleetSync Filter Setup</string>
+   <string>RadioLog - FleetSync / NEXEDGE Filter Setup</string>
   </property>
   <property name="sizeGripEnabled">
    <bool>false</bool>
@@ -34,7 +34,7 @@
       </font>
      </property>
      <property name="text">
-      <string>FleetSync Filter Setup</string>
+      <string>FleetSync / NEXEDGE Filter Setup</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignCenter</set>

diff --git a/designer/fsSendDialog.ui b/designer/fsSendDialog.ui
@@ -142,14 +142,63 @@
       </layout>
      </item>
      <item>
-      <layout class="QHBoxLayout" name="horizontalLayout" stretch="1,2">
+      <widget class="Line" name="line_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,1,2">
+       <item>
+        <layout class="QVBoxLayout" name="verticalLayout_7">
+         <property name="spacing">
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QRadioButton" name="fsRadioButton">
+           <property name="font">
+            <font>
+             <family>Segoe UI</family>
+             <pointsize>12</pointsize>
+            </font>
+           </property>
+           <property name="text">
+            <string>FleetSync</string>
+           </property>
+           <property name="checked">
+            <bool>true</bool>
+           </property>
+           <attribute name="buttonGroup">
+            <string notr="true">buttonGroup_3</string>
+           </attribute>
+          </widget>
+         </item>
+         <item>
+          <widget class="QRadioButton" name="nxRadioButton">
+           <property name="font">
+            <font>
+             <family>Segoe UI</family>
+             <pointsize>12</pointsize>
+            </font>
+           </property>
+           <property name="text">
+            <string>NEXEDGE</string>
+           </property>
+           <attribute name="buttonGroup">
+            <string notr="true">buttonGroup_3</string>
+           </attribute>
+          </widget>
+         </item>
+        </layout>
+       </item>
        <item>
         <layout class="QVBoxLayout" name="verticalLayout_2">
          <property name="spacing">
           <number>0</number>
          </property>
          <item>
-          <widget class="QLabel" name="label">
+          <widget class="QLabel" name="fleetLabel">
            <property name="font">
             <font>
              <family>Segoe UI</family>
@@ -223,7 +272,7 @@
         <enum>QLayout::SetDefaultConstraint</enum>
        </property>
        <item>
-        <widget class="QLabel" name="label_3">
+        <widget class="QLabel" name="messageLabel1">
          <property name="font">
           <font>
            <family>Segoe UI</family>
@@ -242,7 +291,7 @@
         </widget>
        </item>
        <item>
-        <widget class="QLabel" name="label_4">
+        <widget class="QLabel" name="messageLabel2">
          <property name="font">
           <font>
            <family>Segoe UI</family>
@@ -322,8 +371,8 @@
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>304</x>
-     <y>320</y>
+     <x>315</x>
+     <y>374</y>
     </hint>
     <hint type="destinationlabel">
      <x>286</x>
@@ -335,40 +384,59 @@
    <sender>sendTextRadioButton</sender>
    <signal>toggled(bool)</signal>
    <receiver>fsSendDialog</receiver>
-   <slot>functionChanged()</slot>
+   <slot>updateGUI()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>259</x>
-     <y>47</y>
+     <x>306</x>
+     <y>28</y>
     </hint>
     <hint type="destinationlabel">
-     <x>315</x>
-     <y>93</y>
+     <x>386</x>
+     <y>42</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>sendToAllCheckbox</sender>
    <signal>toggled(bool)</signal>
    <receiver>fsSendDialog</receiver>
-   <slot>sendAllCheckboxChanged()</slot>
+   <slot>updateGUI()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>219</x>
-     <y>136</y>
+     <x>251</x>
+     <y>117</y>
     </hint>
     <hint type="destinationlabel">
-     <x>315</x>
-     <y>140</y>
+     <x>383</x>
+     <y>115</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>fsRadioButton</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>fsSendDialog</receiver>
+   <slot>updateGUI()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>59</x>
+     <y>168</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>111</x>
+     <y>217</y>
     </hint>
    </hints>
   </connection>
  </connections>
  <slots>
   <slot>functionChanged()</slot>
   <slot>sendAllCheckboxChanged()</slot>
+  <slot>fsNxRadioButtonChanged()</slot>
+  <slot>updateGUI()</slot>
  </slots>
  <buttongroups>
   <buttongroup name="buttonGroup"/>
+  <buttongroup name="buttonGroup_3"/>
  </buttongroups>
 </ui>