some ui fiddling

2 files changed, 544 insertions, 404 deletions

diff --git a/facetracknoir/facetracknoir.cpp b/facetracknoir/facetracknoir.cpp
index 48163a42..13f186e5 100644
--- a/facetracknoir/facetracknoir.cpp
+++ b/facetracknoir/facetracknoir.cpp
@@ -242,7 +242,7 @@ void FaceTrackNoIR::startTracker( ) {
 }
 
 void FaceTrackNoIR::stopTracker( ) {
-    ui.game_name->setText("Not connected");
+    //ui.game_name->setText("Not connected");
 
     pose_update_timer.stop();
     ui.pose_display->rotateBy(0, 0, 0);
@@ -290,19 +290,19 @@ void FaceTrackNoIR::display_pose(const double *mapped, const double *raw)
         raw_[i] = (int) raw[i];
     }
 
-    ui.lcdNumX->display(raw_[TX]);
-    ui.lcdNumY->display(raw_[TY]);
-    ui.lcdNumZ->display(raw_[TZ]);
-    ui.lcdNumRotX->display(raw_[Yaw]);
-    ui.lcdNumRotY->display(raw_[Pitch]);
-    ui.lcdNumRotZ->display(raw_[Roll]);
-
-    ui.lcdNumOutputPosX->display(mapped_[TX]);
-    ui.lcdNumOutputPosY->display(mapped_[TY]);
-    ui.lcdNumOutputPosZ->display(mapped_[TZ]);
-    ui.lcdNumOutputRotX->display(mapped_[Yaw]);
-    ui.lcdNumOutputRotY->display(mapped_[Pitch]);
-    ui.lcdNumOutputRotZ->display(mapped_[Roll]);
+    ui.raw_x->display(raw_[TX]);
+    ui.raw_y->display(raw_[TY]);
+    ui.raw_z->display(raw_[TZ]);
+    ui.raw_yaw->display(raw_[Yaw]);
+    ui.raw_pitch->display(raw_[Pitch]);
+    ui.raw_roll->display(raw_[Roll]);
+
+    ui.pose_x->display(mapped_[TX]);
+    ui.pose_y->display(mapped_[TY]);
+    ui.pose_z->display(mapped_[TZ]);
+    ui.pose_yaw->display(mapped_[Yaw]);
+    ui.pose_pitch->display(mapped_[Pitch]);
+    ui.pose_roll->display(mapped_[Roll]);
 }
 
 void FaceTrackNoIR::showHeadPose()
@@ -313,11 +313,13 @@ void FaceTrackNoIR::showHeadPose()
 
     display_pose(mapped, raw);
 
+#if 0
     if (libs.pProtocol)
     {
         const QString name = libs.pProtocol->game_name();
         ui.game_name->setText(name);
     }
+#endif
 }
 
 template<typename t>
diff --git a/facetracknoir/facetracknoir.ui b/facetracknoir/facetracknoir.ui
index 5ccdfb46..f4f225f2 100644
--- a/facetracknoir/facetracknoir.ui
+++ b/facetracknoir/facetracknoir.ui
@@ -7,8 +7,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>956</width>
-    <height>740</height>
+    <width>640</width>
+    <height>825</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -22,66 +22,69 @@
     <normaloff>:/images/facetracknoir.png</normaloff>:/images/facetracknoir.png</iconset>
   </property>
   <property name="styleSheet">
-   <string notr="true">#headpose, #video_frame_label, #controls, #video_frame { border: 0; }
-#video_frame { margin: 0; padding: 0; }
+   <string notr="true">#video_feed, #bottom_controls, #top_display, #video_frame_label, #video_frame, QMainWindow { border: 0; }
+QMainWindow, #video_frame { margin: 0; padding: 0; }
 </string>
   </property>
   <widget class="QWidget" name="centralWidget">
-   <layout class="QGridLayout" name="gridLayout_11">
-    <item row="0" column="0">
-     <widget class="QGroupBox" name="octopus">
+   <layout class="QVBoxLayout" name="verticalLayout">
+    <property name="spacing">
+     <number>0</number>
+    </property>
+    <property name="leftMargin">
+     <number>0</number>
+    </property>
+    <property name="topMargin">
+     <number>0</number>
+    </property>
+    <property name="rightMargin">
+     <number>0</number>
+    </property>
+    <property name="bottomMargin">
+     <number>0</number>
+    </property>
+    <item>
+     <widget class="QGroupBox" name="top_display">
       <property name="sizePolicy">
