diff options
| -rw-r--r-- | gui/images/new-clip-left.png | bin | 0 -> 4163 bytes | |||
| -rw-r--r-- | gui/images/new-clip-right.png | bin | 0 -> 4149 bytes | |||
| -rw-r--r-- | gui/images/trackhat-clip-left.png | bin | 5089 -> 5123 bytes | |||
| -rw-r--r-- | gui/images/trackhat-clip-right.png | bin | 5123 -> 5089 bytes | |||
| -rwxr-xr-x | gui/settings.ui | 20 | ||||
| -rw-r--r-- | gui/trackhat-wizard.ui | 136 | ||||
| -rw-r--r-- | gui/ui-res.qrc | 2 | 
7 files changed, 127 insertions, 31 deletions
diff --git a/gui/images/new-clip-left.png b/gui/images/new-clip-left.png Binary files differnew file mode 100644 index 00000000..0d5e687c --- /dev/null +++ b/gui/images/new-clip-left.png diff --git a/gui/images/new-clip-right.png b/gui/images/new-clip-right.png Binary files differnew file mode 100644 index 00000000..e556b3d3 --- /dev/null +++ b/gui/images/new-clip-right.png diff --git a/gui/images/trackhat-clip-left.png b/gui/images/trackhat-clip-left.png Binary files differindex 9970d040..1a3d595e 100644 --- a/gui/images/trackhat-clip-left.png +++ b/gui/images/trackhat-clip-left.png diff --git a/gui/images/trackhat-clip-right.png b/gui/images/trackhat-clip-right.png Binary files differindex 1a3d595e..9970d040 100644 --- a/gui/images/trackhat-clip-right.png +++ b/gui/images/trackhat-clip-right.png diff --git a/gui/settings.ui b/gui/settings.ui index 3f4ca1c6..a7348bf5 100755 --- a/gui/settings.ui +++ b/gui/settings.ui @@ -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"> @@ -667,6 +667,24 @@                 <normaloff>:/images/trackhat-clip-left.png</normaloff>:/images/trackhat-clip-left.png</iconset>               </property>              </item> +            <item> +             <property name="text"> +              <string>New clip</string> +             </property> +             <property name="icon"> +              <iconset resource="ui-res.qrc"> +               <normaloff>:/images/new-clip-right.png</normaloff>:/images/new-clip-right.png</iconset> +             </property> +            </item> +            <item> +             <property name="text"> +              <string>New clip left-handed</string> +             </property> +             <property name="icon"> +              <iconset resource="ui-res.qrc"> +               <normaloff>:/images/new-clip-left.png</normaloff>:/images/new-clip-left.png</iconset> +             </property> +            </item>             </widget>            </item>            <item row="0" column="0"> diff --git a/gui/trackhat-wizard.ui b/gui/trackhat-wizard.ui index 3329e95b..cfb65604 100644 --- a/gui/trackhat-wizard.ui +++ b/gui/trackhat-wizard.ui @@ -6,8 +6,8 @@     <rect>      <x>0</x>      <y>0</y> -    <width>457</width> -    <height>698</height> +    <width>500</width> +    <height>805</height>     </rect>    </property>    <property name="modal"> @@ -42,7 +42,21 @@         <property name="spacing">          <number>0</number>         </property> -       <item row="0" column="1"> +       <item row="0" column="0"> +        <widget class="QRadioButton" name="new_clip_right"> +         <property name="text"> +          <string>New clip, right-handed</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> +         </property> +        </widget> +       </item> +       <item row="4" column="1" alignment="Qt::AlignLeft">          <widget class="QLabel" name="label_12">           <property name="sizePolicy">            <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> @@ -52,14 +66,14 @@           </property>           <property name="minimumSize">            <size> -           <width>192</width> -           <height>192</height> +           <width>128</width> +           <height>128</height>            </size>           </property>           <property name="maximumSize">            <size> -           <width>192</width> -           <height>192</height> +           <width>128</width> +           <height>128</height>            </size>           </property>           <property name="text"> @@ -69,12 +83,22 @@            <pixmap resource="ui-res.qrc">:/images/trackhat-hat.png</pixmap>           </property>           <property name="scaledContents"> -          <bool>false</bool> +          <bool>true</bool>           </property>          </widget>         </item> -       <item row="1" column="1"> -        <widget class="QLabel" name="label_46"> +       <item row="4" column="0"> +        <widget class="QRadioButton" name="cap_model"> +         <property name="text"> +          <string>Cap</string> +         </property> +         <property name="checked"> +          <bool>true</bool> +         </property> +        </widget> +       </item> +       <item row="6" column="1"> +        <widget class="QLabel" name="label_48">           <property name="sizePolicy">            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">             <horstretch>0</horstretch> @@ -83,8 +107,8 @@           </property>           <property name="minimumSize">            <size> -           <width>192</width> -           <height>192</height> +           <width>124</width> +           <height>124</height>            </size>           </property>           <property name="maximumSize"> @@ -97,15 +121,15 @@            <string/>           </property>           <property name="pixmap"> -          <pixmap resource="ui-res.qrc">:/images/trackhat-clip-right.png</pixmap> +          <pixmap resource="ui-res.qrc">:/images/trackhat-clip-left.png</pixmap>           </property>           <property name="scaledContents">            <bool>false</bool>           </property>          </widget>         </item> -       <item row="2" column="1"> -        <widget class="QLabel" name="label_48"> +       <item row="5" column="1" alignment="Qt::AlignLeft"> +        <widget class="QLabel" name="label_46">           <property name="sizePolicy">            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">             <horstretch>0</horstretch> @@ -114,38 +138,35 @@           </property>           <property name="minimumSize">            <size> -           <width>192</width> -           <height>192</height> +           <width>128</width> +           <height>128</height>            </size>           </property>           <property name="maximumSize">            <size> -           <width>192</width> -           <height>192</height> +           <width>128</width> +           <height>128</height>            </size>           </property>           <property name="text">            <string/>           </property>           <property name="pixmap"> -          <pixmap resource="ui-res.qrc">:/images/trackhat-clip-left.png</pixmap> +          <pixmap resource="ui-res.qrc">:/images/trackhat-clip-right.png</pixmap>           </property>           <property name="scaledContents">            <bool>false</bool>           </property>          </widget>         </item> -       <item row="0" column="0"> -        <widget class="QRadioButton" name="cap_model"> +       <item row="6" column="0"> +        <widget class="QRadioButton" name="clip_model_left">           <property name="text"> -          <string>Cap</string> -         </property> -         <property name="checked"> -          <bool>true</bool> +          <string>Clip, left-handed</string>           </property>          </widget>         </item> -       <item row="1" column="0"> +       <item row="5" column="0">          <widget class="QRadioButton" name="clip_model">           <property name="text">            <string>Clip, right-handed</string> @@ -155,10 +176,65 @@           </property>          </widget>         </item> -       <item row="2" column="0"> -        <widget class="QRadioButton" name="clip_model_left"> +       <item row="0" column="1" alignment="Qt::AlignLeft"> +        <widget class="QLabel" name="label"> +         <property name="sizePolicy"> +          <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> +           <horstretch>0</horstretch> +           <verstretch>0</verstretch> +          </sizepolicy> +         </property> +         <property name="minimumSize"> +          <size> +           <width>80</width> +           <height>124</height> +          </size> +         </property> +         <property name="maximumSize"> +          <size> +           <width>80</width> +           <height>124</height> +          </size> +         </property>           <property name="text"> -          <string>Clip, left-handed</string> +          <string/> +         </property> +         <property name="pixmap"> +          <pixmap resource="ui-res.qrc">:/images/new-clip-right.png</pixmap> +         </property> +         <property name="scaledContents"> +          <bool>true</bool> +         </property> +        </widget> +       </item> +       <item row="3" column="1"> +        <widget class="QLabel" name="label_2"> +         <property name="sizePolicy"> +          <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> +           <horstretch>0</horstretch> +           <verstretch>0</verstretch> +          </sizepolicy> +         </property> +         <property name="minimumSize"> +          <size> +           <width>80</width> +           <height>124</height> +          </size> +         </property> +         <property name="maximumSize"> +          <size> +           <width>80</width> +           <height>124</height> +          </size> +         </property> +         <property name="text"> +          <string/> +         </property> +         <property name="pixmap"> +          <pixmap resource="ui-res.qrc">:/images/new-clip-left.png</pixmap> +         </property> +         <property name="scaledContents"> +          <bool>true</bool>           </property>          </widget>         </item> diff --git a/gui/ui-res.qrc b/gui/ui-res.qrc index ec1c7bba..d5343c08 100644 --- a/gui/ui-res.qrc +++ b/gui/ui-res.qrc @@ -9,5 +9,7 @@          <file>images/trackhat-clip-left.png</file>          <file>images/trackhat-clip-right.png</file>          <file>images/trackhat-hat.png</file> +        <file>images/new-clip-right.png</file> +        <file>images/new-clip-left.png</file>      </qresource>  </RCC>  | 
