Use system Decimals, alternate or custom for Dimensions

- Also make Dimension arrowhead size adjustable
This commit is contained in:
WandererFan
2017-09-07 16:31:00 -04:00
committed by wmayer
parent fc6f8a91ce
commit c0cddda862
8 changed files with 273 additions and 173 deletions

View File

@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>521</width>
<height>463</height>
<height>554</height>
</rect>
</property>
<property name="windowTitle">
@@ -21,7 +21,30 @@
</property>
<layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="0">
<layout class="QGridLayout" name="gridLayout" columnstretch="1,2,1">
<layout class="QGridLayout" name="gridLayout" columnstretch="1,0,0">
<item row="6" column="0">
<widget class="QLabel" name="label_9">
<property name="text">
<string>Arrow Style</string>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="Gui::PrefSpinBox" name="sbAltDecimals">
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="value">
<number>2</number>
</property>
<property name="prefEntry" stdset="0">
<cstring>AltDecimals</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>/Mod/TechDraw/Dimensions</cstring>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="Gui::PrefCheckBox" name="cbShowUnits">
<property name="text">
@@ -35,21 +58,21 @@
</property>
</widget>
</item>
<item row="2" column="0">
<item row="4" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Color</string>
</property>
</widget>
</item>
<item row="1" column="0">
<item row="3" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Font Size</string>
</property>
</widget>
</item>
<item row="1" column="1">
<item row="3" column="1">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
@@ -62,7 +85,7 @@
</property>
</spacer>
</item>
<item row="1" column="2">
<item row="3" column="2">
<widget class="Gui::PrefDoubleSpinBox" name="dsbFontSize">
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -81,7 +104,7 @@
</property>
</widget>
</item>
<item row="2" column="2">
<item row="4" column="2">
<widget class="Gui::PrefColorButton" name="colDimColor">
<property name="color">
<color>
@@ -98,14 +121,14 @@
</property>
</widget>
</item>
<item row="3" column="0">
<item row="5" column="0">
<widget class="QLabel" name="label_8">
<property name="text">
<string>Diameter Symbol</string>
</property>
</widget>
</item>
<item row="3" column="2">
<item row="5" column="2">
<widget class="Gui::PrefLineEdit" name="leDiameter">
<property name="font">
<font>
@@ -126,6 +149,121 @@
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_11">
<property name="text">
<string>Alternate Decimals</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="Gui::PrefCheckBox" name="cbGlobalDecimals">
<property name="text">
<string>Use Global Decimals</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
<property name="prefEntry" stdset="0">
<cstring>UseGlobalDecimals</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>/Mod/TechDraw/Dimensions</cstring>
</property>
</widget>
</item>
<item row="6" column="2">
<widget class="Gui::PrefComboBox" name="pcbArrow">
<property name="toolTip">
<string>Preferred arrowhead style</string>
</property>
<property name="currentIndex">
<number>0</number>
</property>
<property name="maxVisibleItems">
<number>5</number>
</property>
<property name="prefEntry" stdset="0">
<cstring>ArrowStyle</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Mod/TechDraw/Dimensions</cstring>
</property>
<item>
<property name="text">
<string>0 - Filled Triangle</string>
</property>
<property name="icon">
<iconset>
<normalon>:/icons/arrowfilled.svg</normalon>
</iconset>
</property>
</item>
<item>
<property name="text">
<string>1 - Open Arrowhead</string>
</property>
<property name="icon">
<iconset>
<normalon>:/icons/arrowopen.svg</normalon>
</iconset>
</property>
</item>
<item>
<property name="text">
<string>2 - Tick</string>
</property>
<property name="icon">
<iconset>
<normalon>:/icons/arrowtick.svg</normalon>
</iconset>
</property>
</item>
<item>
<property name="text">
<string>3 - Dot</string>
</property>
<property name="icon">
<iconset>
<normalon>:/icons/arrowdot.svg</normalon>
</iconset>
</property>
</item>
<item>
<property name="text">
<string>4 - Open Circle</string>
</property>
<property name="icon">
<iconset>
<normalon>:/icons/arrowopendot.svg</normalon>
</iconset>
</property>
</item>
</widget>
</item>
<item row="7" column="0">
<widget class="QLabel" name="label_12">
<property name="text">
<string>Arrow Size</string>
</property>
</widget>
</item>
<item row="7" column="2">
<widget class="Gui::PrefDoubleSpinBox" name="dsbArrowSize">
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="value">
<double>5.000000000000000</double>
</property>
<property name="prefEntry" stdset="0">
<cstring>ArrowSize</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Mod/TechDraw/Dimensions</cstring>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="0">
@@ -151,7 +289,7 @@
</property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
<layout class="QGridLayout" name="gridLayout_2" columnstretch="1,2,1">
<layout class="QGridLayout" name="gridLayout_2" columnstretch="1,0,0">
<item row="0" column="2">
<widget class="Gui::PrefComboBox" name="pcbMatting">
<property name="prefEntry" stdset="0">
@@ -341,82 +479,6 @@
</spacer>
</item>
<item row="5" column="0">
<widget class="QLabel" name="label_9">
<property name="text">
<string>Arrow Style</string>
</property>
</widget>
</item>
<item row="5" column="2">
<widget class="Gui::PrefComboBox" name="pcbArrow">
<property name="toolTip">
<string>Preferred arrowhead style</string>
</property>
<property name="currentIndex">
<number>0</number>
</property>
<property name="maxVisibleItems">
<number>5</number>
</property>
<property name="prefEntry" stdset="0">
<cstring>ArrowStyle</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Mod/TechDraw/Decorations</cstring>
</property>
<item>
<property name="text">
<string>0 - Filled Triangle</string>
</property>
<property name="icon">
<iconset>
<normalon>:/icons/arrowfilled.svg</normalon>
</iconset>
</property>
</item>
<item>
<property name="text">
<string>1 - Open Arrowhead</string>
</property>
<property name="icon">
<iconset>
<normalon>:/icons/arrowopen.svg</normalon>
</iconset>
</property>
</item>
<item>
<property name="text">
<string>2 - Tick</string>
</property>
<property name="icon">
<iconset>
<normalon>:/icons/arrowtick.svg</normalon>
</iconset>
</property>
</item>
<item>
<property name="text">
<string>3 - Dot</string>
</property>
<property name="icon">
<iconset>
<normalon>:/icons/arrowdot.svg</normalon>
</iconset>
</property>
</item>
<item>
<property name="text">
<string>4 - Open Circle</string>
</property>
<property name="icon">
<iconset>
<normalon>:/icons/arrowopendot.svg</normalon>
</iconset>
</property>
</item>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="label_10">
<property name="toolTip">
<string>Default weight for GeomHatch lines</string>
@@ -426,7 +488,7 @@
</property>
</widget>
</item>
<item row="6" column="2">
<item row="5" column="2">
<widget class="Gui::PrefDoubleSpinBox" name="doubleSpinBox">
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -460,19 +522,6 @@
</layout>
</widget>
</item>
<item row="2" column="0">
<spacer name="verticalSpacer_3">
<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>
<customwidgets>
@@ -481,6 +530,11 @@
<extends>QPushButton</extends>
<header>Gui/Widgets.h</header>
</customwidget>
<customwidget>
<class>Gui::PrefSpinBox</class>
<extends>QSpinBox</extends>
<header>Gui/PrefWidgets.h</header>
</customwidget>
<customwidget>
<class>Gui::PrefColorButton</class>
<extends>Gui::ColorButton</extends>