From 96f3107219bc96a92e724b73638389166ca0f679 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Mon, 26 Oct 2015 07:59:14 +0100
Subject: ui: now choose model through combobox

Resize images for smaller binary.
---
 facetracknoir/images/trackhat-clip-left.png  | Bin 136647 -> 1318 bytes
 facetracknoir/images/trackhat-clip-right.png | Bin 136867 -> 1349 bytes
 facetracknoir/images/trackhat-hat.png        | Bin 45281 -> 2150 bytes
 facetracknoir/settings.ui                    | 278 +++++++--------------------
 4 files changed, 67 insertions(+), 211 deletions(-)

diff --git a/facetracknoir/images/trackhat-clip-left.png b/facetracknoir/images/trackhat-clip-left.png
index e4668cad..cdde2160 100644
Binary files a/facetracknoir/images/trackhat-clip-left.png and b/facetracknoir/images/trackhat-clip-left.png differ
diff --git a/facetracknoir/images/trackhat-clip-right.png b/facetracknoir/images/trackhat-clip-right.png
index aeb969cd..59f8ae71 100644
Binary files a/facetracknoir/images/trackhat-clip-right.png and b/facetracknoir/images/trackhat-clip-right.png differ
diff --git a/facetracknoir/images/trackhat-hat.png b/facetracknoir/images/trackhat-hat.png
index 2d5a8f4a..252c2e6b 100644
Binary files a/facetracknoir/images/trackhat-hat.png and b/facetracknoir/images/trackhat-hat.png differ
diff --git a/facetracknoir/settings.ui b/facetracknoir/settings.ui
index 837f3f08..78336eaa 100644
--- a/facetracknoir/settings.ui
+++ b/facetracknoir/settings.ui
@@ -560,233 +560,76 @@
       <attribute name="title">
        <string>Model</string>
       </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_6">
+      <layout class="QVBoxLayout" name="verticalLayout_2">
        <item>
-        <widget class="QGroupBox" name="groupBox_7">
+        <widget class="QFrame" name="frame_6">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <property name="styleSheet">
-          <string notr="true">QGroupBox { border: 0; }</string>
+          <string notr="true">QFrame { border: 0; }</string>
          </property>
-         <property name="title">
-          <string/>
+         <property name="frameShape">
+          <enum>QFrame::NoFrame</enum>
          </property>
-         <layout class="QVBoxLayout" name="verticalLayout_2">
-          <item>
-           <widget class="QFrame" name="frame_5">
-            <property name="styleSheet">
-             <string notr="true">QFrame { border: 0; }</string>
-            </property>
-            <property name="frameShape">
-             <enum>QFrame::NoFrame</enum>
+         <property name="frameShadow">
+          <enum>QFrame::Raised</enum>
+         </property>
+         <property name="lineWidth">
+          <number>0</number>
+         </property>
+         <layout class="QGridLayout" name="gridLayout_17">
+          <property name="leftMargin">
+           <number>31</number>
+          </property>
+          <item row="0" column="0">
+           <widget class="QLabel" name="label_31">
+            <property name="text">
+             <string>Model used</string>
             </property>
-            <property name="frameShadow">
-             <enum>QFrame::Raised</enum>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="QComboBox" name="model_used">
+            <property name="sizeAdjustPolicy">
+             <enum>QComboBox::AdjustToMinimumContentsLength</enum>
             </property>
-            <property name="lineWidth">
-             <number>0</number>
+            <property name="iconSize">
+             <size>
+              <width>32</width>
+              <height>32</height>
+             </size>
             </property>
