Fix mouse protocol, remove most of the options for simplicity's sake

4 files changed, 43 insertions, 464 deletions

diff --git a/ftnoir_protocol_mouse/ftnoir_mousecontrols.ui b/ftnoir_protocol_mouse/ftnoir_mousecontrols.ui
index 1a7712f2..8794e9cd 100644
--- a/ftnoir_protocol_mouse/ftnoir_mousecontrols.ui
+++ b/ftnoir_protocol_mouse/ftnoir_mousecontrols.ui
@@ -6,15 +6,15 @@
    <rect>

     <x>0</x>

     <y>0</y>

-    <width>462</width>

-    <height>299</height>

+    <width>250</width>

+    <height>99</height>

    </rect>

   </property>

   <property name="windowTitle">

    <string>MouseLook settings FaceTrackNoIR</string>

   </property>

   <property name="windowIcon">

-   <iconset resource="Protocol.qrc">

+   <iconset>

     <normaloff>:/images/Mouse.png</normaloff>:/images/Mouse.png</iconset>

   </property>

   <property name="layoutDirection">

@@ -26,62 +26,8 @@
   <layout class="QVBoxLayout" name="_vertical_layout">

    <item>

     <layout class="QGridLayout" name="gridLayout">

-     <item row="0" column="0">

-      <widget class="QLabel" name="textLabel2">

-       <property name="sizePolicy">

-        <sizepolicy hsizetype="Minimum" vsizetype="Fixed">

-         <horstretch>0</horstretch>

-         <verstretch>0</verstretch>

-        </sizepolicy>

-       </property>

-       <property name="text">

-        <string>Mouse style:</string>

-       </property>

-       <property name="alignment">

-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>

-       </property>

-       <property name="wordWrap">

-        <bool>false</bool>

-       </property>

-      </widget>

-     </item>

-     <item row="0" column="1">

-      <widget class="QComboBox" name="cbxSelectMouseStyle">

-       <property name="maximumSize">

-        <size>

-         <width>80</width>

-         <height>16777215</height>

-        </size>

-       </property>

-       <property name="toolTip">

-        <string>Select Number</string>

-       </property>

-       <property name="insertPolicy">

-        <enum>QComboBox::InsertAlphabetically</enum>

-       </property>

-      </widget>

-     </item>

-     <item row="1" column="0">

-      <widget class="QLabel" name="textLabel2_2">

-       <property name="sizePolicy">

-        <sizepolicy hsizetype="Minimum" vsizetype="Fixed">

-         <horstretch>0</horstretch>

-         <verstretch>0</verstretch>

-        </sizepolicy>

-       </property>

-       <property name="text">

-        <string>Map mouse X to:</string>

-       </property>

-       <property name="alignment">

-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>

-       </property>

-       <property name="wordWrap">

-        <bool>false</bool>

-       </property>

-      </widget>

-     </item>

      <item row="1" column="1">

-      <widget class="QComboBox" name="cbxSelectMouse_X">

+      <widget class="QComboBox" name="cbxSelectMouse_Y">

        <property name="maximumSize">

         <size>

          <width>80</width>

@@ -96,7 +42,7 @@
        </property>

       </widget>

      </item>

-     <item row="2" column="0">

+     <item row="1" column="0">

       <widget class="QLabel" name="textLabel2_3">

        <property name="sizePolicy">

         <sizepolicy hsizetype="Minimum" vsizetype="Fixed">

@@ -115,8 +61,8 @@
        </property>

       </widget>

      </item>

-     <item row="3" column="0">

-      <widget class="QLabel" name="textLabel2_4">

+     <item row="0" column="0">

+      <widget class="QLabel" name="textLabel2_2">

        <property name="sizePolicy">

         <sizepolicy hsizetype="Minimum" vsizetype="Fixed">

          <horstretch>0</horstretch>

@@ -124,7 +70,7 @@
         </sizepolicy>

        </property>

        <property name="text">

-        <string>Map mouse Wheel to:</string>

+        <string>Map mouse X to:</string>

        </property>

        <property name="alignment">

         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>

@@ -134,24 +80,8 @@
        </property>

       </widget>

      </item>

-     <item row="2" column="1">

-      <widget class="QComboBox" name="cbxSelectMouse_Y">

-       <property name="maximumSize">

-        <size>

-         <width>80</width>