-       <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
         <horstretch>0</horstretch>
         <verstretch>0</verstretch>
        </sizepolicy>
       </property>
       <property name="title">
-       <string>Tracking preview</string>
+       <string/>
       </property>
-      <layout class="QGridLayout" name="gridLayout_2">
-       <item row="0" column="0">
+      <layout class="QHBoxLayout" name="horizontalLayout">
+       <item>
         <widget class="GLWidget" name="pose_display" native="true">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <property name="minimumSize">
           <size>
-           <width>90</width>
+           <width>100</width>
+           <height>120</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>100</width>
            <height>120</height>
           </size>
          </property>
         </widget>
        </item>
-      </layout>
-     </widget>
-    </item>
-    <item row="0" column="1" colspan="2">
-     <widget class="QGroupBox" name="headpose">
-      <property name="title">
-       <string/>
-      </property>
-      <layout class="QHBoxLayout" name="horizontalLayout">
-       <property name="spacing">
-        <number>10</number>
-       </property>
-       <property name="leftMargin">
-        <number>0</number>
-       </property>
-       <property name="topMargin">
-        <number>0</number>
-       </property>
-       <property name="rightMargin">
-        <number>0</number>
-       </property>
-       <property name="bottomMargin">
-        <number>0</number>
-       </property>
        <item>
         <widget class="QGroupBox" name="box_raw_headpose">
          <property name="title">
-          <string notr="true">Raw pose</string>
+          <string notr="true">Raw tracker data</string>
          </property>
-         <layout class="QGridLayout" name="gridLayout_8">
-          <item row="1" column="1">
-           <widget class="QLCDNumber" name="lcdNumY">
+         <layout class="QGridLayout" name="gridLayout_12">
+          <item row="0" column="1">
+           <widget class="QLCDNumber" name="raw_x">
             <property name="enabled">
              <bool>true</bool>
             </property>
@@ -94,6 +97,15 @@
             <property name="frameShape">
              <enum>QFrame::NoFrame</enum>
             </property>
+            <property name="frameShadow">
+             <enum>QFrame::Plain</enum>
+            </property>
+            <property name="lineWidth">
+             <number>1</number>
+            </property>
+            <property name="smallDecimalPoint">
+             <bool>true</bool>
+            </property>
             <property name="digitCount">
              <number>4</number>
             </property>
@@ -102,56 +114,78 @@
             </property>
            </widget>
           </item>
-          <item row="0" column="3">
-           <widget class="QLCDNumber" name="lcdNumRotX">
-            <property name="enabled">
-             <bool>true</bool>
-            </property>
+          <item row="0" column="2">
+           <widget class="QLabel" name="lblRotX_4">
             <property name="sizePolicy">
-             <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+             <sizepolicy hsizetype="Maximum" vsizetype="Minimum">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
-            <property name="frameShape">
-             <enum>QFrame::NoFrame</enum>
+            <property name="frameShadow">
+             <enum>QFrame::Raised</enum>
             </property>
-            <property name="digitCount">
-             <number>4</number>
+            <property name="text">
+             <string>yaw</string>
             </property>
-            <property name="segmentStyle">
-             <enum>QLCDNumber::Outline</enum>
+           </widget>
+          </item>
+          <item row="2" column="2">
+           <widget class="QLabel" name="lblRotZ_4">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Maximum" vsizetype="Minimum">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="frameShadow">
+             <enum>QFrame::Raised</enum>
+            </property>
+            <property name="text">
+             <string>roll</string>
             </property>
            </widget>
           </item>
-          <item row="1" column="2">
-           <widget class="QLabel" name="lblRotY_3">
+          <item row="2" column="0">
+           <widget class="QLabel" name="lblZ_4">
+            <property name="enabled">
+             <bool>true</bool>
+            </property>
             <property name="sizePolicy">
              <sizepolicy hsizetype="Maximum" vsizetype="Minimum">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
+            <property name="autoFillBackground">
+             <bool>false</bool>
+            </property>
+            <property name="frameShadow">
+             <enum>QFrame::Raised</enum>
+            </property>
             <property name="text">
-             <string>pitch</string>
+             <string>TZ</string>
             </property>
            </widget>
           </item>
-          <item row="0" column="0">
-           <widget class="QLabel" name="lblX_3">
+          <item row="1" column="2">
+           <widget class="QLabel" name="lblRotY_4">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Maximum" vsizetype="Minimum">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
+            <property name="frameShadow">
+             <enum>QFrame::Raised</enum>
+            </property>
             <property name="text">
