kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Part: PR4556 Step 3: sort QGridLayout by row-col

Browse Source
This commit is contained in:
Chris Hennes
2022-03-28 10:12:52 -05:00
parent ac6f33054e
commit 48619ec5cb
16 changed files with 1331 additions and 1331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
src/Mod/Part/AttachmentEditor/TaskAttachmentEditor.ui
View File

@@ -140,6 +140,25 @@
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="Gui::QuantitySpinBox" name="attachmentOffsetX">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>5</height>
</size>
</property>
<property name="toolTip">
<string>Note: The placement is expressed in local space of object being attached.</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="labelOffset2">
<property name="sizePolicy">
@@ -217,51 +236,6 @@
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="labelPitch">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Around y-axis:</string>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="labelRoll">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Around z-axis:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="Gui::QuantitySpinBox" name="attachmentOffsetX">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>5</height>
</size>
</property>
<property name="toolTip">
<string>Note: The placement is expressed in local space of object being attached.</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="Gui::QuantitySpinBox" name="attachmentOffsetRoll">
<property name="sizePolicy">
@@ -294,6 +268,19 @@ Note: The placement is expressed in local space of object being attached.</strin
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="labelPitch">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Around y-axis:</string>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="Gui::QuantitySpinBox" name="attachmentOffsetPitch">
<property name="sizePolicy">
@@ -326,6 +313,19 @@ Note: The placement is expressed in local space of object being attached.</strin
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="labelRoll">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Around z-axis:</string>
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="Gui::QuantitySpinBox" name="attachmentOffsetYaw">
<property name="sizePolicy">

94
src/Mod/Part/BasicShapes/TaskTube.ui
View File

@@ -40,45 +40,6 @@
<property name="spacing">
<number>6</number>
</property>
<item row="1" column="2">
<widget class="Gui::QuantitySpinBox" name="tubeInnerRadius">
<property name="keyboardTracking">
<bool>false</bool>
</property>
<property name="unit" stdset="0">
<string notr="true">mm</string>
</property>
<property name="minimum">
<double>0.000000000000000</double>
</property>
<property name="value">
<double>2.000000000000000</double>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="Gui::QuantitySpinBox" name="tubeHeight">
<property name="keyboardTracking">
<bool>false</bool>
</property>
<property name="unit" stdset="0">
<string notr="true">mm</string>
</property>
<property name="minimum">
<double>0.000000000000000</double>
</property>
<property name="value">
<double>10.000000000000000</double>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="textLabel3">
<property name="text">
<string>Height:</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="textLabel1">
<property name="text">
@@ -86,13 +47,6 @@
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="textLabel2">
<property name="text">
<string>Inner radius</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="Gui::QuantitySpinBox" name="tubeOuterRadius">
<property name="keyboardTracking">
@@ -109,7 +63,53 @@
</property>
</widget>
</item>
</layout>
<item row="1" column="0">
<widget class="QLabel" name="textLabel2">
<property name="text">
<string>Inner radius</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="Gui::QuantitySpinBox" name="tubeInnerRadius">
<property name="keyboardTracking">
<bool>false</bool>
</property>
<property name="unit" stdset="0">
<string notr="true">mm</string>
</property>
<property name="minimum">
<double>0.000000000000000</double>
</property>
<property name="value">
<double>2.000000000000000</double>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="textLabel3">
<property name="text">
<string>Height:</string>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="Gui::QuantitySpinBox" name="tubeHeight">
<property name="keyboardTracking">
<bool>false</bool>
</property>
<property name="unit" stdset="0">
<string notr="true">mm</string>
</property>
<property name="minimum">
<double>0.000000000000000</double>
</property>
<property name="value">
<double>10.000000000000000</double>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>

94
src/Mod/Part/Gui/DlgBlock.ui
View File

