Merge branch 'master' of https://github.com/opentrack/opentrack into dev/ewma2

Resolved conflicts manually in files:
	ftnoir_filter_ewma2/ftnoir_filter_ewma2.cpp
	ftnoir_filter_ewma2/ftnoir_filter_ewma2.h

1 files changed, 93 insertions, 187 deletions

diff --git a/ftnoir_protocol_fsuipc/ftnoir_fsuipccontrols.ui b/ftnoir_protocol_fsuipc/ftnoir_fsuipccontrols.ui
index d02297f3..6cb066bd 100644
--- a/ftnoir_protocol_fsuipc/ftnoir_fsuipccontrols.ui
+++ b/ftnoir_protocol_fsuipc/ftnoir_fsuipccontrols.ui
@@ -2,12 +2,15 @@
 <ui version="4.0">

  <class>UICFSUIPCControls</class>

  <widget class="QWidget" name="UICFSUIPCControls">

+  <property name="windowModality">

+   <enum>Qt::NonModal</enum>

+  </property>

   <property name="geometry">

    <rect>

     <x>0</x>

     <y>0</y>

-    <width>541</width>

-    <height>127</height>

+    <width>512</width>

+    <height>100</height>

    </rect>

   </property>

   <property name="windowTitle">

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

    <bool>false</bool>

   </property>

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

-   <item>

-    <layout class="QHBoxLayout">

-     <item>

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

-       <property name="sizePolicy">

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

-         <horstretch>0</horstretch>

-         <verstretch>0</verstretch>

-        </sizepolicy>

-       </property>

-       <property name="text">

-        <string>Location of FSUIPC.dll:</string>

-       </property>

-       <property name="alignment">

-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>

-       </property>

-       <property name="wordWrap">

-        <bool>false</bool>

-       </property>

-      </widget>

-     </item>

-     <item>

-      <spacer name="horizontalSpacer_3">

-       <property name="orientation">

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

-       </property>

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

-        <size>

-         <width>40</width>

-         <height>20</height>

-        </size>

-       </property>

-      </spacer>

-     </item>

-    </layout>

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

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

+    <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>

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

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

+     <property name="minimumSize">

+      <size>

+       <width>230</width>

+       <height>0</height>

+      </size>

+     </property>

+     <property name="toolTip">

+      <string>Location of FSUIPC.dll</string>

+     </property>

+     <property name="frameShape">

+      <enum>QFrame::Box</enum>

+     </property>

+     <property name="frameShadow">

+      <enum>QFrame::Sunken</enum>

+     </property>

+     <property name="lineWidth">

+      <number>1</number>

+     </property>

+     <property name="text">

+      <string>Location of FSUIPC.dll</string>

+     </property>

+    </widget>

    </item>

-   <item>

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

-     <item>

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

-       <property name="minimumSize">

-        <size>

-         <width>230</width>

-         <height>0</height>

-        </size>

-       </property>

-       <property name="toolTip">

-        <string>Location of FSUIPC.dll</string>

-       </property>

-       <property name="frameShape">

-        <enum>QFrame::Box</enum>

-       </property>

-       <property name="frameShadow">

-        <enum>QFrame::Sunken</enum>

-       </property>

-       <property name="lineWidth">

-        <number>1</number>

-       </property>

-       <property name="text">

-        <string>Location of FSUIPC.dll</string>

-       </property>

-      </widget>

-     </item>

-     <item>

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

-       <property name="maximumSize">

-        <size>

-         <width>35</width>

-         <height>16777215</height>

-        </size>

-       </property>

-       <property name="text">

-        <string>...</string>

-       </property>

-      </widget>

-     </item>

-    </layout>

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

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

+     <property name="text">

+      <string>The DLL should be located in the Modules/ directory of MS FS 2004</string>

+     </property>

+    </widget>

    </item>

-   <item>

-    <spacer name="verticalSpacer">

-     <property name="orientation">

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

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

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

+     <property name="sizePolicy">

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

+       <horstretch>0</horstretch>

+       <verstretch>0</verstretch>

+      </sizepolicy>

      </property>

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

+     <property name="minimumSize">

       <size>

-       <width>20</width>

-       <height>40</height>

+       <width>100</width>

+       <height>0</height>

       </size>

      </property>

-    </spacer>

-   </item>

-   <item>

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

-     <item>

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

-       <property name="text">

-        <string>The DLL should be placed in the Modules folder of MS Flight Simulator</string>

-       </property>

-      </widget>

-     </item>

-    </layout>

+     <property name="maximumSize">

+      <size>

+       <width>100</width>

+       <height>16777215</height>

+      </size>

+     </property>

+     <property name="text">

+      <string>OK</string>

+     </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="1">

+    <widget class="QPushButton" name="btnFindDLL">

+     <property name="maximumSize">

+      <size>

+       <width>35</width>

+       <height>16777215</height>

+      </size>

+     </property>

+     <property name="text">

+      <string>...</string>

+     </property>

+    </widget>

    </item>

   </layout>

  </widget>