-         <height>16777215</height>

-        </size>

-       </property>

-       <property name="toolTip">

-        <string>Select Number</string>

-       </property>

-       <property name="insertPolicy">

-        <enum>QComboBox::InsertAlphabetically</enum>

-       </property>

-      </widget>

-     </item>

-     <item row="3" column="1">

-      <widget class="QComboBox" name="cbxSelectMouse_Wheel">

+     <item row="0" column="1">

+      <widget class="QComboBox" name="cbxSelectMouse_X">

        <property name="maximumSize">

         <size>

          <width>80</width>

@@ -166,149 +96,6 @@
        </property>

       </widget>

      </item>

-     <item row="1" column="2">

-      <widget class="QSlider" name="slideSensX">

-       <property name="maximumSize">

-        <size>

-         <width>150</width>

-         <height>16777215</height>

-        </size>

-       </property>

-       <property name="maximum">

-        <number>50</number>

-       </property>

-       <property name="orientation">

-        <enum>Qt::Horizontal</enum>

-       </property>

-      </widget>

-     </item>

-     <item row="2" column="2">

-      <widget class="QSlider" name="slideSensY">

-       <property name="maximumSize">

-        <size>

-         <width>150</width>

-         <height>16777215</height>

-        </size>

-       </property>

-       <property name="maximum">

-        <number>50</number>

-       </property>

-       <property name="orientation">

-        <enum>Qt::Horizontal</enum>

-       </property>

-      </widget>

-     </item>

-     <item row="3" column="2">

-      <widget class="QSlider" name="slideSensWheel">

-       <property name="maximumSize">

-        <size>

-         <width>150</width>

-         <height>16777215</height>

-        </size>

-       </property>

-       <property name="maximum">

-        <number>50</number>

-       </property>

-       <property name="orientation">

-        <enum>Qt::Horizontal</enum>

-       </property>

-      </widget>

-     </item>

-     <item row="0" column="2">

-      <widget class="QLabel" name="label">

-       <property name="text">

-        <string>Sensitivity (10=1x):</string>

-       </property>

-      </widget>

-     </item>

-     <item row="1" column="3">

-      <widget class="QSpinBox" name="spinSensX">

-       <property name="maximum">

-        <number>50</number>

-       </property>

-      </widget>

-     </item>

-     <item row="2" column="3">

-      <widget class="QSpinBox" name="spinSensY">

-       <property name="maximum">

-        <number>50</number>

-       </property>

-      </widget>

-     </item>

-     <item row="3" column="3">

-      <widget class="QSpinBox" name="spinSensWheel">

-       <property name="maximum">

-        <number>50</number>

-       </property>

-      </widget>

-     </item>

-     <item row="4" column="0">

-      <widget class="QLabel" name="textLabel2_5">

-       <property name="sizePolicy">

-        <sizepolicy hsizetype="Minimum" vsizetype="Fixed">

-         <horstretch>0</horstretch>

-         <verstretch>0</verstretch>

-        </sizepolicy>

-       </property>

-       <property name="text">

-        <string>Use Virtual Desk:</string>

-       </property>

-       <property name="alignment">

-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>

-       </property>

-       <property name="wordWrap">

-        <bool>false</bool>

-       </property>

-      </widget>

-     </item>

-     <item row="4" column="1">

-      <widget class="QCheckBox" name="chkUseVirtualDesk">

-       <property name="minimumSize">

-        <size>

-         <width>0</width>

-         <height>20</height>

-        </size>

-       </property>

-       <property name="text">

-        <string/>

-       </property>

-      </widget>

-     </item>

-    </layout>

-   </item>

-   <item>

-    <spacer name="verticalSpacer">

-     <property name="orientation">

-      <enum>Qt::Vertical</enum>

-     </property>

-     <property name="sizeHint" stdset="0">

-      <size>

-       <width>20</width>

-       <height>40</height>

-      </size>

-     </property>

-    </spacer>

-   </item>

-   <item>

-    <layout class="QHBoxLayout" name="horizontalLayout_3">

-     <item>

-      <widget class="QLabel" name="label_2">

-       <property name="text">

-        <string>Most games (like First Person Shooters) support 'relative' mouse look.</string>

-       </property>

-      </widget>

-     </item>

-    </layout>

-   </item>

-   <item>

-    <layout class="QHBoxLayout" name="horizontalLayout_4">