-            <widget class="QLabel" name="label_4">
-             <property name="geometry">
-              <rect>
-               <x>30</x>
-               <y>40</y>
-               <width>17</width>
-               <height>16</height>
-              </rect>
-             </property>
-             <property name="text">
-              <string>Hat</string>
-             </property>
-            </widget>
-            <widget class="QLabel" name="label_3">
-             <property name="geometry">
-              <rect>
-               <x>210</x>
-               <y>0</y>
-               <width>120</width>
-               <height>108</height>
-              </rect>
-             </property>
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="minimumSize">
-              <size>
-               <width>120</width>
-               <height>108</height>
-              </size>
-             </property>
-             <property name="maximumSize">
-              <size>
-               <width>120</width>
-               <height>108</height>
-              </size>
-             </property>
-             <property name="text">
-              <string/>
-             </property>
-             <property name="pixmap">
-              <pixmap resource="ui-res.qrc">:/images/trackhat-hat.png</pixmap>
-             </property>
-             <property name="scaledContents">
-              <bool>true</bool>
-             </property>
-            </widget>
-            <widget class="QLabel" name="label_34">
-             <property name="geometry">
-              <rect>
-               <x>215</x>
-               <y>80</y>
-               <width>130</width>
-               <height>130</height>
-              </rect>
-             </property>
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="minimumSize">
-              <size>
-               <width>130</width>
-               <height>130</height>
-              </size>
-             </property>
-             <property name="maximumSize">
-              <size>
-               <width>130</width>
-               <height>130</height>
-              </size>
-             </property>
-             <property name="text">
-              <string/>
-             </property>
-             <property name="pixmap">
-              <pixmap resource="ui-res.qrc">:/images/trackhat-clip-right.png</pixmap>
-             </property>
-             <property name="scaledContents">
-              <bool>true</bool>
-             </property>
-            </widget>
-            <widget class="QLabel" name="label_35">
-             <property name="geometry">
-              <rect>
-               <x>20</x>
-               <y>130</y>
-               <width>43</width>
-               <height>16</height>
-              </rect>
-             </property>
+            <item>
              <property name="text">
-              <string>Right clip</string>
-             </property>
-            </widget>
-            <widget class="QLabel" name="label_36">
-             <property name="geometry">
-              <rect>
-               <x>215</x>
-               <y>170</y>
-               <width>130</width>
-               <height>130</height>
-              </rect>
-             </property>
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="minimumSize">
-              <size>
-               <width>130</width>
-               <height>130</height>
-              </size>
+              <string>Cap</string>
              </property>
-             <property name="maximumSize">
-              <size>
-               <width>130</width>
-               <height>130</height>
-              </size>
+             <property name="icon">
+              <iconset resource="ui-res.qrc">
+               <normaloff>:/images/trackhat-hat.png</normaloff>:/images/trackhat-hat.png</iconset>
              </property>
+            </item>
+            <item>
              <property name="text">
-              <string/>
-             </property>
-             <property name="pixmap">
-              <pixmap resource="ui-res.qrc">:/images/trackhat-clip-left.png</pixmap>
+              <string>Clip</string>
              </property>
-             <property name="scaledContents">
-              <bool>true</bool>
-             </property>
-            </widget>
-            <widget class="QLabel" name="label_37">
-             <property name="geometry">
-              <rect>
-               <x>20</x>
-               <y>230</y>
-               <width>37</width>
-               <height>16</height>
-              </rect>
+             <property name="icon">
+              <iconset resource="ui-res.qrc">
+               <normaloff>:/images/trackhat-clip-right.png</normaloff>:/images/trackhat-clip-right.png</iconset>
              </property>
+            </item>
+            <item>
              <property name="text">
-              <string>Left clip</string>
+              <string>Clip left-handed</string>
              </property>
-            </widget>
-           </widget>
-          </item>
-          <item>
-           <widget class="QFrame" name="frame_6">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="styleSheet">
-             <string notr="true">QFrame { border: 0; }</string>
-            </property>
-            <property name="frameShape">
-             <enum>QFrame::NoFrame</enum>
-            </property>
-            <property name="frameShadow">
-             <enum>QFrame::Raised</enum>
-            </property>
-            <property name="lineWidth">
-             <number>0</number>
-            </property>
-            <layout class="QGridLayout" name="gridLayout_17">
-             <property name="leftMargin">
-              <number>31</number>
+             <property name="icon">
+              <iconset resource="ui-res.qrc">
+               <normaloff>:/images/trackhat-clip-left.png</normaloff>:/images/trackhat-clip-left.png</iconset>
              </property>
-             <item row="0" column="0">
-              <widget class="QLabel" name="label_31">
-               <property name="text">
-                <string>Model used</string>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="1">
-              <widget class="QComboBox" name="model_used">
-               <item>
-                <property name="text">
-                 <string>Cap</string>
-                </property>
-               </item>
-               <item>
-                <property name="text">
-                 <string>Clip</string>
-                </property>
-               </item>
-               <item>
-                <property name="text">
-                 <string>Clip left-handed</string>
-                </property>
-               </item>
-              </widget>
-             </item>
-            </layout>
+            </item>
            </widget>
           </item>
          </layout>
@@ -917,6 +760,19 @@
          </layout>
         </widget>
        </item>
+       <item>
+        <spacer name="verticalSpacer_5">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tab_4">
-- 
cgit v1.2.3