trackhat-ui: use final images in wizard/ui

8 files changed, 337 insertions, 94 deletions

diff --git a/facetracknoir/images/trackhat-cap.png b/facetracknoir/images/trackhat-cap.png
deleted file mode 100644
index 7ce4bd1a..00000000
--- a/facetracknoir/images/trackhat-cap.png
+++ /dev/null
diff --git a/facetracknoir/images/trackhat-clip-left.png b/facetracknoir/images/trackhat-clip-left.png
new file mode 100644
index 00000000..e4668cad
--- /dev/null
+++ b/facetracknoir/images/trackhat-clip-left.png
diff --git a/facetracknoir/images/trackhat-clip-right.png b/facetracknoir/images/trackhat-clip-right.png
new file mode 100644
index 00000000..aeb969cd
--- /dev/null
+++ b/facetracknoir/images/trackhat-clip-right.png
diff --git a/facetracknoir/images/trackhat-clip.png b/facetracknoir/images/trackhat-clip.png
deleted file mode 100644
index 3320f831..00000000
--- a/facetracknoir/images/trackhat-clip.png
+++ /dev/null
diff --git a/facetracknoir/images/trackhat-hat.png b/facetracknoir/images/trackhat-hat.png
new file mode 100644
index 00000000..2d5a8f4a
--- /dev/null
+++ b/facetracknoir/images/trackhat-hat.png
diff --git a/facetracknoir/settings.ui b/facetracknoir/settings.ui
index 4341d10d..0ac95452 100644
--- a/facetracknoir/settings.ui
+++ b/facetracknoir/settings.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>462</width>
-    <height>657</height>
+    <height>689</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -27,7 +27,7 @@
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>0</number>
+      <number>2</number>
      </property>
      <widget class="QWidget" name="tab">
       <attribute name="title">
@@ -540,77 +540,219 @@
          <property name="title">
           <string/>
          </property>
-         <widget class="QLabel" name="label_3">
-          <property name="geometry">
-           <rect>
-            <x>40</x>
-            <y>40</y>
-            <width>206</width>
-            <height>156</height>
-           </rect>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-          <property name="pixmap">
-           <pixmap resource="ui-res.qrc">:/images/trackhat-cap.png</pixmap>
-          </property>
-          <property name="scaledContents">
-           <bool>true</bool>
-          </property>
-         </widget>
-         <widget class="QLabel" name="label_4">
-          <property name="geometry">
-           <rect>
-            <x>135</x>
-            <y>150</y>
-            <width>221</width>
-            <height>191</height>
-           </rect>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-          <property name="pixmap">
-           <pixmap resource="ui-res.qrc">:/images/trackhat-clip.png</pixmap>
-          </property>
-          <property name="scaledContents">
-           <bool>true</bool>
-          </property>
-         </widget>
-         <widget class="QLabel" name="label_31">
-          <property name="geometry">
-           <rect>
-            <x>10</x>
-            <y>310</y>
-            <width>61</width>
-            <height>16</height>
-           </rect>
-          </property>
-          <property name="text">
-           <string>Model used</string>
-          </property>
-         </widget>
-         <widget class="QComboBox" name="model_used">
-          <property name="geometry">
-           <rect>
-            <x>90</x>
-            <y>305</y>
-            <width>81</width>
-            <height>22</height>
-           </rect>
-          </property>
+         <layout class="QVBoxLayout" name="verticalLayout_2">
           <item>
-           <property name="text">
-            <string>Cap</string>
-           </property>
+           <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>
+            <property name="frameShadow">
+             <enum>QFrame::Raised</enum>
+            </property>
+            <property name="lineWidth">
+             <number>0</number>
+            </property>
+            <layout class="QGridLayout" name="gridLayout_16">
+             <property name="leftMargin">
+              <number>20</number>
+             </property>
+             <property name="topMargin">
+              <number>0</number>
+             </property>
+             <property name="rightMargin">
+              <number>40</number>
+             </property>
+             <property name="spacing">
+              <number>0</number>
+             </property>
+             <item row="0" column="0">
+              <widget class="QLabel" name="label_4">
+               <property name="font">
+                <font>
+                 <pointsize>12</pointsize>
+                </font>
+               </property>
+               <property name="text">
+                <string>Hat</string>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="1">
+              <widget class="QLabel" name="label_3">
+               <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>
+             </item>
+             <item row="1" column="1">
+              <widget class="QLabel" name="label_34">
+               <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>
+             </item>
+             <item row="1" column="0">
+              <widget class="QLabel" name="label_35">
+               <property name="font">
+                <font>
+                 <pointsize>12</pointsize>
+                </font>
+               </property>
+               <property name="text">
+                <string>Right-handed clip</string>
+               </property>
+              </widget>
+             </item>
+             <item row="2" column="1">
+              <widget class="QLabel" name="label_36">
+               <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-left.png</pixmap>
+               </property>
+               <property name="scaledContents">
+                <bool>true</bool>
+               </property>
+              </widget>
+             </item>
+             <item row="2" column="0">
+              <widget class="QLabel" name="label_37">
+               <property name="font">
+                <font>
+                 <pointsize>12</pointsize>
+                </font>
+               </property>
+               <property name="text">
+                <string>Left-handed clip</string>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </widget>
           </item>
           <item>
