From fe5298dd106579e257c05fa6f0c8f63b10504a61 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Mon, 5 Sep 2016 22:47:41 +0200
Subject: gui, logic: add shortcut for "translation compensation off while
 held"

Requested-by: @Sone989
Issue: #440
---
 gui/options-dialog.cpp |   3 +-
 gui/options-dialog.ui  | 154 ++++++++++++++++++++++++++++---------------------
 2 files changed, 91 insertions(+), 66 deletions(-)

(limited to 'gui')

diff --git a/gui/options-dialog.cpp b/gui/options-dialog.cpp
index 3c3012b5..dfd99e7b 100644
--- a/gui/options-dialog.cpp
+++ b/gui/options-dialog.cpp
@@ -92,7 +92,8 @@ OptionsDialog::OptionsDialog(std::function<void(bool)> pause_keybindings) :
         { main.key_start_tracking, ui.start_tracking_text, ui.bind_start },
         { main.key_stop_tracking, ui.stop_tracking_text , ui.bind_stop},
         { main.key_toggle_tracking, ui.toggle_tracking_text, ui.bind_toggle_tracking },
-        { main.key_restart_tracking, ui.restart_tracking_text, ui.bind_restart_tracking }
+        { main.key_restart_tracking, ui.restart_tracking_text, ui.bind_restart_tracking },
+        { main.key_disable_tcomp_press, ui.tcomp_off_held_text, ui.bind_tcomp_off_held },
     };
 
     for (const tmp& val_ : tuples)
diff --git a/gui/options-dialog.ui b/gui/options-dialog.ui
index aa06b407..97ccffff 100644
--- a/gui/options-dialog.ui
+++ b/gui/options-dialog.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>468</width>
+    <width>546</width>
     <height>622</height>
    </rect>
   </property>
@@ -68,23 +68,61 @@
              <string notr="true">QGroupBox { border: 0; }</string>
             </property>
             <layout class="QGridLayout" name="gridLayout_8">
-             <item row="11" column="2">
-              <widget class="QPushButton" name="bind_toggle_tracking">
+             <property name="horizontalSpacing">
+              <number>20</number>
+             </property>
+             <item row="8" column="1">
+              <widget class="QLabel" name="zero_held_text">
+               <property name="text">
+                <string/>
+               </property>
+              </widget>
+             </item>
+             <item row="6" column="2">
+              <widget class="QPushButton" name="bind_toggle_held">
                <property name="text">
                 <string>Bind</string>
                </property>
               </widget>
              </item>
-             <item row="11" column="0">
-              <widget class="QLabel" name="textLabel2_9">
+             <item row="8" column="2">
+              <widget class="QPushButton" name="bind_zero_held">
                <property name="text">
-                <string>Toggle tracking</string>
+                <string>Bind</string>
+               </property>
+              </widget>
+             </item>
+             <item row="12" column="0">
+              <widget class="QLabel" name="textLabel2_10">
+               <property name="text">
+                <string>Restart tracking</string>
                </property>
                <property name="wordWrap">
                 <bool>false</bool>
                </property>
               </widget>
              </item>
+             <item row="6" column="1">
+              <widget class="QLabel" name="toggle_held_text">
+               <property name="text">
+                <string/>
+               </property>
+              </widget>
+             </item>
+             <item row="12" column="1">
+              <widget class="QLabel" name="restart_tracking_text">
+               <property name="text">
+                <string/>
+               </property>
+              </widget>
+             </item>
+             <item row="12" column="2">
+              <widget class="QPushButton" name="bind_restart_tracking">
+               <property name="text">
+                <string>Bind</string>
+               </property>
+              </widget>
+             </item>
              <item row="6" column="0">
               <widget class="QLabel" name="label_27">
                <property name="text">
@@ -92,17 +130,20 @@
                </property>
               </widget>
              </item>
-             <item row="9" column="1">
-              <widget class="QLabel" name="start_tracking_text">
+             <item row="11" column="2">
+              <widget class="QPushButton" name="bind_toggle_tracking">
                <property name="text">
-                <string/>
+                <string>Bind</string>
                </property>
               </widget>
              </item>
-             <item row="9" column="2">
-              <widget class="QPushButton" name="bind_start">
+             <item row="11" column="0">
+              <widget class="QLabel" name="textLabel2_9">
                <property name="text">
-                <string>Bind</string>
+                <string>Toggle tracking</string>
+               </property>
+               <property name="wordWrap">
+                <bool>false</bool>
                </property>
               </widget>
              </item>
@@ -113,6 +154,20 @@
                </property>
               </widget>
              </item>
