settings for mouse

1 files changed, 45 insertions, 135 deletions

diff --git a/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dialog.cpp b/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dialog.cpp
index c8d62a58..cc62b004 100644
--- a/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dialog.cpp
+++ b/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dialog.cpp
@@ -23,158 +23,68 @@
 *																				*
 ********************************************************************************/
 #include "ftnoir_protocol_mouse.h"
-#include <QDebug>
 #include "facetracknoir/global-settings.h"
 
-//*******************************************************************************************************
-// FaceTrackNoIR Client Settings-dialog.
-//*******************************************************************************************************
-
-//
-// Constructor for server-settings-dialog
-//
-MOUSEControls::MOUSEControls() :
-QWidget()
+MOUSEControls::MOUSEControls() : _proto(nullptr)
 {
-	ui.setupUi( this );
-	ui.cbxSelectMouse_X->addItem("None");
+    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("Y");
+    ui.cbxSelectMouse_X->addItem("Z");
+    ui.cbxSelectMouse_X->addItem("Yaw");
     ui.cbxSelectMouse_X->addItem("Pitch");
-	ui.cbxSelectMouse_X->addItem("Roll");
+    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("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";
-}
+    ui.cbxSelectMouse_Y->addItem("Pitch");
+    ui.cbxSelectMouse_Y->addItem("Roll");
 
-//
-// Initialize tracker-client-dialog
-//
-void MOUSEControls::Initialize(QWidget *parent) {
+    connect(ui.btnOK, SIGNAL(clicked()), this, SLOT(doOK()));
+    connect(ui.btnCancel, SIGNAL(clicked()), this, SLOT(doCancel()));
 
-	QPoint offsetpos(100, 100);
-	if (parent) {
-		this->move(parent->pos() + offsetpos);
-	}
-	show();
+    tie_setting(s.Mouse_X, ui.cbxSelectMouse_X);
+    tie_setting(s.Mouse_Y, ui.cbxSelectMouse_Y);
 }
 
-//
-// OK clicked on server-dialog
-//
 void MOUSEControls::doOK() {
-	save();
-	this->close();
-}
-
-// override show event
-void MOUSEControls::showEvent ( QShowEvent * event ) {
-	loadSettings();
+    s.b->save();
+    if (_proto)
+        _proto->reload();
+    this->close();
 }
 
-//
-// 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;
+    if (s.b->modifiedp()) {
+        int ret = QMessageBox::question ( this, "Settings have changed", "Do you want to save the settings?", QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel);
+
+        qDebug() << "doCancel says: answer =" << ret;
+
+        switch (ret) {
+        case QMessageBox::Save:
+            s.b->save();
+            this->close();
+            if (_proto)
+                _proto->reload();
+            break;
+        case QMessageBox::Discard:
+            s.b->revert();
+            this->close();
+            break;
+        case QMessageBox::Cancel:
+        default:
+            break;
+        }
+    }
+    else {
+        this->close();
+    }
 }
 
-//
-// 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;