rename our Qt .png icon

facetracknoir.png -> opentrack.png

28 files changed, 33 insertions, 33 deletions

diff --git a/gui/images/facetracknoir.png b/gui/images/opentrack.png
index 39359782..39359782 100644
--- a/gui/images/facetracknoir.png
+++ b/gui/images/opentrack.png
diff --git a/gui/mapping-dialog.ui b/gui/mapping-dialog.ui
index 58b8ad1f..0f0aa7c0 100644
--- a/gui/mapping-dialog.ui
+++ b/gui/mapping-dialog.ui
@@ -27,7 +27,7 @@
   </property>
   <property name="windowIcon">
    <iconset>
-    <normaloff>images/facetracknoir.png</normaloff>images/facetracknoir.png</iconset>
+    <normaloff>images/opentrack.png</normaloff>images/opentrack.png</iconset>
   </property>
   <property name="layoutDirection">
    <enum>Qt::LeftToRight</enum>
diff --git a/gui/opentrack-res.qrc b/gui/opentrack-res.qrc
index 1a3728cd..b4d7b4a5 100644
--- a/gui/opentrack-res.qrc
+++ b/gui/opentrack-res.qrc
@@ -3,7 +3,7 @@
         <file>images/tools.png</file>
         <file>images/settings16.png</file>
         <file>images/curves.png</file>
-        <file>images/facetracknoir.png</file>
+        <file>images/opentrack.png</file>
         <file>images/no-feed.png</file>
         <file>images/filter-16.png</file>
         <file>images/tracking-not-started.png</file>
diff --git a/gui/settings-dialog.ui b/gui/settings-dialog.ui
index 20a1b524..6333692a 100644
--- a/gui/settings-dialog.ui
+++ b/gui/settings-dialog.ui
@@ -15,7 +15,7 @@
   </property>
   <property name="windowIcon">
    <iconset>
-    <normaloff>images/facetracknoir.png</normaloff>images/facetracknoir.png</iconset>
+    <normaloff>images/opentrack.png</normaloff>images/opentrack.png</iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_5">
    <property name="topMargin">
diff --git a/macosx/make-app-bundle.sh b/macosx/make-app-bundle.sh
index 30a1517b..05259702 100644
--- a/macosx/make-app-bundle.sh
+++ b/macosx/make-app-bundle.sh
@@ -25,11 +25,11 @@ mkdir "$tmp/$APPNAME.iconset" || exit 1
 mkdir "$tmp/$APPNAME.app/Contents/Resources" || exit 1
 cp "$dir"/opentrack.sh "$tmp/$APPNAME.app/Contents/MacOS" || exit 1
 
-sips -z 16 16     "$dir/../gui/images/facetracknoir.png" --out "$tmp/$APPNAME.iconset/icon_16x16.png" || exit 1
-sips -z 32 32     "$dir/../gui/images/facetracknoir.png" --out "$tmp/$APPNAME.iconset/icon_16x16@2x.png" || exit 1
-sips -z 32 32     "$dir/../gui/images/facetracknoir.png" --out "$tmp/$APPNAME.iconset/icon_32x32.png" || exit 1
-sips -z 64 64     "$dir/../gui/images/facetracknoir.png" --out "$tmp/$APPNAME.iconset/icon_32x32@2x.png" || exit 1
-sips -z 128 128   "$dir/../gui/images/facetracknoir.png" --out "$tmp/$APPNAME.iconset/icon_128x128.png" || exit 1
+sips -z 16 16     "$dir/../gui/images/opentrack.png" --out "$tmp/$APPNAME.iconset/icon_16x16.png" || exit 1
+sips -z 32 32     "$dir/../gui/images/opentrack.png" --out "$tmp/$APPNAME.iconset/icon_16x16@2x.png" || exit 1
+sips -z 32 32     "$dir/../gui/images/opentrack.png" --out "$tmp/$APPNAME.iconset/icon_32x32.png" || exit 1
+sips -z 64 64     "$dir/../gui/images/opentrack.png" --out "$tmp/$APPNAME.iconset/icon_32x32@2x.png" || exit 1
+sips -z 128 128   "$dir/../gui/images/opentrack.png" --out "$tmp/$APPNAME.iconset/icon_128x128.png" || exit 1
 
 iconutil -c icns -o "$tmp/$APPNAME.app/Contents/Resources/$APPNAME.icns" "$tmp/$APPNAME.iconset"
 rm -r "$tmp/$APPNAME.iconset"