-             <string>TX</string>
+             <string>pitch</string>
             </property>
            </widget>
           </item>
-          <item row="2" column="1">
-           <widget class="QLCDNumber" name="lcdNumZ">
+          <item row="1" column="1">
+           <widget class="QLCDNumber" name="raw_y">
             <property name="enabled">
              <bool>true</bool>
             </property>
@@ -164,6 +198,15 @@
             <property name="frameShape">
              <enum>QFrame::NoFrame</enum>
             </property>
+            <property name="frameShadow">
+             <enum>QFrame::Plain</enum>
+            </property>
+            <property name="lineWidth">
+             <number>1</number>
+            </property>
+            <property name="smallDecimalPoint">
+             <bool>true</bool>
+            </property>
             <property name="digitCount">
              <number>4</number>
             </property>
@@ -172,8 +215,8 @@
             </property>
            </widget>
           </item>
-          <item row="0" column="1">
-           <widget class="QLCDNumber" name="lcdNumX">
+          <item row="0" column="3">
+           <widget class="QLCDNumber" name="raw_yaw">
             <property name="enabled">
              <bool>true</bool>
             </property>
@@ -186,6 +229,15 @@
             <property name="frameShape">
              <enum>QFrame::NoFrame</enum>
             </property>
+            <property name="frameShadow">
+             <enum>QFrame::Plain</enum>
+            </property>
+            <property name="lineWidth">
+             <number>1</number>
+            </property>
+            <property name="smallDecimalPoint">
+             <bool>true</bool>
+            </property>
             <property name="digitCount">
              <number>4</number>
             </property>
@@ -194,46 +246,39 @@
             </property>
            </widget>
           </item>
-          <item row="2" column="0">
-           <widget class="QLabel" name="lblZ_3">
+          <item row="2" column="3">
+           <widget class="QLCDNumber" name="raw_roll">
             <property name="enabled">
              <bool>true</bool>
             </property>
             <property name="sizePolicy">
-             <sizepolicy hsizetype="Maximum" vsizetype="Minimum">
+             <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
-            <property name="autoFillBackground">
-             <bool>false</bool>
+            <property name="frameShape">
+             <enum>QFrame::NoFrame</enum>
             </property>
-            <property name="text">
-             <string>TZ</string>
+            <property name="frameShadow">
+             <enum>QFrame::Plain</enum>
             </property>
-           </widget>
-          </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="lblY_3">
-            <property name="enabled">
-             <bool>true</bool>
+            <property name="lineWidth">
+             <number>1</number>
             </property>
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Maximum" vsizetype="Minimum">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
+            <property name="smallDecimalPoint">
+             <bool>true</bool>
             </property>
-            <property name="autoFillBackground">
-             <bool>false</bool>
+            <property name="digitCount">
+             <number>4</number>
             </property>
-            <property name="text">
-             <string>TY</string>
+            <property name="segmentStyle">
+             <enum>QLCDNumber::Outline</enum>
             </property>
            </widget>
           </item>
-          <item row="1" column="3">
-           <widget class="QLCDNumber" name="lcdNumRotY">
+          <item row="2" column="1">
+           <widget class="QLCDNumber" name="raw_z">
             <property name="enabled">
              <bool>true</bool>
             </property>
@@ -246,6 +291,15 @@
             <property name="frameShape">
              <enum>QFrame::NoFrame</enum>
             </property>
+            <property name="frameShadow">
+             <enum>QFrame::Plain</enum>
+            </property>
+            <property name="lineWidth">
+             <number>1</number>
+            </property>
+            <property name="smallDecimalPoint">
+             <bool>true</bool>
+            </property>
             <property name="digitCount">
              <number>4</number>
             </property>
@@ -254,34 +308,24 @@
             </property>
            </widget>
           </item>
-          <item row="0" column="2">
-           <widget class="QLabel" name="lblRotX_3">
+          <item row="0" column="0">
+           <widget class="QLabel" name="lblX_4">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Maximum" vsizetype="Minimum">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
-            <property name="text">
-             <string>yaw</string>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="2">
-           <widget class="QLabel" name="lblRotZ_3">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Maximum" vsizetype="Minimum">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
+            <property name="frameShadow">
+             <enum>QFrame::Raised</enum>
             </property>
             <property name="text">
-             <string>roll</string>
+             <string>TX</string>
             </property>
            </widget>
           </item>