-     <item>

-      <widget class="QLabel" name="label_3">

-       <property name="text">

-        <string>Mouse sensitivity can also be influenced via the Windows Mouse settings.</string>

-       </property>

-      </widget>

-     </item>

     </layout>

    </item>

    <item>

@@ -403,107 +190,8 @@
    </item>

   </layout>

  </widget>

- <resources>

-  <include location="Protocol.qrc"/>

- </resources>

- <connections>

-  <connection>

-   <sender>slideSensX</sender>

-   <signal>valueChanged(int)</signal>

-   <receiver>spinSensX</receiver>

-   <slot>setValue(int)</slot>

-   <hints>

-    <hint type="sourcelabel">

-     <x>334</x>

-     <y>44</y>

-    </hint>

-    <hint type="destinationlabel">

-     <x>445</x>

-     <y>46</y>

-    </hint>

-   </hints>

-  </connection>

-  <connection>

-   <sender>slideSensY</sender>

-   <signal>valueChanged(int)</signal>

-   <receiver>spinSensY</receiver>

-   <slot>setValue(int)</slot>

-   <hints>

-    <hint type="sourcelabel">

-     <x>338</x>

-     <y>73</y>

-    </hint>

-    <hint type="destinationlabel">

-     <x>450</x>

-     <y>70</y>

-    </hint>

-   </hints>

-  </connection>

-  <connection>

-   <sender>slideSensWheel</sender>

-   <signal>valueChanged(int)</signal>

-   <receiver>spinSensWheel</receiver>

-   <slot>setValue(int)</slot>

-   <hints>

-    <hint type="sourcelabel">

-     <x>334</x>

-     <y>98</y>

-    </hint>

-    <hint type="destinationlabel">

-     <x>445</x>

-     <y>96</y>

-    </hint>

-   </hints>

-  </connection>

-  <connection>

-   <sender>spinSensX</sender>

-   <signal>valueChanged(int)</signal>

-   <receiver>slideSensX</receiver>

-   <slot>setValue(int)</slot>

-   <hints>

-    <hint type="sourcelabel">

-     <x>440</x>

-     <y>37</y>

-    </hint>

-    <hint type="destinationlabel">

-     <x>364</x>

-     <y>41</y>

-    </hint>

-   </hints>

-  </connection>

-  <connection>

-   <sender>spinSensY</sender>

-   <signal>valueChanged(int)</signal>

-   <receiver>slideSensY</receiver>

-   <slot>setValue(int)</slot>

-   <hints>

-    <hint type="sourcelabel">

-     <x>441</x>

-     <y>69</y>

-    </hint>

-    <hint type="destinationlabel">

-     <x>347</x>

-     <y>73</y>

-    </hint>

-   </hints>

-  </connection>

-  <connection>

-   <sender>spinSensWheel</sender>

-   <signal>valueChanged(int)</signal>

-   <receiver>slideSensWheel</receiver>

-   <slot>setValue(int)</slot>

-   <hints>

-    <hint type="sourcelabel">

-     <x>459</x>

-     <y>99</y>

-    </hint>

-    <hint type="destinationlabel">

-     <x>350</x>

-     <y>99</y>

-    </hint>

-   </hints>

-  </connection>

- </connections>

+ <resources/>

+ <connections/>

  <slots>

   <slot>startEngineClicked()</slot>

   <slot>stopEngineClicked()</slot>

diff --git a/ftnoir_protocol_mouse/ftnoir_protocol_mouse.cpp b/ftnoir_protocol_mouse/ftnoir_protocol_mouse.cpp
index 40558254..187da752 100644
--- a/ftnoir_protocol_mouse/ftnoir_protocol_mouse.cpp
+++ b/ftnoir_protocol_mouse/ftnoir_protocol_mouse.cpp
@@ -38,10 +38,6 @@
 /** constructor **/

 FTNoIR_Protocol::FTNoIR_Protocol()

 {

-	prev_fMouse_X = 0.0f;

-	prev_fMouse_Y = 0.0f;

-	prev_fMouse_Wheel = 0.0f;

-	frame_delay = 0;

 	loadSettings();

 }

 

@@ -51,16 +47,6 @@ FTNoIR_Protocol::~FTNoIR_Protocol()
 }

 

 //

-// Scale the measured value to the Joystick values

-//

