From 0d2da3ef577162be54bb5a26b85f8959b16bf3ab Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Tue, 28 Oct 2014 04:09:19 +0100
Subject: mv ui elts to common subdir

---
 facetracknoir/facetracknoir.cpp      |   3 +--
 facetracknoir/images/curves.png      | Bin 0 -> 3457 bytes
 facetracknoir/images/no-feed.png     | Bin 0 -> 128664 bytes
 facetracknoir/images/tools.png       | Bin 0 -> 3053 bytes
 facetracknoir/main-facetracknoir.qrc |   6 +++---
 facetracknoir/uielements/curves.png  | Bin 3457 -> 0 bytes
 facetracknoir/uielements/no-feed.png | Bin 128664 -> 0 bytes
 facetracknoir/uielements/tools.png   | Bin 3053 -> 0 bytes
 8 files changed, 4 insertions(+), 5 deletions(-)
 create mode 100644 facetracknoir/images/curves.png
 create mode 100644 facetracknoir/images/no-feed.png
 create mode 100644 facetracknoir/images/tools.png
 delete mode 100644 facetracknoir/uielements/curves.png
 delete mode 100644 facetracknoir/uielements/no-feed.png
 delete mode 100644 facetracknoir/uielements/tools.png

(limited to 'facetracknoir')

diff --git a/facetracknoir/facetracknoir.cpp b/facetracknoir/facetracknoir.cpp
index 22652a0b..7f198e76 100644
--- a/facetracknoir/facetracknoir.cpp
+++ b/facetracknoir/facetracknoir.cpp
@@ -34,11 +34,10 @@
 FaceTrackNoIR::FaceTrackNoIR() :
     pose_update_timer(this),
     kbd_quit(QKeySequence("Ctrl+Q"), this),
-    no_feed_pixmap(":/uielements/no-feed.png")
+    no_feed_pixmap(":/images/no-feed.png")
 {
     ui.setupUi(this);
 
-    adjustSize();
     setFixedSize(size());
 
     updateButtonState(false, false);
diff --git a/facetracknoir/images/curves.png b/facetracknoir/images/curves.png
new file mode 100644
index 00000000..3f953a0a
Binary files /dev/null and b/facetracknoir/images/curves.png differ
diff --git a/facetracknoir/images/no-feed.png b/facetracknoir/images/no-feed.png
new file mode 100644
index 00000000..6494e9c6
Binary files /dev/null and b/facetracknoir/images/no-feed.png differ
diff --git a/facetracknoir/images/tools.png b/facetracknoir/images/tools.png
new file mode 100644
index 00000000..2da8f9f5
Binary files /dev/null and b/facetracknoir/images/tools.png differ
diff --git a/facetracknoir/main-facetracknoir.qrc b/facetracknoir/main-facetracknoir.qrc
index e37c2529..0b28b032 100644
--- a/facetracknoir/main-facetracknoir.qrc
+++ b/facetracknoir/main-facetracknoir.qrc
@@ -1,9 +1,9 @@
 <RCC>
     <qresource prefix="/">
-        <file>uielements/tools.png</file>
+        <file>images/tools.png</file>
         <file>images/settings16.png</file>
-        <file>uielements/curves.png</file>
+        <file>images/curves.png</file>
         <file>images/facetracknoir.png</file>
-        <file>uielements/no-feed.png</file>
+        <file>images/no-feed.png</file>
     </qresource>
 </RCC>
diff --git a/facetracknoir/uielements/curves.png b/facetracknoir/uielements/curves.png
deleted file mode 100644
index 3f953a0a..00000000
Binary files a/facetracknoir/uielements/curves.png and /dev/null differ
diff --git a/facetracknoir/uielements/no-feed.png b/facetracknoir/uielements/no-feed.png
deleted file mode 100644
index 6494e9c6..00000000
Binary files a/facetracknoir/uielements/no-feed.png and /dev/null differ
diff --git a/facetracknoir/uielements/tools.png b/facetracknoir/uielements/tools.png
deleted file mode 100644
index 2da8f9f5..00000000
Binary files a/facetracknoir/uielements/tools.png and /dev/null differ
-- 
cgit v1.2.3