proto/ft: revert npclient-related changes

1 files changed, 62 insertions, 34 deletions

diff --git a/proto-ft/ftnoir_ftcontrols.ui b/proto-ft/ftnoir_ftcontrols.ui
index 4ad00514..0d142d09 100644
--- a/proto-ft/ftnoir_ftcontrols.ui
+++ b/proto-ft/ftnoir_ftcontrols.ui
@@ -8,15 +8,23 @@
   <property name="enabled">
    <bool>true</bool>
   </property>
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>508</width>
+    <height>232</height>
+   </rect>
+  </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
+   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
   <property name="minimumSize">
    <size>
-    <width>571</width>
+    <width>0</width>
     <height>0</height>
    </size>
   </property>
@@ -34,15 +42,8 @@
    <bool>false</bool>
   </property>
   <layout class="QGridLayout" name="gridLayout_2">
-   <item row="2" column="0">
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0">
-    <widget class="QGroupBox" name="groupBox_4">
+   <item row="0" column="0">
+    <widget class="QGroupBox" name="groupBox_3">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
        <horstretch>0</horstretch>
@@ -50,7 +51,7 @@
       </sizepolicy>
      </property>
      <property name="title">
-      <string>Repair NPClient location</string>
+      <string>Select interface</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignJustify|Qt::AlignTop</set>
@@ -58,29 +59,33 @@
      <property name="flat">
       <bool>false</bool>
      </property>
-     <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <layout class="QHBoxLayout" name="horizontalLayout_3">
       <property name="spacing">
        <number>9</number>
       </property>
       <item>
-       <widget class="QPushButton" name="bntLocateNPClient">
-        <property name="text">
-         <string>Locate DLL</string>
-        </property>
+       <widget class="QComboBox" name="cbxSelectInterface">
+        <item>
+         <property name="text">
+          <string>Enable both</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Use freetrack, disable TrackIR</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Use TrackIR, disable freetrack</string>
+         </property>
+        </item>
        </widget>
       </item>
       <item>
-       <widget class="QLabel" name="label_10">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
+       <widget class="QLabel" name="label_8">
         <property name="text">
-         <string>Replace the registry entry if you want to use other software with the NPClient protocol and it doesn't work automatically.
-
-Starting tracking will again overwrite the DLL locations.</string>
+         <string>Disable one of the protocols if game is confused by presence of both at the same time.</string>
         </property>
         <property name="wordWrap">
          <bool>true</bool>
@@ -90,8 +95,8 @@ Starting tracking will again overwrite the DLL locations.</string>
      </layout>
     </widget>
    </item>
-   <item row="0" column="0">
-    <widget class="QGroupBox" name="groupBox_3">
+   <item row="1" column="0">
+    <widget class="QGroupBox" name="groupBox_4">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
        <horstretch>0</horstretch>
@@ -99,7 +104,7 @@ Starting tracking will again overwrite the DLL locations.</string>
       </sizepolicy>
      </property>
      <property name="title">
-      <string>Select interface</string>
+      <string>Repair NPClient location</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignJustify|Qt::AlignTop</set>
@@ -107,17 +112,29 @@ Starting tracking will again overwrite the DLL locations.</string>
      <property name="flat">
       <bool>false</bool>
      </property>
-     <layout class="QHBoxLayout" name="horizontalLayout_3">
+     <layout class="QHBoxLayout" name="horizontalLayout_2">
       <property name="spacing">
        <number>9</number>
       </property>
       <item>
-       <widget class="QComboBox" name="cbxSelectInterface"/>
+       <widget class="QPushButton" name="bntLocateNPClient">
+        <property name="text">
+         <string>Locate DLL</string>
+        </property>
+       </widget>
       </item>
       <item>
-       <widget class="QLabel" name="label_8">
+       <widget class="QLabel" name="label_10">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
         <property name="text">
-         <string>Disable one of the protocols if game is confused by presence of both at the same time.</string>
+         <string>Replace the registry entry if you want to use other software with the NPClient protocol and it doesn't work automatically.
+
+Starting tracking will again overwrite the DLL locations.</string>
         </property>
         <property name="wordWrap">
          <bool>true</bool>
@@ -127,10 +144,21 @@ Starting tracking will again overwrite the DLL locations.</string>
      </layout>
     </widget>
    </item>
+   <item row="2" column="0">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources>
   <include location="ft-protocol.qrc"/>
+  <include location="ft-protocol.qrc"/>
+  <include location="ft-protocol.qrc"/>
+  <include location="ft-protocol.qrc"/>
+  <include location="ft-protocol.qrc"/>
  </resources>
  <connections/>
  <slots>