+             <item row="9" column="2">
+              <widget class="QPushButton" name="bind_start">
+               <property name="text">
+                <string>Bind</string>
+               </property>
+              </widget>
+             </item>
+             <item row="9" column="1">
+              <widget class="QLabel" name="start_tracking_text">
+               <property name="text">
+                <string/>
+               </property>
+              </widget>
+             </item>
              <item row="10" column="1">
               <widget class="QLabel" name="stop_tracking_text">
                <property name="text">
@@ -144,6 +199,13 @@
                </property>
               </widget>
              </item>
+             <item row="0" column="1">
+              <widget class="QLabel" name="center_text">
+               <property name="text">
+                <string/>
+               </property>
+              </widget>
+             </item>
              <item row="10" column="0">
               <widget class="QLabel" name="textLabel2_8">
                <property name="text">
@@ -154,13 +216,6 @@
                </property>
               </widget>
              </item>
-             <item row="0" column="1">
-              <widget class="QLabel" name="center_text">
-               <property name="text">
-                <string/>
-               </property>
-              </widget>
-             </item>
              <item row="0" column="0">
               <widget class="QLabel" name="textLabel2_3">
                <property name="text">
@@ -178,13 +233,6 @@
                </property>
               </widget>
              </item>
-             <item row="5" column="1">
-              <widget class="QLabel" name="toggle_text">
-               <property name="text">
-                <string/>
-               </property>
-              </widget>
-             </item>
              <item row="7" column="0">
               <widget class="QLabel" name="textLabel2_6">
                <property name="text">
@@ -195,6 +243,13 @@
                </property>
               </widget>
              </item>
+             <item row="5" column="1">
+              <widget class="QLabel" name="toggle_text">
+               <property name="text">
+                <string/>
+               </property>
+              </widget>
+             </item>
              <item row="8" column="0">
               <widget class="QLabel" name="label_28">
                <property name="text">
@@ -226,53 +281,22 @@
                </property>
               </widget>
              </item>
-             <item row="6" column="2">
-              <widget class="QPushButton" name="bind_toggle_held">
-               <property name="text">
-                <string>Bind</string>
-               </property>
-              </widget>
-             </item>
-             <item row="8" column="1">
-              <widget class="QLabel" name="zero_held_text">
-               <property name="text">
-                <string/>
-               </property>
-              </widget>
-             </item>
-             <item row="8" column="2">
-              <widget class="QPushButton" name="bind_zero_held">
+             <item row="13" column="0">
+              <widget class="QLabel" name="label_30">
                <property name="text">
-                <string>Bind</string>
+                <string>Translation compensation off while held</string>
                </property>
               </widget>
              </item>
-             <item row="6" column="1">
-              <widget class="QLabel" name="toggle_held_text">
+             <item row="13" column="1">
+              <widget class="QLabel" name="tcomp_off_held_text">
                <property name="text">
                 <string/>
                </property>
               </widget>
              </item>
-             <item row="12" column="0">
-              <widget class="QLabel" name="textLabel2_10">
-               <property name="text">
-                <string>Restart tracking</string>
-               </property>
-               <property name="wordWrap">
-                <bool>false</bool>
-               </property>
-              </widget>
-             </item>
-             <item row="12" column="1">
-              <widget class="QLabel" name="restart_tracking_text">
-               <property name="text">
-                <string/>
-               </property>
-              </widget>
-             </item>
-             <item row="12" column="2">
-              <widget class="QPushButton" name="bind_restart_tracking">
+             <item row="13" column="2">
+              <widget class="QPushButton" name="bind_tcomp_off_held">
                <property name="text">
                 <string>Bind</string>
                </property>
@@ -1383,6 +1407,7 @@ It won't work properly with translation compensation enabled.</string>
   <tabstop>bind_stop</tabstop>
   <tabstop>bind_toggle_tracking</tabstop>
   <tabstop>bind_restart_tracking</tabstop>
+  <tabstop>bind_tcomp_off_held</tabstop>
   <tabstop>center_at_startup</tabstop>
   <tabstop>trayp</tabstop>
   <tabstop>camera_yaw</tabstop>
@@ -1412,7 +1437,6 @@ It won't work properly with translation compensation enabled.</string>
   <tabstop>invert_z</tabstop>
   <tabstop>tracklogging_enabled</tabstop>
   <tabstop>tracklogging_fileselectbtn</tabstop>
-  <tabstop>tracklogging_filenameedit</tabstop>
  </tabstops>
  <resources/>
  <connections/>
-- 
cgit v1.2.3