-          <item row="2" column="3">
-           <widget class="QLCDNumber" name="lcdNumRotZ">
+          <item row="1" column="3">
+           <widget class="QLCDNumber" name="raw_pitch">
             <property name="enabled">
              <bool>true</bool>
             </property>
@@ -294,6 +338,15 @@
             <property name="frameShape">
              <enum>QFrame::NoFrame</enum>
             </property>
+            <property name="frameShadow">
+             <enum>QFrame::Plain</enum>
+            </property>
+            <property name="lineWidth">
+             <number>1</number>
+            </property>
+            <property name="smallDecimalPoint">
+             <bool>true</bool>
+            </property>
             <property name="digitCount">
              <number>4</number>
             </property>
@@ -302,6 +355,28 @@
             </property>
            </widget>
           </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="lblY_4">
+            <property name="enabled">
+             <bool>true</bool>
+            </property>
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Maximum" vsizetype="Minimum">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="autoFillBackground">
+             <bool>false</bool>
+            </property>
+            <property name="frameShadow">
+             <enum>QFrame::Raised</enum>
+            </property>
+            <property name="text">
+             <string>TY</string>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>
@@ -311,49 +386,46 @@
           <string notr="true">Game data</string>
          </property>
          <layout class="QGridLayout" name="gridLayout_10">
-          <item row="0" column="0">
-           <widget class="QLabel" name="lblX_2">
+          <item row="1" column="0">
+           <widget class="QLabel" name="lblY_2">
+            <property name="enabled">
+             <bool>true</bool>
+            </property>
             <property name="sizePolicy">
              <sizepolicy hsizetype="Maximum" vsizetype="Minimum">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
+            <property name="autoFillBackground">
+             <bool>false</bool>
+            </property>
             <property name="frameShadow">
              <enum>QFrame::Raised</enum>
             </property>
             <property name="text">
-             <string>TX</string>
+             <string>TY</string>
             </property>
            </widget>
           </item>
-          <item row="0" column="1">
-           <widget class="QLCDNumber" name="lcdNumOutputPosX">
-            <property name="enabled">
-             <bool>true</bool>
-            </property>
+          <item row="1" column="2">
+           <widget class="QLabel" name="lblRotY_2">
             <property name="sizePolicy">
-             <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+             <sizepolicy hsizetype="Maximum" vsizetype="Minimum">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
-            <property name="frameShape">
-             <enum>QFrame::NoFrame</enum>
-            </property>
-            <property name="smallDecimalPoint">
-             <bool>true</bool>
-            </property>
-            <property name="digitCount">
-             <number>4</number>
+            <property name="frameShadow">
+             <enum>QFrame::Raised</enum>
             </property>
-            <property name="segmentStyle">
-             <enum>QLCDNumber::Flat</enum>
+            <property name="text">
+             <string>pitch</string>
             </property>
            </widget>
           </item>
-          <item row="1" column="1">
-           <widget class="QLCDNumber" name="lcdNumOutputPosY">
+          <item row="0" column="1">
+           <widget class="QLCDNumber" name="pose_x">
             <property name="enabled">
              <bool>true</bool>
             </property>
@@ -377,8 +449,8 @@
             </property>
            </widget>
           </item>
-          <item row="1" column="2">
-           <widget class="QLabel" name="lblRotY_2">
+          <item row="0" column="2">
+           <widget class="QLabel" name="lblRotX_2">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Maximum" vsizetype="Minimum">
               <horstretch>0</horstretch>
@@ -389,32 +461,23 @@
              <enum>QFrame::Raised</enum>
             </property>
             <property name="text">
-             <string>pitch</string>
+             <string>yaw</string>
             </property>
            </widget>
           </item>
-          <item row="1" column="3">
-           <widget class="QLCDNumber" name="lcdNumOutputRotY">
-            <property name="enabled">
-             <bool>true</bool>
-            </property>
+          <item row="2" column="2">
+           <widget class="QLabel" name="lblRotZ_2">
             <property name="sizePolicy">
-             <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+             <sizepolicy hsizetype="Maximum" vsizetype="Minimum">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
-            <property name="frameShape">
-             <enum>QFrame::NoFrame</enum>
-            </property>
-            <property name="smallDecimalPoint">
-             <bool>true</bool>
-            </property>
-            <property name="digitCount">
-             <number>4</number>
+            <property name="frameShadow">
+             <enum>QFrame::Raised</enum>
             </property>
