From ce6a3128139807b1059107d95fb1966efcd149c3 Mon Sep 17 00:00:00 2001
From: stojce <stojce@me.com>
Date: Fri, 29 Aug 2014 19:50:39 +0200
Subject: [PATCH] Fix preferences dialog layout

---
 interface/src/ui/PreferencesDialog.cpp |    3 +
 interface/ui/preferencesDialog.ui      | 1673 ++++++++++--------------
 2 files changed, 723 insertions(+), 953 deletions(-)

diff --git a/interface/src/ui/PreferencesDialog.cpp b/interface/src/ui/PreferencesDialog.cpp
index 5295dca752..a1f0f4e2d4 100644
--- a/interface/src/ui/PreferencesDialog.cpp
+++ b/interface/src/ui/PreferencesDialog.cpp
@@ -30,6 +30,9 @@ PreferencesDialog::PreferencesDialog() :
     connect(ui.buttonBrowseScriptsLocation, &QPushButton::clicked, this, &PreferencesDialog::openScriptsLocationBrowser);
     connect(ui.buttonReloadDefaultScripts, &QPushButton::clicked,
             Application::getInstance(), &Application::loadDefaultScripts);
+    // move dialog to left side
+    move(0, 0);
+    setWindowState(Qt::WindowMaximized);
 }
 
 void PreferencesDialog::accept() {
diff --git a/interface/ui/preferencesDialog.ui b/interface/ui/preferencesDialog.ui
index 11132ce1b1..2ec8579383 100644
--- a/interface/ui/preferencesDialog.ui
+++ b/interface/ui/preferencesDialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>500</width>
-    <height>609</height>
+    <height>554</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -34,9 +34,15 @@
      <x>0</x>
      <y>0</y>
      <width>501</width>
-     <height>501</height>
+     <height>491</height>
     </rect>
    </property>
+   <property name="sizePolicy">
+    <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
    <property name="frameShape">
     <enum>QFrame::NoFrame</enum>
    </property>
@@ -55,7 +61,7 @@
       <x>0</x>
       <y>0</y>
       <width>501</width>
-      <height>1350</height>
+      <height>1435</height>
      </rect>
     </property>
     <layout class="QVBoxLayout" name="verticalLayout_2">
@@ -74,6 +80,42 @@
      <property name="bottomMargin">
       <number>30</number>
      </property>
+     <item>
+      <widget class="QLabel" name="label_11">
+       <property name="minimumSize">
+        <size>
+         <width>0</width>
+         <height>40</height>
+        </size>
+       </property>
+       <property name="baseSize">
+        <size>
+         <width>0</width>
+         <height>40</height>
+        </size>
+       </property>
+       <property name="font">
+        <font>
+         <family>Arial</family>
+         <pointsize>20</pointsize>
+         <weight>75</weight>
+         <bold>true</bold>
+        </font>
+       </property>
+       <property name="styleSheet">
+        <string notr="true">color:#29967e</string>
+       </property>
+       <property name="text">
+        <string>Avatar basics</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+       </property>
+       <property name="margin">
+        <number>0</number>
+       </property>
+      </widget>
+     </item>
      <item>
       <widget class="QLabel" name="avatarDisplayLabel">
        <property name="sizePolicy">
@@ -146,7 +188,7 @@
        <property name="minimumSize">
         <size>
          <width>0</width>
-         <height>30</height>
+         <height>25</height>
         </size>
        </property>
        <property name="font">
@@ -191,7 +233,7 @@
          </property>
          <property name="sizeHint" stdset="0">
           <size>
-           <width>20</width>
+           <width>5</width>
            <height>20</height>
           </size>
          </property>
@@ -199,6 +241,12 @@
        </item>
        <item>
         <widget class="QPushButton" name="buttonBrowseHead">
+         <property name="font">
+          <font>
+           <family>Arial</family>
+           <pointsize>14</pointsize>
+          </font>
+         </property>
          <property name="text">
           <string>Browse</string>
          </property>
@@ -223,7 +271,7 @@
        <property name="minimumSize">
         <size>
          <width>0</width>
-         <height>30</height>
+         <height>25</height>
         </size>
        </property>
        <property name="font">
@@ -265,7 +313,7 @@
          </property>
          <property name="sizeHint" stdset="0">
           <size>
-           <width>20</width>
+           <width>5</width>
            <height>20</height>
           </size>
          </property>
@@ -273,6 +321,12 @@
        </item>
        <item>
         <widget class="QPushButton" name="buttonBrowseBody">
+         <property name="font">
+          <font>
+           <family>Arial</family>
+           <pointsize>14</pointsize>
+          </font>
+         </property>
          <property name="text">
           <string>Browse</string>
          </property>
@@ -297,17 +351,20 @@
        <property name="minimumSize">
         <size>
          <width>0</width>
-         <height>40</height>
+         <height>35</height>
         </size>
        </property>
        <property name="font">
         <font>
          <family>Arial</family>
          <pointsize>20</pointsize>
-         <weight>50</weight>
-         <bold>false</bold>
+         <weight>75</weight>
+         <bold>true</bold>
         </font>
        </property>
+       <property name="styleSheet">
+        <string notr="true">color:#29967e</string>
+       </property>
        <property name="text">
         <string>Snapshots</string>
        </property>
@@ -327,7 +384,7 @@
        <property name="minimumSize">
         <size>
          <width>0</width>
-         <height>30</height>
+         <height>25</height>
         </size>
        </property>
        <property name="font">
@@ -377,7 +434,7 @@
          </property>
          <property name="sizeHint" stdset="0">
           <size>
-           <width>20</width>
+           <width>5</width>
            <height>20</height>
           </size>
          </property>
@@ -385,6 +442,12 @@
        </item>
        <item>
         <widget class="QPushButton" name="buttonBrowseLocation">
+         <property name="font">
+          <font>
+           <family>Arial</family>
+           <pointsize>14</pointsize>
+          </font>
+         </property>
          <property name="text">
           <string>Browse</string>
          </property>
@@ -416,10 +479,13 @@
         <font>
          <family>Arial</family>
          <pointsize>20</pointsize>
-         <weight>50</weight>
-         <bold>false</bold>
+         <weight>75</weight>
+         <bold>true</bold>
         </font>
        </property>
+       <property name="styleSheet">
+        <string notr="true">color:#29967e</string>
+       </property>
        <property name="text">
         <string>Scripts</string>
        </property>
@@ -439,7 +505,7 @@
        <property name="minimumSize">
         <size>
          <width>0</width>
-         <height>30</height>
+         <height>25</height>
         </size>
        </property>
        <property name="font">
@@ -489,7 +555,7 @@
          </property>
          <property name="sizeHint" stdset="0">
           <size>
-           <width>20</width>
+           <width>5</width>
            <height>20</height>
           </size>
          </property>
@@ -497,6 +563,12 @@
        </item>
        <item>
         <widget class="QPushButton" name="buttonBrowseScriptsLocation">
+         <property name="font">
+          <font>
+           <family>Arial</family>
+           <pointsize>14</pointsize>
+          </font>
+         </property>
          <property name="text">
           <string>Browse</string>
          </property>
@@ -511,35 +583,34 @@
       </layout>
      </item>
      <item>
-      <widget class="QWidget" name="widget" native="true">
-       <layout class="QHBoxLayout" name="horizontalLayout_12">
-        <item>
-         <widget class="QPushButton" name="buttonReloadDefaultScripts">
-          <property name="text">
-           <string>Load Default Scripts</string>
-          </property>
-          <property name="iconSize">
-           <size>
-            <width>0</width>
-            <height>0</height>
-           </size>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer name="horizontalSpacer_13">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
+      <widget class="QPushButton" name="buttonReloadDefaultScripts">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>150</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="baseSize">
+        <size>
+         <width>300</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="font">
+        <font>
+         <family>Arial</family>
+         <pointsize>14</pointsize>
+        </font>
+       </property>
+       <property name="text">
+        <string>Load Default Scripts</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -559,9 +630,14 @@
        <property name="font">
         <font>
          <family>Arial</family>
-         <pointsize>16</pointsize>
+         <pointsize>20</pointsize>
+         <weight>75</weight>
+         <bold>true</bold>
         </font>
        </property>
+       <property name="styleSheet">
+        <string notr="true">color:#29967e</string>
+       </property>
        <property name="text">
         <string>Privacy</string>
        </property>
@@ -577,93 +653,41 @@
       </widget>
      </item>
      <item>
-      <layout class="QHBoxLayout" name="horizontalLayout_18">
-       <property name="spacing">
-        <number>0</number>
+      <widget class="QCheckBox" name="sendDataCheckBox">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
        </property>
-       <property name="topMargin">
-        <number>10</number>
+       <property name="minimumSize">
+        <size>
+         <width>32</width>
+         <height>32</height>
+        </size>
        </property>
-       <property name="rightMargin">
-        <number>0</number>
+       <property name="baseSize">
+        <size>
+         <width>0</width>
+         <height>0</height>
+        </size>
        </property>
-       <property name="bottomMargin">
-        <number>10</number>
+       <property name="font">
+        <font>
+         <family>Arial</family>
+         <pointsize>13</pointsize>
+        </font>
        </property>
-       <item>
-        <widget class="QLabel" name="label_15">
-         <property name="font">
-          <font>
-           <family>Arial</family>
-          </font>
-         </property>
-         <property name="styleSheet">
-          <string notr="true">color: rgb(51, 51, 51)</string>
-         </property>
-         <property name="text">
-          <string>Send data</string>
-         </property>
-         <property name="indent">
-          <number>15</number>
-         </property>
-         <property name="buddy">
-          <cstring>maxVoxelsSpin</cstring>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer name="horizontalSpacer_18">
-         <property name="font">
-          <font>
-           <family>Arial</family>
-          </font>
-         </property>
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>40</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item>
-        <widget class="QCheckBox" name="sendDataCheckBox">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>22</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="baseSize">
-          <size>
-           <width>0</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="text">
-          <string/>
-         </property>
-         <property name="iconSize">
-          <size>
-           <width>0</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="checked">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-      </layout>
+       <property name="text">
+        <string>Send data</string>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>0</width>
+         <height>0</height>
+        </size>
+       </property>
+      </widget>
      </item>
      <item>
       <spacer name="verticalSpacer">
@@ -678,71 +702,6 @@
        </property>
       </spacer>
      </item>
-     <item>
-      <widget class="QLabel" name="advancedTuningLabel">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>0</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="font">
-        <font>
-         <family>Arial</family>
-         <pointsize>24</pointsize>
-        </font>
-       </property>
-       <property name="styleSheet">
-        <string notr="true"/>
-       </property>
-       <property name="text">
-        <string>Advanced Tuning</string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-       </property>
-       <property name="indent">
-        <number>0</number>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="advancedTextLabel">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="font">
-        <font>
-         <family>Arial</family>
-         <pointsize>16</pointsize>
-        </font>
-       </property>
-       <property name="autoFillBackground">
-        <bool>true</bool>
-       </property>
-       <property name="styleSheet">
-        <string notr="true">color: rgb(51, 51, 51);</string>
-       </property>
-       <property name="text">
-        <string>It's not recomended that you play with these settings unless you've looked into exactly what they do.</string>
-       </property>
-       <property name="scaledContents">
-        <bool>false</bool>
-       </property>
-       <property name="wordWrap">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
      <item>
       <widget class="QLabel" name="avatarTitleLabel">
        <property name="sizePolicy">
@@ -761,12 +720,15 @@
         <font>
          <family>Arial</family>
          <pointsize>20</pointsize>
-         <weight>50</weight>
-         <bold>false</bold>
+         <weight>75</weight>
+         <bold>true</bold>
         </font>
        </property>
+       <property name="styleSheet">
+        <string notr="true">color:#29967e</string>
+       </property>
        <property name="text">
-        <string>Avatar</string>
+        <string>Avatar tuning</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
@@ -779,13 +741,13 @@
         <number>0</number>
        </property>
        <property name="topMargin">
-        <number>10</number>
+        <number>8</number>
        </property>
        <property name="rightMargin">
         <number>0</number>
        </property>
        <property name="bottomMargin">
-        <number>10</number>
+        <number>8</number>
        </property>
        <item>
         <widget class="QLabel" name="label_9">
@@ -801,7 +763,7 @@
           <string>Real world vertical field of view (angular size of monitor)</string>
          </property>
          <property name="indent">
-          <number>15</number>
+          <number>0</number>
          </property>
          <property name="buddy">
           <cstring>fieldOfViewSpin</cstring>
@@ -861,13 +823,13 @@
         <number>0</number>
        </property>
        <property name="topMargin">
-        <number>10</number>
+        <number>8</number>
        </property>
        <property name="rightMargin">
         <number>0</number>
        </property>
        <property name="bottomMargin">
-        <number>10</number>
+        <number>8</number>
        </property>
        <item>
         <widget class="QLabel" name="label_2">
@@ -883,7 +845,7 @@
           <string>Vertical field of view</string>
          </property>
          <property name="indent">
-          <number>15</number>
+          <number>0</number>
          </property>
          <property name="buddy">
           <cstring>fieldOfViewSpin</cstring>
@@ -949,10 +911,10 @@
         <number>0</number>
        </property>
        <property name="topMargin">
-        <number>10</number>
+        <number>8</number>
        </property>
        <property name="bottomMargin">
-        <number>10</number>
+        <number>8</number>
        </property>
        <item>
         <widget class="QLabel" name="label">
@@ -986,7 +948,7 @@
           <string>Lean scale (applies to Faceshift users)</string>
          </property>
          <property name="indent">
-          <number>15</number>
+          <number>0</number>
          </property>
          <property name="buddy">
           <cstring>leanScaleSpin</cstring>
@@ -1043,13 +1005,13 @@
         <number>0</number>
        </property>
        <property name="topMargin">
-        <number>10</number>
+        <number>8</number>
        </property>
        <property name="rightMargin">
         <number>0</number>
        </property>
        <property name="bottomMargin">
-        <number>10</number>
+        <number>8</number>
        </property>
        <item>
         <widget class="QLabel" name="label_3">
@@ -1065,7 +1027,7 @@
           <string>Avatar scale &lt;span style=&quot; color:#909090;&quot;&gt;(default is 1.0)&lt;/span&gt;</string>
          </property>
          <property name="indent">
-          <number>15</number>
+          <number>0</number>
          </property>
          <property name="buddy">
           <cstring>avatarScaleSpin</cstring>
@@ -1119,13 +1081,13 @@
         <number>0</number>
        </property>
        <property name="topMargin">
-        <number>10</number>
+        <number>8</number>
        </property>
        <property name="rightMargin">
         <number>0</number>
        </property>
        <property name="bottomMargin">
-        <number>10</number>
+        <number>8</number>
        </property>
        <item alignment="Qt::AlignLeft">
         <widget class="QLabel" name="label_4">
@@ -1141,7 +1103,7 @@
           <string>Pupil dillation</string>
          </property>
          <property name="indent">
-          <number>15</number>
+          <number>0</number>
          </property>
          <property name="buddy">
           <cstring>pupilDilationSlider</cstring>
@@ -1192,110 +1154,50 @@
        </item>
       </layout>
      </item>
-
-        <!-- dynamic jitter buffers ____________________________________________________________________________ -->
-        <item>
-            <layout class="QHBoxLayout" name="horizontalLayout_23">
-                <property name="spacing">
-                    <number>0</number>
-                </property>
-                <property name="topMargin">
-                    <number>10</number>
-                </property>
-                <property name="rightMargin">
-                    <number>0</number>
-                </property>
-                <property name="bottomMargin">
-                    <number>10</number>
-                </property>
-                <item>
-                    <widget class="QLabel" name="label_20">
-                        <property name="font">
-                            <font>
-                                <family>Arial</family>
-                            </font>
-                        </property>
-                        <property name="styleSheet">
-                            <string notr="true">color: rgb(51, 51, 51)</string>
-                        </property>
-                        <property name="text">
-                            <string>Enable Dynamic Jitter Buffers</string>
-                        </property>
-                        <property name="indent">
-                            <number>15</number>
-                        </property>
-                        <property name="buddy">
-                            <cstring>dynamicJitterBuffersCheckBox</cstring>
-                        </property>
-                    </widget>
-                </item>
-                <item>
-                    <spacer name="horizontalSpacer_17">
-                        <property name="font">
-                            <font>
-                                <family>Arial</family>
-                            </font>
-                        </property>
-                        <property name="orientation">
-                            <enum>Qt::Horizontal</enum>
-                        </property>
-                        <property name="sizeHint" stdset="0">
-                            <size>
-                                <width>40</width>
-                                <height>20</height>
-                            </size>
-                        </property>
-                    </spacer>
-                </item>
-                <item>
-                    <widget class="QCheckBox" name="dynamicJitterBuffersCheckBox">
-                        <property name="sizePolicy">
-                            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-                                <horstretch>0</horstretch>
-                                <verstretch>0</verstretch>
-                            </sizepolicy>
-                        </property>
-                        <property name="minimumSize">
-                            <size>
-                                <width>32</width>
-                                <height>0</height>
-                            </size>
-                        </property>
-                        <property name="baseSize">
-                            <size>
-                                <width>0</width>
-                                <height>0</height>
-                            </size>
-                        </property>
-                        <property name="text">
-                            <string/>
-                        </property>
-                        <property name="iconSize">
-                            <size>
-                                <width>32</width>
-                                <height>32</height>
-                            </size>
-                        </property>
-                    </widget>
-                </item>
-            </layout>
-        </item>
-        
-
-        <!-- static desired jitter frames____________________________________________________________________________ -->
+     <item>
+      <widget class="QCheckBox" name="dynamicJitterBuffersCheckBox">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>0</width>
+         <height>40</height>
+        </size>
+       </property>
+       <property name="baseSize">
+        <size>
+         <width>0</width>
+         <height>40</height>
+        </size>
+       </property>
+       <property name="font">
+        <font>
+         <family>Arial</family>
+         <pointsize>13</pointsize>
+        </font>
+       </property>
+       <property name="text">
+        <string>Enable Dynamic Jitter Buffers</string>
+       </property>
+      </widget>
+     </item>
      <item>
       <layout class="QHBoxLayout" name="horizontalLayout_8">
        <property name="spacing">
         <number>0</number>
        </property>
        <property name="topMargin">
-        <number>10</number>
+        <number>8</number>
        </property>
        <property name="rightMargin">
         <number>0</number>
        </property>
        <property name="bottomMargin">
-        <number>10</number>
+        <number>8</number>
        </property>
        <item alignment="Qt::AlignLeft">
         <widget class="QLabel" name="label_6">
@@ -1311,7 +1213,7 @@
           <string>Static Jitter Buffer Frames</string>
          </property>
          <property name="indent">
-          <number>15</number>
+          <number>0</number>
          </property>
          <property name="buddy">
           <cstring>staticDesiredJitterBufferFramesSpin</cstring>
@@ -1374,13 +1276,13 @@
         <number>0</number>
        </property>
        <property name="topMargin">
-        <number>10</number>
+        <number>8</number>
        </property>
        <property name="rightMargin">
         <number>0</number>
        </property>
        <property name="bottomMargin">
-        <number>10</number>
+        <number>8</number>
        </property>
        <item alignment="Qt::AlignLeft">
         <widget class="QLabel" name="label_10">
@@ -1396,7 +1298,7 @@
           <string>Max Frames Over Desired</string>
          </property>
          <property name="indent">
-          <number>15</number>
+          <number>0</number>
          </property>
          <property name="buddy">
           <cstring>maxFramesOverDesiredSpin</cstring>
@@ -1447,573 +1349,455 @@
        </item>
       </layout>
      </item>
-        <!-- max frames over desired ____________________________________________________________________________ -->
      <item>
-        <layout class="QHBoxLayout" name="horizontalLayout_13">
-            <property name="spacing">
-                <number>0</number>
-            </property>
-            <property name="topMargin">
-                <number>10</number>
-            </property>
-            <property name="rightMargin">
-                <number>0</number>
-            </property>
-            <property name="bottomMargin">
-                <number>10</number>
-            </property>
-            <item alignment="Qt::AlignLeft">
-                <widget class="QLabel" name="label_10">
-                    <property name="font">
-                        <font>
-                            <family>Arial</family>
-                        </font>
-                    </property>
-                    <property name="styleSheet">
-                        <string notr="true">color: rgb(51, 51, 51)</string>
-                    </property>
-                    <property name="text">
-                        <string>Max Frames Over Desired</string>
-                    </property>
-                    <property name="indent">
-                        <number>15</number>
-                    </property>
-                    <property name="buddy">
-                        <cstring>maxFramesOverDesiredSpin</cstring>
-                    </property>
-                </widget>
-            </item>
-            <item>
-                <spacer name="horizontalSpacer_20">
-                    <property name="font">
-                        <font>
-                            <family>Arial</family>
-                        </font>
-                    </property>
-                    <property name="orientation">
-                        <enum>Qt::Horizontal</enum>
-                    </property>
-                    <property name="sizeHint" stdset="0">
-                        <size>
-                            <width>40</width>
-                            <height>20</height>
-                        </size>
-                    </property>
-                </spacer>
-            </item>
-            <item>
-                <widget class="QSpinBox" name="maxFramesOverDesiredSpin">
-                    <property name="sizePolicy">
-                        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-                            <horstretch>0</horstretch>
-                            <verstretch>0</verstretch>
-                        </sizepolicy>
-                    </property>
-                    <property name="minimumSize">
-                        <size>
-                            <width>95</width>
-                            <height>36</height>
-                        </size>
-                    </property>
-                    <property name="maximumSize">
-                        <size>
-                            <width>70</width>
-                            <height>16777215</height>
-                        </size>
-                    </property>
-                    <property name="font">
-                        <font>
-                            <family>Arial</family>
-                        </font>
-                    </property>
-                    <property name="minimum">
-                        <number>0</number>
-                    </property>
-                    <property name="maximum">
-                        <number>10000</number>
-                    </property>
-                    <property name="value">
-                        <number>1</number>
-                    </property>
-                </widget>
-            </item>
-        </layout>
-    </item>
-
-
-        <!-- use stdev for jitter calc ____________________________________________________________________________ -->
-        <item>
-            <layout class="QHBoxLayout" name="horizontalLayout_19">
-                <property name="spacing">
-                    <number>0</number>
-                </property>
-                <property name="topMargin">
-                    <number>10</number>
-                </property>
-                <property name="rightMargin">
-                    <number>0</number>
-                </property>
-                <property name="bottomMargin">
-                    <number>10</number>
-                </property>
-                <item>
-                    <widget class="QLabel" name="label_16">
-                        <property name="font">
-                            <font>
-                                <family>Arial</family>
-                            </font>
-                        </property>
-                        <property name="styleSheet">
-                            <string notr="true">color: rgb(51, 51, 51)</string>
-                        </property>
-                        <property name="text">
-                            <string>Use Stdev for Dynamic Jitter Calc</string>
-                        </property>
-                        <property name="indent">
-                            <number>15</number>
-                        </property>
-                        <property name="buddy">
-                            <cstring>useStdevForJitterCalcCheckBox</cstring>
-                        </property>
-                    </widget>
-                </item>
-                <item>
-                    <spacer name="horizontalSpacer_21">
-                        <property name="font">
-                            <font>
-                                <family>Arial</family>
-                            </font>
-                        </property>
-                        <property name="orientation">
-                            <enum>Qt::Horizontal</enum>
-                        </property>
-                        <property name="sizeHint" stdset="0">
-                            <size>
-                                <width>40</width>
-                                <height>20</height>
-                            </size>
-                        </property>
-                    </spacer>
-                </item>
-                <item>
-                    <widget class="QCheckBox" name="useStdevForJitterCalcCheckBox">
-                        <property name="sizePolicy">
-                            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-                                <horstretch>0</horstretch>
-                                <verstretch>0</verstretch>
-                            </sizepolicy>
-                        </property>
-                        <property name="minimumSize">
-                            <size>
-                                <width>32</width>
-                                <height>0</height>
-                            </size>
-                        </property>
-                        <property name="baseSize">
-                            <size>
-                                <width>0</width>
-                                <height>0</height>
-                            </size>
-                        </property>
-                        <property name="text">
-                            <string/>
-                        </property>
-                        <property name="iconSize">
-                            <size>
-                                <width>32</width>
-                                <height>32</height>
-                            </size>
-                        </property>
-                    </widget>
-                </item>
-            </layout>
-        </item>
-
-
-
-        <!-- window starve threshold ____________________________________________________________________________ -->
-        <item>
-            <layout class="QHBoxLayout" name="horizontalLayout_20">
-                <property name="spacing">
-                    <number>0</number>
-                </property>
-                <property name="topMargin">
-                    <number>10</number>
-                </property>
-                <property name="rightMargin">
-                    <number>0</number>
-                </property>
-                <property name="bottomMargin">
-                    <number>10</number>
-                </property>
-                <item alignment="Qt::AlignLeft">
-                    <widget class="QLabel" name="label_17">
-                        <property name="font">
-                            <font>
-                                <family>Arial</family>
-                            </font>
-                        </property>
-                        <property name="styleSheet">
-                            <string notr="true">color: rgb(51, 51, 51)</string>
-                        </property>
-                        <property name="text">
-                            <string>Window A Starve Threshold</string>
-                        </property>
-                        <property name="indent">
-                            <number>15</number>
-                        </property>
-                        <property name="buddy">
-                            <cstring>windowStarveThresholdSpin</cstring>
-                        </property>
-                    </widget>
-                </item>
-                <item>
-                    <spacer name="horizontalSpacer_22">
-                        <property name="font">
-                            <font>
-                                <family>Arial</family>
-                            </font>
-                        </property>
-                        <property name="orientation">
-                            <enum>Qt::Horizontal</enum>
-                        </property>
-                        <property name="sizeHint" stdset="0">
-                            <size>
-                                <width>40</width>
-                                <height>20</height>
-                            </size>
-                        </property>
-                    </spacer>
-                </item>
-                <item>
-                    <widget class="QSpinBox" name="windowStarveThresholdSpin">
-                        <property name="sizePolicy">
-                            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-                                <horstretch>0</horstretch>
-                                <verstretch>0</verstretch>
-                            </sizepolicy>
-                        </property>
-                        <property name="minimumSize">
-                            <size>
-                                <width>95</width>
-                                <height>36</height>
-                            </size>
-                        </property>
-                        <property name="maximumSize">
-                            <size>
-                                <width>70</width>
-                                <height>16777215</height>
-                            </size>
-                        </property>
-                        <property name="font">
-                            <font>
-                                <family>Arial</family>
-                            </font>
-                        </property>
-                        <property name="minimum">
-                            <number>0</number>
-                        </property>
-                        <property name="maximum">
-                            <number>10000</number>
-                        </property>
-                        <property name="value">
-                            <number>1</number>
-                        </property>
-                    </widget>
-                </item>
-            </layout>
-        </item>
-
-
-        <!-- window A seconds ____________________________________________________________________________ -->
-        <item>
-            <layout class="QHBoxLayout" name="horizontalLayout_21">
-                <property name="spacing">
-                    <number>0</number>
-                </property>
-                <property name="topMargin">
-                    <number>10</number>
-                </property>
-                <property name="rightMargin">
-                    <number>0</number>
-                </property>
-                <property name="bottomMargin">
-                    <number>10</number>
-                </property>
-                <item alignment="Qt::AlignLeft">
-                    <widget class="QLabel" name="label_18">
-                        <property name="font">
-                            <font>
-                                <family>Arial</family>
-                            </font>
-                        </property>
-                        <property name="styleSheet">
-                            <string notr="true">color: rgb(51, 51, 51)</string>
-                        </property>
-                        <property name="text">
-                            <string>Window A (raise desired on N starves) Seconds</string>
-                        </property>
-                        <property name="indent">
-                            <number>15</number>
-                        </property>
-                        <property name="buddy">
-                            <cstring>windowSecondsForDesiredCalcOnTooManyStarvesSpin</cstring>
-                        </property>
-                    </widget>
-                </item>
-                <item>
-                    <spacer name="horizontalSpacer_23">
-                        <property name="font">
-                            <font>
-                                <family>Arial</family>
-                            </font>
-                        </property>
-                        <property name="orientation">
-                            <enum>Qt::Horizontal</enum>
-                        </property>
-                        <property name="sizeHint" stdset="0">
-                            <size>
-                                <width>40</width>
-                                <height>20</height>
-                            </size>
-                        </property>
-                    </spacer>
-                </item>
-                <item>
-                    <widget class="QSpinBox" name="windowSecondsForDesiredCalcOnTooManyStarvesSpin">
-                        <property name="sizePolicy">
-                            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-                                <horstretch>0</horstretch>
-                                <verstretch>0</verstretch>
-                            </sizepolicy>
-                        </property>
-                        <property name="minimumSize">
-                            <size>
-                                <width>95</width>
-                                <height>36</height>
-                            </size>
-                        </property>
-                        <property name="maximumSize">
-                            <size>
-                                <width>70</width>
-                                <height>16777215</height>
-                            </size>
-                        </property>
-                        <property name="font">
-                            <font>
-                                <family>Arial</family>
-                            </font>
-                        </property>
-                        <property name="minimum">
-                            <number>0</number>
-                        </property>
-                        <property name="maximum">
-                            <number>10000</number>
-                        </property>
-                        <property name="value">
-                            <number>1</number>
-                        </property>
-                    </widget>
-                </item>
-            </layout>
-        </item>
-
-
-        <!-- window B seconds ____________________________________________________________________________ -->
-        <item>
-            <layout class="QHBoxLayout" name="horizontalLayout_22">
-                <property name="spacing">
-                    <number>0</number>
-                </property>
-                <property name="topMargin">
-                    <number>10</number>
-                </property>
-                <property name="rightMargin">
-                    <number>0</number>
-                </property>
-                <property name="bottomMargin">
-                    <number>10</number>
-                </property>
-                <item alignment="Qt::AlignLeft">
-                    <widget class="QLabel" name="label_19">
-                        <property name="font">
-                            <font>
-                                <family>Arial</family>
-                            </font>
-                        </property>
-                        <property name="styleSheet">
-                            <string notr="true">color: rgb(51, 51, 51)</string>
-                        </property>
-                        <property name="text">
-                            <string>Window B (desired ceiling) Seconds</string>
-                        </property>
-                        <property name="indent">
-                            <number>15</number>
-                        </property>
-                        <property name="buddy">
-                            <cstring>windowSecondsForDesiredReductionSpin</cstring>
-                        </property>
-                    </widget>
-                </item>
-                <item>
-                    <spacer name="horizontalSpacer_24">
-                        <property name="font">
-                            <font>
-                                <family>Arial</family>
-                            </font>
-                        </property>
-                        <property name="orientation">
-                            <enum>Qt::Horizontal</enum>
-                        </property>
-                        <property name="sizeHint" stdset="0">
-                            <size>
-                                <width>40</width>
-                                <height>20</height>
-                            </size>
-                        </property>
-                    </spacer>
-                </item>
-                <item>
-                    <widget class="QSpinBox" name="windowSecondsForDesiredReductionSpin">
-                        <property name="sizePolicy">
-                            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-                                <horstretch>0</horstretch>
-                                <verstretch>0</verstretch>
-                            </sizepolicy>
-                        </property>
-                        <property name="minimumSize">
-                            <size>
-                                <width>95</width>
-                                <height>36</height>
-                            </size>
-                        </property>
-                        <property name="maximumSize">
-                            <size>
-                                <width>70</width>
-                                <height>16777215</height>
-                            </size>
-                        </property>
-                        <property name="font">
-                            <font>
-                                <family>Arial</family>
-                            </font>
-                        </property>
-                        <property name="minimum">
-                            <number>0</number>
-                        </property>
-                        <property name="maximum">
-                            <number>10000</number>
-                        </property>
-                        <property name="value">
-                            <number>1</number>
-                        </property>
-                    </widget>
-                </item>
-            </layout>
-        </item>
-
-
-        <!-- repetition with fade ____________________________________________________________________________ -->
-        <item>
-            <layout class="QHBoxLayout" name="horizontalLayout_24">
-                <property name="spacing">
-                    <number>0</number>
-                </property>
-                <property name="topMargin">
-                    <number>10</number>
-                </property>
-                <property name="rightMargin">
-                    <number>0</number>
-                </property>
-                <property name="bottomMargin">
-                    <number>10</number>
-                </property>
-                <item>
-                    <widget class="QLabel" name="label_21">
-                        <property name="font">
-                            <font>
-                                <family>Arial</family>
-                            </font>
-                        </property>
-                        <property name="styleSheet">
-                            <string notr="true">color: rgb(51, 51, 51)</string>
-                        </property>
-                        <property name="text">
-                            <string>Repetition with Fade</string>
-                        </property>
-                        <property name="indent">
-                            <number>15</number>
-                        </property>
-                        <property name="buddy">
-                            <cstring>repetitionWithFadeCheckBox</cstring>
-                        </property>
-                    </widget>
-                </item>
-                <item>
-                    <spacer name="horizontalSpacer_25">
-                        <property name="font">
-                            <font>
-                                <family>Arial</family>
-                            </font>
-                        </property>
-                        <property name="orientation">
-                            <enum>Qt::Horizontal</enum>
-                        </property>
-                        <property name="sizeHint" stdset="0">
-                            <size>
-                                <width>40</width>
-                                <height>20</height>
-                            </size>
-                        </property>
-                    </spacer>
-                </item>
-                <item>
-                    <widget class="QCheckBox" name="repetitionWithFadeCheckBox">
-                        <property name="sizePolicy">
-                            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-                                <horstretch>0</horstretch>
-                                <verstretch>0</verstretch>
-                            </sizepolicy>
-                        </property>
-                        <property name="minimumSize">
-                            <size>
-                                <width>32</width>
-                                <height>0</height>
-                            </size>
-                        </property>
-                        <property name="baseSize">
-                            <size>
-                                <width>0</width>
-                                <height>0</height>
-                            </size>
-                        </property>
-                        <property name="text">
-                            <string/>
-                        </property>
-                        <property name="iconSize">
-                            <size>
-                                <width>32</width>
-                                <height>32</height>
-                            </size>
-                        </property>
-                    </widget>
-                </item>
-            </layout>
-        </item>
-        
+      <layout class="QHBoxLayout" name="horizontalLayout_13">
+       <property name="spacing">
+        <number>0</number>
+       </property>
+       <property name="topMargin">
+        <number>8</number>
+       </property>
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <property name="bottomMargin">
+        <number>8</number>
+       </property>
+       <item alignment="Qt::AlignLeft">
+        <widget class="QLabel" name="label_10">
+         <property name="font">
+          <font>
+           <family>Arial</family>
+          </font>
+         </property>
+         <property name="styleSheet">
+          <string notr="true">color: rgb(51, 51, 51)</string>
+         </property>
+         <property name="text">
+          <string>Max Frames Over Desired</string>
+         </property>
+         <property name="indent">
+          <number>0</number>
+         </property>
+         <property name="buddy">
+          <cstring>maxFramesOverDesiredSpin</cstring>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="horizontalSpacer_20">
+         <property name="font">
+          <font>
+           <family>Arial</family>
+          </font>
+         </property>
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QSpinBox" name="maxFramesOverDesiredSpin">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>100</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>70</width>
+           <height>16777215</height>
+          </size>
+         </property>
+         <property name="font">
+          <font>
+           <family>Arial</family>
+          </font>
+         </property>
+         <property name="minimum">
+          <number>0</number>
+         </property>
+         <property name="maximum">
+          <number>10000</number>
+         </property>
+         <property name="value">
+          <number>1</number>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <widget class="QCheckBox" name="useStdevForJitterCalcCheckBox">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>0</width>
+         <height>40</height>
+        </size>
+       </property>
+       <property name="baseSize">
+        <size>
+         <width>0</width>
+         <height>32</height>
+        </size>
+       </property>
+       <property name="font">
+        <font>
+         <family>Arial</family>
+        </font>
+       </property>
+       <property name="text">
+        <string>Use Stdev for Dynamic Jitter Calc</string>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>32</width>
+         <height>32</height>
+        </size>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout_20">
+       <property name="spacing">
+        <number>0</number>
+       </property>
+       <property name="topMargin">
+        <number>8</number>
+       </property>
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <property name="bottomMargin">
+        <number>8</number>
+       </property>
+       <item alignment="Qt::AlignLeft">
+        <widget class="QLabel" name="label_17">
+         <property name="font">
+          <font>
+           <family>Arial</family>
+          </font>
+         </property>
+         <property name="styleSheet">
+          <string notr="true">color: rgb(51, 51, 51)</string>
+         </property>
+         <property name="text">
+          <string>Window A Starve Threshold</string>
+         </property>
+         <property name="indent">
+          <number>0</number>
+         </property>
+         <property name="buddy">
+          <cstring>windowStarveThresholdSpin</cstring>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="horizontalSpacer_22">
+         <property name="font">
+          <font>
+           <family>Arial</family>
+          </font>
+         </property>
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QSpinBox" name="windowStarveThresholdSpin">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>100</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>70</width>
+           <height>16777215</height>
+          </size>
+         </property>
+         <property name="font">
+          <font>
+           <family>Arial</family>
+          </font>
+         </property>
+         <property name="minimum">
+          <number>0</number>
+         </property>
+         <property name="maximum">
+          <number>10000</number>
+         </property>
+         <property name="value">
+          <number>1</number>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout_21">
+       <property name="spacing">
+        <number>0</number>
+       </property>
+       <property name="topMargin">
+        <number>8</number>
+       </property>
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <property name="bottomMargin">
+        <number>8</number>
+       </property>
+       <item alignment="Qt::AlignLeft">
+        <widget class="QLabel" name="label_18">
+         <property name="font">
+          <font>
+           <family>Arial</family>
+          </font>
+         </property>
+         <property name="styleSheet">
+          <string notr="true">color: rgb(51, 51, 51)</string>
+         </property>
+         <property name="text">
+          <string>Window A (raise desired on N starves) Seconds</string>
+         </property>
+         <property name="indent">
+          <number>0</number>
+         </property>
+         <property name="buddy">
+          <cstring>windowSecondsForDesiredCalcOnTooManyStarvesSpin</cstring>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="horizontalSpacer_23">
+         <property name="font">
+          <font>
+           <family>Arial</family>
+          </font>
+         </property>
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QSpinBox" name="windowSecondsForDesiredCalcOnTooManyStarvesSpin">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>100</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>70</width>
+           <height>16777215</height>
+          </size>
+         </property>
+         <property name="font">
+          <font>
+           <family>Arial</family>
+          </font>
+         </property>
+         <property name="minimum">
+          <number>0</number>
+         </property>
+         <property name="maximum">
+          <number>10000</number>
+         </property>
+         <property name="value">
+          <number>1</number>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout_22">
+       <property name="spacing">
+        <number>0</number>
+       </property>
+       <property name="topMargin">
+        <number>8</number>
+       </property>
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <property name="bottomMargin">
+        <number>8</number>
+       </property>
+       <item alignment="Qt::AlignLeft">
+        <widget class="QLabel" name="label_19">
+         <property name="font">
+          <font>
+           <family>Arial</family>
+          </font>
+         </property>
+         <property name="styleSheet">
+          <string notr="true">color: rgb(51, 51, 51)</string>
+         </property>
+         <property name="text">
+          <string>Window B (desired ceiling) Seconds</string>
+         </property>
+         <property name="indent">
+          <number>0</number>
+         </property>
+         <property name="buddy">
+          <cstring>windowSecondsForDesiredReductionSpin</cstring>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="horizontalSpacer_24">
+         <property name="font">
+          <font>
+           <family>Arial</family>
+          </font>
+         </property>
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QSpinBox" name="windowSecondsForDesiredReductionSpin">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>100</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>70</width>
+           <height>16777215</height>
+          </size>
+         </property>
+         <property name="font">
+          <font>
+           <family>Arial</family>
+          </font>
+         </property>
+         <property name="minimum">
+          <number>0</number>
+         </property>
+         <property name="maximum">
+          <number>10000</number>
+         </property>
+         <property name="value">
+          <number>1</number>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <widget class="QCheckBox" name="repetitionWithFadeCheckBox">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>32</width>
+         <height>40</height>
+        </size>
+       </property>
+       <property name="baseSize">
+        <size>
+         <width>0</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="font">
+        <font>
+         <family>Arial</family>
+        </font>
+       </property>
+       <property name="text">
+        <string>Repetition with Fade</string>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>32</width>
+         <height>32</height>
+        </size>
+       </property>
+      </widget>
+     </item>
      <item>
       <layout class="QHBoxLayout" name="horizontalLayout_6">
        <property name="spacing">
         <number>0</number>
        </property>
        <property name="topMargin">
-        <number>10</number>
+        <number>8</number>
        </property>
        <property name="rightMargin">
         <number>0</number>
        </property>
        <property name="bottomMargin">
-        <number>10</number>
+        <number>8</number>
        </property>
        <item>
         <widget class="QLabel" name="label_5">
@@ -2029,7 +1813,7 @@
           <string>Faceshift eye detection</string>
          </property>
          <property name="indent">
-          <number>15</number>
+          <number>0</number>
          </property>
          <property name="buddy">
           <cstring>faceshiftEyeDeflectionSider</cstring>
@@ -2083,7 +1867,7 @@
      <item>
       <widget class="QLabel" name="voxelsTitleLabel">
        <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+        <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
@@ -2091,7 +1875,7 @@
        <property name="minimumSize">
         <size>
          <width>0</width>
-         <height>40</height>
+         <height>35</height>
         </size>
        </property>
        <property name="font">
@@ -2102,6 +1886,9 @@
          <bold>false</bold>
         </font>
        </property>
+       <property name="styleSheet">
+        <string notr="true">color:#29967e</string>
+       </property>
        <property name="text">
         <string>Voxels</string>
        </property>
@@ -2116,13 +1903,13 @@
         <number>0</number>
        </property>
        <property name="topMargin">
-        <number>10</number>
+        <number>8</number>
        </property>
        <property name="rightMargin">
         <number>0</number>
        </property>
        <property name="bottomMargin">
-        <number>10</number>
+        <number>8</number>
        </property>
        <item>
         <widget class="QLabel" name="label_7">
@@ -2138,7 +1925,7 @@
           <string>Maximum voxels</string>
          </property>
          <property name="indent">
-          <number>15</number>
+          <number>0</number>
          </property>
          <property name="buddy">
           <cstring>maxVoxelsSpin</cstring>
@@ -2192,13 +1979,13 @@
         <number>0</number>
        </property>
        <property name="topMargin">
-        <number>10</number>
+        <number>8</number>
        </property>
        <property name="rightMargin">
         <number>0</number>
        </property>
        <property name="bottomMargin">
-        <number>10</number>
+        <number>8</number>
        </property>
        <item>
         <widget class="QLabel" name="label_8">
@@ -2211,7 +1998,7 @@
           <string>Max voxels sent each second</string>
          </property>
          <property name="indent">
-          <number>15</number>
+          <number>0</number>
          </property>
          <property name="buddy">
           <cstring>maxVoxelsPPSSpin</cstring>
@@ -2264,10 +2051,16 @@
      </item>
      <item>
       <widget class="QLabel" name="oculusRiftTitleLabel">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
        <property name="minimumSize">
         <size>
          <width>0</width>
-         <height>40</height>
+         <height>35</height>
         </size>
        </property>
        <property name="font">
@@ -2278,6 +2071,9 @@
          <bold>false</bold>
         </font>
        </property>
+       <property name="styleSheet">
+        <string notr="true">color:#29967e</string>
+       </property>
        <property name="text">
         <string>Oculus Rift</string>
        </property>
@@ -2292,13 +2088,13 @@
         <number>0</number>
        </property>
        <property name="topMargin">
-        <number>10</number>
+        <number>8</number>
        </property>
        <property name="rightMargin">
         <number>0</number>
        </property>
        <property name="bottomMargin">
-        <number>10</number>
+        <number>8</number>
        </property>
        <item>
         <widget class="QLabel" name="label_12">
@@ -2314,7 +2110,7 @@
           <string>User Interface Angular Size</string>
          </property>
          <property name="indent">
-          <number>15</number>
+          <number>0</number>
          </property>
          <property name="buddy">
           <cstring>maxVoxelsSpin</cstring>
@@ -2371,7 +2167,7 @@
      <item>
       <widget class="QLabel" name="sixenseControllersTitleLabel">
        <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+        <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
@@ -2379,7 +2175,7 @@
        <property name="minimumSize">
         <size>
          <width>0</width>
-         <height>40</height>
+         <height>35</height>
         </size>
        </property>
        <property name="font">
@@ -2390,6 +2186,9 @@
          <bold>false</bold>
         </font>
        </property>
+       <property name="styleSheet">
+        <string notr="true">color:#29967e</string>
+       </property>
        <property name="text">
         <string>Sixense Controllers</string>
        </property>
@@ -2399,78 +2198,34 @@
       </widget>
      </item>
      <item>
-      <layout class="QHBoxLayout" name="horizontalLayout_17">
-       <property name="spacing">
-        <number>0</number>
+      <widget class="QCheckBox" name="invertSixenseButtonsCheckBox">
+       <property name="minimumSize">
+        <size>
+         <width>0</width>
+         <height>40</height>
+        </size>
        </property>
-       <property name="topMargin">
-        <number>10</number>
+       <property name="baseSize">
+        <size>
+         <width>0</width>
+         <height>40</height>
+        </size>
        </property>
-       <property name="rightMargin">
-        <number>0</number>
+       <property name="font">
+        <font>
+         <family>Arial</family>
+        </font>
        </property>
-       <property name="bottomMargin">
-        <number>10</number>
+       <property name="text">
+        <string>Invert Mouse Buttons</string>
        </property>
-       <item>
-        <widget class="QLabel" name="label_14">
-         <property name="font">
-          <font>
-           <family>Arial</family>
-          </font>
-         </property>
-         <property name="styleSheet">
-          <string notr="true">color: rgb(51, 51, 51)</string>
-         </property>
-         <property name="text">
-          <string>Invert Mouse Buttons</string>
-         </property>
-         <property name="indent">
-          <number>15</number>
-         </property>
-         <property name="buddy">
-          <cstring>maxVoxelsSpin</cstring>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer name="horizontalSpacer_17">
-         <property name="font">
-          <font>
-           <family>Arial</family>
-          </font>
-         </property>
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>40</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item>
-        <widget class="QCheckBox" name="invertSixenseButtonsCheckBox">
-         <property name="baseSize">
-          <size>
-           <width>0</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="text">
-          <string/>
-         </property>
-         <property name="iconSize">
-          <size>
-           <width>0</width>
-           <height>0</height>
-          </size>
-         </property>
-        </widget>
-       </item>
-      </layout>
+       <property name="iconSize">
+        <size>
+         <width>0</width>
+         <height>0</height>
+        </size>
+       </property>
+      </widget>
      </item>
      <item>
       <layout class="QHBoxLayout" name="horizontalLayout_16">
@@ -2478,13 +2233,13 @@
         <number>0</number>
        </property>
        <property name="topMargin">
-        <number>10</number>
+        <number>8</number>
        </property>
        <property name="rightMargin">
         <number>0</number>
        </property>
        <property name="bottomMargin">
-        <number>10</number>
+        <number>8</number>
        </property>
        <item>
         <widget class="QLabel" name="label_13">
@@ -2500,7 +2255,7 @@
           <string>Reticle Movement Speed</string>
          </property>
          <property name="indent">
-          <number>15</number>
+          <number>0</number>
          </property>
          <property name="buddy">
           <cstring>maxVoxelsSpin</cstring>
@@ -2558,9 +2313,9 @@
    <property name="geometry">
     <rect>
      <x>0</x>
-     <y>530</y>
+     <y>490</y>
      <width>501</width>
-     <height>60</height>
+     <height>50</height>
     </rect>
    </property>
    <property name="frameShape">
@@ -2573,7 +2328,7 @@
     <property name="geometry">
      <rect>
       <x>0</x>
-      <y>10</y>
+      <y>0</y>
       <width>491</width>
       <height>41</height>
      </rect>
@@ -2594,6 +2349,12 @@
      </item>
      <item>
       <widget class="QPushButton" name="cancelButton">
+       <property name="font">
+        <font>
+         <family>Arial</family>
+         <pointsize>14</pointsize>
+        </font>
+       </property>
        <property name="text">
         <string>Cancel</string>
        </property>
@@ -2604,6 +2365,12 @@
      </item>
      <item>
       <widget class="QPushButton" name="defaultButton">
+       <property name="font">
+        <font>
+         <family>Arial</family>
+         <pointsize>14</pointsize>
+        </font>
+       </property>
        <property name="text">
         <string>Save all changes</string>
        </property>