From 5470a55e152e9fb29062762e7d08bfcf8a9231d7 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Fri, 2 Aug 2019 23:49:35 +0200
Subject: [PATCH] Ref T609, adjusted/fixed cockpit form

* Naming to receive/transmit
* Fixed wrong LED order
---
 src/blackgui/editors/cockpitcomform.cpp | 21 +++++++++++----------
 src/blackgui/editors/cockpitcomform.ui  |  6 +++---
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/blackgui/editors/cockpitcomform.cpp b/src/blackgui/editors/cockpitcomform.cpp
index 75601ef4e..0f5f73c57 100644
--- a/src/blackgui/editors/cockpitcomform.cpp
+++ b/src/blackgui/editors/cockpitcomform.cpp
@@ -102,16 +102,16 @@ namespace BlackGui
 
         void CCockpitComForm::setSelectedAtcStations(const CAtcStationList &selectedStations)
         {
-            const CAtcStation com1Station = selectedStations.size() > 0 ? selectedStations[0] : CAtcStation();
+            const CAtcStation com1Ttation = selectedStations.size() > 0 ? selectedStations[0] : CAtcStation();
             const CAtcStation com2Station = selectedStations.size() > 1 ? selectedStations[1] : CAtcStation();
-            if (com1Station.getCallsign().isEmpty())
+            if (com1Ttation.getCallsign().isEmpty())
             {
                 ui->lbl_ComPanelCom1Active->setToolTip("");
                 ui->led_ComPanelCom1->setOn(false);
             }
             else
             {
-                ui->lbl_ComPanelCom1Active->setToolTip(com1Station.getCallsign().getStringAsSet());
+                ui->lbl_ComPanelCom1Active->setToolTip(com1Ttation.getCallsign().getStringAsSet());
                 ui->led_ComPanelCom1->setOn(true);
 
             }
@@ -138,6 +138,7 @@ namespace BlackGui
             this->setSelcal(aircraft.getSelcal());
             this->setTransponder(aircraft.getTransponder());
             this->alignUiElementsHeight();
+            this->updateIntegratedFlagFromSimulatorContext();
         }
 
         CSelcal CCockpitComForm::getSelcal() const
@@ -157,14 +158,14 @@ namespace BlackGui
             ui->led_ComPanelCom2->setValues(CLedWidget::Yellow, CLedWidget::Black, shape, "COM2 connected to station", "COM2 disconnected", 14);
 
             ui->led_ComPanelCom1R->setValues(CLedWidget::Yellow, CLedWidget::Black, shape, "COM1 receive (sim)", "COM1 not receiving", 14);
-            ui->led_ComPanelCom1S->setValues(CLedWidget::Yellow, CLedWidget::Black, shape, "COM1 trasmit (sim)", "COM1 not transmitting", 14);
+            ui->led_ComPanelCom1T->setValues(CLedWidget::Yellow, CLedWidget::Black, shape, "COM1 transmit (sim)", "COM1 not transmitting", 14);
             ui->led_ComPanelCom1R->setTriStateValues(CLedWidget::Blue, "receive not synced");
-            ui->led_ComPanelCom1S->setTriStateValues(CLedWidget::Blue, "transmit not synced");
+            ui->led_ComPanelCom1T->setTriStateValues(CLedWidget::Blue, "transmit not synced");
 
             ui->led_ComPanelCom2R->setValues(CLedWidget::Yellow, CLedWidget::Black, shape, "COM2 receive (sim)", "COM2 not receiving", 14);
-            ui->led_ComPanelCom2S->setValues(CLedWidget::Yellow, CLedWidget::Black, shape, "COM2 trasmit (sim)", "COM2 not transmitting", 14);
+            ui->led_ComPanelCom2T->setValues(CLedWidget::Yellow, CLedWidget::Black, shape, "COM2 transmit (sim)", "COM2 not transmitting", 14);
             ui->led_ComPanelCom2R->setTriStateValues(CLedWidget::Blue, "receive not synced");
-            ui->led_ComPanelCom2S->setTriStateValues(CLedWidget::Blue, "transmit not synced");
+            ui->led_ComPanelCom2T->setTriStateValues(CLedWidget::Blue, "transmit not synced");
         }
 
         CSimulatedAircraft CCockpitComForm::cockpitValuesToAircraftObject()
@@ -301,14 +302,14 @@ namespace BlackGui
             if (!integratedWithSim)
             {
                 ui->led_ComPanelCom1R->setTriState();
-                ui->led_ComPanelCom1S->setTriState();
+                ui->led_ComPanelCom1T->setTriState();
                 ui->led_ComPanelCom2R->setTriState();
-                ui->led_ComPanelCom2S->setTriState();
+                ui->led_ComPanelCom2T->setTriState();
             }
             else
             {
                 ui->led_ComPanelCom1R->setOn(com1R);
-                ui->led_ComPanelCom1S->setOn(com1S);
+                ui->led_ComPanelCom1T->setOn(com1T);
                 ui->led_ComPanelCom2R->setOn(com2R);
                 ui->led_ComPanelCom2T->setOn(com2T);
             }
diff --git a/src/blackgui/editors/cockpitcomform.ui b/src/blackgui/editors/cockpitcomform.ui
index 24914eed9..4d7aea7a4 100644
--- a/src/blackgui/editors/cockpitcomform.ui
+++ b/src/blackgui/editors/cockpitcomform.ui
@@ -136,10 +136,10 @@
        <widget class="BlackGui::CLedWidget" name="led_ComPanelCom2" native="true"/>
       </item>
       <item>
-       <widget class="BlackGui::CLedWidget" name="led_ComPanelCom2R" native="true"/>
+       <widget class="BlackGui::CLedWidget" name="led_ComPanelCom2T" native="true"/>
       </item>
       <item>
-       <widget class="BlackGui::CLedWidget" name="led_ComPanelCom2S" native="true"/>
+       <widget class="BlackGui::CLedWidget" name="led_ComPanelCom2R" native="true"/>
       </item>
      </layout>
     </widget>
@@ -263,7 +263,7 @@
        <widget class="BlackGui::CLedWidget" name="led_ComPanelCom1" native="true"/>
       </item>
       <item>
-       <widget class="BlackGui::CLedWidget" name="led_ComPanelCom1S" native="true"/>
+       <widget class="BlackGui::CLedWidget" name="led_ComPanelCom1T" native="true"/>
       </item>
       <item>
        <widget class="BlackGui::CLedWidget" name="led_ComPanelCom1R" native="true"/>