-long FTNoIR_Protocol::scale2AnalogLimits( float x, float min_x, float max_x ) {

-double y;

-

-	y = ((MOUSE_AXIS_MAX - MOUSE_AXIS_MIN)/(max_x - min_x)) * x + ((MOUSE_AXIS_MAX - MOUSE_AXIS_MIN)/2) + MOUSE_AXIS_MIN;

-	return (long) y;

-}

-

-//

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

 //

 void FTNoIR_Protocol::loadSettings() {

@@ -70,17 +56,8 @@ void FTNoIR_Protocol::loadSettings() {
 	QSettings iniFile( currentFile, QSettings::IniFormat );		// Application settings (in INI-file)

 

 	iniFile.beginGroup ( "Mouse" );

-	Mouse_Style = (FTN_MouseStyle) (iniFile.value ( "Style", 1 ).toInt() - 1);

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

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

-	Mouse_Wheel = (FTN_AngleName) (iniFile.value ( "Mouse_Wheel", 1 ).toInt() - 1);

-

-	mouse_X_factor = iniFile.value("SensX", 10).toFloat() / 10.0f;

-	mouse_Y_factor = iniFile.value("SensY", 10).toFloat() / 10.0f;

-	mouse_Wheel_factor = iniFile.value("SensWheel", 10).toFloat() / 10.0f;

-

-	useVirtualDesk = iniFile.value ( "useVirtualDesk", 0 ).toBool();

-

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

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

 	iniFile.endGroup ();

 }

 

@@ -88,48 +65,22 @@ void FTNoIR_Protocol::loadSettings() {
 // Update Headpose in Game.

 //

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

-float fMouse_X = 0;							// The actual value

-float fMouse_Y = 0;

-float fMouse_Wheel = 0;

-

-

-	//

-	// Determine which of the 6DOF's is used.

-	// The rotations are from -180 to +180 and the translations from -50cm to +50cm.

-	// Let's scale the translations to the degrees for simplicity sake...

-    //

-

-    if (Mouse_X > 0 && Mouse_X < 6+1)

-        fMouse_X = headpose[Mouse_X-1];

-

-    if (Mouse_X < 3+1 && Mouse_X > 0)

-        fMouse_X *= 3;

-

-    if (Mouse_Y > 0 && Mouse_Y < 6+1)

-        fMouse_Y = headpose[Mouse_Y-1];

-

-    if (Mouse_Y < 3+1 && Mouse_Y > 0)

-        fMouse_Y *= 3;

-

-    if (Mouse_Wheel > 0 && Mouse_Wheel < 6+1)

-        fMouse_Wheel = headpose[Mouse_Wheel-1];

-

-    if (Mouse_Wheel < 3+1 && Mouse_Wheel > 0)

-        fMouse_Wheel *= 3;

-

-	//

-	// Only send Input, when it has changed.

-	// This releases the Mouse, when tracking is stopped (for a while).

-	//

-	if (frame_delay > 10) {

-		if ((prev_fMouse_X != fMouse_X) || (prev_fMouse_Y != fMouse_Y) || (prev_fMouse_Wheel != fMouse_Wheel)) {

-			SendInput(1, &MouseStruct, sizeof(MouseStruct));

-		}

-

-		prev_fMouse_X = fMouse_X;

-		prev_fMouse_Y = fMouse_Y;

-		prev_fMouse_Wheel = fMouse_Wheel;

-	}

+    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);

+    }

 }

 

 //

diff --git a/ftnoir_protocol_mouse/ftnoir_protocol_mouse.h b/ftnoir_protocol_mouse/ftnoir_protocol_mouse.h
index d5c614fa..14719540 100644
--- a/ftnoir_protocol_mouse/ftnoir_protocol_mouse.h
+++ b/ftnoir_protocol_mouse/ftnoir_protocol_mouse.h
@@ -46,20 +46,14 @@
 #define MOUSE_AXIS_MAX 65535

 

 enum FTN_AngleName {

-    FTN_PITCH = RX,

-    FTN_YAW = TY,

+    FTN_YAW = RX,

+    FTN_PITCH = RY,

     FTN_ROLL = RZ,

     FTN_X = TX,

     FTN_Y = TY,

     FTN_Z = TZ

 };

 

-enum FTN_MouseStyle {

-	FTN_ABSOLUTE = 0,

-	FTN_RELATIVE = 1	

-};

