fix lousy UItrackhat-1.2p5

4 files changed, 37 insertions, 34 deletions

diff --git a/gui/images/new-clip-left.png b/gui/images/new-clip-left.png
index 0d5e687c..281904a4 100644
--- a/gui/images/new-clip-left.png
+++ b/gui/images/new-clip-left.png
diff --git a/gui/images/new-clip-right.png b/gui/images/new-clip-right.png
index e556b3d3..e590f6b5 100644
--- a/gui/images/new-clip-right.png
+++ b/gui/images/new-clip-right.png
diff --git a/gui/settings.ui b/gui/settings.ui
index a7348bf5..750629f2 100755
--- a/gui/settings.ui
+++ b/gui/settings.ui
@@ -27,7 +27,7 @@
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>2</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="tab">
       <attribute name="title">
@@ -651,7 +651,7 @@
             </item>
             <item>
              <property name="text">
-              <string>Clip</string>
+              <string>Right Clip</string>
              </property>
              <property name="icon">
               <iconset resource="ui-res.qrc">
@@ -660,7 +660,7 @@
             </item>
             <item>
              <property name="text">
-              <string>Clip left-handed</string>
+              <string>Left Clip</string>
              </property>
              <property name="icon">
               <iconset resource="ui-res.qrc">
@@ -669,7 +669,7 @@
             </item>
             <item>
              <property name="text">
-              <string>New clip</string>
+              <string>Right Mini Clip</string>
              </property>
              <property name="icon">
               <iconset resource="ui-res.qrc">
@@ -678,7 +678,7 @@
             </item>
             <item>
              <property name="text">
-              <string>New clip left-handed</string>
+              <string>Left Mini Clip</string>
              </property>
              <property name="icon">
               <iconset resource="ui-res.qrc">
diff --git a/gui/trackhat-wizard.ui b/gui/trackhat-wizard.ui
index cfb65604..5557e174 100644
--- a/gui/trackhat-wizard.ui
+++ b/gui/trackhat-wizard.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>500</width>
-    <height>805</height>
+    <height>549</height>
    </rect>
   </property>
   <property name="modal">
@@ -39,20 +39,23 @@
        <property name="bottomMargin">
         <number>12</number>
        </property>
-       <property name="spacing">
+       <property name="horizontalSpacing">
         <number>0</number>
        </property>
+       <property name="verticalSpacing">
+        <number>10</number>
+       </property>
        <item row="0" column="0">
         <widget class="QRadioButton" name="new_clip_right">
          <property name="text">
-          <string>New clip, right-handed</string>
+          <string>Right Mini Clip</string>
          </property>
         </widget>
        </item>
        <item row="3" column="0">
         <widget class="QRadioButton" name="new_clip_left">
          <property name="text">
-          <string>New clip, left-handed</string>
+          <string>Left Mini Clip</string>
          </property>
         </widget>
        </item>
@@ -66,14 +69,14 @@
          </property>
          <property name="minimumSize">
           <size>
-           <width>128</width>
-           <height>128</height>
+           <width>80</width>
+           <height>80</height>
           </size>
          </property>
          <property name="maximumSize">
           <size>
-           <width>128</width>
-           <height>128</height>
+           <width>80</width>
+           <height>80</height>
           </size>
          </property>
          <property name="text">
@@ -97,7 +100,7 @@
          </property>
         </widget>
        </item>
-       <item row="6" column="1">
+       <item row="6" column="1" alignment="Qt::AlignLeft">
         <widget class="QLabel" name="label_48">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@@ -107,14 +110,14 @@
          </property>
          <property name="minimumSize">
           <size>
-           <width>124</width>
-           <height>124</height>
+           <width>96</width>
+           <height>96</height>
           </size>
          </property>
          <property name="maximumSize">
           <size>
-           <width>192</width>
-           <height>192</height>
+           <width>96</width>
+           <height>96</height>
           </size>
          </property>
          <property name="text">
@@ -124,7 +127,7 @@
           <pixmap resource="ui-res.qrc">:/images/trackhat-clip-left.png</pixmap>
          </property>
          <property name="scaledContents">
-          <bool>false</bool>
+          <bool>true</bool>
          </property>
         </widget>
        </item>
@@ -138,14 +141,14 @@
          </property>
          <property name="minimumSize">
           <size>
-           <width>128</width>
-           <height>128</height>
+           <width>96</width>
+           <height>96</height>
           </size>
          </property>
          <property name="maximumSize">
           <size>
-           <width>128</width>
-           <height>128</height>
+           <width>96</width>
+           <height>96</height>
           </size>
          </property>
          <property name="text">
@@ -155,21 +158,21 @@
           <pixmap resource="ui-res.qrc">:/images/trackhat-clip-right.png</pixmap>
          </property>
          <property name="scaledContents">
-          <bool>false</bool>
+          <bool>true</bool>
          </property>
         </widget>
        </item>
        <item row="6" column="0">
         <widget class="QRadioButton" name="clip_model_left">
          <property name="text">
-          <string>Clip, left-handed</string>
+          <string>Left Clip</string>
          </property>
         </widget>
        </item>
        <item row="5" column="0">
         <widget class="QRadioButton" name="clip_model">
          <property name="text">
-          <string>Clip, right-handed</string>
+          <string>Right Clip</string>
          </property>
          <property name="checked">
           <bool>false</bool>
@@ -186,14 +189,14 @@
          </property>
          <property name="minimumSize">
           <size>
-           <width>80</width>
-           <height>124</height>
+           <width>64</width>
+           <height>64</height>
           </size>
          </property>
          <property name="maximumSize">
           <size>
-           <width>80</width>
-           <height>124</height>
+           <width>64</width>
+           <height>64</height>
           </size>
          </property>
          <property name="text">
@@ -217,14 +220,14 @@
          </property>
          <property name="minimumSize">
           <size>
-           <width>80</width>
-           <height>124</height>
+           <width>64</width>
+           <height>64</height>
           </size>
          </property>
          <property name="maximumSize">
           <size>
-           <width>80</width>
-           <height>124</height>
+           <width>64</width>
+           <height>64</height>
           </size>
          </property>
          <property name="text">