change icons, remove self-references

25 files changed, 87 insertions, 85 deletions

diff --git a/FTNoIR_Tracker_PT/FTNoIR_PT_Controls.ui b/FTNoIR_Tracker_PT/FTNoIR_PT_Controls.ui
index ce708849..9f00cf29 100644
--- a/FTNoIR_Tracker_PT/FTNoIR_PT_Controls.ui
+++ b/FTNoIR_Tracker_PT/FTNoIR_PT_Controls.ui
@@ -24,7 +24,7 @@
   </property>

   <property name="windowIcon">

    <iconset resource="ftnoir_tracker_pt.qrc">

-    <normaloff>:/Resources/icon.ico</normaloff>:/Resources/icon.ico</iconset>

+    <normaloff>:/Resources/Logo_IR.png</normaloff>:/Resources/Logo_IR.png</iconset>

   </property>

   <property name="layoutDirection">

    <enum>Qt::LeftToRight</enum>

diff --git a/FTNoIR_Tracker_PT/Resources/icon.ico b/FTNoIR_Tracker_PT/Resources/icon.ico
deleted file mode 100644
index c4b2aedc..00000000
--- a/FTNoIR_Tracker_PT/Resources/icon.ico
+++ /dev/null
diff --git a/FTNoIR_Tracker_PT/ftnoir_tracker_pt.qrc b/FTNoIR_Tracker_PT/ftnoir_tracker_pt.qrc
index 9b510981..a8f9a1af 100644
--- a/FTNoIR_Tracker_PT/ftnoir_tracker_pt.qrc
+++ b/FTNoIR_Tracker_PT/ftnoir_tracker_pt.qrc
@@ -1,10 +1,9 @@
-<RCC>

-  <qresource prefix="/">

-    <file>Resources/icon.ico</file>

-    <file>Resources/cap_front.png</file>

-    <file>Resources/cap_side.png</file>

-    <file>Resources/clip_front.png</file>

-    <file>Resources/clip_side.png</file>

-    <file>Resources/Logo_IR.png</file>

-  </qresource>

-</RCC>