-

-

 class FTNoIR_Protocol : public IProtocol

 {

 public:

@@ -75,18 +69,6 @@ private:
 	FTN_AngleName Mouse_X;			// Map one of the 6DOF's to this Mouse direction

 	FTN_AngleName Mouse_Y;

 	FTN_AngleName Mouse_Wheel;

-	FTN_MouseStyle Mouse_Style;		// AutoPan, Absolute or Relative?

-	bool useVirtualDesk;			// Extend the mouse-range beyond the standard

-	float prev_fMouse_X;			// The previous value(s)

-	float mouse_X_factor;			// Sensitivity factor

-	float prev_fMouse_Y;

-	float mouse_Y_factor;			// Sensitivity factor

-	float prev_fMouse_Wheel;

-	float mouse_Wheel_factor;		// Sensitivity factor

-

-	int frame_delay;				// Number of frames to delay SendInput (too fast, too furious?)

-

-	long scale2AnalogLimits( float x, float min_x, float max_x );

 	void loadSettings();

     QString getGameName() {

         return "Mouse tracker";

diff --git a/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dialog.cpp b/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dialog.cpp
index 6882ab6a..2b737030 100644
--- a/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dialog.cpp
+++ b/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dialog.cpp
@@ -45,52 +45,27 @@ MOUSEControls::MOUSEControls() :
 QWidget()

 {

 	ui.setupUi( this );

-

-	//

-	// Setup the choices

-	//

-	ui.cbxSelectMouseStyle->addItem("Absolute");

-	ui.cbxSelectMouseStyle->addItem("Relative");

-

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

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

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

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

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

+    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("Pitch");

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

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

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

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

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

-

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

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

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

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

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

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

-	ui.cbxSelectMouse_Wheel->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 )));

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

-

-	connect(ui.spinSensX, SIGNAL(valueChanged(int)), this, SLOT(settingChanged(int)));

-	connect(ui.spinSensY, SIGNAL(valueChanged(int)), this, SLOT(settingChanged(int)));

-	connect(ui.spinSensWheel, SIGNAL(valueChanged(int)), this, SLOT(settingChanged(int)));

-

-	connect(ui.chkUseVirtualDesk, SIGNAL(stateChanged(int)), this, SLOT(settingChanged(int)));

-

 	theProtocol = NULL;

-

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

 	loadSettings();

 }

@@ -173,17 +148,8 @@ void MOUSEControls::loadSettings() {
 	qDebug() << "loadSettings says: iniFile = " << currentFile;

 

 	iniFile.beginGroup ( "Mouse" );

-	ui.cbxSelectMouseStyle->setCurrentIndex(iniFile.value ( "Style", 1 ).toInt() - 1);

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

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

-	ui.cbxSelectMouse_Wheel->setCurrentIndex(iniFile.value ( "Mouse_Wheel", 1 ).toInt() - 1);

-

-	ui.slideSensX->setValue(iniFile.value("SensX", 10).toInt());

-	ui.slideSensY->setValue(iniFile.value("SensY", 10).toInt());

-	ui.slideSensWheel->setValue(iniFile.value("SensWheel", 10).toInt());

-

-	ui.chkUseVirtualDesk->setChecked( iniFile.value ( "useVirtualDesk", 0 ).toBool() );

-

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

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

 	iniFile.endGroup ();

 

 	settingsDirty = false;

@@ -201,16 +167,8 @@ void MOUSEControls::save() {
 	QSettings iniFile( currentFile, QSettings::IniFormat );		// Application settings (in INI-file)

 

 	iniFile.beginGroup ( "Mouse" );

-	iniFile.setValue ( "Style", ui.cbxSelectMouseStyle->currentIndex() + 1 );

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

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

-	iniFile.setValue ( "Mouse_Wheel", ui.cbxSelectMouse_Wheel->currentIndex() + 1 );

-

-	iniFile.setValue ( "SensX", ui.slideSensX->value() );

-	iniFile.setValue ( "SensY", ui.slideSensY->value() );

-	iniFile.setValue ( "SensWheel", ui.slideSensWheel->value() );

-

-	iniFile.setValue( "useVirtualDesk", ui.chkUseVirtualDesk->isChecked() );

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

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

 	iniFile.endGroup ();

 

 	settingsDirty = false;