From c451602b8c1ff3d19275e718a39dcf72cd5f3934 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Sat, 10 Mar 2018 17:57:55 +0100
Subject: [PATCH] Ref T259, Ref T243 UI for FSD setup adjusted (added gnd
 flags)

---
 src/blackgui/editors/fsdsetupform.cpp |  9 ++-
 src/blackgui/editors/fsdsetupform.ui  | 84 +++++++++++++++++----------
 src/blackgui/editors/serverform.ui    | 29 +++------
 3 files changed, 67 insertions(+), 55 deletions(-)

diff --git a/src/blackgui/editors/fsdsetupform.cpp b/src/blackgui/editors/fsdsetupform.cpp
index 155accfa8..144a4f71a 100644
--- a/src/blackgui/editors/fsdsetupform.cpp
+++ b/src/blackgui/editors/fsdsetupform.cpp
@@ -41,6 +41,7 @@ namespace BlackGui
             CFsdSetup s(ui->le_TextCodec->text().trimmed().toLower());
             s.setSendReceiveDetails(
                 ui->cb_AircraftPartsSend->isChecked(), ui->cb_AircraftPartsReceive->isChecked(),
+                ui->cb_GndFlagSend->isChecked(), ui->cb_GndFlagReceive->isChecked(),
                 ui->cb_FastPositionSend->isChecked(), ui->cb_FastPositionReceive->isChecked()
             );
             return s;
@@ -52,7 +53,7 @@ namespace BlackGui
             return fsd;
         }
 
-        void CFsdSetupForm::setValue(const BlackMisc::Network::CFsdSetup &setup)
+        void CFsdSetupForm::setValue(const CFsdSetup &setup)
         {
             ui->le_TextCodec->setText(setup.getTextCodec());
             const CFsdSetup::SendReceiveDetails d = setup.getSendReceiveDetails();
@@ -60,7 +61,7 @@ namespace BlackGui
             ui->cb_AircraftPartsReceive->setChecked(d & CFsdSetup::ReceiveAircraftParts);
             ui->cb_AircraftPartsSend->setChecked(d & CFsdSetup::SendAircraftParts);
             ui->cb_FastPositionReceive->setChecked(d & CFsdSetup::ReceiveInterimPositions);
-            ui->cb_FastPositionSend->setChecked(d & CFsdSetup::SendIterimPositions);
+            ui->cb_FastPositionSend->setChecked(d & CFsdSetup::SendInterimPositions);
         }
 
         bool CFsdSetupForm::isFsdSetupEnabled() const
@@ -88,6 +89,8 @@ namespace BlackGui
             CGuiUtility::checkBoxReadOnly(ui->cb_AircraftPartsSend, readonly);
             CGuiUtility::checkBoxReadOnly(ui->cb_FastPositionReceive, readonly);
             CGuiUtility::checkBoxReadOnly(ui->cb_FastPositionSend, readonly);
+            CGuiUtility::checkBoxReadOnly(ui->cb_GndFlagReceive, readonly);
+            CGuiUtility::checkBoxReadOnly(ui->cb_GndFlagSend, readonly);
             this->forceStyleSheetUpdate();
         }
 
@@ -120,6 +123,8 @@ namespace BlackGui
             ui->cb_AircraftPartsSend->setChecked(true);
             ui->cb_FastPositionReceive->setChecked(true);
             ui->cb_FastPositionSend->setChecked(true);
+            ui->cb_GndFlagReceive->setChecked(true);
+            ui->cb_GndFlagSend->setChecked(true);
             ui->le_TextCodec->setText("latin1");
         }
     } // ns
diff --git a/src/blackgui/editors/fsdsetupform.ui b/src/blackgui/editors/fsdsetupform.ui
index 55981cb3c..babeabbc9 100644
--- a/src/blackgui/editors/fsdsetupform.ui
+++ b/src/blackgui/editors/fsdsetupform.ui
@@ -6,12 +6,12 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>244</width>
-    <height>91</height>
+    <width>194</width>
+    <height>101</height>
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Frame</string>
+   <string>FSD setup</string>
   </property>
   <layout class="QGridLayout" name="gl_FsdSetupForm">
    <property name="leftMargin">
@@ -26,17 +26,13 @@
    <property name="bottomMargin">
     <number>0</number>
    </property>
-   <item row="4" column="2">
-    <widget class="QCheckBox" name="cb_FastPositionReceive">
+   <property name="spacing">
+    <number>4</number>
+   </property>
+   <item row="0" column="2">
+    <widget class="QPushButton" name="pb_SetDefaults">
      <property name="text">
