Run dos2unix on the tree. No user-facing changes.

4 files changed, 459 insertions, 459 deletions

diff --git a/ftnoir_protocol_mouse/ftnoir_protocol_mouse.cpp b/ftnoir_protocol_mouse/ftnoir_protocol_mouse.cpp
index 16a501b6..6b013d74 100644
--- a/ftnoir_protocol_mouse/ftnoir_protocol_mouse.cpp
+++ b/ftnoir_protocol_mouse/ftnoir_protocol_mouse.cpp
@@ -1,101 +1,101 @@
-/********************************************************************************

-* FaceTrackNoIR		This program is a private project of the some enthusiastic	*

-*					gamers from Holland, who don't like to pay much for			*

-*					head-tracking.												*

-*																				*

-* Copyright (C) 2010-2011	Wim Vriend (Developing)								*

-*							Ron Hendriks (Researching and Testing)				*

-*																				*

-* Homepage																		*

-*																				*

-* This program is free software; you can redistribute it and/or modify it		*

-* under the terms of the GNU General Public License as published by the			*

-* Free Software Foundation; either version 3 of the License, or (at your		*

-* option) any later version.													*

-*																				*

-* This program is distributed in the hope that it will be useful, but			*

-* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY	*

-* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for	*

-* more details.																	*

-*																				*

-* You should have received a copy of the GNU General Public License along		*

-* with this program; if not, see <http://www.gnu.org/licenses/>.				*

-*																				*

-* FTNoIR_Protocol_Mouse	The Class, that communicates headpose-data by			*

-*						generating Mouse commands.								*

-*						Many games (like FPS's) support Mouse-look features,	*

-*						but no face-tracking.									*

-********************************************************************************/

-#include "ftnoir_protocol_mouse.h"

-#include "facetracknoir/global-settings.h"

-

-/** constructor **/

-FTNoIR_Protocol::FTNoIR_Protocol()

-{

-	loadSettings();

-}

-

-/** destructor **/

-FTNoIR_Protocol::~FTNoIR_Protocol()

-{

-}

-

-//

-// Load the current Settings from the currently 'active' INI-file.

-//

-void FTNoIR_Protocol::loadSettings() {

-	QSettings settings("opentrack");	// Registry settings (in HK_USER)

-

-	QString currentFile = settings.value ( "SettingsFile", QCoreApplication::applicationDirPath() + "/Settings/default.ini" ).toString();

-	QSettings iniFile( currentFile, QSettings::IniFormat );		// Application settings (in INI-file)

-

-	iniFile.beginGroup ( "Mouse" );

-	Mouse_X = (FTN_AngleName) (iniFile.value ( "Mouse_X", 0 ).toInt());

-	Mouse_Y = (FTN_AngleName) (iniFile.value ( "Mouse_Y", 0 ).toInt());

-	iniFile.endGroup ();

-}

-

-//

-// Update Headpose in Game.

-//

-void FTNoIR_Protocol::sendHeadposeToGame(double *headpose, double *rawheadpose ) {

-    float fMouse_X = 0;

-    float fMouse_Y = 0;

-	

-    if (Mouse_X > 0 && Mouse_X <= 6)

-        fMouse_X = headpose[Mouse_X-1] / (Mouse_X < 3 ? 100 : 180);

-

-    if (Mouse_Y > 0 && Mouse_Y <= 6)

-        fMouse_Y = headpose[Mouse_Y-1] / (Mouse_Y < 3 ? 100 : 180);

-    

-    RECT desktop;

-    const HWND hDesktop = GetDesktopWindow();

-    if (hDesktop != NULL && GetWindowRect(hDesktop, &desktop)) {

-        fMouse_X *= desktop.right;

-        fMouse_Y *= desktop.bottom;

-        SetCursorPos(fMouse_X + desktop.right/2, fMouse_Y + desktop.bottom/2);

-    }

-}

-

-//

-// Returns 'true' if all seems OK.

-//

-bool FTNoIR_Protocol::checkServerInstallationOK()

-{   

-

-	return true;

-}

-

-////////////////////////////////////////////////////////////////////////////////

-// Factory function that creates instances if the Protocol object.

-

-// Export both decorated and undecorated names.

-//   GetProtocol     - Undecorated name, which can be easily used with GetProcAddress

-//                Win32 API function.

-//   _GetProtocol@0  - Common name decoration for __stdcall functions in C language.

-//#pragma comment(linker, "/export:GetProtocol=_GetProtocol@0")

-