-            <property name="segmentStyle">
-             <enum>QLCDNumber::Flat</enum>
+            <property name="text">
+             <string>roll</string>
             </property>
            </widget>
           </item>
@@ -440,8 +503,8 @@
             </property>
            </widget>
           </item>
-          <item row="0" column="3">
-           <widget class="QLCDNumber" name="lcdNumOutputRotX">
+          <item row="1" column="1">
+           <widget class="QLCDNumber" name="pose_y">
             <property name="enabled">
              <bool>true</bool>
             </property>
@@ -465,46 +528,58 @@
             </property>
            </widget>
           </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="lblY_2">
+          <item row="2" column="3">
+           <widget class="QLCDNumber" name="pose_roll">
             <property name="enabled">
              <bool>true</bool>
             </property>
             <property name="sizePolicy">
-             <sizepolicy hsizetype="Maximum" vsizetype="Minimum">
+             <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
-            <property name="autoFillBackground">
-             <bool>false</bool>
+            <property name="frameShape">
+             <enum>QFrame::NoFrame</enum>
             </property>
-            <property name="frameShadow">
-             <enum>QFrame::Raised</enum>
+            <property name="smallDecimalPoint">
+             <bool>true</bool>
             </property>
-            <property name="text">
-             <string>TY</string>
+            <property name="digitCount">
+             <number>4</number>
+            </property>
+            <property name="segmentStyle">
+             <enum>QLCDNumber::Flat</enum>
             </property>
            </widget>
           </item>
-          <item row="0" column="2">
-           <widget class="QLabel" name="lblRotX_2">
+          <item row="0" column="3">
+           <widget class="QLCDNumber" name="pose_yaw">
+            <property name="enabled">
+             <bool>true</bool>
+            </property>
             <property name="sizePolicy">
-             <sizepolicy hsizetype="Maximum" vsizetype="Minimum">
+             <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
-            <property name="frameShadow">
-             <enum>QFrame::Raised</enum>
+            <property name="frameShape">
+             <enum>QFrame::NoFrame</enum>
             </property>
-            <property name="text">
-             <string>yaw</string>
+            <property name="smallDecimalPoint">
+             <bool>true</bool>
+            </property>
+            <property name="digitCount">
+             <number>4</number>
+            </property>
+            <property name="segmentStyle">
+             <enum>QLCDNumber::Flat</enum>
             </property>
            </widget>
           </item>
           <item row="2" column="1">
-           <widget class="QLCDNumber" name="lcdNumOutputPosZ">
+           <widget class="QLCDNumber" name="pose_z">
             <property name="enabled">
              <bool>true</bool>
             </property>
@@ -528,8 +603,8 @@
             </property>
            </widget>
           </item>
-          <item row="2" column="2">
-           <widget class="QLabel" name="lblRotZ_2">
+          <item row="0" column="0">
+           <widget class="QLabel" name="lblx">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Maximum" vsizetype="Minimum">
               <horstretch>0</horstretch>
@@ -540,12 +615,12 @@
              <enum>QFrame::Raised</enum>
             </property>
             <property name="text">
-             <string>roll</string>
+             <string>TX</string>
             </property>
            </widget>
           </item>
-          <item row="2" column="3">
-           <widget class="QLCDNumber" name="lcdNumOutputRotZ">
+          <item row="1" column="3">
+           <widget class="QLCDNumber" name="pose_pitch">
             <property name="enabled">
              <bool>true</bool>
             </property>
@@ -575,18 +650,30 @@
       </layout>
      </widget>
     </item>
-    <item row="1" column="0" colspan="2">
+    <item>
      <widget class="QGroupBox" name="video_feed">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="minimumSize">
+       <size>
+        <width>640</width>
+        <height>480</height>
+       </size>
+      </property>
+      <property name="maximumSize">
+       <size>
+        <width>640</width>
+        <height>16777215</height>
+       </size>
+      </property>
       <property name="title">
-       <string>Video preview</string>
+       <string/>
       </property>
-      <layout class="QFormLayout">
-       <property name="horizontalSpacing">
-        <number>0</number>
-       </property>
-       <property name="verticalSpacing">
-        <number>0</number>
-       </property>
+      <layout class="QGridLayout" name="gridLayout_11">
        <property name="leftMargin">
         <number>0</number>
        </property>
@@ -599,216 +686,235 @@
        <property name="bottomMargin">
         <number>0</number>
        </property>
+       <property name="spacing">
+        <number>0</number>
+       </property>
        <item row="0" column="0">
         <widget class="QFrame" name="video_frame">
          <property name="sizePolicy">
