summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2014-10-28 04:09:19 +0100
committerStanislaw Halik <sthalik@misaki.pl>2014-10-28 04:12:36 +0100
commit0d2da3ef577162be54bb5a26b85f8959b16bf3ab (patch)
tree977e2c9f146c83252f9aa8be5f1a1bce6229022e
parent58b8ac748e6c2b73864342c6b7fa4dad5d6efc91 (diff)
mv ui elts to common subdir
-rw-r--r--facetracknoir/facetracknoir.cpp3
-rw-r--r--facetracknoir/images/curves.png (renamed from facetracknoir/uielements/curves.png)bin3457 -> 3457 bytes
-rw-r--r--facetracknoir/images/no-feed.png (renamed from facetracknoir/uielements/no-feed.png)bin128664 -> 128664 bytes
-rw-r--r--facetracknoir/images/tools.png (renamed from facetracknoir/uielements/tools.png)bin3053 -> 3053 bytes
-rw-r--r--facetracknoir/main-facetracknoir.qrc6
5 files changed, 4 insertions, 5 deletions
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/uielements/curves.png b/facetracknoir/images/curves.png
index 3f953a0a..3f953a0a 100644
--- a/facetracknoir/uielements/curves.png
+++ b/facetracknoir/images/curves.png
Binary files differ
diff --git a/facetracknoir/uielements/no-feed.png b/facetracknoir/images/no-feed.png
index 6494e9c6..6494e9c6 100644
--- a/facetracknoir/uielements/no-feed.png
+++ b/facetracknoir/images/no-feed.png
Binary files differ
diff --git a/facetracknoir/uielements/tools.png b/facetracknoir/images/tools.png
index 2da8f9f5..2da8f9f5 100644
--- a/facetracknoir/uielements/tools.png
+++ b/facetracknoir/images/tools.png
Binary files 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>