From 863efe5f6f51fb0fd9dedec38527a11e8510e0f2 Mon Sep 17 00:00:00 2001
From: Wim Vriend <facetracknoir@gmail.com>
Date: Mon, 27 Aug 2012 13:40:13 +0000
Subject: For update v170 alpha 2

git-svn-id: svn+ssh://svn.code.sf.net/p/facetracknoir/code@121 19e81ba0-9b1a-49c3-bd6c-561e1906d5fb
---
 FTNoIR_Protocol_FT/FTNoIR_FTcontrols.ui   | 33 +++----------------------------
 FTNoIR_Protocol_FT/FTNoIR_Protocol_FT.cpp |  6 +++---
 2 files changed, 6 insertions(+), 33 deletions(-)

(limited to 'FTNoIR_Protocol_FT')

diff --git a/FTNoIR_Protocol_FT/FTNoIR_FTcontrols.ui b/FTNoIR_Protocol_FT/FTNoIR_FTcontrols.ui
index 89b5d712..29cba42b 100644
--- a/FTNoIR_Protocol_FT/FTNoIR_FTcontrols.ui
+++ b/FTNoIR_Protocol_FT/FTNoIR_FTcontrols.ui
@@ -7,11 +7,11 @@
     <x>0</x>
     <y>0</y>
     <width>411</width>
-    <height>157</height>
+    <height>112</height>
    </rect>
   </property>
   <property name="windowTitle">
-   <string>FTIR settings FaceTrackNoIR</string>
+   <string>FreeTrack settings FaceTrackNoIR</string>
   </property>
   <property name="windowIcon">
    <iconset>
@@ -39,16 +39,6 @@
        </property>
       </spacer>
      </item>
-     <item>
-      <widget class="QCheckBox" name="chkTIRViews">
-       <property name="layoutDirection">
-        <enum>Qt::RightToLeft</enum>
-       </property>
-       <property name="text">
-        <string>Use TIRViews</string>
-       </property>
-      </widget>
-     </item>
     </layout>
    </item>
    <item>
@@ -69,24 +59,7 @@
      <item>
       <widget class="QLabel" name="label_2">
        <property name="text">
-        <string>TIRViews is only required for some older games (like CFS3).</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="label">
-       <property name="text">
-        <string>For it to work, TIRViews.dll must be placed in the FaceTrackNoIR program folder.</string>
-       </property>
-       <property name="wordWrap">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="label_3">
-       <property name="text">
-        <string>If the checkbox is disabled, the DLL was not found.</string>
+        <string>There are no settings necessary for the FreeTrack protocol.</string>
        </property>
       </widget>
      </item>
diff --git a/FTNoIR_Protocol_FT/FTNoIR_Protocol_FT.cpp b/FTNoIR_Protocol_FT/FTNoIR_Protocol_FT.cpp
index e6100956..d51072e5 100644
--- a/FTNoIR_Protocol_FT/FTNoIR_Protocol_FT.cpp
+++ b/FTNoIR_Protocol_FT/FTNoIR_Protocol_FT.cpp
@@ -356,7 +356,7 @@ QWidget()
 	// Connect Qt signals to member-functions
 	connect(ui.btnOK, SIGNAL(clicked()), this, SLOT(doOK()));
 	connect(ui.btnCancel, SIGNAL(clicked()), this, SLOT(doCancel()));
-	connect(ui.chkTIRViews, SIGNAL(stateChanged(int)), this, SLOT(chkTIRViewsChanged()));
+//	connect(ui.chkTIRViews, SIGNAL(stateChanged(int)), this, SLOT(chkTIRViewsChanged()));
 
 	// Load the settings from the current .INI-file
 	loadSettings();
@@ -445,7 +445,7 @@ void FTControls::loadSettings() {
 	qDebug() << "loadSettings says: iniFile = " << currentFile;
 
 	iniFile.beginGroup ( "FT" );
-	ui.chkTIRViews->setChecked (iniFile.value ( "useTIRViews", 0 ).toBool());
+//	ui.chkTIRViews->setChecked (iniFile.value ( "useTIRViews", 0 ).toBool());
 	iniFile.endGroup ();
 
 	settingsDirty = false;
@@ -461,7 +461,7 @@ void FTControls::save() {
 	QSettings iniFile( currentFile, QSettings::IniFormat );		// Application settings (in INI-file)
 
 	iniFile.beginGroup ( "FT" );
-	iniFile.setValue ( "useTIRViews", ui.chkTIRViews->isChecked() );
+//	iniFile.setValue ( "useTIRViews", ui.chkTIRViews->isChecked() );
 	iniFile.endGroup ();
 
 	settingsDirty = false;
-- 
cgit v1.2.3