@@ -41,23 +41,6 @@
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QSpinBox" name="FirstLimitLength">
<property name="suffix">
<string>mm</string>
</property>
<property name="value">
<number>20</number>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="TextLabel2">
<property name="text">
<string>Length:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="FirstLimitType">
<item>
@@ -87,6 +70,23 @@
</item>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="TextLabel2">
<property name="text">
<string>Length:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QSpinBox" name="FirstLimitLength">
<property name="suffix">
<string>mm</string>
</property>
<property name="value">
<number>20</number>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="TextLabel3">
<property name="text">
@@ -195,26 +195,6 @@
<property name="spacing">
<number>6</number>
</property>
<item row="1" column="1">
<widget class="QSpinBox" name="SecondLimitLength">
<property name="suffix">
<string>mm</string>
</property>
<property name="value">
<number>20</number>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLineEdit" name="SecondLimitSelection">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>No selection</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="TextLabel1_2">
<property name="text">
@@ -258,6 +238,16 @@
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QSpinBox" name="SecondLimitLength">
<property name="suffix">
<string>mm</string>
</property>
<property name="value">
<number>20</number>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="TextLabel3_2">
<property name="text">
@@ -265,7 +255,17 @@
</property>
</widget>
</item>
</layout>
<item row="2" column="1">
<widget class="QLineEdit" name="SecondLimitSelection">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>No selection</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
@@ -300,7 +300,14 @@
<property name="spacing">
<number>6</number>
</property>
<item row="0" column="1">
<item row="0" column="0">
<widget class="QLabel" name="TextLabel5">
<property name="text">
<string>Reference</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="DirectionSelection">
<property name="enabled">
<bool>false</bool>
@@ -310,14 +317,7 @@
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="TextLabel5">
<property name="text">
<string>Reference</string>
</property>
</widget>
</item>
</layout>
</layout>
</item>
</layout>
</widget>

30
src/Mod/Part/Gui/DlgBooleanOperation.ui
View File

@@ -26,20 +26,6 @@
<property name="spacing">
<number>6</number>
</property>
<item row="1" column="1">
<widget class="QRadioButton" name="sectionButton">
<property name="text">
<string>Section</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QRadioButton" name="diffButton">
<property name="text">
<string>Difference</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QRadioButton" name="unionButton">
<property name="text">
@@ -50,6 +36,13 @@
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QRadioButton" name="diffButton">
<property name="text">
<string>Difference</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QRadioButton" name="interButton">
<property name="text">
@@ -57,7 +50,14 @@
</property>
</widget>
</item>
</layout>
<item row="1" column="1">
<widget class="QRadioButton" name="sectionButton">
<property name="text">
<string>Section</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="1" column="0">

72
src/Mod/Part/Gui/DlgExtrusion.ui
View File

@@ -26,26 +26,6 @@
<string>Direction</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="4" column="2">
<widget class="QCheckBox" name="chkReversed">
<property name="toolTip">
<string>If checked, direction of extrusion is reversed.</string>
</property>
<property name="text">
<string>Reversed</string>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QRadioButton" name="rbDirModeCustom">
<property name="toolTip">
<string>Specify direction manually using X,Y,Z values.</string>
</property>
<property name="text">
<string>Custom direction:</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QRadioButton" name="rbDirModeNormal">
<property name="toolTip">
@@ -59,6 +39,29 @@
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QRadioButton" name="rbDirModeEdge">
<property name="toolTip">
<string>Set direction to match a direction of straight edge. Hint: to account for length of the edge too, set both lengths to zero.</string>
</property>
<property name="text">
<string>Along edge:</string>
</property>
</widget>
</item>
<item row="4" column="2">
<widget class="QCheckBox" name="chkReversed">
<property name="toolTip">
<string>If checked, direction of extrusion is reversed.</string>
</property>
<property name="text">
<string>Reversed</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLineEdit" name="txtLink"/>
</item>
<item row="5" column="2">
<widget class="QPushButton" name="btnSelectEdge">
<property name="toolTip">
@@ -69,16 +72,13 @@
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLineEdit" name="txtLink"/>
</item>
<item row="4" column="0">
<widget class="QRadioButton" name="rbDirModeEdge">
<item row="6" column="0">
<widget class="QRadioButton" name="rbDirModeCustom">
<property name="toolTip">
<string>Set direction to match a direction of straight edge. Hint: to account for length of the edge too, set both lengths to zero.</string>
<string>Specify direction manually using X,Y,Z values.</string>
</property>
<property name="text">
<string>Along edge:</string>
<string>Custom direction:</string>
</property>
</widget>
</item>
@@ -300,7 +300,14 @@ If both lengths are zero, magnitude of direction is used.</string>
</property>
</widget>
</item>
<item row="1" column="1">
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Taper angle against</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="Gui::QuantitySpinBox" name="spinTaperAngleRev">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -322,14 +329,7 @@ If both lengths are zero, magnitude of direction is used.</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Taper angle against</string>
</property>
</widget>
</item>
</layout>
</layout>
</item>
<item>
<widget class="QCheckBox" name="chkSolid">