diff --git a/proto-fsuipc/ftnoir_fsuipccontrols.ui b/proto-fsuipc/ftnoir_fsuipccontrols.ui
index 637e4dba..4c85c91c 100644
--- a/proto-fsuipc/ftnoir_fsuipccontrols.ui
+++ b/proto-fsuipc/ftnoir_fsuipccontrols.ui
@@ -18,7 +18,7 @@
   </property>
   <property name="windowIcon">
    <iconset>
-    <normaloff>images/FaceTrackNoIR.png</normaloff>images/FaceTrackNoIR.png</iconset>
+    <normaloff>images/opentrack.png</normaloff>images/opentrack.png</iconset>
   </property>
   <property name="layoutDirection">
    <enum>Qt::LeftToRight</enum>
diff --git a/proto-iokit-foohid/iokitprotocol.h b/proto-iokit-foohid/iokitprotocol.h
index 1282b3d2..e3a1355c 100644
--- a/proto-iokit-foohid/iokitprotocol.h
+++ b/proto-iokit-foohid/iokitprotocol.h
@@ -30,5 +30,5 @@ class IOKitProtocolMetadata : public Metadata
 {
 public:
     QString name() { return otr_tr("Virtual joystick"); }
-    QIcon icon() { return QIcon(":/images/facetracknoir.png"); }
+    QIcon icon() { return QIcon(":/images/opentrack.png"); }
 };
diff --git a/proto-simconnect/ftnoir_sccontrols.ui b/proto-simconnect/ftnoir_sccontrols.ui
index 7a607096..6439550f 100644
--- a/proto-simconnect/ftnoir_sccontrols.ui
+++ b/proto-simconnect/ftnoir_sccontrols.ui
@@ -18,7 +18,7 @@
   </property>
   <property name="windowIcon">
    <iconset>
-    <normaloff>images/FaceTrackNoIR.png</normaloff>images/FaceTrackNoIR.png</iconset>
+    <normaloff>images/opentrack.png</normaloff>images/opentrack.png</iconset>
   </property>
   <property name="layoutDirection">
    <enum>Qt::LeftToRight</enum>
diff --git a/proto-udp/ftnoir_ftncontrols.ui b/proto-udp/ftnoir_ftncontrols.ui
index d6a4dfce..209095db 100644
--- a/proto-udp/ftnoir_ftncontrols.ui
+++ b/proto-udp/ftnoir_ftncontrols.ui
@@ -18,7 +18,7 @@
   </property>
   <property name="windowIcon">
    <iconset resource="../gui/opentrack-res.qrc">
-    <normaloff>:/images/facetracknoir.png</normaloff>:/images/facetracknoir.png</iconset>
+    <normaloff>:/images/opentrack.png</normaloff>:/images/opentrack.png</iconset>
   </property>
   <property name="layoutDirection">
    <enum>Qt::LeftToRight</enum>
diff --git a/proto-udp/ftnoir_protocol_ftn.h b/proto-udp/ftnoir_protocol_ftn.h
index 3a5c820b..c0454699 100644
--- a/proto-udp/ftnoir_protocol_ftn.h
+++ b/proto-udp/ftnoir_protocol_ftn.h
@@ -71,5 +71,5 @@ class udpDll : public Metadata
 {
 public:
     QString name() { return otr_tr("UDP over network"); }
-    QIcon icon() { return QIcon(":/images/facetracknoir.png"); }
+    QIcon icon() { return QIcon(":/images/opentrack.png"); }
 };
diff --git a/tracker-freepie-udp/freepie-udp-controls.ui b/tracker-freepie-udp/freepie-udp-controls.ui
index c59b9781..e818acb4 100644
--- a/tracker-freepie-udp/freepie-udp-controls.ui
+++ b/tracker-freepie-udp/freepie-udp-controls.ui
@@ -18,7 +18,7 @@
   </property>
   <property name="windowIcon">
    <iconset>