-          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
-         <property name="minimumSize">
-          <size>
-           <width>640</width>
-           <height>480</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>640</width>
-           <height>480</height>
-          </size>
-         </property>
-         <widget class="QLabel" name="video_frame_label">
-          <property name="geometry">
-           <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>640</width>
-            <height>480</height>
-           </rect>
+         <layout class="QGridLayout" name="gridLayout_13">
+          <property name="leftMargin">
+           <number>0</number>
           </property>
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
+          <property name="topMargin">
+           <number>0</number>
           </property>
-          <property name="minimumSize">
-           <size>
-            <width>640</width>
-            <height>480</height>
-           </size>
+          <property name="rightMargin">
+           <number>0</number>
           </property>
-          <property name="maximumSize">
-           <size>
-            <width>640</width>
-            <height>480</height>
-           </size>
+          <property name="bottomMargin">
+           <number>0</number>
           </property>
-          <property name="text">
-           <string/>
+          <property name="spacing">
+           <number>0</number>
           </property>
-         </widget>
+          <item row="0" column="0">
+           <widget class="QLabel" name="video_frame_label">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimumSize">
+             <size>
+              <width>640</width>
+              <height>480</height>
+             </size>
+            </property>
+            <property name="maximumSize">
+             <size>
+              <width>640</width>
+              <height>480</height>
+             </size>
+            </property>
+            <property name="lineWidth">
+             <number>0</number>
+            </property>
+            <property name="text">
+             <string/>
+            </property>
+           </widget>
+          </item>
+         </layout>
         </widget>
        </item>
       </layout>
      </widget>
     </item>
-    <item row="1" column="2">
-     <widget class="QGroupBox" name="controls">
+    <item>
+     <widget class="QGroupBox" name="bottom_controls">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
       <property name="title">
        <string/>
       </property>
-      <property name="alignment">
-       <set>Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing</set>
-      </property>
-      <layout class="QVBoxLayout" name="verticalLayout">
-       <property name="spacing">
-        <number>3</number>
-       </property>
+      <layout class="QGridLayout" name="gridLayout_2">
        <property name="leftMargin">
-        <number>0</number>
+        <number>2</number>
        </property>
        <property name="topMargin">
-        <number>0</number>
+        <number>8</number>
        </property>
        <property name="rightMargin">
-        <number>0</number>
+        <number>2</number>
        </property>
        <property name="bottomMargin">
-        <number>0</number>
+        <number>8</number>
        </property>
-       <item>
-        <widget class="QGroupBox" name="groupBox">
-         <property name="title">
-          <string>Connected game</string>
-         </property>
-         <layout class="QGridLayout" name="gridLayout_9">
-          <property name="topMargin">
-           <number>6</number>
-          </property>
-          <property name="bottomMargin">
-           <number>6</number>
-          </property>
-          <property name="verticalSpacing">
-           <number>3</number>
-          </property>
-          <item row="0" column="0">
-           <widget class="QLabel" name="game_name">
-            <property name="text">
-             <string>Not connected</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="groupProfile">
+       <property name="verticalSpacing">
+        <number>2</number>
+       </property>
+       <item row="1" column="0">
+        <widget class="QGroupBox" name="groupGameProtocol">
          <property name="sizePolicy">
-          <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="title">
-          <string>Profile</string>
+          <string>Protocol</string>
          </property>
-         <layout class="QGridLayout" name="gridLayout_7">
+         <layout class="QGridLayout" name="gridLayout_4">
+          <property name="leftMargin">
+           <number>4</number>
+          </property>
           <property name="topMargin">
-           <number>6</number>
+           <number>0</number>
+          </property>
+          <property name="rightMargin">
+           <number>4</number>
           </property>
           <property name="bottomMargin">
-           <number>6</number>
+           <number>4</number>
           </property>
           <property name="verticalSpacing">
-           <number>3</number>
+           <number>2</number>
           </property>
-          <item row="1" column="1">
-           <widget class="QPushButton" name="btnSave">
+          <item row="0" column="1">
+           <widget class="QPushButton" name="btnShowServerControls">
             <property name="enabled">
              <bool>true</bool>
             </property>
             <property name="sizePolicy">
-             <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+             <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
             <property name="text">
-             <string>Save</string>
+             <string>Settings</string>
             </property>
            </widget>
           </item>
