fix icon paths

7 files changed, 14 insertions, 14 deletions

diff --git a/filter-accela/ftnoir_accela_filtercontrols.ui b/filter-accela/ftnoir_accela_filtercontrols.ui
index 3ab9a78e..6ec6e751 100644
--- a/filter-accela/ftnoir_accela_filtercontrols.ui
+++ b/filter-accela/ftnoir_accela_filtercontrols.ui
@@ -17,7 +17,7 @@
    <string>Accela filter settings</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../facetracknoir/ui-res.qrc">
+   <iconset resource="../gui/ui-res.qrc">
     <normaloff>:/images/filter-16.png</normaloff>:/images/filter-16.png</iconset>
   </property>
   <layout class="QGridLayout" name="gridLayout">
@@ -289,7 +289,7 @@
   <tabstop>buttonBox</tabstop>
  </tabstops>
  <resources>
-  <include location="../facetracknoir/ui-res.qrc"/>
+  <include location="../gui/ui-res.qrc"/>
  </resources>
  <connections/>
  <slots>
diff --git a/filter-kalman/ftnoir_kalman_filtercontrols.ui b/filter-kalman/ftnoir_kalman_filtercontrols.ui
index 69297102..df213815 100644
--- a/filter-kalman/ftnoir_kalman_filtercontrols.ui
+++ b/filter-kalman/ftnoir_kalman_filtercontrols.ui
@@ -23,7 +23,7 @@
    <string>Kalman settings</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../facetracknoir/ui-res.qrc">
+   <iconset resource="../gui/ui-res.qrc">
     <normaloff>:/images/filter-16.png</normaloff>:/images/filter-16.png</iconset>
   </property>
   <property name="layoutDirection">
@@ -88,7 +88,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="../facetracknoir/ui-res.qrc"/>
+  <include location="../gui/ui-res.qrc"/>
  </resources>
  <connections/>
  <designerdata>
diff --git a/macosx/make-app-bundle.sh b/macosx/make-app-bundle.sh
index 1001af4a..d0afb790 100644
--- a/macosx/make-app-bundle.sh
+++ b/macosx/make-app-bundle.sh
@@ -24,11 +24,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/../facetracknoir/images/facetracknoir.png" --out "$tmp/$APPNAME.iconset/icon_16x16.png" || exit 1
-sips -z 32 32     "$dir/../facetracknoir/images/facetracknoir.png" --out "$tmp/$APPNAME.iconset/icon_16x16@2x.png" || exit 1
-sips -z 32 32     "$dir/../facetracknoir/images/facetracknoir.png" --out "$tmp/$APPNAME.iconset/icon_32x32.png" || exit 1
-sips -z 64 64     "$dir/../facetracknoir/images/facetracknoir.png" --out "$tmp/$APPNAME.iconset/icon_32x32@2x.png" || exit 1
-sips -z 128 128   "$dir/../facetracknoir/images/facetracknoir.png" --out "$tmp/$APPNAME.iconset/icon_128x128.png" || 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
 
 iconutil -c icns -o "$tmp/$APPNAME.app/Contents/Resources/$APPNAME.icns" "$tmp/$APPNAME.iconset"
 rm -r "$tmp/$APPNAME.iconset"
diff --git a/protocol-ftn/ftnoir_ftncontrols.ui b/protocol-ftn/ftnoir_ftncontrols.ui
index ca811e99..28f8ccdf 100644
--- a/protocol-ftn/ftnoir_ftncontrols.ui
+++ b/protocol-ftn/ftnoir_ftncontrols.ui
@@ -17,7 +17,7 @@
    <string>UDP protocol settings</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../facetracknoir/main-facetracknoir.qrc">
+   <iconset resource="../gui/main-facetracknoir.qrc">
     <normaloff>:/images/facetracknoir.png</normaloff>:/images/facetracknoir.png</iconset>
   </property>
   <property name="layoutDirection">
@@ -255,7 +255,7 @@
   <tabstop>btnCancel</tabstop>
  </tabstops>
  <resources>
-  <include location="../facetracknoir/main-facetracknoir.qrc"/>
+  <include location="../gui/main-facetracknoir.qrc"/>
  </resources>
  <connections/>
  <slots>
diff --git a/tracker-freepie-udp/freepie-udp-controls.ui b/tracker-freepie-udp/freepie-udp-controls.ui
index 74e5a6f1..c59b9781 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>../facetracknoir/images/facetracknoir.png</normaloff>../facetracknoir/images/facetracknoir.png</iconset>
+    <normaloff>../gui/images/facetracknoir.png</normaloff>../gui/images/facetracknoir.png</iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
diff --git a/tracker-joystick/ftnoir_tracker_joystick_controls.ui b/tracker-joystick/ftnoir_tracker_joystick_controls.ui
index 88737023..ca41e35b 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>../facetracknoir/images/facetracknoir.png</normaloff>../facetracknoir/images/facetracknoir.png</iconset>
+    <normaloff>../gui/images/facetracknoir.png</normaloff>../gui/images/facetracknoir.png</iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="leftMargin">
diff --git a/tracker-udp/ftnoir_ftnclientcontrols.ui b/tracker-udp/ftnoir_ftnclientcontrols.ui
index cb9362ca..147c08e6 100644
--- a/tracker-udp/ftnoir_ftnclientcontrols.ui
+++ b/tracker-udp/ftnoir_ftnclientcontrols.ui
@@ -18,7 +18,7 @@
   </property>
   <property name="windowIcon">
    <iconset>
-    <normaloff>../facetracknoir/images/facetracknoir.png</normaloff>../facetracknoir/images/facetracknoir.png</iconset>
+    <normaloff>../gui/images/facetracknoir.png</normaloff>../gui/images/facetracknoir.png</iconset>
   </property>
   <property name="layoutDirection">
    <enum>Qt::LeftToRight</enum>