22
src/Mod/Part/Gui/DlgImportExportIges.ui
View File

@@ -132,6 +132,16 @@
<item row="0" column="1">
<widget class="QLineEdit" name="lineEditCompany"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Author</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="lineEditAuthor"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
@@ -142,17 +152,7 @@
<item row="2" column="1">
<widget class="QLineEdit" name="lineEditProduct"/>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="lineEditAuthor"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Author</string>
</property>
</widget>
</item>
</layout>
</layout>
</widget>
</item>
<item row="3" column="0">

302
src/Mod/Part/Gui/DlgImportExportStep.ui
View File

@@ -20,6 +20,100 @@
<string>Export</string>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Units for export of STEP</string>
</property>
</widget>
</item>
<item row="0" column="1">
<spacer>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="2">
<widget class="QComboBox" name="comboBoxUnits">
<item>
<property name="text">
<string>Millimeter</string>
</property>
</item>
<item>
<property name="text">
<string>Meter</string>
</property>
</item>
<item>
<property name="text">
<string>Inch</string>
</property>
</item>
</widget>
</item>
<item row="2" column="0" colspan="3">
<widget class="QCheckBox" name="checkBoxPcurves">
<property name="text">
<string>Write out curves in parametric space of surface</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="Gui::PrefCheckBox" name="checkBoxExportHiddenObj">
<property name="toolTip">
<string>Uncheck this to skip invisible object when exporting, which is useful for CADs that do not support invisibility STEP styling.</string>
</property>
<property name="text">
<string>Export invisible objects</string>
</property>
<property name="prefEntry" stdset="0">
<cstring>ExportHiddenObject</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Mod/Import</cstring>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="Gui::PrefCheckBox" name="checkBoxKeepPlacement">
<property name="toolTip">
<string>Check this option to keep the placement information when exporting
a single object. Please note that when import back the STEP file, the
placement will be encoded into the shape geometry, instead of keeping
it inside the Placement property.</string>
</property>
<property name="text">
<string>Export single object placement</string>
</property>
<property name="prefEntry" stdset="0">
<cstring>ExportKeepPlacement</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Mod/Import</cstring>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="Gui::PrefCheckBox" name="checkBoxExportLegacy">
<property name="text">
<string>Use legacy exporter</string>
</property>
<property name="prefEntry" stdset="0">
<cstring>ExportLegacy</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Mod/Import</cstring>
</property>
</widget>
</item>
<item row="6" column="0" colspan="3">
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
@@ -58,156 +152,7 @@
</layout>
</widget>
</item>
<item row="3" column="0">
<widget class="Gui::PrefCheckBox" name="checkBoxExportHiddenObj">
<property name="toolTip">
<string>Uncheck this to skip invisible object when exporting, which is useful for CADs that do not support invisibility STEP styling.</string>
</property>
<property name="text">
<string>Export invisible objects</string>
</property>
<property name="prefEntry" stdset="0">
<cstring>ExportHiddenObject</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Mod/Import</cstring>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Units for export of STEP</string>
</property>
</widget>
</item>
<item row="2" column="0" colspan="3">
<widget class="QCheckBox" name="checkBoxPcurves">
<property name="text">
<string>Write out curves in parametric space of surface</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QComboBox" name="comboBoxUnits">
<item>
<property name="text">
<string>Millimeter</string>
</property>
</item>
<item>
<property name="text">
<string>Meter</string>
</property>
</item>
<item>
<property name="text">
<string>Inch</string>
</property>
</item>
</widget>
</item>
<item row="0" column="1">
<spacer>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="5" column="0">
<widget class="Gui::PrefCheckBox" name="checkBoxExportLegacy">
<property name="text">
<string>Use legacy exporter</string>
</property>
<property name="prefEntry" stdset="0">
<cstring>ExportLegacy</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Mod/Import</cstring>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="Gui::PrefCheckBox" name="checkBoxKeepPlacement">
<property name="toolTip">
<string>Check this option to keep the placement information when exporting
a single object. Please note that when import back the STEP file, the
placement will be encoded into the shape geometry, instead of keeping
it inside the Placement property.</string>
</property>
<property name="text">
<string>Export single object placement</string>
</property>
<property name="prefEntry" stdset="0">
<cstring>ExportKeepPlacement</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Mod/Import</cstring>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="4" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>82</height>
</size>
</property>
</spacer>
</item>
<item row="3" column="0">
<widget class="QGroupBox" name="groupBoxHeader">
<property name="toolTip">
<string>If not empty, field contents will be used in the STEP file header.</string>
</property>
<property name="title">
<string>Header</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="1" column="1">
<widget class="QLineEdit" name="lineEditAuthor"/>
</item>
<item row="2" column="1">
<widget class="QLineEdit" name="lineEditProduct"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Author</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Product</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Company</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="lineEditCompany"/>
</item>
</layout>
</layout>
</widget>
</item>
<item row="2" column="0">
@@ -387,7 +332,62 @@ during file reading (slower but higher details).</string>
</layout>
</widget>
</item>
</layout>
<item row="3" column="0">
<widget class="QGroupBox" name="groupBoxHeader">
<property name="toolTip">
<string>If not empty, field contents will be used in the STEP file header.</string>
</property>
<property name="title">
<string>Header</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Company</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="lineEditCompany"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Author</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="lineEditAuthor"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Product</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLineEdit" name="lineEditProduct"/>
</item>
</layout>
</widget>
</item>
<item row="4" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>82</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>