+<RCC>
+    <qresource prefix="/">
+        <file>Resources/cap_front.png</file>
+        <file>Resources/cap_side.png</file>
+        <file>Resources/clip_front.png</file>
+        <file>Resources/clip_side.png</file>
+        <file>Resources/Logo_IR.png</file>
+    </qresource>
+</RCC>
diff --git a/facetracknoir/facetracknoir.cpp b/facetracknoir/facetracknoir.cpp
index de5b491f..f2767587 100644
--- a/facetracknoir/facetracknoir.cpp
+++ b/facetracknoir/facetracknoir.cpp
@@ -246,7 +246,7 @@ void FaceTrackNoIR::open() {
      
 	 QString fileName = dialog.getOpenFileName(
 								this,
-                                 tr("Select one FTNoir settings file"),
+                                 tr("Open the settings file"),
 								 QCoreApplication::applicationDirPath() + "/settings/",
                                  tr("Settings file (*.ini);;All Files (*)"),
                                                NULL);
diff --git a/facetracknoir/facetracknoir.ui b/facetracknoir/facetracknoir.ui
index c25ee0db..d5300b0f 100644
--- a/facetracknoir/facetracknoir.ui
+++ b/facetracknoir/facetracknoir.ui
@@ -10,8 +10,8 @@
    <rect>

     <x>0</x>

     <y>0</y>

-    <width>788</width>

-    <height>554</height>

+    <width>790</width>

+    <height>500</height>

    </rect>

   </property>

   <property name="sizePolicy">

@@ -82,8 +82,8 @@
    <widget class="QFrame" name="video_frame">

     <property name="geometry">

      <rect>

-      <x>5</x>

-      <y>170</y>

+      <x>10</x>

+      <y>130</y>

       <width>320</width>

       <height>240</height>

      </rect>

@@ -113,7 +113,7 @@
      <property name="geometry">

       <rect>

        <x>0</x>

-       <y>-10</y>

+       <y>0</y>

        <width>320</width>

        <height>240</height>

       </rect>

@@ -141,8 +141,8 @@
    <widget class="QGroupBox" name="groupBox4logo">

     <property name="geometry">

      <rect>

-      <x>110</x>

-      <y>50</y>

+      <x>100</x>

+      <y>10</y>

       <width>229</width>

       <height>121</height>

      </rect>

@@ -516,8 +516,8 @@
    <widget class="GLWidget" name="pose_display" native="true">

     <property name="geometry">

      <rect>

-      <x>20</x>

-      <y>50</y>

+      <x>10</x>

+      <y>20</y>

       <width>81</width>

       <height>100</height>

      </rect>

@@ -545,7 +545,7 @@
     <property name="geometry">

      <rect>

       <x>350</x>

-      <y>370</y>

+      <y>270</y>

       <width>191</width>

       <height>91</height>

      </rect>

@@ -631,7 +631,7 @@
     <property name="geometry">

      <rect>

       <x>580</x>

-      <y>460</y>

+      <y>390</y>

       <width>171</width>

       <height>38</height>

      </rect>

@@ -677,9 +677,9 @@
    <widget class="QLabel" name="game_name">

     <property name="geometry">

      <rect>

-      <x>130</x>

-      <y>30</y>

-      <width>651</width>

+      <x>370</x>

+      <y>40</y>

+      <width>411</width>

       <height>20</height>

      </rect>

     </property>

@@ -702,9 +702,9 @@
    <widget class="QGroupBox" name="groupFilter">

     <property name="geometry">

      <rect>

-      <x>350</x>

-      <y>270</y>

-      <width>191</width>

+      <x>550</x>

+      <y>210</y>

+      <width>231</width>

       <height>91</height>

      </rect>

     </property>

@@ -868,9 +868,9 @@
    <widget class="QLabel" name="cameraName">

     <property name="geometry">

      <rect>

-      <x>130</x>

-      <y>0</y>

-      <width>651</width>

+      <x>370</x>

+      <y>10</y>

+      <width>411</width>

       <height>25</height>

      </rect>

     </property>

@@ -980,7 +980,7 @@
     <property name="geometry">

      <rect>

       <x>350</x>

-      <y>470</y>

+      <y>400</y>

       <width>190</width>

       <height>65</height>

      </rect>

@@ -1060,7 +1060,7 @@
     <property name="geometry">

      <rect>

       <x>580</x>

-      <y>410</y>

+      <y>340</y>

       <width>171</width>

       <height>38</height>

      </rect>

@@ -1228,7 +1228,7 @@
     <property name="geometry">

      <rect>

       <x>10</x>

-      <y>420</y>

+      <y>380</y>

       <width>141</width>

       <height>106</height>

      </rect>

@@ -1468,7 +1468,7 @@
     <property name="geometry">

      <rect>

       <x>160</x>

-      <y>420</y>

+      <y>380</y>

       <width>161</width>

       <height>111</height>

      </rect>

diff --git a/facetracknoir/ftnoir_keyboardshortcuts.ui b/facetracknoir/ftnoir_keyboardshortcuts.ui
index 0d4e9142..94d11734 100644
--- a/facetracknoir/ftnoir_keyboardshortcuts.ui
+++ b/facetracknoir/ftnoir_keyboardshortcuts.ui
@@ -21,7 +21,7 @@
   </property>

   <property name="windowIcon">

    <iconset>

-    <normaloff>images/FaceTrackNoIR.png</normaloff>images/FaceTrackNoIR.png</iconset>

+    <normaloff>images/facetracknoir.png</normaloff>images/facetracknoir.png</iconset>

   </property>

   <property name="layoutDirection">

    <enum>Qt::LeftToRight</enum>

diff --git a/facetracknoir/uielements/logo_facetracknoir_32px.jpg b/facetracknoir/uielements/logo_facetracknoir_32px.jpg
deleted file mode 100644
index 73ead853..00000000
--- a/facetracknoir/uielements/logo_facetracknoir_32px.jpg
+++ /dev/null
diff --git a/facetracknoir/uielements/logo_facetracknoir_32px.png b/facetracknoir/uielements/logo_facetracknoir_32px.png
deleted file mode 100644
index c4e63c76..00000000
--- a/facetracknoir/uielements/logo_facetracknoir_32px.png
+++ /dev/null
diff --git a/facetracknoir/uielements/logo_noir.png b/facetracknoir/uielements/logo_noir.png
deleted file mode 100644
index bb654a07..00000000
--- a/facetracknoir/uielements/logo_noir.png
+++ /dev/null
diff --git a/facetracknoir/uielements/logo_noir_small.png b/facetracknoir/uielements/logo_noir_small.png
deleted file mode 100644
index 5d49e0b1..00000000
--- a/facetracknoir/uielements/logo_noir_small.png
+++ /dev/null
diff --git a/facetracknoir/uielements/logo_noir_small_target.png b/facetracknoir/uielements/logo_noir_small_target.png
deleted file mode 100644
index 4bbaf41f..00000000
--- a/facetracknoir/uielements/logo_noir_small_target.png
+++ /dev/null
diff --git a/facetracknoir/uielements/logo_noir_small_target90px.png b/facetracknoir/uielements/logo_noir_small_target90px.png
deleted file mode 100644
index ecaa4e12..00000000
--- a/facetracknoir/uielements/logo_noir_small_target90px.png
+++ /dev/null
diff --git a/facetracknoir/uielements/logofacetracknoir.png b/facetracknoir/uielements/logofacetracknoir.png
deleted file mode 100644
index a1a3407b..00000000
--- a/facetracknoir/uielements/logofacetracknoir.png
+++ /dev/null
diff --git a/facetracknoir/uielements/logofacetracknoir60px.png b/facetracknoir/uielements/logofacetracknoir60px.png
deleted file mode 100644
index f01f6024..00000000
--- a/facetracknoir/uielements/logofacetracknoir60px.png
+++ /dev/null
diff --git a/ftnoir_filter_accela/ftnoir_accela_filtercontrols.ui b/ftnoir_filter_accela/ftnoir_accela_filtercontrols.ui
index 4ea78c9f..ba750cd6 100644
--- a/ftnoir_filter_accela/ftnoir_accela_filtercontrols.ui
+++ b/ftnoir_filter_accela/ftnoir_accela_filtercontrols.ui
@@ -9,8 +9,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>202</width>
-    <height>241</height>
+    <width>215</width>
+    <height>285</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -32,11 +32,11 @@
    </size>
   </property>
   <property name="windowTitle">
-   <string>Filter settings</string>
+   <string>Accela filter settings</string>
   </property>
   <property name="windowIcon">
-   <iconset>
-    <normaloff>images/FaceTrackNoIR.png</normaloff>images/FaceTrackNoIR.png</iconset>
+   <iconset resource="../ftnoir_filter_ewma2/ewma-filter.qrc">
+    <normaloff>:/images/filter-16.png</normaloff>:/images/filter-16.png</iconset>
   </property>
   <property name="layoutDirection">
    <enum>Qt::LeftToRight</enum>
@@ -346,7 +346,9 @@ background:none;</string>
    </item>
   </layout>
  </widget>
- <resources/>
+ <resources>
+  <include location="../ftnoir_filter_ewma2/ewma-filter.qrc"/>
+ </resources>
  <connections/>
  <slots>
   <slot>startEngineClicked()</slot>
diff --git a/ftnoir_filter_ewma2/ftnoir_ewma_filtercontrols.ui b/ftnoir_filter_ewma2/ftnoir_ewma_filtercontrols.ui
index 8a0e485a..a1083265 100644
--- a/ftnoir_filter_ewma2/ftnoir_ewma_filtercontrols.ui
+++ b/ftnoir_filter_ewma2/ftnoir_ewma_filtercontrols.ui
@@ -9,7 +9,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>374</width>
+    <width>477</width>
     <height>380</height>
    </rect>
   </property>
@@ -20,15 +20,11 @@
    </size>
   </property>
   <property name="windowTitle">
-   <string>EWMA2 Filter settings FaceTrackNoIR</string>
+   <string>EWMA2 filter settings</string>
   </property>
   <property name="windowIcon">
-   <iconset>
-    <normaloff>
-    images/facetracknoir.png
-   </normaloff>
-    images/facetracknoir.png
-   </iconset>
+   <iconset resource="ewma-filter.qrc">
+    <normaloff>:/images/filter-16.png</normaloff>:/images/filter-16.png</iconset>
   </property>
   <property name="layoutDirection">
    <enum>Qt::LeftToRight</enum>
@@ -486,7 +482,9 @@ p, li { white-space: pre-wrap; }
   <tabstop>btnOK</tabstop>
   <tabstop>btnCancel</tabstop>
  </tabstops>
- <resources/>
+ <resources>
+  <include location="ewma-filter.qrc"/>
+ </resources>
  <connections>
   <connection>
    <sender>minSmooth</sender>
diff --git a/ftnoir_filter_kalman/ftnoir_kalman_filtercontrols.ui b/ftnoir_filter_kalman/ftnoir_kalman_filtercontrols.ui
index d1cff81e..a9fdec6e 100644
--- a/ftnoir_filter_kalman/ftnoir_kalman_filtercontrols.ui
+++ b/ftnoir_filter_kalman/ftnoir_kalman_filtercontrols.ui
@@ -20,13 +20,11 @@
    </sizepolicy>
   </property>
   <property name="windowTitle">
-   <string>Filter settings</string>
+   <string>Kalman settings</string>
   </property>
   <property name="windowIcon">
-   <iconset>
-    <normaloff>
-    images/facetracknoir.png</normaloff>
-    images/facetracknoir.png</iconset>
+   <iconset resource="../ftnoir_filter_ewma2/ewma-filter.qrc">
+    <normaloff>:/images/filter-16.png</normaloff>:/images/filter-16.png</iconset>
   </property>
   <property name="layoutDirection">
    <enum>Qt::LeftToRight</enum>
@@ -64,7 +62,9 @@
    </property>
   </widget>
  </widget>
- <resources/>
+ <resources>
+  <include location="../ftnoir_filter_ewma2/ewma-filter.qrc"/>
+ </resources>
  <connections/>
  <designerdata>
   <property name="gridDeltaX">
diff --git a/ftnoir_protocol_fg/ftnoir_fgcontrols.ui b/ftnoir_protocol_fg/ftnoir_fgcontrols.ui
index f3b54486..e351647b 100644
--- a/ftnoir_protocol_fg/ftnoir_fgcontrols.ui
+++ b/ftnoir_protocol_fg/ftnoir_fgcontrols.ui
@@ -9,16 +9,16 @@
    <rect>

     <x>0</x>

     <y>0</y>

-    <width>404</width>

+    <width>415</width>

     <height>112</height>

    </rect>

   </property>

   <property name="windowTitle">

-   <string>FlightGear settings FaceTrackNoIR</string>

+   <string>FlightGear protocol settings</string>

   </property>

   <property name="windowIcon">

-   <iconset>

-    <normaloff>images/FaceTrackNoIR.png</normaloff>images/FaceTrackNoIR.png</iconset>

+   <iconset resource="../ftnoir_filter_ewma2/ewma-filter.qrc">

+    <normaloff>:/images/filter-16.png</normaloff>:/images/filter-16.png</iconset>

   </property>

   <property name="layoutDirection">

    <enum>Qt::LeftToRight</enum>

@@ -131,7 +131,9 @@
   <tabstop>spinIPFourthNibble</tabstop>

   <tabstop>spinPortNumber</tabstop>

  </tabstops>

- <resources/>

+ <resources>

+  <include location="../ftnoir_filter_ewma2/ewma-filter.qrc"/>

+ </resources>

  <connections/>

  <slots>

   <slot>startEngineClicked()</slot>

diff --git a/ftnoir_protocol_ft/ftnoir_ftcontrols.ui b/ftnoir_protocol_ft/ftnoir_ftcontrols.ui
index f4d94ee8..39787d90 100644
--- a/ftnoir_protocol_ft/ftnoir_ftcontrols.ui
+++ b/ftnoir_protocol_ft/ftnoir_ftcontrols.ui
@@ -13,7 +13,7 @@
     <x>0</x>

     <y>0</y>

     <width>407</width>

-    <height>347</height>

+    <height>414</height>

    </rect>

   </property>

   <property name="sizePolicy">

@@ -29,11 +29,11 @@
    </size>

   </property>

   <property name="windowTitle">

-   <string>FreeTrack 2.0 settings FaceTrackNoIR</string>

+   <string>freetrack protocol settings</string>

   </property>

   <property name="windowIcon">

-   <iconset>

-    <normaloff>images/FaceTrackNoIR.ico</normaloff>images/FaceTrackNoIR.ico</iconset>

+   <iconset resource="ft-protocol.qrc">

+    <normaloff>:/images/freetrack.png</normaloff>:/images/freetrack.png</iconset>

   </property>

   <property name="layoutDirection">

    <enum>Qt::LeftToRight</enum>

@@ -214,7 +214,9 @@
    </item>

   </layout>

  </widget>

- <resources/>

+ <resources>

+  <include location="ft-protocol.qrc"/>

+ </resources>

  <connections/>

  <slots>

   <slot>startEngineClicked()</slot>

diff --git a/ftnoir_protocol_ftn/ftn-protocol.qrc b/ftnoir_protocol_ftn/ftn-protocol.qrc
deleted file mode 100644
index 18ae0aae..00000000
--- a/ftnoir_protocol_ftn/ftn-protocol.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file>images/facetracknoir.png</file>
-    </qresource>
-</RCC>
diff --git a/ftnoir_protocol_ftn/ftnoir_ftncontrols.ui b/ftnoir_protocol_ftn/ftnoir_ftncontrols.ui
index ac6988d7..429e7046 100644
--- a/ftnoir_protocol_ftn/ftnoir_ftncontrols.ui
+++ b/ftnoir_protocol_ftn/ftnoir_ftncontrols.ui
@@ -17,8 +17,8 @@
    <string>UDP protocol settings</string>

   </property>

   <property name="windowIcon">

-   <iconset>

-    <normaloff>images/FaceTrackNoIR.png</normaloff>images/FaceTrackNoIR.png</iconset>

+   <iconset resource="../facetracknoir/main-facetracknoir.qrc">

+    <normaloff>:/images/facetracknoir.png</normaloff>:/images/facetracknoir.png</iconset>

   </property>

   <property name="layoutDirection">

    <enum>Qt::LeftToRight</enum>

@@ -254,7 +254,9 @@
   <tabstop>btnOK</tabstop>

   <tabstop>btnCancel</tabstop>

  </tabstops>

- <resources/>

+ <resources>

+  <include location="../facetracknoir/main-facetracknoir.qrc"/>

+ </resources>

  <connections/>

  <slots>

   <slot>startEngineClicked()</slot>

diff --git a/ftnoir_protocol_ftn/images/facetracknoir.png b/ftnoir_protocol_ftn/images/facetracknoir.png
deleted file mode 100644
index b69a13ef..00000000
--- a/ftnoir_protocol_ftn/images/facetracknoir.png
+++ /dev/null
diff --git a/ftnoir_protocol_mouse/ftnoir_mousecontrols.ui b/ftnoir_protocol_mouse/ftnoir_mousecontrols.ui
index ee15ded2..540e4f0d 100644
--- a/ftnoir_protocol_mouse/ftnoir_mousecontrols.ui
+++ b/ftnoir_protocol_mouse/ftnoir_mousecontrols.ui
@@ -9,16 +9,16 @@
    <rect>

     <x>0</x>

     <y>0</y>

-    <width>250</width>

-    <height>112</height>

+    <width>257</width>

+    <height>114</height>

    </rect>

   </property>

   <property name="windowTitle">

-   <string>MouseLook settings FaceTrackNoIR</string>

+   <string>Mouse protocol settings</string>

   </property>

   <property name="windowIcon">

-   <iconset>

-    <normaloff>:/images/Mouse.png</normaloff>:/images/Mouse.png</iconset>

+   <iconset resource="win32-mouse-protocol.qrc">

+    <normaloff>:/images/mouse.png</normaloff>:/images/mouse.png</iconset>

   </property>

   <property name="layoutDirection">

    <enum>Qt::LeftToRight</enum>

@@ -193,7 +193,9 @@
    </item>

   </layout>

  </widget>

- <resources/>

+ <resources>

+  <include location="win32-mouse-protocol.qrc"/>

+ </resources>

  <connections/>

  <slots>

   <slot>startEngineClicked()</slot>

diff --git a/ftnoir_tracker_joystick/ftnoir_tracker_joystick_controls.ui b/ftnoir_tracker_joystick/ftnoir_tracker_joystick_controls.ui
index e1f1d28c..a0fa43d3 100644
--- a/ftnoir_tracker_joystick/ftnoir_tracker_joystick_controls.ui
+++ b/ftnoir_tracker_joystick/ftnoir_tracker_joystick_controls.ui
@@ -20,11 +20,11 @@
    </sizepolicy>
   </property>
   <property name="windowTitle">
-   <string>Joystick protcool settings</string>
+   <string>Joystick protocol settings</string>
   </property>
   <property name="windowIcon">
    <iconset>
-    <normaloff>images/FaceTrackNoIR.png</normaloff>images/FaceTrackNoIR.png</iconset>
+    <normaloff>../facetracknoir/images/facetracknoir.png</normaloff>../facetracknoir/images/facetracknoir.png</iconset>
   </property>
   <property name="layoutDirection">
    <enum>Qt::LeftToRight</enum>
diff --git a/ftnoir_tracker_udp/ftnoir_ftnclientcontrols.ui b/ftnoir_tracker_udp/ftnoir_ftnclientcontrols.ui
index 6c71b50b..fc614477 100644
--- a/ftnoir_tracker_udp/ftnoir_ftnclientcontrols.ui
+++ b/ftnoir_tracker_udp/ftnoir_ftnclientcontrols.ui
@@ -18,7 +18,7 @@
   </property>

   <property name="windowIcon">

    <iconset>

-    <normaloff>images/FaceTrackNoIR.png</normaloff>images/FaceTrackNoIR.png</iconset>

+    <normaloff>../facetracknoir/images/facetracknoir.png</normaloff>../facetracknoir/images/facetracknoir.png</iconset>

   </property>

   <property name="layoutDirection">

    <enum>Qt::LeftToRight</enum>