From c91d06fea5132c0bada82b581f96edea38f3bf43 Mon Sep 17 00:00:00 2001
From: Elliott Liggett <kilocharlie8@gmail.com>
Date: Fri, 27 Jan 2023 22:34:40 -0800
Subject: [PATCH] Added update of mode to CW sender. Modified cw sender UI
 slightly for spacing.

---
 cwsender.ui | 135 +++++++++++++++++++++++++++++++++-------------------
 wfmain.cpp  |   2 +-
 2 files changed, 88 insertions(+), 49 deletions(-)

diff --git a/cwsender.ui b/cwsender.ui
index 900684f..f328e0f 100644
--- a/cwsender.ui
+++ b/cwsender.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>636</width>
+    <width>886</width>
     <height>451</height>
    </rect>
   </property>
@@ -18,7 +18,7 @@
   </property>
   <widget class="QWidget" name="centralwidget">
    <layout class="QGridLayout" name="gridLayout">
-    <item row="3" column="0" colspan="12">
+    <item row="4" column="0" colspan="12">
      <widget class="QGroupBox" name="groupBox">
       <property name="title">
        <string>Macros</string>
@@ -161,41 +161,6 @@
       </layout>
      </widget>
     </item>
-    <item row="1" column="2">
-     <widget class="QComboBox" name="textToSendEdit">
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="toolTip">
-       <string>Type here to send text as CW</string>
-      </property>
-      <property name="editable">
-       <bool>true</bool>
-      </property>
-      <property name="currentText">
-       <string notr="true"/>
-      </property>
-      <property name="insertPolicy">
-       <enum>QComboBox::InsertAtTop</enum>
-      </property>
-     </widget>
-    </item>
-    <item row="1" column="0">
-     <widget class="QPushButton" name="sendBtn">
-      <property name="text">
-       <string>Send</string>
-      </property>
-      <property name="shortcut">
-       <string>Return</string>
-      </property>
-      <property name="default">
-       <bool>true</bool>
-      </property>
-     </widget>
-    </item>
     <item row="0" column="0" colspan="12">
      <widget class="QPlainTextEdit" name="transcriptText">
       <property name="focusPolicy">
@@ -212,17 +177,7 @@
       </property>
      </widget>
     </item>
-    <item row="1" column="1">
-     <widget class="QPushButton" name="stopBtn">
-      <property name="toolTip">
-       <string>Stop sending CW</string>
-      </property>
-      <property name="text">
-       <string>Stop</string>
-      </property>
-     </widget>
-    </item>
-    <item row="1" column="3" colspan="2">
+    <item row="1" column="3">
      <layout class="QGridLayout" name="gridLayout_3">
       <property name="sizeConstraint">
        <enum>QLayout::SetMinimumSize</enum>
@@ -334,6 +289,90 @@
       </item>
      </layout>
     </item>
+    <item row="1" column="1">
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="QLabel" name="spacerLabel">
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout_2">
+        <property name="leftMargin">
+         <number>0</number>
+        </property>
+        <property name="topMargin">
+         <number>0</number>
+        </property>
+        <property name="rightMargin">
+         <number>0</number>
+        </property>
+        <property name="bottomMargin">
+         <number>0</number>
+        </property>
+        <item>
+         <widget class="QPushButton" name="sendBtn">
+          <property name="text">
+           <string>Send</string>
+          </property>
+          <property name="shortcut">
+           <string>Return</string>
+          </property>
+          <property name="default">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="stopBtn">
+          <property name="toolTip">
+           <string>Stop sending CW</string>
+          </property>
+          <property name="text">
+           <string>Stop</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QComboBox" name="textToSendEdit">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="toolTip">
+           <string>Type here to send text as CW</string>
+          </property>
+          <property name="editable">
+           <bool>true</bool>
+          </property>
+          <property name="currentText">
+           <string notr="true"/>
+          </property>
+          <property name="insertPolicy">
+           <enum>QComboBox::InsertAtTop</enum>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </item>
    </layout>
   </widget>
   <widget class="QStatusBar" name="statusbar"/>
diff --git a/wfmain.cpp b/wfmain.cpp
index add58cd..1b869e2 100644
--- a/wfmain.cpp
+++ b/wfmain.cpp
@@ -5485,7 +5485,7 @@ void wfmain::receiveMode(unsigned char mode, unsigned char filter)
             currentModeInfo.filter = filter;
             currentModeInfo.reg = mode;
             rpt->handleUpdateCurrentMainMode(currentModeInfo);
-
+            cw->handleCurrentModeUpdate(currentMode);
             if (!found)
             {
                 qWarning(logSystem()) << __func__ << "Received mode " << mode << " but could not match to any index within the modeSelectCombo. ";