nix ui taking too much vertical space

2 files changed, 210 insertions, 274 deletions

diff --git a/facetracknoir/facetracknoir.cpp b/facetracknoir/facetracknoir.cpp
index 13f186e5..6c87047e 100644
--- a/facetracknoir/facetracknoir.cpp
+++ b/facetracknoir/facetracknoir.cpp
@@ -38,7 +38,9 @@ FaceTrackNoIR::FaceTrackNoIR() :
 {
     ui.setupUi(this);
 
+    adjustSize();
     setFixedSize(size());
+
     updateButtonState(false, false);
     ui.video_frame_label->setPixmap(no_feed_pixmap);
     QDir::setCurrent(QCoreApplication::applicationDirPath());
diff --git a/facetracknoir/facetracknoir.ui b/facetracknoir/facetracknoir.ui
index f4f225f2..36fd1e30 100644
--- a/facetracknoir/facetracknoir.ui
+++ b/facetracknoir/facetracknoir.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <author>WVR</author>
+ <author>Lovecraftian Octopus</author>
  <class>OpentrackUI</class>
  <widget class="QMainWindow" name="OpentrackUI">
   <property name="geometry">
@@ -8,25 +8,24 @@
     <x>0</x>
     <y>0</y>
     <width>640</width>
-    <height>825</height>
+    <height>710</height>
    </rect>
   </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
   <property name="windowIcon">
    <iconset resource="main-facetracknoir.qrc">
     <normaloff>:/images/facetracknoir.png</normaloff>:/images/facetracknoir.png</iconset>
   </property>
   <property name="styleSheet">
-   <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 notr="true">#video_feed { border: 0; }
 </string>
   </property>
   <widget class="QWidget" name="centralWidget">
+   <property name="sizePolicy">
+    <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
    <layout class="QVBoxLayout" name="verticalLayout">
     <property name="spacing">
      <number>0</number>
@@ -44,34 +43,40 @@ QMainWindow, #video_frame { margin: 0; padding: 0; }
      <number>0</number>
     </property>
     <item>
-     <widget class="QGroupBox" name="top_display">
+     <widget class="QFrame" name="top_display">
       <property name="sizePolicy">
-       <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
+       <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
         <horstretch>0</horstretch>
         <verstretch>0</verstretch>
        </sizepolicy>
       </property>
-      <property name="title">
-       <string/>
-      </property>
       <layout class="QHBoxLayout" name="horizontalLayout">
+       <property name="spacing">
+        <number>32</number>
+       </property>
+       <property name="leftMargin">
+        <number>12</number>
+       </property>
+       <property name="topMargin">
+        <number>0</number>
+       </property>
+       <property name="rightMargin">
+        <number>12</number>
+       </property>
+       <property name="bottomMargin">
+        <number>0</number>
+       </property>
        <item>
         <widget class="GLWidget" name="pose_display" native="true">
          <property name="sizePolicy">
-          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
-         <property name="minimumSize">
-          <size>
-           <width>100</width>
-           <height>120</height>
-          </size>
-         </property>
          <property name="maximumSize">
           <size>
-           <width>100</width>
+           <width>80</width>
            <height>120</height>
           </size>
          </property>
@@ -79,10 +84,25 @@ QMainWindow, #video_frame { margin: 0; padding: 0; }
        </item>
        <item>
         <widget class="QGroupBox" name="box_raw_headpose">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <property name="title">
           <string notr="true">Raw tracker data</string>
          </property>
          <layout class="QGridLayout" name="gridLayout_12">
+          <property name="topMargin">
+           <number>0</number>
+          </property>
+          <property name="bottomMargin">
+           <number>0</number>
+          </property>
+          <property name="verticalSpacing">
+           <number>0</number>
+          </property>
           <item row="0" column="1">
            <widget class="QLCDNumber" name="raw_x">
             <property name="enabled">
@@ -382,10 +402,25 @@ QMainWindow, #video_frame { margin: 0; padding: 0; }
        </item>
        <item>
         <widget class="QGroupBox" name="box_mapped_headpose">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <property name="title">
           <string notr="true">Game data</string>
          </property>
-         <layout class="QGridLayout" name="gridLayout_10">
+         <layout class="QGridLayout" name="gridLayout_14">
+          <property name="topMargin">
+           <number>0</number>
+          </property>
+          <property name="bottomMargin">
+           <number>0</number>
+          </property>
+          <property name="verticalSpacing">
+           <number>0</number>
+          </property>
           <item row="1" column="0">
            <widget class="QLabel" name="lblY_2">
             <property name="enabled">
@@ -651,7 +686,7 @@ QMainWindow, #video_frame { margin: 0; padding: 0; }
      </widget>
     </item>
     <item>
-     <widget class="QGroupBox" name="video_feed">
+     <widget class="QFrame" name="video_feed">
       <property name="sizePolicy">
        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
         <horstretch>0</horstretch>
@@ -667,12 +702,9 @@ QMainWindow, #video_frame { margin: 0; padding: 0; }
       <property name="maximumSize">
        <size>
         <width>640</width>
-        <height>16777215</height>
+        <height>480</height>
        </size>
       </property>
-      <property name="title">
-       <string/>
-      </property>
       <layout class="QGridLayout" name="gridLayout_11">
        <property name="leftMargin">
         <number>0</number>
@@ -733,9 +765,6 @@ QMainWindow, #video_frame { margin: 0; padding: 0; }
               <height>480</height>
              </size>
             </property>
-            <property name="lineWidth">
-             <number>0</number>
-            </property>
             <property name="text">
              <string/>
             </property>
@@ -748,100 +777,82 @@ QMainWindow, #video_frame { margin: 0; padding: 0; }
      </widget>
     </item>
     <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>
+     <widget class="QFrame" name="bottom_controls">
       <layout class="QGridLayout" name="gridLayout_2">
-       <property name="leftMargin">
-        <number>2</number>
-       </property>
        <property name="topMargin">
-        <number>8</number>
-       </property>
-       <property name="rightMargin">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="bottomMargin">
-        <number>8</number>
+        <number>0</number>
+       </property>
+       <property name="horizontalSpacing">
+        <number>6</number>
        </property>
        <property name="verticalSpacing">
-        <number>2</number>
+        <number>0</number>
        </property>
-       <item row="1" column="0">
-        <widget class="QGroupBox" name="groupGameProtocol">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
+       <item row="1" column="1">
+        <widget class="QGroupBox" name="groupStartStop">
          <property name="title">
-          <string>Protocol</string>
+          <string notr="true">Controls</string>
          </property>
-         <layout class="QGridLayout" name="gridLayout_4">
+         <property name="flat">
+          <bool>true</bool>
+         </property>
+         <layout class="QGridLayout" name="gridLayout_5">
           <property name="leftMargin">
            <number>4</number>
           </property>
           <property name="topMargin">
-           <number>0</number>
+           <number>12</number>
           </property>
           <property name="rightMargin">
            <number>4</number>
           </property>
           <property name="bottomMargin">
-           <number>4</number>
-          </property>
-          <property name="verticalSpacing">
-           <number>2</number>
+           <number>12</number>
           </property>
           <item row="0" column="1">
-           <widget class="QPushButton" name="btnShowServerControls">
+           <widget class="QToolButton" name="btnStopTracker">
             <property name="enabled">
-             <bool>true</bool>
+             <bool>false</bool>
             </property>
             <property name="sizePolicy">
-             <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+             <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
             <property name="text">
-             <string>Settings</string>
+             <string>Stop</string>
             </property>
            </widget>
           </item>
           <item row="0" column="0">
-           <widget class="QComboBox" name="iconcomboProtocol">
+           <widget class="QToolButton" name="btnStartTracker">
             <property name="sizePolicy">
-             <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+             <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
+            <property name="text">
+             <string>Start</string>
+            </property>
            </widget>
           </item>
          </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>
+       <item row="1" column="2">
+        <widget class="QGroupBox" name="groupWindows">
          <property name="title">
-          <string>Tracker</string>
+          <string>Settings</string>
          </property>
-         <layout class="QGridLayout" name="gridLayout">
+         <property name="flat">
+          <bool>true</bool>
+         </property>
+         <layout class="QGridLayout" name="gridLayout_6">
           <property name="leftMargin">
            <number>4</number>
           </property>
@@ -857,46 +868,63 @@ QMainWindow, #video_frame { margin: 0; padding: 0; }
           <property name="verticalSpacing">
            <number>2</number>
           </property>
-          <item row="0" column="0">
-           <widget class="QComboBox" name="iconcomboTrackerSource">
+          <item row="1" column="0">
+           <widget class="QPushButton" name="btnShortcuts">
             <property name="sizePolicy">
-             <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
+            <property name="text">
+             <string>Keys</string>
+            </property>
+            <property name="icon">
+             <iconset resource="main-facetracknoir.qrc">
+              <normaloff>:/uielements/tools.png</normaloff>:/uielements/tools.png</iconset>
+            </property>
+            <property name="iconSize">
+             <size>
+              <width>80</width>
+              <height>24</height>
+             </size>
+            </property>
            </widget>
           </item>
-          <item row="0" column="1">
-           <widget class="QPushButton" name="btnShowEngineControls">
-            <property name="enabled">
-             <bool>true</bool>
-            </property>
+          <item row="0" column="0">
+           <widget class="QPushButton" name="btnEditCurves">
             <property name="sizePolicy">
-             <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
             <property name="text">
-             <string>Settings</string>
+             <string>Mapping</string>
+            </property>
+            <property name="icon">
+             <iconset resource="main-facetracknoir.qrc">
+              <normaloff>:/uielements/curves.png</normaloff>:/uielements/curves.png</iconset>
+            </property>
+            <property name="iconSize">
+             <size>
+              <width>80</width>
+              <height>24</height>
+             </size>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
-       <item row="0" column="1">
+       <item row="0" column="2">
         <widget class="QGroupBox" name="groupFilter">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
          <property name="title">
           <string>Filter</string>
          </property>
+         <property name="flat">
+          <bool>true</bool>
+         </property>
          <layout class="QGridLayout" name="gridLayout_3">
           <property name="leftMargin">
            <number>4</number>
@@ -914,58 +942,33 @@ QMainWindow, #video_frame { margin: 0; padding: 0; }
            <number>2</number>
           </property>
           <item row="0" column="0">
-           <widget class="QComboBox" name="iconcomboFilter">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-           </widget>
+           <widget class="QComboBox" name="iconcomboFilter"/>
           </item>
           <item row="0" column="1">
-           <widget class="QPushButton" name="btnShowFilterControls">
+           <widget class="QToolButton" name="btnShowFilterControls">
             <property name="enabled">
              <bool>true</bool>
             </property>
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
             <property name="text">
-             <string>Settings</string>
+             <string>...</string>
+            </property>
+            <property name="flat" stdset="0">
+             <bool>false</bool>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
-       <item row="1" column="1">
-        <widget class="QGroupBox" name="groupStartStop">
-         <property name="sizePolicy">
-          <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>
+       <item row="0" column="0">
+        <widget class="QGroupBox" name="groupTrackerSource">
          <property name="title">
-          <string notr="true">Controls</string>
+          <string>Tracker</string>
          </property>
-         <layout class="QGridLayout" name="gridLayout_5">
+         <property name="flat">
+          <bool>true</bool>
+         </property>
+         <layout class="QGridLayout" name="gridLayout">
           <property name="leftMargin">
            <number>4</number>
           </property>
@@ -981,81 +984,76 @@ QMainWindow, #video_frame { margin: 0; padding: 0; }
           <property name="verticalSpacing">
            <number>2</number>
           </property>
-          <item row="1" column="1">
-           <widget class="QPushButton" name="btnStopTracker">
+          <item row="0" column="0">
+           <widget class="QComboBox" name="iconcomboTrackerSource"/>
+          </item>
+          <item row="0" column="1">
+           <widget class="QToolButton" name="btnShowEngineControls">
             <property name="enabled">
-             <bool>false</bool>
-            </property>
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
+             <bool>true</bool>
             </property>
             <property name="text">
-             <string>Stop</string>
+             <string>...</string>
+            </property>
+            <property name="flat" stdset="0">
+             <bool>false</bool>
             </property>
            </widget>
           </item>
-          <item row="1" column="0">
-           <widget class="QPushButton" name="btnStartTracker">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
+         </layout>
+        </widget>
+       </item>
+       <item row="0" column="1">
+        <widget class="QGroupBox" name="groupGameProtocol">
+         <property name="title">
+          <string>Protocol</string>
+         </property>
+         <property name="flat">
+          <bool>true</bool>
+         </property>
+         <layout class="QGridLayout" name="gridLayout_4">
+          <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="1">
+           <widget class="QToolButton" name="btnShowServerControls">
+            <property name="enabled">
+             <bool>true</bool>
             </property>
             <property name="text">
-             <string>Start</string>
+             <string>...</string>
+            </property>
+            <property name="flat" stdset="0">
+             <bool>false</bool>
             </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>
+           <widget class="QComboBox" name="iconcomboProtocol"/>
           </item>
          </layout>
         </widget>
        </item>
-       <item row="0" column="2">
+       <item row="1" column="0">
         <widget class="QGroupBox" name="groupProfile">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
          <property name="title">
           <string>Profile</string>
          </property>
+         <property name="flat">
+          <bool>true</bool>
+         </property>
          <layout class="QGridLayout" name="gridLayout_7">
           <property name="leftMargin">
            <number>4</number>
@@ -1072,26 +1070,10 @@ QMainWindow, #video_frame { margin: 0; padding: 0; }
           <property name="verticalSpacing">
            <number>2</number>
           </property>
-          <item row="1" column="1">
-           <widget class="QPushButton" name="btnSave">
-            <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</string>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="0">
-           <widget class="QPushButton" name="btnLoad">
+          <item row="0" column="1">
+           <widget class="QToolButton" name="btnLoad">
             <property name="sizePolicy">
-             <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
@@ -1101,10 +1083,10 @@ QMainWindow, #video_frame { margin: 0; padding: 0; }
             </property>
            </widget>
           </item>
-          <item row="1" column="0">
+          <item row="0" column="0">
            <widget class="QComboBox" name="iconcomboProfile">
             <property name="sizePolicy">
-             <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
@@ -1114,8 +1096,8 @@ QMainWindow, #video_frame { margin: 0; padding: 0; }
             </property>
            </widget>
           </item>
-          <item row="2" column="1">
-           <widget class="QPushButton" name="btnSaveAs">
+          <item row="1" column="1">
+           <widget class="QToolButton" name="btnSaveAs">
             <property name="enabled">
              <bool>true</bool>
             </property>
@@ -1126,71 +1108,23 @@ QMainWindow, #video_frame { margin: 0; padding: 0; }
              </sizepolicy>
             </property>
             <property name="text">
-             <string>Save As ...</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item row="1" column="2">
-        <widget class="QGroupBox" name="groupWindows">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="title">
-          <string>Settings</string>
-         </property>
-         <layout class="QGridLayout" name="gridLayout_6">
-          <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="QPushButton" name="btnEditCurves">
-            <property name="text">
-             <string>Mapping</string>
-            </property>
-            <property name="icon">
-             <iconset resource="main-facetracknoir.qrc">
-              <normaloff>:/uielements/curves.png</normaloff>:/uielements/curves.png</iconset>
-            </property>
-            <property name="iconSize">
-             <size>
-              <width>91</width>
-              <height>20</height>
-             </size>
+             <string>Save...</string>
             </property>
            </widget>
           </item>
           <item row="1" column="0">
-           <widget class="QPushButton" name="btnShortcuts">
-            <property name="text">
-             <string>Keys</string>
+           <widget class="QToolButton" name="btnSave">
+            <property name="enabled">
+             <bool>true</bool>
             </property>
-            <property name="icon">
-             <iconset resource="main-facetracknoir.qrc">
-              <normaloff>:/uielements/tools.png</normaloff>:/uielements/tools.png</iconset>
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
             </property>
-            <property name="iconSize">
-             <size>
-              <width>98</width>
-              <height>24</height>
-             </size>
+            <property name="text">
+             <string>Save</string>
             </property>
            </widget>
           </item>