-    <normaloff>../gui/images/facetracknoir.png</normaloff>../gui/images/facetracknoir.png</iconset>
+    <normaloff>../gui/images/opentrack.png</normaloff>../gui/images/opentrack.png</iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
diff --git a/tracker-hydra/ftnoir_hydra_clientcontrols.ui b/tracker-hydra/ftnoir_hydra_clientcontrols.ui
index 7cfac075..4f509f61 100644
--- a/tracker-hydra/ftnoir_hydra_clientcontrols.ui
+++ b/tracker-hydra/ftnoir_hydra_clientcontrols.ui
@@ -18,7 +18,7 @@
   </property>
   <property name="windowIcon">
    <iconset>
-    <normaloff>images/FaceTrackNoIR.png</normaloff>images/FaceTrackNoIR.png</iconset>
+    <normaloff>images/opentrack.png</normaloff>images/opentrack.png</iconset>
   </property>
   <property name="layoutDirection">
    <enum>Qt::LeftToRight</enum>
diff --git a/tracker-hydra/ftnoir_tracker_hydra.h b/tracker-hydra/ftnoir_tracker_hydra.h
index f6b9a099..474a93f8 100644
--- a/tracker-hydra/ftnoir_tracker_hydra.h
+++ b/tracker-hydra/ftnoir_tracker_hydra.h
@@ -43,6 +43,6 @@ class hydraDll : public Metadata
 {
 public:
     QString name() { return QString("Razer Hydra -- inertial device"); }
-    QIcon icon() { return QIcon(":/images/facetracknoir.png"); }
+    QIcon icon() { return QIcon(":/images/opentrack.png"); }
 };
 
diff --git a/tracker-joystick/ftnoir_tracker_joystick.h b/tracker-joystick/ftnoir_tracker_joystick.h
index 6b0e7497..f3bbcda6 100644
--- a/tracker-joystick/ftnoir_tracker_joystick.h
+++ b/tracker-joystick/ftnoir_tracker_joystick.h
@@ -73,6 +73,6 @@ class joystickDll : public Metadata
 {
 public:
     QString name() { return otr_tr("Joystick input"); }
-    QIcon icon() { return QIcon(":/images/facetracknoir.png"); }
+    QIcon icon() { return QIcon(":/images/opentrack.png"); }
 };
 
diff --git a/tracker-joystick/ftnoir_tracker_joystick_controls.ui b/tracker-joystick/ftnoir_tracker_joystick_controls.ui
index ca41e35b..122dcf45 100644
--- a/tracker-joystick/ftnoir_tracker_joystick_controls.ui
+++ b/tracker-joystick/ftnoir_tracker_joystick_controls.ui
@@ -18,7 +18,7 @@
   </property>
   <property name="windowIcon">
    <iconset>
-    <normaloff>../gui/images/facetracknoir.png</normaloff>../gui/images/facetracknoir.png</iconset>
+    <normaloff>../gui/images/opentrack.png</normaloff>../gui/images/opentrack.png</iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="leftMargin">
diff --git a/tracker-rift-025/ftnoir_rift_clientcontrols_025.ui b/tracker-rift-025/ftnoir_rift_clientcontrols_025.ui
index a22ad85d..71918a71 100644
--- a/tracker-rift-025/ftnoir_rift_clientcontrols_025.ui
+++ b/tracker-rift-025/ftnoir_rift_clientcontrols_025.ui
@@ -24,7 +24,7 @@
   </property>
   <property name="windowIcon">
    <iconset>
-    <normaloff>images/FaceTrackNoIR.png</normaloff>images/FaceTrackNoIR.png</iconset>
+    <normaloff>images/opentrack.png</normaloff>images/opentrack.png</iconset>
   </property>
   <property name="layoutDirection">
    <enum>Qt::LeftToRight</enum>
diff --git a/tracker-rift-042/ftnoir_rift_clientcontrols_042.ui b/tracker-rift-042/ftnoir_rift_clientcontrols_042.ui
index 2b3316fd..102e16b2 100644
--- a/tracker-rift-042/ftnoir_rift_clientcontrols_042.ui
+++ b/tracker-rift-042/ftnoir_rift_clientcontrols_042.ui
@@ -24,7 +24,7 @@
   </property>
   <property name="windowIcon">
    <iconset>