102
src/Mod/Part/Gui/DlgPartBox.ui
View File

@@ -26,6 +26,13 @@
<property name="spacing">
<number>6</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="TextLabel1">
<property name="text">
<string>X:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="Gui::QuantitySpinBox" name="xPos">
<property name="unit" stdset="0">
@@ -39,10 +46,10 @@
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QComboBox" name="direction">
<property name="currentIndex">
<number>-1</number>
<item row="1" column="0">
<widget class="QLabel" name="TextLabel2">
<property name="text">
<string>Y:</string>
</property>
</widget>
</item>
@@ -59,7 +66,14 @@
</property>
</widget>
</item>
<item row="2" column="1">
<item row="2" column="0">
<widget class="QLabel" name="TextLabel3">
<property name="text">
<string>Z:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="Gui::QuantitySpinBox" name="zPos">
<property name="unit" stdset="0">
<string notr="true">mm</string>
@@ -79,28 +93,14 @@
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="TextLabel1">
<property name="text">
<string>X:</string>
<item row="3" column="1">
<widget class="QComboBox" name="direction">
<property name="currentIndex">
<number>-1</number>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="TextLabel2">
<property name="text">
<string>Y:</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="TextLabel3">
<property name="text">
<string>Z:</string>
</property>
</widget>
</item>
</layout>
</layout>
</widget>
</item>
<item row="1" column="0">
@@ -115,8 +115,15 @@
<property name="spacing">
<number>6</number>
</property>
<item row="2" column="1">
<widget class="Gui::QuantitySpinBox" name="wLength">
<item row="0" column="0">
<widget class="QLabel" name="TextLabel1_2">
<property name="text">
<string>Length:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="Gui::QuantitySpinBox" name="uLength">
<property name="unit" stdset="0">
<string notr="true">mm</string>
</property>
@@ -128,6 +135,13 @@
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="TextLabel2_2">
<property name="text">
<string>Width:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="Gui::QuantitySpinBox" name="vLength">
<property name="unit" stdset="0">
@@ -141,19 +155,6 @@
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="Gui::QuantitySpinBox" name="uLength">
<property name="unit" stdset="0">
<string notr="true">mm</string>
</property>
<property name="maximum">
<double>2147480000.000000000000000</double>
</property>
<property name="value">
<double>100.000000000000000</double>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="TextLabel3_2">
<property name="text">
@@ -161,21 +162,20 @@
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="TextLabel2_2">
<property name="text">
<string>Width:</string>
<item row="2" column="1">
<widget class="Gui::QuantitySpinBox" name="wLength">
<property name="unit" stdset="0">
<string notr="true">mm</string>
</property>
<property name="maximum">
<double>2147480000.000000000000000</double>
</property>
<property name="value">
<double>100.000000000000000</double>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="TextLabel1_2">
<property name="text">
<string>Length:</string>
</property>
</widget>
</item>
</layout>
</layout>
</widget>
</item>
<item row="2" column="0">

