change icons, remove self-references

11 files changed, 26 insertions, 26 deletions

diff --git a/facetracknoir/facetracknoir.cpp b/facetracknoir/facetracknoir.cpp
index de5b491f..f2767587 100644
--- a/facetracknoir/facetracknoir.cpp
+++ b/facetracknoir/facetracknoir.cpp
@@ -246,7 +246,7 @@ void FaceTrackNoIR::open() {
      
 	 QString fileName = dialog.getOpenFileName(
 								this,
-                                 tr("Select one FTNoir settings file"),
+                                 tr("Open the settings file"),
 								 QCoreApplication::applicationDirPath() + "/settings/",
                                  tr("Settings file (*.ini);;All Files (*)"),
                                                NULL);
diff --git a/facetracknoir/facetracknoir.ui b/facetracknoir/facetracknoir.ui
index c25ee0db..d5300b0f 100644
--- a/facetracknoir/facetracknoir.ui
+++ b/facetracknoir/facetracknoir.ui
@@ -10,8 +10,8 @@
    <rect>

     <x>0</x>

     <y>0</y>

-    <width>788</width>

-    <height>554</height>

+    <width>790</width>

+    <height>500</height>

    </rect>

   </property>

   <property name="sizePolicy">

@@ -82,8 +82,8 @@
    <widget class="QFrame" name="video_frame">

     <property name="geometry">

      <rect>

-      <x>5</x>

-      <y>170</y>

+      <x>10</x>

+      <y>130</y>

       <width>320</width>

       <height>240</height>

      </rect>

@@ -113,7 +113,7 @@
      <property name="geometry">

       <rect>

        <x>0</x>

-       <y>-10</y>

+       <y>0</y>

        <width>320</width>

        <height>240</height>

       </rect>

@@ -141,8 +141,8 @@
    <widget class="QGroupBox" name="groupBox4logo">

     <property name="geometry">

      <rect>

-      <x>110</x>

-      <y>50</y>

+      <x>100</x>

+      <y>10</y>

       <width>229</width>

       <height>121</height>

      </rect>

@@ -516,8 +516,8 @@
    <widget class="GLWidget" name="pose_display" native="true">

     <property name="geometry">

      <rect>

-      <x>20</x>

-      <y>50</y>

+      <x>10</x>

+      <y>20</y>

       <width>81</width>

       <height>100</height>

      </rect>

@@ -545,7 +545,7 @@
     <property name="geometry">

      <rect>

       <x>350</x>

-      <y>370</y>

+      <y>270</y>

       <width>191</width>

       <height>91</height>

      </rect>

@@ -631,7 +631,7 @@
     <property name="geometry">

      <rect>

       <x>580</x>

-      <y>460</y>

+      <y>390</y>

       <width>171</width>

       <height>38</height>

      </rect>

@@ -677,9 +677,9 @@
    <widget class="QLabel" name="game_name">

     <property name="geometry">

      <rect>

-      <x>130</x>

-      <y>30</y>

-      <width>651</width>

+      <x>370</x>

+      <y>40</y>

+      <width>411</width>

       <height>20</height>

      </rect>

     </property>

@@ -702,9 +702,9 @@
    <widget class="QGroupBox" name="groupFilter">

     <property name="geometry">

      <rect>

-      <x>350</x>

-      <y>270</y>

-      <width>191</width>

+      <x>550</x>

+      <y>210</y>

+      <width>231</width>

       <height>91</height>

      </rect>

     </property>

@@ -868,9 +868,9 @@
    <widget class="QLabel" name="cameraName">

     <property name="geometry">

      <rect>

-      <x>130</x>

-      <y>0</y>

-      <width>651</width>

+      <x>370</x>

+      <y>10</y>

+      <width>411</width>

       <height>25</height>

      </rect>

     </property>

@@ -980,7 +980,7 @@
     <property name="geometry">

      <rect>

       <x>350</x>

-      <y>470</y>

+      <y>400</y>

       <width>190</width>

       <height>65</height>

      </rect>

@@ -1060,7 +1060,7 @@
     <property name="geometry">

      <rect>

       <x>580</x>

-      <y>410</y>

+      <y>340</y>

       <width>171</width>

       <height>38</height>

      </rect>

@@ -1228,7 +1228,7 @@
     <property name="geometry">

      <rect>

       <x>10</x>

-      <y>420</y>

+      <y>380</y>

       <width>141</width>

       <height>106</height>

      </rect>

@@ -1468,7 +1468,7 @@
     <property name="geometry">

      <rect>

       <x>160</x>

-      <y>420</y>

+      <y>380</y>

       <width>161</width>

       <height>111</height>

      </rect>

diff --git a/facetracknoir/ftnoir_keyboardshortcuts.ui b/facetracknoir/ftnoir_keyboardshortcuts.ui
index 0d4e9142..94d11734 100644
--- a/facetracknoir/ftnoir_keyboardshortcuts.ui
+++ b/facetracknoir/ftnoir_keyboardshortcuts.ui
@@ -21,7 +21,7 @@
   </property>

   <property name="windowIcon">

    <iconset>

-    <normaloff>images/FaceTrackNoIR.png</normaloff>images/FaceTrackNoIR.png</iconset>

+    <normaloff>images/facetracknoir.png</normaloff>images/facetracknoir.png</iconset>

   </property>

   <property name="layoutDirection">

    <enum>Qt::LeftToRight</enum>

diff --git a/facetracknoir/uielements/logo_facetracknoir_32px.jpg b/facetracknoir/uielements/logo_facetracknoir_32px.jpg
deleted file mode 100644
index 73ead853..00000000
--- a/facetracknoir/uielements/logo_facetracknoir_32px.jpg
+++ /dev/null
diff --git a/facetracknoir/uielements/logo_facetracknoir_32px.png b/facetracknoir/uielements/logo_facetracknoir_32px.png
deleted file mode 100644
index c4e63c76..00000000
--- a/facetracknoir/uielements/logo_facetracknoir_32px.png
+++ /dev/null
diff --git a/facetracknoir/uielements/logo_noir.png b/facetracknoir/uielements/logo_noir.png
deleted file mode 100644
index bb654a07..00000000
--- a/facetracknoir/uielements/logo_noir.png
+++ /dev/null
diff --git a/facetracknoir/uielements/logo_noir_small.png b/facetracknoir/uielements/logo_noir_small.png
deleted file mode 100644
index 5d49e0b1..00000000
--- a/facetracknoir/uielements/logo_noir_small.png
+++ /dev/null
diff --git a/facetracknoir/uielements/logo_noir_small_target.png b/facetracknoir/uielements/logo_noir_small_target.png
deleted file mode 100644
index 4bbaf41f..00000000
--- a/facetracknoir/uielements/logo_noir_small_target.png
+++ /dev/null
diff --git a/facetracknoir/uielements/logo_noir_small_target90px.png b/facetracknoir/uielements/logo_noir_small_target90px.png
deleted file mode 100644
index ecaa4e12..00000000
--- a/facetracknoir/uielements/logo_noir_small_target90px.png
+++ /dev/null
diff --git a/facetracknoir/uielements/logofacetracknoir.png b/facetracknoir/uielements/logofacetracknoir.png
deleted file mode 100644
index a1a3407b..00000000
--- a/facetracknoir/uielements/logofacetracknoir.png
+++ /dev/null
diff --git a/facetracknoir/uielements/logofacetracknoir60px.png b/facetracknoir/uielements/logofacetracknoir60px.png
deleted file mode 100644
index f01f6024..00000000
--- a/facetracknoir/uielements/logofacetracknoir60px.png
+++ /dev/null