change icons, remove self-references

3 files changed, 5 insertions, 8 deletions

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