-           <property name="text">
-            <string>Clip</string>
-           </property>
+           <widget class="QFrame" name="frame_6">
+            <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>
+             <item row="0" column="0">
+              <widget class="QLabel" name="label_31">
+               <property name="font">
+                <font>
+                 <pointsize>12</pointsize>
+                </font>
+               </property>
+               <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>
+           </widget>
           </item>
-         </widget>
+         </layout>
         </widget>
        </item>
        <item>
diff --git a/facetracknoir/trackhat-wizard.ui b/facetracknoir/trackhat-wizard.ui
index 059f1629..09f68c03 100644
--- a/facetracknoir/trackhat-wizard.ui
+++ b/facetracknoir/trackhat-wizard.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>500</width>
-    <height>360</height>
+    <width>365</width>
+    <height>586</height>
    </rect>
   </property>
   <property name="modal">
@@ -23,34 +23,122 @@
    <property name="title">
     <string>Select a model</string>
    </property>
-   <layout class="QGridLayout" name="gridLayout_6">
-    <item row="0" column="0">
-     <widget class="QLabel" name="label_5">
-      <property name="text">
-       <string>Select one of TrackHat models.</string>
-      </property>
-     </widget>
-    </item>
-    <item row="1" column="0">
-     <widget class="QGroupBox" name="groupBox">
+   <layout class="QVBoxLayout" name="verticalLayout">
+    <item>
+     <widget class="QFrame" name="frame_7">
       <property name="styleSheet">
-       <string notr="true">QGroupBox { border: 0; }</string>
-      </property>
-      <property name="title">
-       <string/>
+       <string notr="true">QFrame {
+	border: 0;
+	background: transparent;
+}</string>
       </property>
-      <layout class="QGridLayout" name="gridLayout_5">
-       <item row="2" column="0">
-        <widget class="QRadioButton" name="cap_model">
+      <layout class="QGridLayout" name="gridLayout">
+       <property name="leftMargin">
+        <number>20</number>
+       </property>
+       <property name="bottomMargin">
+        <number>12</number>
+       </property>
+       <property name="spacing">
+        <number>0</number>
+       </property>
+       <item row="0" column="1">
+        <widget class="QLabel" name="label_12">
+         <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>
+       </item>
+       <item row="1" column="1">
+        <widget class="QLabel" name="label_46">
+         <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>
+       </item>
+       <item row="2" column="1">
+        <widget class="QLabel" name="label_48">
+         <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>Cap, add a big logo</string>
+          <string/>
+         </property>
+         <property name="pixmap">
+          <pixmap resource="ui-res.qrc">:/images/trackhat-clip-left.png</pixmap>
+         </property>
+         <property name="scaledContents">
+          <bool>true</bool>
          </property>
         </widget>
        </item>
        <item row="0" column="0">
-        <widget class="QRadioButton" name="clip_model">
+        <widget class="QRadioButton" name="cap_model">
          <property name="text">
-          <string>Clip, add a big logo</string>
+          <string>Cap</string>
          </property>
          <property name="checked">
           <bool>true</bool>
@@ -58,6 +146,16 @@
         </widget>
        </item>
        <item row="1" column="0">
+        <widget class="QRadioButton" name="clip_model">
+         <property name="text">
+          <string>Clip, right-handed</string>
+         </property>
+         <property name="checked">
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="0">
         <widget class="QRadioButton" name="clip_model_left">
          <property name="text">
           <string>Clip, left-handed</string>
@@ -84,6 +182,8 @@
    </layout>
   </widget>
  </widget>
- <resources/>
+ <resources>
+  <include location="ui-res.qrc"/>
+ </resources>
  <connections/>
 </ui>
diff --git a/facetracknoir/ui-res.qrc b/facetracknoir/ui-res.qrc
index b251ab8f..ec1c7bba 100644
--- a/facetracknoir/ui-res.qrc
+++ b/facetracknoir/ui-res.qrc
@@ -6,7 +6,8 @@
         <file>images/facetracknoir.png</file>
         <file>images/no-feed.png</file>
         <file>images/filter-16.png</file>
-        <file>images/trackhat-cap.png</file>
-        <file>images/trackhat-clip.png</file>
+        <file>images/trackhat-clip-left.png</file>
+        <file>images/trackhat-clip-right.png</file>
+        <file>images/trackhat-hat.png</file>
     </qresource>
 </RCC>