152
src/Mod/Part/Gui/DlgPartCylinder.ui
View File

@@ -26,20 +26,6 @@
<property name="spacing">
<number>6</number>
</property>
<item row="3" column="1">
<widget class="QComboBox" name="direction">
<property name="currentIndex">
<number>-1</number>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="TextLabel1_3">
<property name="text">
<string>Direction:</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="TextLabel1">
<property name="text">
@@ -47,46 +33,6 @@
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="TextLabel3">
<property name="text">
<string>Z:</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="TextLabel2">
<property name="text">
<string>Y:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="Gui::QuantitySpinBox" name="zPos">
<property name="unit" stdset="0">
<string notr="true">mm</string>
</property>
<property name="minimum">
<double>-2147480000.000000000000000</double>
</property>
<property name="maximum">
<double>2147480000.000000000000000</double>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="Gui::QuantitySpinBox" name="yPos">
<property name="unit" stdset="0">
<string notr="true">mm</string>
</property>
<property name="minimum">
<double>-2147480000.000000000000000</double>
</property>
<property name="maximum">
<double>2147480000.000000000000000</double>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="Gui::QuantitySpinBox" name="xPos">
<property name="unit" stdset="0">
@@ -100,7 +46,61 @@
</property>
</widget>
</item>
</layout>
<item row="1" column="0">
<widget class="QLabel" name="TextLabel2">
<property name="text">
<string>Y:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="Gui::QuantitySpinBox" name="yPos">
<property name="unit" stdset="0">
<string notr="true">mm</string>
</property>
<property name="minimum">
<double>-2147480000.000000000000000</double>
</property>
<property name="maximum">
<double>2147480000.000000000000000</double>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="TextLabel3">
<property name="text">
<string>Z:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="Gui::QuantitySpinBox" name="zPos">
<property name="unit" stdset="0">
<string notr="true">mm</string>
</property>
<property name="minimum">
<double>-2147480000.000000000000000</double>
</property>
<property name="maximum">
<double>2147480000.000000000000000</double>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="TextLabel1_3">
<property name="text">
<string>Direction:</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QComboBox" name="direction">
<property name="currentIndex">
<number>-1</number>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="1" column="0">
@@ -115,13 +115,6 @@
<property name="spacing">
<number>6</number>
</property>
<item row="1" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Height:</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="TextLabel1_2">
<property name="text">
@@ -129,19 +122,6 @@
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="Gui::QuantitySpinBox" name="length">
<property name="unit" stdset="0">
<string notr="true">mm</string>
</property>
<property name="maximum">
<double>2147480000.000000000000000</double>
</property>
<property name="value">
<double>100.000000000000000</double>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="Gui::QuantitySpinBox" name="radius">
<property name="unit" stdset="0">
@@ -155,7 +135,27 @@
</property>
</widget>
</item>
</layout>
<item row="1" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Height:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="Gui::QuantitySpinBox" name="length">
<property name="unit" stdset="0">
<string notr="true">mm</string>
</property>
<property name="maximum">
<double>2147480000.000000000000000</double>
</property>
<property name="value">
<double>100.000000000000000</double>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="2" column="0">