-          <item row="2" column="0">
-           <widget class="QPushButton" name="btnLoad">
+          <item row="0" column="0">
+           <widget class="QComboBox" name="iconcomboProtocol">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
-            <property name="text">
-             <string>Load</string>
-            </property>
            </widget>
           </item>
-          <item row="1" column="0">
-           <widget class="QComboBox" name="iconcomboProfile">
+         </layout>
+        </widget>
+       </item>
+       <item row="0" column="0">
+        <widget class="QGroupBox" name="groupTrackerSource">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="title">
+          <string>Tracker</string>
+         </property>
+         <layout class="QGridLayout" name="gridLayout">
+          <property name="leftMargin">
+           <number>4</number>
+          </property>
+          <property name="topMargin">
+           <number>0</number>
+          </property>
+          <property name="rightMargin">
+           <number>4</number>
+          </property>
+          <property name="bottomMargin">
+           <number>4</number>
+          </property>
+          <property name="verticalSpacing">
+           <number>2</number>
+          </property>
+          <item row="0" column="0">
+           <widget class="QComboBox" name="iconcomboTrackerSource">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
-            <property name="maxVisibleItems">
-             <number>10</number>
-            </property>
            </widget>
           </item>
-          <item row="2" column="1">
-           <widget class="QPushButton" name="btnSaveAs">
+          <item row="0" column="1">
+           <widget class="QPushButton" name="btnShowEngineControls">
             <property name="enabled">
              <bool>true</bool>
             </property>
             <property name="sizePolicy">
-             <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+             <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
             <property name="text">
-             <string>Save As ...</string>
+             <string>Settings</string>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
-       <item>
-        <widget class="QGroupBox" name="groupTrackerSource">
+       <item row="0" column="1">
+        <widget class="QGroupBox" name="groupFilter">
          <property name="sizePolicy">
-          <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="title">
-          <string>Tracker</string>
+          <string>Filter</string>
          </property>
-         <layout class="QGridLayout" name="gridLayout">
+         <layout class="QGridLayout" name="gridLayout_3">
+          <property name="leftMargin">
+           <number>4</number>
+          </property>
           <property name="topMargin">
-           <number>6</number>
+           <number>0</number>
+          </property>
+          <property name="rightMargin">
+           <number>4</number>
           </property>
           <property name="bottomMargin">
-           <number>6</number>
+           <number>4</number>
           </property>
           <property name="verticalSpacing">
-           <number>3</number>
+           <number>2</number>
           </property>
           <item row="0" column="0">
-           <widget class="QComboBox" name="iconcomboTrackerSource">
+           <widget class="QComboBox" name="iconcomboFilter">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
               <horstretch>0</horstretch>
@@ -818,7 +924,7 @@
            </widget>
           </item>
           <item row="0" column="1">
-           <widget class="QPushButton" name="btnShowEngineControls">
+           <widget class="QPushButton" name="btnShowFilterControls">
             <property name="enabled">
              <bool>true</bool>
             </property>
@@ -836,110 +942,201 @@
          </layout>
         </widget>
        </item>
-       <item>
-        <widget class="QGroupBox" name="groupFilter">
+       <item row="1" column="1">
+        <widget class="QGroupBox" name="groupStartStop">
          <property name="sizePolicy">
-          <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
+          <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
+         <property name="minimumSize">
+          <size>
+           <width>0</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>65536</width>
+           <height>65536</height>
+          </size>
+         </property>
          <property name="title">
-          <string>Filter</string>
+          <string notr="true">Controls</string>
          </property>
-         <layout class="QGridLayout" name="gridLayout_3">
+         <layout class="QGridLayout" name="gridLayout_5">
+          <property name="leftMargin">
+           <number>4</number>
+          </property>
           <property name="topMargin">
-           <number>6</number>
+           <number>0</number>
+          </property>
+          <property name="rightMargin">
+           <number>4</number>
           </property>
           <property name="bottomMargin">
-           <number>6</number>
+           <number>4</number>
           </property>
           <property name="verticalSpacing">
-           <number>3</number>
+           <number>2</number>
           </property>
-          <item row="0" column="0">
-           <widget class="QComboBox" name="iconcomboFilter">
+          <item row="1" column="1">
+           <widget class="QPushButton" name="btnStopTracker">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
             <property name="sizePolicy">
              <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
+            <property name="text">
+             <string>Stop</string>
+            </property>
            </widget>
           </item>
-          <item row="0" column="1">
-           <widget class="QPushButton" name="btnShowFilterControls">
-            <property name="enabled">
-             <bool>true</bool>
-            </property>
+          <item row="1" column="0">
+           <widget class="QPushButton" name="btnStartTracker">
             <property name="sizePolicy">
