Resize main form

1 files changed, 158 insertions, 151 deletions

diff --git a/facetracknoir/facetracknoir.ui b/facetracknoir/facetracknoir.ui
index 801c3b0a..9442aff9 100644
--- a/facetracknoir/facetracknoir.ui
+++ b/facetracknoir/facetracknoir.ui
@@ -11,7 +11,7 @@
     <x>0</x>

     <y>0</y>

     <width>890</width>

-    <height>400</height>

+    <height>380</height>

    </rect>

   </property>

   <property name="sizePolicy">

@@ -23,13 +23,13 @@
   <property name="minimumSize">

    <size>

     <width>890</width>

-    <height>400</height>

+    <height>380</height>

    </size>

   </property>

   <property name="maximumSize">

    <size>

     <width>890</width>

-    <height>410</height>

+    <height>380</height>

    </size>

   </property>

   <property name="contextMenuPolicy">

@@ -39,7 +39,7 @@
    <string>FaceTrackNoIR</string>

   </property>

   <property name="windowIcon">

-   <iconset resource="main-facetracknoir.qrc">

+   <iconset resource="../ftnoir_protocol_ftn/ftn-protocol.qrc">

     <normaloff>:/images/facetracknoir.png</normaloff>:/images/facetracknoir.png</iconset>

   </property>

   <property name="toolTip">