-extern "C" FTNOIR_PROTOCOL_BASE_EXPORT IProtocol* CALLING_CONVENTION GetConstructor()

-{

-    return new FTNoIR_Protocol;

-}

+/********************************************************************************
+* FaceTrackNoIR		This program is a private project of the some enthusiastic	*
+*					gamers from Holland, who don't like to pay much for			*
+*					head-tracking.												*
+*																				*
+* Copyright (C) 2010-2011	Wim Vriend (Developing)								*
+*							Ron Hendriks (Researching and Testing)				*
+*																				*
+* Homepage																		*
+*																				*
+* This program is free software; you can redistribute it and/or modify it		*
+* under the terms of the GNU General Public License as published by the			*
+* Free Software Foundation; either version 3 of the License, or (at your		*
+* option) any later version.													*
+*																				*
+* This program is distributed in the hope that it will be useful, but			*
+* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY	*
+* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for	*
+* more details.																	*
+*																				*
+* You should have received a copy of the GNU General Public License along		*
+* with this program; if not, see <http://www.gnu.org/licenses/>.				*
+*																				*
+* FTNoIR_Protocol_Mouse	The Class, that communicates headpose-data by			*
+*						generating Mouse commands.								*
+*						Many games (like FPS's) support Mouse-look features,	*
+*						but no face-tracking.									*
+********************************************************************************/
+#include "ftnoir_protocol_mouse.h"
+#include "facetracknoir/global-settings.h"
+
+/** constructor **/
+FTNoIR_Protocol::FTNoIR_Protocol()
+{
+	loadSettings();
+}
+
+/** destructor **/
+FTNoIR_Protocol::~FTNoIR_Protocol()
+{
+}
+
+//
+// Load the current Settings from the currently 'active' INI-file.
+//
+void FTNoIR_Protocol::loadSettings() {
+	QSettings settings("opentrack");	// Registry settings (in HK_USER)
+
+	QString currentFile = settings.value ( "SettingsFile", QCoreApplication::applicationDirPath() + "/Settings/default.ini" ).toString();
+	QSettings iniFile( currentFile, QSettings::IniFormat );		// Application settings (in INI-file)
+
+	iniFile.beginGroup ( "Mouse" );
+	Mouse_X = (FTN_AngleName) (iniFile.value ( "Mouse_X", 0 ).toInt());
+	Mouse_Y = (FTN_AngleName) (iniFile.value ( "Mouse_Y", 0 ).toInt());
+	iniFile.endGroup ();
+}
+
+//
+// Update Headpose in Game.
+//
+void FTNoIR_Protocol::sendHeadposeToGame(double *headpose, double *rawheadpose ) {
+    float fMouse_X = 0;
+    float fMouse_Y = 0;
+	
+    if (Mouse_X > 0 && Mouse_X <= 6)
+        fMouse_X = headpose[Mouse_X-1] / (Mouse_X < 3 ? 100 : 180);
+
+    if (Mouse_Y > 0 && Mouse_Y <= 6)
+        fMouse_Y = headpose[Mouse_Y-1] / (Mouse_Y < 3 ? 100 : 180);
+    
+    RECT desktop;
+    const HWND hDesktop = GetDesktopWindow();
+    if (hDesktop != NULL && GetWindowRect(hDesktop, &desktop)) {
+        fMouse_X *= desktop.right;
+        fMouse_Y *= desktop.bottom;
+        SetCursorPos(fMouse_X + desktop.right/2, fMouse_Y + desktop.bottom/2);
+    }
+}
+
+//
+// Returns 'true' if all seems OK.
+//
+bool FTNoIR_Protocol::checkServerInstallationOK()
+{   
+
+	return true;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// Factory function that creates instances if the Protocol object.
+
+// Export both decorated and undecorated names.
+//   GetProtocol     - Undecorated name, which can be easily used with GetProcAddress
+//                Win32 API function.
+//   _GetProtocol@0  - Common name decoration for __stdcall functions in C language.
+//#pragma comment(linker, "/export:GetProtocol=_GetProtocol@0")
+
+extern "C" FTNOIR_PROTOCOL_BASE_EXPORT IProtocol* CALLING_CONVENTION GetConstructor()
+{
+    return new FTNoIR_Protocol;
+}
diff --git a/ftnoir_protocol_mouse/ftnoir_protocol_mouse.h b/ftnoir_protocol_mouse/ftnoir_protocol_mouse.h
index fd0058ea..b537fc4e 100644
--- a/ftnoir_protocol_mouse/ftnoir_protocol_mouse.h
+++ b/ftnoir_protocol_mouse/ftnoir_protocol_mouse.h
@@ -1,128 +1,128 @@
-/********************************************************************************

-* FaceTrackNoIR		This program is a private project of some enthusiastic		*

-*					gamers from Holland, who don't like to pay much for			*

-*					head-tracking.												*

-*																				*

-* Copyright (C) 2010-2011	Wim Vriend (Developing)								*

-*							Ron Hendriks (Researching and Testing)				*

-*																				*

-* http://facetracknoir.sourceforge.net/home/default.htm							*

-*																				*

-* This program is free software; you can redistribute it and/or modify it		*

-* under the terms of the GNU General Public License as published by the			*

-* Free Software Foundation; either version 3 of the License, or (at your		*

-* option) any later version.													*

-*																				*

-* This program is distributed in the hope that it will be useful, but			*

-* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY	*

-* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for	*

-* more details.																	*

-*																				*

-* You should have received a copy of the GNU General Public License along		*

-* with this program; if not, see <http://www.gnu.org/licenses/>.				*

-*																				*

-* FTNoIR_Protocol_Mouse	The Class, that communicates headpose-data by			*

-*						generating Mouse commands.								*

-*						Many games (like FPS's) support Mouse-look features,	*

-*						but no face-tracking.									*

-********************************************************************************/

-#pragma once

-#ifndef INCLUDED_MOUSESERVER_H

-#define INCLUDED_MOUSESERVER_H

-

-#include "ftnoir_protocol_base/ftnoir_protocol_base.h"

-#include "ui_ftnoir_mousecontrols.h"

-#include <QMessageBox>

-#include <QSettings>

-#include <QLibrary>

-#include <QProcess>

-#include <QDebug>

-#include <QFile>

-#include <windows.h>

-#include <winuser.h>

-#include "facetracknoir/global-settings.h"

-

-#define MOUSE_AXIS_MIN 0

-#define MOUSE_AXIS_MAX 65535

-

-enum FTN_AngleName {

-    FTN_YAW = Yaw,

-    FTN_PITCH = Pitch,

-    FTN_ROLL = Roll,

-    FTN_X = TX,

-    FTN_Y = TY,

-    FTN_Z = TZ

-};

-

-class FTNoIR_Protocol : public IProtocol

-{

-public:

-	FTNoIR_Protocol();

-	~FTNoIR_Protocol();

-    bool checkServerInstallationOK();

-    void sendHeadposeToGame( double *headpose, double *rawheadpose );

-

-private:

-	HANDLE h;

-	INPUT MouseStruct;

-

-	FTN_AngleName Mouse_X;			// Map one of the 6DOF's to this Mouse direction

-	FTN_AngleName Mouse_Y;

-	FTN_AngleName Mouse_Wheel;

-	void loadSettings();

-    QString getGameName() {

-        return "Mouse tracker";

-    }

-};

-

-// Widget that has controls for FTNoIR protocol client-settings.

-class MOUSEControls: public QWidget, public IProtocolDialog

-{

-    Q_OBJECT

-public:

-

-	explicit MOUSEControls();

-    virtual ~MOUSEControls();

-	void showEvent ( QShowEvent * event );

-    void Initialize(QWidget *parent);

-	void registerProtocol(IProtocol *protocol) {

-		theProtocol = (FTNoIR_Protocol *) protocol;			// Accept the pointer to the Protocol

-	}

-	void unRegisterProtocol() {

-		theProtocol = NULL;									// Reset the pointer

-	}

-

-private:

-	Ui::UICMOUSEControls ui;

-	void loadSettings();

-	void save();

-

-	/** helper **/

-	bool settingsDirty;

-	FTNoIR_Protocol *theProtocol;

-

-private slots:

-	void doOK();

-	void doCancel();

-	void settingChanged( int setting ) { settingsDirty = true; }

-};

-

-//*******************************************************************************************************

-// FaceTrackNoIR Protocol DLL. Functions used to get general info on the Protocol

-//*******************************************************************************************************

-class FTNoIR_ProtocolDll : public Metadata

-{

-public:

-	FTNoIR_ProtocolDll();

-	~FTNoIR_ProtocolDll();

-

-	void getFullName(QString *strToBeFilled) { *strToBeFilled = QString("Mouse Look"); }

-	void getShortName(QString *strToBeFilled) { *strToBeFilled = QString("Mouse Look"); }

-	void getDescription(QString *strToBeFilled) { *strToBeFilled = QString("Mouse Look protocol"); }

-

-    void getIcon(QIcon *icon) { *icon = QIcon(":/images/mouse.png"); }

-};

-

-

-#endif//INCLUDED_MOUSESERVER_H

-//END

+/********************************************************************************
+* FaceTrackNoIR		This program is a private project of some enthusiastic		*
+*					gamers from Holland, who don't like to pay much for			*
+*					head-tracking.												*
+*																				*
+* Copyright (C) 2010-2011	Wim Vriend (Developing)								*
+*							Ron Hendriks (Researching and Testing)				*
+*																				*
+* http://facetracknoir.sourceforge.net/home/default.htm							*
+*																				*
+* This program is free software; you can redistribute it and/or modify it		*
+* under the terms of the GNU General Public License as published by the			*
+* Free Software Foundation; either version 3 of the License, or (at your		*
+* option) any later version.													*
+*																				*
+* This program is distributed in the hope that it will be useful, but			*
+* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY	*
+* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for	*
+* more details.																	*
+*																				*
+* You should have received a copy of the GNU General Public License along		*
+* with this program; if not, see <http://www.gnu.org/licenses/>.				*
+*																				*
+* FTNoIR_Protocol_Mouse	The Class, that communicates headpose-data by			*
+*						generating Mouse commands.								*
+*						Many games (like FPS's) support Mouse-look features,	*
+*						but no face-tracking.									*
+********************************************************************************/
+#pragma once
+#ifndef INCLUDED_MOUSESERVER_H
+#define INCLUDED_MOUSESERVER_H
+
+#include "ftnoir_protocol_base/ftnoir_protocol_base.h"
+#include "ui_ftnoir_mousecontrols.h"
+#include <QMessageBox>
+#include <QSettings>
+#include <QLibrary>
+#include <QProcess>
+#include <QDebug>
+#include <QFile>
+#include <windows.h>
+#include <winuser.h>
+#include "facetracknoir/global-settings.h"
+
+#define MOUSE_AXIS_MIN 0
+#define MOUSE_AXIS_MAX 65535
+
+enum FTN_AngleName {
+    FTN_YAW = Yaw,
+    FTN_PITCH = Pitch,
+    FTN_ROLL = Roll,
+    FTN_X = TX,
+    FTN_Y = TY,
+    FTN_Z = TZ
+};
+
+class FTNoIR_Protocol : public IProtocol
+{
+public:
+	FTNoIR_Protocol();
+	~FTNoIR_Protocol();
+    bool checkServerInstallationOK();
+    void sendHeadposeToGame( double *headpose, double *rawheadpose );
+
+private:
+	HANDLE h;
+	INPUT MouseStruct;
+
+	FTN_AngleName Mouse_X;			// Map one of the 6DOF's to this Mouse direction
+	FTN_AngleName Mouse_Y;
+	FTN_AngleName Mouse_Wheel;
+	void loadSettings();
+    QString getGameName() {
+        return "Mouse tracker";
+    }
+};
+
+// Widget that has controls for FTNoIR protocol client-settings.
+class MOUSEControls: public QWidget, public IProtocolDialog
+{
+    Q_OBJECT
+public:
+
+	explicit MOUSEControls();
+    virtual ~MOUSEControls();
+	void showEvent ( QShowEvent * event );
+    void Initialize(QWidget *parent);
+	void registerProtocol(IProtocol *protocol) {
+		theProtocol = (FTNoIR_Protocol *) protocol;			// Accept the pointer to the Protocol
+	}
+	void unRegisterProtocol() {
+		theProtocol = NULL;									// Reset the pointer
+	}
+
+private:
+	Ui::UICMOUSEControls ui;
+	void loadSettings();
+	void save();
+
+	/** helper **/
+	bool settingsDirty;
+	FTNoIR_Protocol *theProtocol;
+
+private slots:
+	void doOK();
+	void doCancel();
+	void settingChanged( int setting ) { settingsDirty = true; }
+};
+
+//*******************************************************************************************************
+// FaceTrackNoIR Protocol DLL. Functions used to get general info on the Protocol
+//*******************************************************************************************************
+class FTNoIR_ProtocolDll : public Metadata
+{
+public:
+	FTNoIR_ProtocolDll();
+	~FTNoIR_ProtocolDll();
+
+	void getFullName(QString *strToBeFilled) { *strToBeFilled = QString("Mouse Look"); }
+	void getShortName(QString *strToBeFilled) { *strToBeFilled = QString("Mouse Look"); }
+	void getDescription(QString *strToBeFilled) { *strToBeFilled = QString("Mouse Look protocol"); }
+
+    void getIcon(QIcon *icon) { *icon = QIcon(":/images/mouse.png"); }
+};
+
+
+#endif//INCLUDED_MOUSESERVER_H
+//END
diff --git a/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dialog.cpp b/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dialog.cpp
index c2f68bd2..1e03a022 100644
--- a/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dialog.cpp
+++ b/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dialog.cpp
@@ -1,181 +1,181 @@
-/********************************************************************************

-* FaceTrackNoIR		This program is a private project of some enthusiastic		*

-*					gamers from Holland, who don't like to pay much for			*

-*					head-tracking.												*

-*																				*

-* Copyright (C) 2012	Wim Vriend (Developing)									*

-*						Ron Hendriks (Researching and Testing)					*

-*																				*

-* Homepage																		*

-*																				*

-* This program is free software; you can redistribute it and/or modify it		*

-* under the terms of the GNU General Public License as published by the			*

-* Free Software Foundation; either version 3 of the License, or (at your		*

-* option) any later version.													*

-*																				*

-* This program is distributed in the hope that it will be useful, but			*

-* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY	*

-* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for	*

-* more details.																	*

-*																				*

-* You should have received a copy of the GNU General Public License along		*

-* with this program; if not, see <http://www.gnu.org/licenses/>.				*

-*																				*

-********************************************************************************/

-#include "ftnoir_protocol_mouse.h"

-#include <QDebug>

-#include "facetracknoir/global-settings.h"

-

-//*******************************************************************************************************

-// FaceTrackNoIR Client Settings-dialog.

-//*******************************************************************************************************

-

-//

-// Constructor for server-settings-dialog

-//

-MOUSEControls::MOUSEControls() :

-QWidget()

-{

-	ui.setupUi( this );

-	ui.cbxSelectMouse_X->addItem("None");

-    ui.cbxSelectMouse_X->addItem("X");

-	ui.cbxSelectMouse_X->addItem("Y");

-	ui.cbxSelectMouse_X->addItem("Z");

-	ui.cbxSelectMouse_X->addItem("Yaw");

-    ui.cbxSelectMouse_X->addItem("Pitch");

-	ui.cbxSelectMouse_X->addItem("Roll");

-

-	ui.cbxSelectMouse_Y->addItem("None");

-	ui.cbxSelectMouse_Y->addItem("X");

-	ui.cbxSelectMouse_Y->addItem("Y");

-	ui.cbxSelectMouse_Y->addItem("Z");

-    ui.cbxSelectMouse_Y->addItem("Yaw");

-	ui.cbxSelectMouse_Y->addItem("Pitch");

-	ui.cbxSelectMouse_Y->addItem("Roll");

-	// Connect Qt signals to member-functions

-	connect(ui.btnOK, SIGNAL(clicked()), this, SLOT(doOK()));

-	connect(ui.btnCancel, SIGNAL(clicked()), this, SLOT(doCancel()));

-	connect(ui.cbxSelectMouse_X, SIGNAL(currentIndexChanged(int)), this, SLOT(settingChanged( int )));

-	connect(ui.cbxSelectMouse_Y, SIGNAL(currentIndexChanged(int)), this, SLOT(settingChanged( int )));

-	theProtocol = NULL;

-	// Load the settings from the current .INI-file

-	loadSettings();

-}

-

-//

-// Destructor for server-dialog

-//

-MOUSEControls::~MOUSEControls() {

-	qDebug() << "~MOUSEControls() says: started";

-}

-

-//

-// Initialize tracker-client-dialog

-//

-void MOUSEControls::Initialize(QWidget *parent) {

-

-	QPoint offsetpos(100, 100);

-	if (parent) {

-		this->move(parent->pos() + offsetpos);

-	}

-	show();

-}

-

-//

-// OK clicked on server-dialog

-//

-void MOUSEControls::doOK() {

-	save();

-	this->close();

-}

-

-// override show event

-void MOUSEControls::showEvent ( QShowEvent * event ) {

-	loadSettings();

-}

-

-//

-// Cancel clicked on server-dialog

-//

-void MOUSEControls::doCancel() {

-	//

-	// Ask if changed Settings should be saved

-	//

-	if (settingsDirty) {

-		int ret = QMessageBox::question ( this, "Settings have changed", "Do you want to save the settings?", QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel, QMessageBox::Discard );

-

-		qDebug() << "doCancel says: answer =" << ret;

-

-		switch (ret) {

-			case QMessageBox::Save:

-				save();

-				this->close();

-				break;

-			case QMessageBox::Discard:

-				this->close();

-				break;

-			case QMessageBox::Cancel:

-				// Cancel was clicked

-				break;

-			default:

-				// should never be reached

-			break;

-		}

-	}

-	else {

-		this->close();

-	}

-}

-

-//

-// Load the current Settings from the currently 'active' INI-file.

-//

-void MOUSEControls::loadSettings() {

-	qDebug() << "loadSettings says: Starting ";

-	QSettings settings("opentrack");	// Registry settings (in HK_USER)

-

-	QString currentFile = settings.value ( "SettingsFile", QCoreApplication::applicationDirPath() + "/Settings/default.ini" ).toString();

-	QSettings iniFile( currentFile, QSettings::IniFormat );		// Application settings (in INI-file)

-

-	qDebug() << "loadSettings says: iniFile = " << currentFile;

-

-	iniFile.beginGroup ( "Mouse" );

-	ui.cbxSelectMouse_X->setCurrentIndex(iniFile.value ( "Mouse_X", 0 ).toInt() );

-	ui.cbxSelectMouse_Y->setCurrentIndex(iniFile.value ( "Mouse_Y", 0 ).toInt() );

-	iniFile.endGroup ();

-

-	settingsDirty = false;

-}

-

-//

-// Save the current Settings to the currently 'active' INI-file.

-//

-void MOUSEControls::save() {

-	qDebug() << "save() says: started";

-

-	QSettings settings("opentrack");	// Registry settings (in HK_USER)

-

-	QString currentFile = settings.value ( "SettingsFile", QCoreApplication::applicationDirPath() + "/Settings/default.ini" ).toString();

-	QSettings iniFile( currentFile, QSettings::IniFormat );		// Application settings (in INI-file)

-

-	iniFile.beginGroup ( "Mouse" );

-	iniFile.setValue ( "Mouse_X", ui.cbxSelectMouse_X->currentIndex() );

-	iniFile.setValue ( "Mouse_Y", ui.cbxSelectMouse_Y->currentIndex() );

-	iniFile.endGroup ();

-

-	settingsDirty = false;

-}

-

-////////////////////////////////////////////////////////////////////////////////

-// Factory function that creates instances if the Protocol-settings dialog object.

-

-// Export both decorated and undecorated names.

-//   GetProtocolDialog     - Undecorated name, which can be easily used with GetProcAddress

-//                          Win32 API function.

-//   _GetProtocolDialog@0  - Common name decoration for __stdcall functions in C language.

-//#pragma comment(linker, "/export:GetProtocolDialog=_GetProtocolDialog@0")

-

-extern "C" FTNOIR_PROTOCOL_BASE_EXPORT IProtocolDialog* CALLING_CONVENTION GetDialog( )

-{

-    return new MOUSEControls;

-}

+/********************************************************************************
+* FaceTrackNoIR		This program is a private project of some enthusiastic		*
+*					gamers from Holland, who don't like to pay much for			*
+*					head-tracking.												*
+*																				*
+* Copyright (C) 2012	Wim Vriend (Developing)									*
+*						Ron Hendriks (Researching and Testing)					*
+*																				*
+* Homepage																		*
+*																				*
+* This program is free software; you can redistribute it and/or modify it		*
+* under the terms of the GNU General Public License as published by the			*
+* Free Software Foundation; either version 3 of the License, or (at your		*
+* option) any later version.													*
+*																				*
+* This program is distributed in the hope that it will be useful, but			*
+* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY	*
+* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for	*
+* more details.																	*
+*																				*
+* You should have received a copy of the GNU General Public License along		*
+* with this program; if not, see <http://www.gnu.org/licenses/>.				*
+*																				*
+********************************************************************************/
+#include "ftnoir_protocol_mouse.h"
+#include <QDebug>
+#include "facetracknoir/global-settings.h"
+
+//*******************************************************************************************************
+// FaceTrackNoIR Client Settings-dialog.
+//*******************************************************************************************************
+
+//
+// Constructor for server-settings-dialog
+//
+MOUSEControls::MOUSEControls() :
+QWidget()
+{
+	ui.setupUi( this );
+	ui.cbxSelectMouse_X->addItem("None");
+    ui.cbxSelectMouse_X->addItem("X");
+	ui.cbxSelectMouse_X->addItem("Y");
+	ui.cbxSelectMouse_X->addItem("Z");
+	ui.cbxSelectMouse_X->addItem("Yaw");
+    ui.cbxSelectMouse_X->addItem("Pitch");
+	ui.cbxSelectMouse_X->addItem("Roll");
+
+	ui.cbxSelectMouse_Y->addItem("None");
+	ui.cbxSelectMouse_Y->addItem("X");
+	ui.cbxSelectMouse_Y->addItem("Y");
+	ui.cbxSelectMouse_Y->addItem("Z");
+    ui.cbxSelectMouse_Y->addItem("Yaw");
+	ui.cbxSelectMouse_Y->addItem("Pitch");
+	ui.cbxSelectMouse_Y->addItem("Roll");
+	// Connect Qt signals to member-functions
+	connect(ui.btnOK, SIGNAL(clicked()), this, SLOT(doOK()));
+	connect(ui.btnCancel, SIGNAL(clicked()), this, SLOT(doCancel()));
+	connect(ui.cbxSelectMouse_X, SIGNAL(currentIndexChanged(int)), this, SLOT(settingChanged( int )));
+	connect(ui.cbxSelectMouse_Y, SIGNAL(currentIndexChanged(int)), this, SLOT(settingChanged( int )));
+	theProtocol = NULL;
+	// Load the settings from the current .INI-file
+	loadSettings();
+}
+
+//
+// Destructor for server-dialog
+//
+MOUSEControls::~MOUSEControls() {
+	qDebug() << "~MOUSEControls() says: started";
+}
+
+//
+// Initialize tracker-client-dialog
+//
+void MOUSEControls::Initialize(QWidget *parent) {
+
+	QPoint offsetpos(100, 100);
+	if (parent) {
+		this->move(parent->pos() + offsetpos);
+	}
+	show();
+}
+
+//
+// OK clicked on server-dialog
+//
+void MOUSEControls::doOK() {
+	save();
+	this->close();
+}
+
+// override show event
+void MOUSEControls::showEvent ( QShowEvent * event ) {
+	loadSettings();
+}
+
+//
+// Cancel clicked on server-dialog
+//
+void MOUSEControls::doCancel() {
+	//
+	// Ask if changed Settings should be saved
+	//
+	if (settingsDirty) {
+		int ret = QMessageBox::question ( this, "Settings have changed", "Do you want to save the settings?", QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel, QMessageBox::Discard );
+
+		qDebug() << "doCancel says: answer =" << ret;
+
+		switch (ret) {
+			case QMessageBox::Save:
+				save();
+				this->close();
+				break;
+			case QMessageBox::Discard:
+				this->close();
+				break;
+			case QMessageBox::Cancel:
+				// Cancel was clicked
+				break;
+			default:
+				// should never be reached
+			break;
+		}
+	}
+	else {
+		this->close();
+	}
+}
+
+//
+// Load the current Settings from the currently 'active' INI-file.
+//
+void MOUSEControls::loadSettings() {
+	qDebug() << "loadSettings says: Starting ";
+	QSettings settings("opentrack");	// Registry settings (in HK_USER)
+
+	QString currentFile = settings.value ( "SettingsFile", QCoreApplication::applicationDirPath() + "/Settings/default.ini" ).toString();
+	QSettings iniFile( currentFile, QSettings::IniFormat );		// Application settings (in INI-file)
+
+	qDebug() << "loadSettings says: iniFile = " << currentFile;
+
+	iniFile.beginGroup ( "Mouse" );
+	ui.cbxSelectMouse_X->setCurrentIndex(iniFile.value ( "Mouse_X", 0 ).toInt() );
+	ui.cbxSelectMouse_Y->setCurrentIndex(iniFile.value ( "Mouse_Y", 0 ).toInt() );
+	iniFile.endGroup ();
+
+	settingsDirty = false;
+}
+
+//
+// Save the current Settings to the currently 'active' INI-file.
+//
+void MOUSEControls::save() {
+	qDebug() << "save() says: started";
+
+	QSettings settings("opentrack");	// Registry settings (in HK_USER)
+
+	QString currentFile = settings.value ( "SettingsFile", QCoreApplication::applicationDirPath() + "/Settings/default.ini" ).toString();
+	QSettings iniFile( currentFile, QSettings::IniFormat );		// Application settings (in INI-file)
+
+	iniFile.beginGroup ( "Mouse" );
+	iniFile.setValue ( "Mouse_X", ui.cbxSelectMouse_X->currentIndex() );
+	iniFile.setValue ( "Mouse_Y", ui.cbxSelectMouse_Y->currentIndex() );
+	iniFile.endGroup ();
+
+	settingsDirty = false;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// Factory function that creates instances if the Protocol-settings dialog object.
+
+// Export both decorated and undecorated names.
+//   GetProtocolDialog     - Undecorated name, which can be easily used with GetProcAddress
+//                          Win32 API function.
+//   _GetProtocolDialog@0  - Common name decoration for __stdcall functions in C language.
+//#pragma comment(linker, "/export:GetProtocolDialog=_GetProtocolDialog@0")
+
+extern "C" FTNOIR_PROTOCOL_BASE_EXPORT IProtocolDialog* CALLING_CONVENTION GetDialog( )
+{
+    return new MOUSEControls;
+}
diff --git a/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dll.cpp b/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dll.cpp
index f2250735..d142934d 100644
--- a/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dll.cpp
+++ b/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dll.cpp
@@ -1,49 +1,49 @@
-/********************************************************************************

-* FaceTrackNoIR		This program is a private project of some enthusiastic		*

-*					gamers from Holland, who don't like to pay much for			*

-*					head-tracking.												*

-*																				*

-* Copyright (C) 2012	Wim Vriend (Developing)									*

-*						Ron Hendriks (Researching and Testing)					*

-*																				*

-* Homepage																		*

-*																				*

-* This program is free software; you can redistribute it and/or modify it		*

-* under the terms of the GNU General Public License as published by the			*

-* Free Software Foundation; either version 3 of the License, or (at your		*

-* option) any later version.													*

-*																				*

-* This program is distributed in the hope that it will be useful, but			*

-* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY	*

-* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for	*

-* more details.																	*

-*																				*

-* You should have received a copy of the GNU General Public License along		*

-* with this program; if not, see <http://www.gnu.org/licenses/>.				*

-*																				*

-********************************************************************************/

-#include "ftnoir_protocol_mouse.h"

-#include <QDebug>

-#include "facetracknoir/global-settings.h"

-

-FTNoIR_ProtocolDll::FTNoIR_ProtocolDll() {

-}

-

-FTNoIR_ProtocolDll::~FTNoIR_ProtocolDll()

-{

-

-}

-

-////////////////////////////////////////////////////////////////////////////////

-// Factory function that creates instances if the Protocol object.

-

-// Export both decorated and undecorated names.

-//   GetProtocolDll     - Undecorated name, which can be easily used with GetProcAddress

-//						Win32 API function.

-//   _GetProtocolDll@0  - Common name decoration for __stdcall functions in C language.

-//#pragma comment(linker, "/export:GetProtocolDll=_GetProtocolDll@0")

-

-extern "C" FTNOIR_PROTOCOL_BASE_EXPORT Metadata* CALLING_CONVENTION GetMetadata()

-{

-	return new FTNoIR_ProtocolDll;

-}

+/********************************************************************************
+* FaceTrackNoIR		This program is a private project of some enthusiastic		*
+*					gamers from Holland, who don't like to pay much for			*
+*					head-tracking.												*
+*																				*
+* Copyright (C) 2012	Wim Vriend (Developing)									*
+*						Ron Hendriks (Researching and Testing)					*
+*																				*
+* Homepage																		*
+*																				*
+* This program is free software; you can redistribute it and/or modify it		*
+* under the terms of the GNU General Public License as published by the			*
+* Free Software Foundation; either version 3 of the License, or (at your		*
+* option) any later version.													*
+*																				*
+* This program is distributed in the hope that it will be useful, but			*
+* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY	*
+* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for	*
+* more details.																	*
+*																				*
+* You should have received a copy of the GNU General Public License along		*
+* with this program; if not, see <http://www.gnu.org/licenses/>.				*
+*																				*
+********************************************************************************/
+#include "ftnoir_protocol_mouse.h"
+#include <QDebug>
+#include "facetracknoir/global-settings.h"
+
+FTNoIR_ProtocolDll::FTNoIR_ProtocolDll() {
+}
+
+FTNoIR_ProtocolDll::~FTNoIR_ProtocolDll()
+{
+
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// Factory function that creates instances if the Protocol object.
+
+// Export both decorated and undecorated names.
+//   GetProtocolDll     - Undecorated name, which can be easily used with GetProcAddress
+//						Win32 API function.
+//   _GetProtocolDll@0  - Common name decoration for __stdcall functions in C language.
+//#pragma comment(linker, "/export:GetProtocolDll=_GetProtocolDll@0")
+
+extern "C" FTNOIR_PROTOCOL_BASE_EXPORT Metadata* CALLING_CONVENTION GetMetadata()
+{
+	return new FTNoIR_ProtocolDll;
+}