1360
src/Mod/Part/Gui/DlgPrimitives.ui
View File

File diff suppressed because it is too large Load Diff

112
src/Mod/Part/Gui/DlgRevolution.ui
View File

@@ -26,16 +26,6 @@
<property name="spacing">
<number>6</number>
</property>
<item row="5" column="3">
<widget class="QCheckBox" name="checkSolid">
<property name="toolTip">
<string>If checked, revolving wires will produce solids. If not, revolving a wire yields a shell.</string>
</property>
<property name="text">
<string>Create Solid</string>
</property>
</widget>
</item>
<item row="0" column="3">
<widget class="QTreeWidget" name="treeWidget">
<property name="selectionMode">
@@ -54,51 +44,6 @@
</column>
</widget>
</item>
<item row="3" column="3">
<layout class="QFormLayout" name="formLayout_3">
<property name="horizontalSpacing">
<number>6</number>
</property>
<property name="verticalSpacing">
<number>6</number>
</property>
<property name="margin">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Angle:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="Gui::QuantitySpinBox" name="angle">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="unit" stdset="0">
<string notr="true">deg</string>
</property>
<property name="minimum">
<double>-360.000000000000000</double>
</property>
<property name="maximum">
<double>360.000000000000000</double>
</property>
<property name="value">
<double>360.000000000000000</double>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="3" rowspan="2">
<widget class="QGroupBox" name="groupBox">
<property name="minimumSize">
@@ -319,6 +264,51 @@
</layout>
</widget>
</item>
<item row="3" column="3">
<layout class="QFormLayout" name="formLayout_3">
<property name="horizontalSpacing">
<number>6</number>
</property>
<property name="verticalSpacing">
<number>6</number>
</property>
<property name="margin">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Angle:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="Gui::QuantitySpinBox" name="angle">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="unit" stdset="0">
<string notr="true">deg</string>
</property>
<property name="minimum">
<double>-360.000000000000000</double>
</property>
<property name="maximum">
<double>360.000000000000000</double>
</property>
<property name="value">
<double>360.000000000000000</double>
</property>
</widget>
</item>
</layout>
</item>
<item row="4" column="3">
<widget class="QCheckBox" name="checkSymmetric">
<property name="toolTip">
@@ -329,7 +319,17 @@
</property>
</widget>
</item>
</layout>
<item row="5" column="3">
<widget class="QCheckBox" name="checkSolid">
<property name="toolTip">
<string>If checked, revolving wires will produce solids. If not, revolving a wire yields a shell.</string>
</property>
<property name="text">
<string>Create Solid</string>
</property>
</widget>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>

54
src/Mod/Part/Gui/DlgSettings3DViewPart.ui
View File

File diff suppressed because one or more lines are too long

98
src/Mod/Part/Gui/TaskAttacher.ui
View File

