proto/mouse: add legacy input method

1 files changed, 89 insertions, 112 deletions

diff --git a/proto-mouse/ftnoir_mousecontrols.ui b/proto-mouse/ftnoir_mousecontrols.ui
index f970f887..45b33470 100644
--- a/proto-mouse/ftnoir_mousecontrols.ui
+++ b/proto-mouse/ftnoir_mousecontrols.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>UICMOUSEControls</class>
- <widget class="QWidget" name="UICMOUSEControls">
+ <class>UI_mouse</class>
+ <widget class="QWidget" name="UI_mouse">
   <property name="windowModality">
    <enum>Qt::NonModal</enum>
   </property>
@@ -9,70 +9,42 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>413</width>
-    <height>155</height>
+    <width>360</width>
+    <height>146</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
-    <width>413</width>
+    <width>360</width>
     <height>0</height>
    </size>
   </property>
   <property name="windowTitle">
-   <string>Mouse protocol settings</string>
+   <string>Mouse protocol</string>
   </property>
   <property name="windowIcon">
    <iconset resource="win32-mouse-protocol.qrc">
     <normaloff>:/images/mouse.png</normaloff>:/images/mouse.png</iconset>
   </property>
-  <property name="layoutDirection">
-   <enum>Qt::LeftToRight</enum>
-  </property>
-  <property name="autoFillBackground">
-   <bool>false</bool>
-  </property>
-  <layout class="QGridLayout" name="gridLayout">
+  <layout class="QFormLayout" name="formLayout">
+   <property name="leftMargin">
+    <number>9</number>
+   </property>
+   <property name="topMargin">
+    <number>11</number>
+   </property>
+   <property name="rightMargin">
+    <number>6</number>
+   </property>
    <item row="0" column="0">
     <widget class="QLabel" name="textLabel2_2">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
-       <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="0">
-    <widget class="QLabel" name="textLabel2_3">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
      <property name="text">
-      <string>Map mouse Y to:</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-     </property>
-     <property name="wordWrap">
-      <bool>false</bool>
+      <string>X axis</string>
      </property>
     </widget>
    </item>
-   <item row="0" column="1" colspan="2">
-    <widget class="QComboBox" name="cbxSelectMouse_X">
+   <item row="0" column="1">
+    <widget class="QComboBox" name="axis_x">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
        <horstretch>0</horstretch>
@@ -81,16 +53,10 @@
      </property>
      <property name="maximumSize">
       <size>
-       <width>80</width>
+       <width>105</width>
        <height>16777215</height>
       </size>
      </property>
-     <property name="toolTip">
-      <string>Select Number</string>
-     </property>
-     <property name="insertPolicy">
-      <enum>QComboBox::InsertAlphabetically</enum>
-     </property>
      <item>
       <property name="text">
        <string>None</string>
@@ -128,8 +94,38 @@
      </item>
     </widget>
    </item>
-   <item row="1" column="1" colspan="2">
-    <widget class="QComboBox" name="cbxSelectMouse_Y">
+   <item row="1" column="0">
+    <widget class="QLabel" name="textLabel2_6">
+     <property name="text">
+      <string>Sensitivity</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QSlider" name="sensitivity_x">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="tickInterval">
+      <number>25</number>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0">
+    <widget class="QLabel" name="textLabel2_3">
+     <property name="text">
+      <string>Y axis</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1">
+    <widget class="QComboBox" name="axis_y">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
        <horstretch>0</horstretch>
@@ -138,16 +134,10 @@
      </property>
      <property name="maximumSize">
       <size>
-       <width>80</width>
+       <width>105</width>
        <height>16777215</height>
       </size>
      </property>
-     <property name="toolTip">
-      <string>Select Number</string>
-     </property>
-     <property name="insertPolicy">
-      <enum>QComboBox::InsertAlphabetically</enum>
-     </property>
      <item>
       <property name="text">
        <string>None</string>
@@ -185,36 +175,17 @@
      </item>
     </widget>
    </item>
-   <item row="4" column="1">
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0">
-    <widget class="QLabel" name="textLabel2_4">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
+   <item row="3" column="0">
+    <widget class="QLabel" name="textLabel2_7">
      <property name="text">
-      <string>X axis sensitivity</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-     </property>
-     <property name="wordWrap">
-      <bool>false</bool>
+      <string>Sensitivity</string>
      </property>
     </widget>
    </item>
-   <item row="2" column="1">
-    <widget class="QSlider" name="sensitivity_x">
+   <item row="3" column="1">
+    <widget class="QSlider" name="sensitivity_y">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Maximum">
+      <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
@@ -227,38 +198,49 @@
      </property>
     </widget>
    </item>
-   <item row="3" column="0">
-    <widget class="QLabel" name="textLabel2_5">
+   <item row="4" column="0">
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>Method</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="1">
+    <widget class="QComboBox" name="input_method">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
+      <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="text">
-      <string>Y axis sensitivity</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-     </property>
-     <property name="wordWrap">
-      <bool>false</bool>
+     <property name="maximumSize">
+      <size>
+       <width>105</width>
+       <height>16777215</height>
+      </size>
      </property>
+     <item>
+      <property name="text">
+       <string>Direct input</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Legacy</string>
+      </property>
+     </item>
     </widget>
    </item>
-   <item row="3" column="1">
-    <widget class="QSlider" name="sensitivity_y">
+   <item row="5" column="0" colspan="2">
+    <widget class="QDialogButtonBox" name="buttonBox">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Maximum">
+      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="tickInterval">
-      <number>25</number>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
@@ -268,9 +250,4 @@
   <include location="win32-mouse-protocol.qrc"/>
  </resources>
  <connections/>
- <slots>
-  <slot>startEngineClicked()</slot>
-  <slot>stopEngineClicked()</slot>
-  <slot>cameraSettingsClicked()</slot>
- </slots>
 </ui>