-      <string>receive</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0">
-    <widget class="QLabel" name="lbl_TextCodec">
-     <property name="text">
-      <string>Text codec</string>
+      <string>set defaults</string>
      </property>
     </widget>
    </item>
@@ -47,38 +43,52 @@
      </property>
     </widget>
    </item>
-   <item row="3" column="1">
-    <widget class="QCheckBox" name="cb_AircraftPartsSend">
+   <item row="4" column="2">
+    <widget class="QCheckBox" name="cb_FastPositionSend">
      <property name="text">
       <string>send</string>
      </property>
     </widget>
    </item>
-   <item row="0" column="2">
-    <widget class="QPushButton" name="pb_SetDefaults">
+   <item row="4" column="1">
+    <widget class="QCheckBox" name="cb_GndFlagSend">
      <property name="text">
-      <string>set defaults</string>
+      <string>send</string>
      </property>
     </widget>
    </item>
-   <item row="4" column="0">
-    <widget class="QLabel" name="lbl_FastPositions">
+   <item row="5" column="2">
+    <widget class="QCheckBox" name="cb_FastPositionReceive">
      <property name="text">
-      <string>Fast positions</string>
+      <string>receive</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="2">
+   <item row="5" column="0">
     <widget class="QCheckBox" name="cb_AircraftPartsReceive">
      <property name="text">
       <string>receive</string>
      </property>
     </widget>
    </item>
-   <item row="4" column="1">
-    <widget class="QCheckBox" name="cb_FastPositionSend">
+   <item row="3" column="1">
+    <widget class="QLabel" name="lbl_GndFlag">
      <property name="text">
-      <string>send</string>
+      <string>Gnd.flag</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="2">
+    <widget class="QLabel" name="lbl_FastPositions">
+     <property name="text">
+      <string>Fast positions</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0">
+    <widget class="QLabel" name="lbl_FsdSetup">
+     <property name="text">
+      <string>FSD setup:</string>
      </property>
     </widget>
    </item>
@@ -89,10 +99,24 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="0">
-    <widget class="QLabel" name="lbl_FsdSetup">
+   <item row="4" column="0">
+    <widget class="QCheckBox" name="cb_AircraftPartsSend">
      <property name="text">
-      <string>FSD setup:</string>
+      <string>send</string>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="1">
+    <widget class="QCheckBox" name="cb_GndFlagReceive">
+     <property name="text">
+      <string>receive</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="lbl_TextCodec">
+     <property name="text">
+      <string>Text codec</string>
      </property>
     </widget>
    </item>
@@ -109,10 +133,6 @@
   <tabstop>cb_Override</tabstop>
   <tabstop>pb_SetDefaults</tabstop>
   <tabstop>le_TextCodec</tabstop>
-  <tabstop>cb_AircraftPartsSend</tabstop>
-  <tabstop>cb_AircraftPartsReceive</tabstop>
-  <tabstop>cb_FastPositionSend</tabstop>
-  <tabstop>cb_FastPositionReceive</tabstop>
  </tabstops>
  <resources/>
  <connections/>
diff --git a/src/blackgui/editors/serverform.ui b/src/blackgui/editors/serverform.ui
index e567247e5..ca27d1bf9 100644
--- a/src/blackgui/editors/serverform.ui
+++ b/src/blackgui/editors/serverform.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>227</width>
-    <height>194</height>
+    <width>223</width>
+    <height>190</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -55,16 +55,16 @@
         <widget class="QFrame" name="fr_ServerGeneral">
          <layout class="QGridLayout" name="gl_ServerGeneral" columnstretch="1,2,2">
           <property name="leftMargin">
-           <number>3</number>
+           <number>1</number>
           </property>
           <property name="topMargin">
-           <number>3</number>
+           <number>1</number>
           </property>
           <property name="rightMargin">
-           <number>3</number>
+           <number>1</number>
           </property>
           <property name="bottomMargin">
-           <number>3</number>
+           <number>1</number>
           </property>
           <item row="0" column="0">
            <widget class="QLabel" name="lbl_Name">
@@ -200,12 +200,12 @@
        <property name="bottomMargin">
         <number>3</number>
        </property>
-       <item>
+       <item alignment="Qt::AlignTop">
         <widget class="BlackGui::Editors::CFsdSetupForm" name="form_ServerFsd">
          <property name="minimumSize">
           <size>
            <width>0</width>
-           <height>75</height>
+           <height>100</height>
           </size>
          </property>
          <property name="frameShape">
@@ -216,19 +216,6 @@
          </property>
         </widget>
        </item>
-       <item>
-        <spacer name="vs_ServerFsd">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
       </layout>
      </widget>
     </widget>