fgfs: use settings framework

1 files changed, 90 insertions, 231 deletions

diff --git a/ftnoir_protocol_fg/ftnoir_fgcontrols.ui b/ftnoir_protocol_fg/ftnoir_fgcontrols.ui
index fd0df6b0..f3b54486 100644
--- a/ftnoir_protocol_fg/ftnoir_fgcontrols.ui
+++ b/ftnoir_protocol_fg/ftnoir_fgcontrols.ui
@@ -9,8 +9,8 @@
    <rect>

     <x>0</x>

     <y>0</y>

-    <width>518</width>

-    <height>208</height>

+    <width>404</width>

+    <height>112</height>

    </rect>

   </property>

   <property name="windowTitle">

@@ -26,239 +26,101 @@
   <property name="autoFillBackground">

    <bool>false</bool>

   </property>

-  <layout class="QVBoxLayout" name="_vertical_layout">

-   <item>

-    <layout class="QGridLayout" name="gridLayout">

-     <item row="2" column="4">

-      <widget class="QSpinBox" name="spinIPFourthNibble">

-       <property name="maximumSize">

-        <size>

-         <width>60</width>

-         <height>16777215</height>

-        </size>

-       </property>

-       <property name="maximum">

-        <number>255</number>

-       </property>

-       <property name="singleStep">

-        <number>1</number>

-       </property>

-      </widget>

-     </item>

-     <item row="2" column="1">

-      <widget class="QSpinBox" name="spinIPFirstNibble">

-       <property name="maximumSize">

-        <size>

-         <width>60</width>

-         <height>16777215</height>

-        </size>

-       </property>

-       <property name="maximum">

-        <number>255</number>

-       </property>

-       <property name="singleStep">

-        <number>1</number>

-       </property>

-      </widget>

-     </item>

-     <item row="2" column="2">

-      <widget class="QSpinBox" name="spinIPSecondNibble">

-       <property name="maximumSize">

-        <size>

-         <width>60</width>

-         <height>16777215</height>

-        </size>

-       </property>

-       <property name="maximum">

-        <number>255</number>

-       </property>

-       <property name="singleStep">

-        <number>1</number>

-       </property>

-      </widget>

-     </item>

-     <item row="2" column="3">

-      <widget class="QSpinBox" name="spinIPThirdNibble">

-       <property name="maximumSize">

-        <size>

-         <width>60</width>

-         <height>16777215</height>

-        </size>

-       </property>

-       <property name="maximum">

-        <number>255</number>

-       </property>

-       <property name="singleStep">

-        <number>1</number>

-       </property>

-      </widget>

-     </item>

-     <item row="2" column="0">

-      <widget class="QLabel" name="label_4">

-       <property name="text">

-        <string>IP-address remote PC</string>

-       </property>

-      </widget>

-     </item>

-     <item row="1" column="0">

-      <widget class="QCheckBox" name="chkLocalPC">

-       <property name="layoutDirection">

-        <enum>Qt::RightToLeft</enum>

-       </property>

-       <property name="text">

-        <string>Local PC only</string>

-       </property>

-      </widget>

-     </item>

-     <item row="3" column="0">

-      <widget class="QLabel" name="label_5">

-       <property name="text">

-        <string>Port-number</string>

-       </property>

-      </widget>

-     </item>

-     <item row="3" column="1">

-      <widget class="QSpinBox" name="spinPortNumber">

-       <property name="minimum">

-        <number>1000</number>

-       </property>

-       <property name="maximum">

-        <number>10000</number>

-       </property>

-      </widget>

-     </item>

-    </layout>

+  <layout class="QGridLayout" name="gridLayout">

+   <item row="0" column="0">

+    <widget class="QLabel" name="label_4">

+     <property name="text">

+      <string>IP-address remote PC</string>

+     </property>

+    </widget>

    </item>

-   <item>

-    <spacer name="verticalSpacer">

-     <property name="orientation">

-      <enum>Qt::Vertical</enum>

+   <item row="0" column="1">

+    <widget class="QSpinBox" name="spinIPFirstNibble">

+     <property name="maximumSize">

+      <size>

+       <width>60</width>

+       <height>16777215</height>

+      </size>

+     </property>

+     <property name="maximum">

+      <number>255</number>

      </property>

-     <property name="sizeHint" stdset="0">

+     <property name="singleStep">

+      <number>1</number>

+     </property>

+    </widget>

+   </item>

+   <item row="0" column="2">

+    <widget class="QSpinBox" name="spinIPSecondNibble">

+     <property name="maximumSize">

       <size>

-       <width>20</width>

-       <height>40</height>

+       <width>60</width>

+       <height>16777215</height>

       </size>

      </property>

-    </spacer>

+     <property name="maximum">

+      <number>255</number>

+     </property>

+     <property name="singleStep">

+      <number>1</number>

+     </property>

+    </widget>

    </item>

-   <item>

-    <layout class="QVBoxLayout" name="verticalLayout">

-     <item>