-    <normaloff>images/FaceTrackNoIR.png</normaloff>images/FaceTrackNoIR.png</iconset>
+    <normaloff>images/opentrack.png</normaloff>images/opentrack.png</iconset>
   </property>
   <property name="layoutDirection">
    <enum>Qt::LeftToRight</enum>
diff --git a/tracker-rift-080/ftnoir_rift_clientcontrols_080.ui b/tracker-rift-080/ftnoir_rift_clientcontrols_080.ui
index d348fd35..cfc1b59f 100644
--- a/tracker-rift-080/ftnoir_rift_clientcontrols_080.ui
+++ b/tracker-rift-080/ftnoir_rift_clientcontrols_080.ui
@@ -24,7 +24,7 @@
   </property>
   <property name="windowIcon">
    <iconset>
-    <normaloff>images/FaceTrackNoIR.png</normaloff>images/FaceTrackNoIR.png</iconset>
+    <normaloff>images/opentrack.png</normaloff>images/opentrack.png</iconset>
   </property>
   <property name="layoutDirection">
    <enum>Qt::LeftToRight</enum>
diff --git a/tracker-rift-140/dialog.ui b/tracker-rift-140/dialog.ui
index 6fe583c3..a440db58 100644
--- a/tracker-rift-140/dialog.ui
+++ b/tracker-rift-140/dialog.ui
@@ -24,7 +24,7 @@
   </property>
   <property name="windowIcon">
    <iconset>
-    <normaloff>images/FaceTrackNoIR.png</normaloff>images/FaceTrackNoIR.png</iconset>
+    <normaloff>images/opentrack.png</normaloff>images/opentrack.png</iconset>
   </property>
   <property name="layoutDirection">
    <enum>Qt::LeftToRight</enum>
diff --git a/tracker-s2bot/s2bot-controls.ui b/tracker-s2bot/s2bot-controls.ui
index 9124ddd9..3d69321f 100644
--- a/tracker-s2bot/s2bot-controls.ui
+++ b/tracker-s2bot/s2bot-controls.ui
@@ -18,7 +18,7 @@
   </property>
   <property name="windowIcon">
    <iconset>
-    <normaloff>../gui/images/facetracknoir.png</normaloff>../gui/images/facetracknoir.png</iconset>
+    <normaloff>../gui/images/opentrack.png</normaloff>../gui/images/opentrack.png</iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
diff --git a/tracker-steamvr/dialog.ui b/tracker-steamvr/dialog.ui
index 88af913d..0f981160 100644
--- a/tracker-steamvr/dialog.ui
+++ b/tracker-steamvr/dialog.ui
@@ -24,7 +24,7 @@
   </property>
   <property name="windowIcon">
    <iconset>
-    <normaloff>images/FaceTrackNoIR.png</normaloff>images/FaceTrackNoIR.png</iconset>
+    <normaloff>images/opentrack.png</normaloff>images/opentrack.png</iconset>
   </property>
   <property name="layoutDirection">
    <enum>Qt::LeftToRight</enum>
diff --git a/tracker-test/test.h b/tracker-test/test.h
index 0f71005f..c7f19698 100644
--- a/tracker-test/test.h
+++ b/tracker-test/test.h
@@ -38,6 +38,6 @@ class test_metadata : public Metadata
 {
 public:
     QString name() { return _("Testing - sine wave"); }
-    QIcon icon() { return QIcon(":/images/facetracknoir.png"); }
+    QIcon icon() { return QIcon(":/images/opentrack.png"); }
 };
 
diff --git a/tracker-test/test.ui b/tracker-test/test.ui
index 556b19a3..509eb819 100644
--- a/tracker-test/test.ui
+++ b/tracker-test/test.ui
@@ -18,7 +18,7 @@
   </property>
   <property name="windowIcon">
    <iconset>
-    <normaloff>../gui/images/facetracknoir.png</normaloff>../gui/images/facetracknoir.png</iconset>
+    <normaloff>../gui/images/opentrack.png</normaloff>../gui/images/opentrack.png</iconset>
   </property>
   <property name="layoutDirection">
    <enum>Qt::LeftToRight</enum>