-             <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+             <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
             <property name="text">
-             <string>Settings</string>
+             <string>Start</string>
             </property>
            </widget>
           </item>
+          <item row="0" column="0">
+           <spacer name="verticalSpacer">
+            <property name="orientation">
+             <enum>Qt::Vertical</enum>
+            </property>
+            <property name="sizeType">
+             <enum>QSizePolicy::Maximum</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>1</width>
+              <height>12</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item row="2" column="0">
+           <spacer name="verticalSpacer_2">
+            <property name="orientation">
+             <enum>Qt::Vertical</enum>
+            </property>
+            <property name="sizeType">
+             <enum>QSizePolicy::Maximum</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>1</width>
+              <height>12</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
          </layout>
         </widget>
        </item>
-       <item>
-        <widget class="QGroupBox" name="groupGameProtocol">
+       <item row="0" column="2">
+        <widget class="QGroupBox" name="groupProfile">
          <property name="sizePolicy">
-          <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="title">
-          <string>Protocol</string>
+          <string>Profile</string>
          </property>
-         <layout class="QGridLayout" name="gridLayout_4">
+         <layout class="QGridLayout" name="gridLayout_7">
+          <property name="leftMargin">
+           <number>4</number>
+          </property>
           <property name="topMargin">
-           <number>6</number>
+           <number>0</number>
+          </property>
+          <property name="rightMargin">
+           <number>4</number>
           </property>
           <property name="bottomMargin">
-           <number>6</number>
+           <number>4</number>
           </property>
           <property name="verticalSpacing">
-           <number>3</number>
+           <number>2</number>
           </property>
-          <item row="0" column="1">
-           <widget class="QPushButton" name="btnShowServerControls">
+          <item row="1" column="1">
+           <widget class="QPushButton" name="btnSave">
             <property name="enabled">
              <bool>true</bool>
             </property>
             <property name="sizePolicy">
-             <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+             <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
             <property name="text">
-             <string>Settings</string>
+             <string>Save</string>
             </property>
            </widget>
           </item>
-          <item row="0" column="0">
-           <widget class="QComboBox" name="iconcomboProtocol">
+          <item row="2" column="0">
+           <widget class="QPushButton" name="btnLoad">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="text">
+             <string>Load</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QComboBox" name="iconcomboProfile">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
+            <property name="maxVisibleItems">
+             <number>10</number>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1">
+           <widget class="QPushButton" name="btnSaveAs">
+            <property name="enabled">
+             <bool>true</bool>
+            </property>
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="text">
+             <string>Save As ...</string>
+            </property>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
-       <item>
+       <item row="1" column="2">
         <widget class="QGroupBox" name="groupWindows">
          <property name="sizePolicy">
-          <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
@@ -948,14 +1145,20 @@
           <string>Settings</string>
          </property>
          <layout class="QGridLayout" name="gridLayout_6">
+          <property name="leftMargin">
+           <number>4</number>
+          </property>
           <property name="topMargin">
-           <number>6</number>
+           <number>0</number>
+          </property>
+          <property name="rightMargin">
+           <number>4</number>
           </property>
           <property name="bottomMargin">
-           <number>6</number>
+           <number>4</number>
           </property>
           <property name="verticalSpacing">
-           <number>3</number>
+           <number>2</number>
           </property>
           <item row="0" column="0">
            <widget class="QPushButton" name="btnEditCurves">
@@ -994,71 +1197,6 @@
          </layout>
         </widget>
        </item>
-       <item>
-        <widget class="QGroupBox" name="groupStartStop">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>0</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>65536</width>
-           <height>65536</height>
-          </size>
-         </property>
-         <property name="title">
-          <string notr="true">Controls</string>
-         </property>
-         <layout class="QGridLayout" name="gridLayout_5">
-          <property name="topMargin">
-           <number>6</number>
-          </property>
-          <property name="bottomMargin">
-           <number>6</number>
-          </property>
-          <property name="verticalSpacing">
-           <number>3</number>
-          </property>
-          <item row="0" column="1">
-           <widget class="QPushButton" name="btnStopTracker">
-            <property name="enabled">
-             <bool>false</bool>
-            </property>
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="text">
-             <string>Stop</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="0">
-           <widget class="QPushButton" name="btnStartTracker">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="text">
-             <string>Start</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
       </layout>
      </widget>
     </item>