-      <widget class="QLabel" name="label_2">

-       <property name="text">

-        <string>If FlightGear is on the same PC as FaceTrackNoIR, tick the 'Local PC only' box.</string>

-       </property>

-      </widget>

-     </item>

-     <item>

-      <widget class="QLabel" name="label">

-       <property name="text">

-        <string>Otherwise: enter IP-address and port-number for the remote PC.</string>

-       </property>

-       <property name="wordWrap">

-        <bool>true</bool>

-       </property>

-      </widget>

-     </item>

-     <item>

-      <widget class="QLabel" name="label_3">

-       <property name="text">

-        <string>Remember: you may have to change firewall-settings too!</string>

-       </property>

-      </widget>

-     </item>

-    </layout>

+   <item row="0" column="3">

+    <widget class="QSpinBox" name="spinIPThirdNibble">

+     <property name="maximumSize">

+      <size>

+       <width>60</width>

+       <height>16777215</height>

+      </size>

+     </property>

+     <property name="maximum">

+      <number>255</number>

+     </property>

+     <property name="singleStep">

+      <number>1</number>

+     </property>

+    </widget>

    </item>

-   <item>

-    <layout class="QHBoxLayout" name="horizontalLayout">

-     <item>

-      <spacer name="horizontalSpacer_2">

-       <property name="orientation">

-        <enum>Qt::Horizontal</enum>

-       </property>

-       <property name="sizeHint" stdset="0">

-        <size>

-         <width>40</width>

-         <height>20</height>

-        </size>

-       </property>

-      </spacer>

-     </item>

-     <item>

-      <layout class="QHBoxLayout" name="horizontalLayout_2">

-       <property name="sizeConstraint">

-        <enum>QLayout::SetDefaultConstraint</enum>

-       </property>

-       <item>

-        <widget class="QPushButton" name="btnOK">

-         <property name="sizePolicy">

-          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">

-           <horstretch>0</horstretch>

-           <verstretch>0</verstretch>

-          </sizepolicy>

-         </property>

-         <property name="minimumSize">

-          <size>

-           <width>100</width>

-           <height>0</height>

-          </size>

-         </property>

-         <property name="maximumSize">

-          <size>

-           <width>100</width>

-           <height>16777215</height>

-          </size>

-         </property>

-         <property name="text">

-          <string>OK</string>

-         </property>

-        </widget>

-       </item>

-       <item>

-        <widget class="QPushButton" name="btnCancel">

-         <property name="sizePolicy">

-          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">

-           <horstretch>0</horstretch>

-           <verstretch>0</verstretch>

-          </sizepolicy>

-         </property>

-         <property name="minimumSize">

-          <size>

-           <width>100</width>

-           <height>0</height>

-          </size>

-         </property>

-         <property name="maximumSize">

-          <size>

-           <width>100</width>

-           <height>16777215</height>

-          </size>

-         </property>

-         <property name="text">

-          <string>Cancel</string>

-         </property>

-        </widget>

-       </item>

-      </layout>

-     </item>

-     <item>

-      <spacer name="horizontalSpacer">

-       <property name="orientation">

-        <enum>Qt::Horizontal</enum>

-       </property>

-       <property name="sizeType">

-        <enum>QSizePolicy::Fixed</enum>

-       </property>

-       <property name="sizeHint" stdset="0">

-        <size>

-         <width>10</width>

-         <height>20</height>

-        </size>

-       </property>

-      </spacer>

-     </item>

-    </layout>

+   <item row="0" column="4">

+    <widget class="QSpinBox" name="spinIPFourthNibble">

+     <property name="maximumSize">

+      <size>

+       <width>60</width>

+       <height>16777215</height>

+      </size>

+     </property>

+     <property name="maximum">

+      <number>255</number>

+     </property>

+     <property name="singleStep">

+      <number>1</number>

+     </property>

+    </widget>

+   </item>

+   <item row="1" column="0">

+    <widget class="QLabel" name="label_5">

+     <property name="text">

+      <string>Port-number</string>

+     </property>

+    </widget>

+   </item>

+   <item row="1" column="1">

+    <widget class="QSpinBox" name="spinPortNumber">

+     <property name="minimum">

+      <number>1000</number>

+     </property>

+     <property name="maximum">

+      <number>10000</number>

+     </property>

+    </widget>

+   </item>

+   <item row="2" column="2" colspan="3">

+    <widget class="QDialogButtonBox" name="buttonBox">

+     <property name="standardButtons">

+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>

+     </property>

+    </widget>

    </item>

   </layout>

  </widget>

@@ -268,9 +130,6 @@
   <tabstop>spinIPThirdNibble</tabstop>

   <tabstop>spinIPFourthNibble</tabstop>

   <tabstop>spinPortNumber</tabstop>

-  <tabstop>btnOK</tabstop>

-  <tabstop>btnCancel</tabstop>

-  <tabstop>chkLocalPC</tabstop>

  </tabstops>

  <resources/>

  <connections/>