diff --git a/tracker-udp/ftnoir_ftnclientcontrols.ui b/tracker-udp/ftnoir_ftnclientcontrols.ui
index 25204c30..ddeb0a95 100644
--- a/tracker-udp/ftnoir_ftnclientcontrols.ui
+++ b/tracker-udp/ftnoir_ftnclientcontrols.ui
@@ -24,7 +24,7 @@
   </property>
   <property name="windowIcon">
    <iconset>
-    <normaloff>../gui/images/facetracknoir.png</normaloff>../gui/images/facetracknoir.png</iconset>
+    <normaloff>../gui/images/opentrack.png</normaloff>../gui/images/opentrack.png</iconset>
   </property>
   <property name="layoutDirection">
    <enum>Qt::LeftToRight</enum>
diff --git a/tracker-udp/ftnoir_tracker_udp.h b/tracker-udp/ftnoir_tracker_udp.h
index 1bf6b0a6..bccb2891 100644
--- a/tracker-udp/ftnoir_tracker_udp.h
+++ b/tracker-udp/ftnoir_tracker_udp.h
@@ -55,6 +55,6 @@ class udpDll : public Metadata
 {
 public:
     QString name() { return otr_tr("UDP over network"); }
-    QIcon icon() { return QIcon(":/images/facetracknoir.png"); }
+    QIcon icon() { return QIcon(":/images/opentrack.png"); }
 };
 
diff --git a/variant/default/main-window.cpp b/variant/default/main-window.cpp
index be6c08ec..9ac838f1 100644
--- a/variant/default/main-window.cpp
+++ b/variant/default/main-window.cpp
@@ -217,12 +217,12 @@ void main_window::init_tray()
 
     menu_action_header.setEnabled(false);
     menu_action_header.setText(display_name);
-    menu_action_header.setIcon(QIcon(":/images/facetracknoir.png"));
+    menu_action_header.setIcon(QIcon(":/images/opentrack.png"));
     tray_menu.addAction(&menu_action_header);
 
     menu_action_show.setIconVisibleInMenu(true);
     menu_action_show.setText(isHidden() ? tr("Show the Octopus") : tr("Hide the Octopus"));
-    menu_action_show.setIcon(QIcon(":/images/facetracknoir.png"));
+    menu_action_show.setIcon(QIcon(":/images/opentrack.png"));
     QObject::connect(&menu_action_show, &QAction::triggered, this, [&]() { toggle_restore_from_tray(QSystemTrayIcon::Trigger); });
     tray_menu.addAction(&menu_action_show);
 
@@ -748,7 +748,7 @@ void main_window::ensure_tray()
         if (!tray)
         {
             tray = std::make_unique<QSystemTrayIcon>(this);
-            tray->setIcon(QIcon(":/images/facetracknoir.png"));
+            tray->setIcon(QIcon(":/images/opentrack.png"));
             tray->setContextMenu(&tray_menu);
             tray->show();
 
diff --git a/variant/default/main-window.ui b/variant/default/main-window.ui
index bd377c1c..603afb08 100644
--- a/variant/default/main-window.ui
+++ b/variant/default/main-window.ui
@@ -13,7 +13,7 @@
   </property>
   <property name="windowIcon">
    <iconset resource="../../gui/opentrack-res.qrc">
-    <normaloff>:/images/facetracknoir.png</normaloff>:/images/facetracknoir.png</iconset>
+    <normaloff>:/images/opentrack.png</normaloff>:/images/opentrack.png</iconset>
   </property>
   <property name="styleSheet">
    <string notr="true">#video_feed { border: 0; }
diff --git a/variant/default/new_config.ui b/variant/default/new_config.ui
index 27dce0f8..a262e725 100644
--- a/variant/default/new_config.ui
+++ b/variant/default/new_config.ui
@@ -18,7 +18,7 @@
   </property>
   <property name="windowIcon">
    <iconset>
-    <normaloff>images/facetracknoir.png</normaloff>images/facetracknoir.png</iconset>
+    <normaloff>images/opentrack.png</normaloff>images/opentrack.png</iconset>
   </property>
   <layout class="QFormLayout" name="formLayout">
    <item row="0" column="0">