Show tools in two columns instead three.

--HG--
branch : develop
This commit is contained in:
dismine 2014-08-18 20:39:27 +03:00
parent 6ed576a71e
commit bbf88fc585

View File

@ -25,14 +25,14 @@
<item> <item>
<widget class="QToolBox" name="toolBox"> <widget class="QToolBox" name="toolBox">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Minimum"> <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>1</horstretch> <horstretch>1</horstretch>
<verstretch>1</verstretch> <verstretch>1</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>150</width> <width>85</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
@ -40,15 +40,15 @@
<string/> <string/>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>1</number> <number>4</number>
</property> </property>
<widget class="QWidget" name="page"> <widget class="QWidget" name="page">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>150</width> <width>820</width>
<height>150</height> <height>272</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -63,112 +63,11 @@
<attribute name="label"> <attribute name="label">
<string>Point</string> <string>Point</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout"> <layout class="QFormLayout" name="formLayout">
<item row="0" column="0"> <property name="fieldGrowthPolicy">
<widget class="QToolButton" name="toolButtonEndLine"> <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
<property name="enabled"> </property>
<bool>false</bool> <item row="3" column="0">
</property>
<property name="toolTip">
<string>Point at distance and angle</string>
</property>
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="share/resources/icon.qrc">
<normaloff>:/icon/32x32/segment.png</normaloff>:/icon/32x32/segment.png</iconset>
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QToolButton" name="toolButtonShoulderPoint">
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip">
<string>Special point on shoulder.</string>
</property>
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="share/resources/icon.qrc">
<normaloff>:/icon/32x32/shoulder.png</normaloff>:/icon/32x32/shoulder.png</iconset>
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QToolButton" name="toolButtonPointOfContact">
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip">
<string>Point at intersection of arc and line.</string>
</property>
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="share/resources/icon.qrc">
<normaloff>:/icon/32x32/point_of_contact.png</normaloff>:/icon/32x32/point_of_contact.png</iconset>
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QToolButton" name="toolButtonBisector">
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip">
<string>Point along bisector</string>
</property>
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="share/resources/icon.qrc">
<normaloff>:/icon/32x32/bisector.png</normaloff>:/icon/32x32/bisector.png</iconset>
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QToolButton" name="toolButtonNormal"> <widget class="QToolButton" name="toolButtonNormal">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
@ -194,20 +93,20 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="5" column="0">
<widget class="QToolButton" name="toolButtonAlongLine"> <widget class="QToolButton" name="toolButtonShoulderPoint">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Point at distance along line</string> <string>Special point on shoulder.</string>
</property> </property>
<property name="text"> <property name="text">
<string>...</string> <string>...</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="share/resources/icon.qrc"> <iconset resource="share/resources/icon.qrc">
<normaloff>:/icon/32x32/along_line.png</normaloff>:/icon/32x32/along_line.png</iconset> <normaloff>:/icon/32x32/shoulder.png</normaloff>:/icon/32x32/shoulder.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
<size> <size>
@ -220,33 +119,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="7" column="0">
<widget class="QToolButton" name="toolButtonHeight">
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip">
<string>Perpendicular point along line</string>
</property>
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="share/resources/icon.qrc">
<normaloff>:/icon/32x32/height.png</normaloff>:/icon/32x32/height.png</iconset>
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QToolButton" name="toolButtonTriangle"> <widget class="QToolButton" name="toolButtonTriangle">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
@ -272,7 +145,85 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="2"> <item row="9" column="0">
<widget class="QToolButton" name="toolButtonHeight">
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip">
<string>Perpendicular point along line</string>
</property>
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="share/resources/icon.qrc">
<normaloff>:/icon/32x32/height.png</normaloff>:/icon/32x32/height.png</iconset>
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QToolButton" name="toolButtonBisector">
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip">
<string>Point along bisector</string>
</property>
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="share/resources/icon.qrc">
<normaloff>:/icon/32x32/bisector.png</normaloff>:/icon/32x32/bisector.png</iconset>
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QToolButton" name="toolButtonPointOfContact">
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip">
<string>Point at intersection of arc and line.</string>
</property>
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="share/resources/icon.qrc">
<normaloff>:/icon/32x32/point_of_contact.png</normaloff>:/icon/32x32/point_of_contact.png</iconset>
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
<item row="7" column="1">
<widget class="QToolButton" name="toolButtonPointOfIntersection"> <widget class="QToolButton" name="toolButtonPointOfIntersection">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
@ -298,6 +249,58 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0">
<widget class="QToolButton" name="toolButtonEndLine">
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip">
<string>Point at distance and angle</string>
</property>
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="share/resources/icon.qrc">
<normaloff>:/icon/32x32/segment.png</normaloff>:/icon/32x32/segment.png</iconset>
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QToolButton" name="toolButtonAlongLine">
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip">
<string>Point at distance along line</string>
</property>
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="share/resources/icon.qrc">
<normaloff>:/icon/32x32/along_line.png</normaloff>:/icon/32x32/along_line.png</iconset>
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="page_2"> <widget class="QWidget" name="page_2">
@ -305,8 +308,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>150</width> <width>820</width>
<height>58</height> <height>70</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -321,34 +324,8 @@
<attribute name="label"> <attribute name="label">
<string>Line</string> <string>Line</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QFormLayout" name="formLayout_2">
<item row="1" column="1"> <item row="0" column="0">
<widget class="QToolButton" name="toolButtonLineIntersect">
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip">
<string>Point at line intersection</string>
</property>
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="share/resources/icon.qrc">
<normaloff>:/icon/32x32/intersect.png</normaloff>:/icon/32x32/intersect.png</iconset>
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QToolButton" name="toolButtonLine"> <widget class="QToolButton" name="toolButtonLine">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
@ -374,6 +351,32 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1">
<widget class="QToolButton" name="toolButtonLineIntersect">
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip">
<string>Point at line intersection</string>
</property>
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="share/resources/icon.qrc">
<normaloff>:/icon/32x32/intersect.png</normaloff>:/icon/32x32/intersect.png</iconset>
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="page_3"> <widget class="QWidget" name="page_3">
@ -381,8 +384,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>150</width> <width>820</width>
<height>104</height> <height>116</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -397,7 +400,7 @@
<attribute name="label"> <attribute name="label">
<string>Curve</string> <string>Curve</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_4"> <layout class="QFormLayout" name="formLayout_3">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QToolButton" name="toolButtonSpline"> <widget class="QToolButton" name="toolButtonSpline">
<property name="enabled"> <property name="enabled">
@ -424,7 +427,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="2" column="0">
<widget class="QToolButton" name="toolButtonSplinePath"> <widget class="QToolButton" name="toolButtonSplinePath">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
@ -450,33 +453,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="0" column="1">
<widget class="QToolButton" name="toolButtonSplinePathCutPoint">
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip">
<string>Tool segment a pathed curve.</string>
</property>
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="share/resources/icon.qrc">
<normaloff>:/icon/32x32/splinePath_cut_point.png</normaloff>:/icon/32x32/splinePath_cut_point.png</iconset>
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QToolButton" name="toolButtonSplineCutPoint"> <widget class="QToolButton" name="toolButtonSplineCutPoint">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
@ -502,6 +479,32 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1">
<widget class="QToolButton" name="toolButtonSplinePathCutPoint">
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip">
<string>Tool segment a pathed curve.</string>
</property>
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="share/resources/icon.qrc">
<normaloff>:/icon/32x32/splinePath_cut_point.png</normaloff>:/icon/32x32/splinePath_cut_point.png</iconset>
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="page_4"> <widget class="QWidget" name="page_4">
@ -509,8 +512,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>150</width> <width>820</width>
<height>58</height> <height>70</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -525,7 +528,7 @@
<attribute name="label"> <attribute name="label">
<string>Arc</string> <string>Arc</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_5"> <layout class="QFormLayout" name="formLayout_4">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QToolButton" name="toolButtonArc"> <widget class="QToolButton" name="toolButtonArc">
<property name="enabled"> <property name="enabled">
@ -585,8 +588,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>150</width> <width>100</width>
<height>58</height> <height>64</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -601,7 +604,7 @@
<attribute name="label"> <attribute name="label">
<string>Detail</string> <string>Detail</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QFormLayout" name="formLayout_5">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QToolButton" name="toolButtonNewDetail"> <widget class="QToolButton" name="toolButtonNewDetail">
<property name="toolTip"> <property name="toolTip">
@ -1123,18 +1126,7 @@
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<tabstops> <tabstops>
<tabstop>toolButtonEndLine</tabstop>
<tabstop>toolButtonAlongLine</tabstop>
<tabstop>toolButtonBisector</tabstop>
<tabstop>toolButtonNormal</tabstop>
<tabstop>toolButtonShoulderPoint</tabstop>
<tabstop>toolButtonPointOfContact</tabstop>
<tabstop>toolButtonLine</tabstop>
<tabstop>toolButtonLineIntersect</tabstop>
<tabstop>toolButtonSpline</tabstop>
<tabstop>toolButtonSplinePath</tabstop> <tabstop>toolButtonSplinePath</tabstop>
<tabstop>toolButtonArc</tabstop>
<tabstop>toolButtonNewDetail</tabstop>
</tabstops> </tabstops>
<resources> <resources>
<include location="share/resources/icon.qrc"/> <include location="share/resources/icon.qrc"/>