@@ -140,6 +140,29 @@
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="Gui::PrefQuantitySpinBox" name="attachmentOffsetX">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>5</height>
</size>
</property>
<property name="toolTip">
<string>Note: The placement is expressed in local coordinate system
of object being attached.</string>
</property>
<property name="keyboardTracking">
<bool>false</bool>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="labelOffset2">
<property name="sizePolicy">
@@ -225,55 +248,6 @@ of object being attached.</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="labelPitch">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Around y-axis:</string>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="labelRoll">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Around z-axis:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="Gui::PrefQuantitySpinBox" name="attachmentOffsetX">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>5</height>
</size>
</property>
<property name="toolTip">
<string>Note: The placement is expressed in local coordinate system
of object being attached.</string>
</property>
<property name="keyboardTracking">
<bool>false</bool>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="Gui::QuantitySpinBox" name="attachmentOffsetRoll">
<property name="sizePolicy">
@@ -301,6 +275,19 @@ of object being attached.</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="labelPitch">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Around y-axis:</string>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="Gui::QuantitySpinBox" name="attachmentOffsetPitch">
<property name="sizePolicy">
@@ -328,6 +315,19 @@ of object being attached.</string>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="labelRoll">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Around z-axis:</string>
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="Gui::QuantitySpinBox" name="attachmentOffsetYaw">
<property name="sizePolicy">

18
src/Mod/Part/Gui/TaskFaceColors.ui
View File

@@ -40,7 +40,14 @@
</property>
</widget>
</item>
<item row="1" column="0" colspan="2">
<item row="0" column="1" colspan="2">
<widget class="QLabel" name="labelElement">
<property name="text">
<string notr="true">[]</string>
</property>
</widget>
</item>
<item row="1" column="0" colspan="2">
<widget class="Gui::ColorButton" name="colorButton">
<property name="minimumSize">
<size>
@@ -69,14 +76,7 @@
</property>
</spacer>
</item>
<item row="0" column="1" colspan="2">
<widget class="QLabel" name="labelElement">
<property name="text">
<string notr="true">[]</string>
</property>
</widget>
</item>
</layout>
</layout>
</widget>
</item>
<item>

18
src/Mod/Part/Gui/TaskLoft.ui
View File

@@ -31,7 +31,14 @@
</property>
</widget>
</item>
<item row="1" column="3">
<item row="1" column="2">
<widget class="QCheckBox" name="checkClosed">
<property name="text">
<string>Closed</string>
</property>
</widget>
</item>
<item row="1" column="3">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
@@ -44,14 +51,7 @@
</property>
</spacer>
</item>
<item row="1" column="2">
<widget class="QCheckBox" name="checkClosed">
<property name="text">
<string>Closed</string>
</property>
</widget>
</item>
</layout>
</layout>
</widget>
<customwidgets>
<customwidget>

44
src/Mod/Part/Gui/TaskShapeBuilder.ui
View File

@@ -20,20 +20,6 @@
<string>Create shape</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="2" column="0">
<widget class="QRadioButton" name="radioButtonFaceFromVertex">
<property name="text">
<string>Face from vertices</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QRadioButton" name="radioButtonShellFromFace">
<property name="text">
<string>Shell from faces</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QRadioButton" name="radioButtonEdgeFromVertex">
<property name="text">
@@ -41,6 +27,20 @@
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QRadioButton" name="radioButtonWireFromEdge">
<property name="text">
<string>Wire from edges</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QRadioButton" name="radioButtonFaceFromVertex">
<property name="text">
<string>Face from vertices</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QRadioButton" name="radioButtonFaceFromEdge">
<property name="text">
@@ -48,6 +48,13 @@
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QRadioButton" name="radioButtonShellFromFace">
<property name="text">
<string>Shell from faces</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QRadioButton" name="radioButtonSolidFromShell">
<property name="text">
@@ -110,14 +117,7 @@
</item>
</layout>
</item>
<item row="1" column="0">
<widget class="QRadioButton" name="radioButtonWireFromEdge">
<property name="text">
<string>Wire from edges</string>
</property>
</widget>
</item>
</layout>
</layout>
</widget>
</item>
<item row="1" column="1">