@@ -142,10 +142,16 @@ QGroupBox {
    <bool>false</bool>

   </property>

   <widget class="QWidget" name="centralWidget">

+   <property name="sizePolicy">

+    <sizepolicy hsizetype="Fixed" vsizetype="Fixed">

+     <horstretch>0</horstretch>

+     <verstretch>0</verstretch>

+    </sizepolicy>

+   </property>

    <property name="minimumSize">

     <size>

      <width>890</width>

-     <height>410</height>

+     <height>380</height>

     </size>

    </property>

    <property name="styleSheet">

@@ -440,9 +446,9 @@ QGroupBox {
     <widget class="QWidget" name="layoutWidget">

      <property name="geometry">

       <rect>

-       <x>10</x>

-       <y>220</y>

-       <width>623</width>

+       <x>20</x>

+       <y>200</y>

+       <width>611</width>

        <height>172</height>

       </rect>

      </property>

@@ -453,8 +459,88 @@ QGroupBox {
       <property name="verticalSpacing">

        <number>6</number>

       </property>

-      <item row="0" column="0">

-       <widget class="QGroupBox" name="groupTrackerSource">

+      <item row="1" column="2">

+       <layout class="QVBoxLayout" name="verticalLayout_3">

+        <item>

+         <widget class="QPushButton" name="btnShortcuts">

+          <property name="minimumSize">

+           <size>

+            <width>54</width>

+            <height>38</height>

+           </size>

+          </property>

+          <property name="maximumSize">

+           <size>

+            <width>200</width>

+            <height>16777215</height>

+           </size>

+          </property>

+          <property name="cursor">

+           <cursorShape>PointingHandCursor</cursorShape>

+          </property>

+          <property name="toolTip">

+           <string>Edit the Keyboard and mouse shortcuts</string>

+          </property>

+          <property name="text">

+           <string>Shortkeys</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>24</width>

+            <height>24</height>

+           </size>

+          </property>

+         </widget>

+        </item>

+        <item>

+         <widget class="QPushButton" name="btnEditCurves">

+          <property name="minimumSize">

+           <size>

+            <width>54</width>

+            <height>38</height>

+           </size>

+          </property>

+          <property name="maximumSize">

+           <size>

+            <width>200</width>

+            <height>16777215</height>

+           </size>

+          </property>

+          <property name="cursor">

+           <cursorShape>PointingHandCursor</cursorShape>

+          </property>

+          <property name="toolTip">

+           <string>Edit the Curve settings</string>

+          </property>

+          <property name="layoutDirection">

+           <enum>Qt::LeftToRight</enum>

+          </property>

+          <property name="styleSheet">

+           <string notr="true">background:none;</string>

+          </property>

+          <property name="text">

+           <string>Curves</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>120</width>

+            <height>24</height>

+           </size>

+          </property>

+         </widget>

+        </item>

+       </layout>

+      </item>

+      <item row="0" column="2">

+       <widget class="QGroupBox" name="groupGameProtocol">

         <property name="minimumSize">

          <size>

           <width>200</width>

@@ -471,9 +557,9 @@ QGroupBox {
          <string notr="true"/>

         </property>

         <property name="title">

-         <string>Tracker Source(1st = Master)</string>

+         <string>Game protocol</string>

         </property>

-        <widget class="QComboBox" name="iconcomboTrackerSource">

+        <widget class="QComboBox" name="iconcomboProtocol">

          <property name="geometry">

           <rect>

            <x>10</x>

@@ -489,10 +575,10 @@ QGroupBox {
           <number>-1</number>

          </property>

          <property name="maxVisibleItems">

-          <number>42</number>

+          <number>7</number>

          </property>

         </widget>

-        <widget class="QPushButton" name="btnShowEngineControls">

+        <widget class="QPushButton" name="btnShowServerControls">

          <property name="enabled">

           <bool>true</bool>

          </property>

@@ -505,7 +591,7 @@ QGroupBox {
           </rect>

          </property>

          <property name="toolTip">

-          <string>Change tracker settings</string>

+          <string>Change game protocol settings</string>

          </property>

          <property name="styleSheet">

           <string notr="true"/>

@@ -516,8 +602,8 @@ QGroupBox {
         </widget>

        </widget>

       </item>

-      <item row="0" column="2">

-       <widget class="QGroupBox" name="groupGameProtocol">

+      <item row="0" column="0">

+       <widget class="QGroupBox" name="groupTrackerSource">

         <property name="minimumSize">

          <size>

           <width>200</width>

@@ -534,9 +620,9 @@ QGroupBox {
          <string notr="true"/>

         </property>

         <property name="title">

-         <string>Game protocol</string>

+         <string>Tracker Source(1st = Master)</string>

         </property>

-        <widget class="QComboBox" name="iconcomboProtocol">

+        <widget class="QComboBox" name="iconcomboTrackerSource">

          <property name="geometry">

           <rect>

            <x>10</x>

@@ -552,10 +638,10 @@ QGroupBox {
           <number>-1</number>

          </property>

          <property name="maxVisibleItems">

-          <number>7</number>

+          <number>42</number>

          </property>

         </widget>

-        <widget class="QPushButton" name="btnShowServerControls">

+        <widget class="QPushButton" name="btnShowEngineControls">

          <property name="enabled">

           <bool>true</bool>

          </property>

@@ -568,7 +654,7 @@ QGroupBox {
           </rect>

          </property>

          <property name="toolTip">

-          <string>Change game protocol settings</string>

+          <string>Change tracker settings</string>

          </property>

          <property name="styleSheet">

           <string notr="true"/>

@@ -642,88 +728,8 @@ QGroupBox {
         </widget>

        </widget>

       </item>

-      <item row="1" column="2">

-       <layout class="QVBoxLayout" name="verticalLayout_3">

-        <item>

-         <widget class="QPushButton" name="btnShortcuts">

-          <property name="minimumSize">

-           <size>

-            <width>54</width>

-            <height>38</height>

-           </size>

-          </property>

-          <property name="maximumSize">

-           <size>

-            <width>200</width>

-            <height>16777215</height>

-           </size>

-          </property>

-          <property name="cursor">

-           <cursorShape>PointingHandCursor</cursorShape>

-          </property>

-          <property name="toolTip">

-           <string>Edit the Keyboard and mouse shortcuts</string>

-          </property>

-          <property name="text">

-           <string>Shortkeys</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>24</width>

-            <height>24</height>

-           </size>

-          </property>

-         </widget>

-        </item>

-        <item>

-         <widget class="QPushButton" name="btnEditCurves">

-          <property name="minimumSize">

-           <size>

-            <width>54</width>

-            <height>38</height>

-           </size>

-          </property>

-          <property name="maximumSize">

-           <size>

-            <width>200</width>

-            <height>16777215</height>

-           </size>

-          </property>

-          <property name="cursor">

-           <cursorShape>PointingHandCursor</cursorShape>

-          </property>

-          <property name="toolTip">

-           <string>Edit the Curve settings</string>

-          </property>

-          <property name="layoutDirection">

-           <enum>Qt::LeftToRight</enum>

-          </property>

-          <property name="styleSheet">

-           <string notr="true">background:none;</string>

-          </property>

-          <property name="text">

-           <string>Curves</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>120</width>

-            <height>24</height>

-           </size>

-          </property>

-         </widget>

-        </item>

-       </layout>

-      </item>

-      <item row="1" column="1">

-       <widget class="QGroupBox" name="groupStartStop">

+      <item row="1" column="0">

+       <widget class="QGroupBox" name="groupBox_3">

         <property name="minimumSize">

          <size>

           <width>200</width>

@@ -732,58 +738,58 @@ QGroupBox {
         </property>

         <property name="maximumSize">

          <size>

-          <width>16777215</width>

+          <width>200</width>

           <height>80</height>

          </size>

         </property>

         <property name="title">

-         <string>GO!</string>

+         <string>Tracker Source (2nd)</string>

         </property>

-        <widget class="QPushButton" name="btnStartTracker">

+        <widget class="QPushButton" name="btnShowSecondTrackerSettings">

+         <property name="enabled">

+          <bool>true</bool>

+         </property>

          <property name="geometry">

           <rect>

            <x>10</x>

-           <y>30</y>

-           <width>81</width>

-           <height>21</height>

+           <y>50</y>

+           <width>180</width>

+           <height>23</height>

           </rect>

          </property>

          <property name="toolTip">

-          <string>Start the Tracker</string>

+          <string>Change tracker settings</string>

          </property>

          <property name="styleSheet">

           <string notr="true"/>

          </property>

          <property name="text">

-          <string>Start</string>

+          <string>Settings</string>

          </property>

         </widget>

-        <widget class="QPushButton" name="btnStopTracker">

-         <property name="enabled">

-          <bool>false</bool>

-         </property>

+        <widget class="QComboBox" name="cbxSecondTrackerSource">

          <property name="geometry">

           <rect>

-           <x>100</x>

-           <y>30</y>

-           <width>81</width>

-           <height>21</height>

+           <x>10</x>

+           <y>20</y>

+           <width>180</width>

+           <height>22</height>

           </rect>

          </property>

-         <property name="toolTip">

-          <string>Stop the Tracker</string>

-         </property>

          <property name="styleSheet">

           <string notr="true"/>

          </property>

-         <property name="text">

-          <string>Stop</string>

+         <property name="currentIndex">

+          <number>-1</number>

+         </property>

+         <property name="maxVisibleItems">

+          <number>5</number>

          </property>

         </widget>

        </widget>

       </item>

-      <item row="1" column="0">

-       <widget class="QGroupBox" name="groupBox_3">

+      <item row="1" column="1">

+       <widget class="QGroupBox" name="groupStartStop">

         <property name="minimumSize">

          <size>

           <width>200</width>

@@ -792,52 +798,52 @@ QGroupBox {
         </property>

         <property name="maximumSize">

          <size>

-          <width>200</width>

+          <width>16777215</width>

           <height>80</height>

          </size>

         </property>

         <property name="title">

-         <string>Tracker Source (2nd)</string>

+         <string>GO!</string>

         </property>

-        <widget class="QPushButton" name="btnShowSecondTrackerSettings">

-         <property name="enabled">

-          <bool>true</bool>

-         </property>

+        <widget class="QPushButton" name="btnStartTracker">

          <property name="geometry">

           <rect>

            <x>10</x>

-           <y>50</y>

-           <width>180</width>

-           <height>23</height>

+           <y>30</y>

+           <width>81</width>

+           <height>21</height>

           </rect>

          </property>

          <property name="toolTip">

-          <string>Change tracker settings</string>

+          <string>Start the Tracker</string>

          </property>

          <property name="styleSheet">

           <string notr="true"/>

          </property>

          <property name="text">

-          <string>Settings</string>

+          <string>Start</string>

          </property>

         </widget>

-        <widget class="QComboBox" name="cbxSecondTrackerSource">

+        <widget class="QPushButton" name="btnStopTracker">

+         <property name="enabled">

+          <bool>false</bool>

+         </property>

          <property name="geometry">

           <rect>

-           <x>10</x>

-           <y>20</y>

-           <width>180</width>

-           <height>22</height>

+           <x>100</x>

+           <y>30</y>

+           <width>81</width>

+           <height>21</height>

           </rect>

          </property>

+         <property name="toolTip">

+          <string>Stop the Tracker</string>

+         </property>

          <property name="styleSheet">

           <string notr="true"/>

          </property>

-         <property name="currentIndex">

-          <number>-1</number>

-         </property>

-         <property name="maxVisibleItems">

-          <number>5</number>

+         <property name="text">

+          <string>Stop</string>

          </property>

         </widget>

        </widget>

@@ -876,8 +882,8 @@ background:none;</string>
     <widget class="QGroupBox" name="groupBox_4">

      <property name="geometry">

       <rect>

-       <x>350</x>

-       <y>71</y>

+       <x>340</x>

+       <y>70</y>

        <width>251</width>

        <height>121</height>

       </rect>

@@ -890,7 +896,7 @@ background:none;</string>
      <property name="geometry">

       <rect>

        <x>30</x>

-       <y>71</y>

+       <y>70</y>

        <width>271</width>

        <height>120</height>

       </rect>

@@ -2026,6 +2032,7 @@ color: rgb(0, 255, 0);</string>
   <tabstop>iconcomboProtocol</tabstop>

  </tabstops>

  <resources>

+  <include location="../ftnoir_protocol_ftn/ftn-protocol.qrc"/>

   <include location="main-facetracknoir.qrc"/>

  </resources>

  <connections/>