From 4b9e2b009fbc290d5108b8a83010dcbf2c5841e2 Mon Sep 17 00:00:00 2001
From: Xavier Hallade <xavier.hallade@intel.com>
Date: Wed, 26 Aug 2015 17:36:04 +0200
Subject: tracker_rs: more readable icon

---
 ftnoir_tracker_rs/ftnoir_tracker_rs.cpp  |  10 +++++-----
 ftnoir_tracker_rs/images/RS.png          | Bin 4287 -> 4770 bytes
 ftnoir_tracker_rs/images/intel-16x16.png | Bin 0 -> 637 bytes
 ftnoir_tracker_rs/rs_tracker.qrc         |   1 +
 4 files changed, 6 insertions(+), 5 deletions(-)
 create mode 100644 ftnoir_tracker_rs/images/intel-16x16.png

(limited to 'ftnoir_tracker_rs')

diff --git a/ftnoir_tracker_rs/ftnoir_tracker_rs.cpp b/ftnoir_tracker_rs/ftnoir_tracker_rs.cpp
index a9a50963..fee56fd1 100644
--- a/ftnoir_tracker_rs/ftnoir_tracker_rs.cpp
+++ b/ftnoir_tracker_rs/ftnoir_tracker_rs.cpp
@@ -35,8 +35,8 @@ RSTracker::RSTracker() : mPose{ 0,0,0, 0,0,0 } {
 
     connect(&mThread, &QThread::finished,
             &mThread, [this]{
-            mRealSenseImplProcess.kill();
-            mRealSenseImplProcess.waitForFinished();
+        mRealSenseImplProcess.kill();
+        mRealSenseImplProcess.waitForFinished();
     }, Qt::DirectConnection);
 }
 
@@ -85,7 +85,7 @@ void RSTracker::rsImplProcessFinished(int exitCode){
         if(msgBox.clickedButton() == triggerSdkInstallation){
             bool pStarted = QProcess::startDetached("clientfiles\\intel_rs_sdk_runtime_websetup_6.0.21.6598.exe --finstall=core,face3d --fnone=all");
             if(!pStarted){
-                QMessageBox::warning(0, "Intel® RealSenseTM Runtime Installation", "Installation process failed to start.", QMessageBox::Ok);
+                QMessageBox::warning(0, "Intel® RealSense™ Runtime Installation", "Installation process failed to start.", QMessageBox::Ok);
             }
         }
     }
@@ -103,11 +103,11 @@ RSTracker::~RSTracker() {
 }
 
 QString RSTrackerMetaData::name() {
-    return QString("RealSense 3D Face Tracking");
+    return QString("RealSense™ 3D Face Tracking");
 }
 
 QIcon RSTrackerMetaData::icon() {
-    return QIcon(":/images/RS.png");
+    return QIcon(":/images/intel-16x16.png");
 }
 
 OPENTRACK_DECLARE_TRACKER(RSTracker, RSTrackerControls, RSTrackerMetaData)
diff --git a/ftnoir_tracker_rs/images/RS.png b/ftnoir_tracker_rs/images/RS.png
index bc1dfc11..4ca11aac 100644
Binary files a/ftnoir_tracker_rs/images/RS.png and b/ftnoir_tracker_rs/images/RS.png differ
diff --git a/ftnoir_tracker_rs/images/intel-16x16.png b/ftnoir_tracker_rs/images/intel-16x16.png
new file mode 100644
index 00000000..e985ace1
Binary files /dev/null and b/ftnoir_tracker_rs/images/intel-16x16.png differ
diff --git a/ftnoir_tracker_rs/rs_tracker.qrc b/ftnoir_tracker_rs/rs_tracker.qrc
index ccdda669..155a5bd1 100644
--- a/ftnoir_tracker_rs/rs_tracker.qrc
+++ b/ftnoir_tracker_rs/rs_tracker.qrc
@@ -1,5 +1,6 @@
 <RCC>
     <qresource prefix="/">
         <file>images/RS.png</file>
+        <file>images/intel-16x16.png</file>
     </qresource>
 </RCC>
-- 
cgit v1.2.3