suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix layout in TaskDatumParameters dialog.

Browse Source
This commit is contained in:
Mateusz Skowroński 2016-05-07 15:10:12 +02:00 committed by wmayer
parent 77f667fcde
commit 58daa046f1
2 changed files with 116 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/PartDesign/Gui/TaskDatumParameters.cpp
View File

@ -331,7 +331,7 @@ bool TaskDatumParameters::updatePreview()
} }
} }
QString splmLabelText = attached ? tr("Extra placement:") : tr("Extra placement (inactive - not attached):"); QString splmLabelText = attached ? tr("Extra placement:") : tr("Extra placement (inactive - not attached):");
ui->label_superplacement->setText(splmLabelText); ui->groupBox_superplacement->setTitle(splmLabelText);
return attached; return attached;
} }

238
src/Mod/PartDesign/Gui/TaskDatumParameters.ui
View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>272</width> <width>271</width>
<height>583</height> <height>604</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -110,18 +110,21 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLabel" name="label_superplacement"> <widget class="QGroupBox" name="groupBox_superplacement">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip"> <property name="toolTip">
<string>Mirror of superPlacement property. Extra placement is expressed in local space of object being attached.</string> <string>Mirror of superPlacement property. Extra placement is expressed in local space of object being attached.</string>
</property> </property>
<property name="text"> <property name="title">
<string>Extra placement:</string> <string>Extra placement:</string>
</property> </property>
</widget> <layout class="QGridLayout" name="gridLayout">
</item> <item row="1" column="0">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<widget class="QLabel" name="labelOffset"> <widget class="QLabel" name="labelOffset">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred"> <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
@ -130,25 +133,14 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text"> <property name="text">
<string>X</string> <string>X:</string>
</property>
<property name="buddy">
<cstring>labelOffset</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="2" column="0">
<widget class="Gui::PrefQuantitySpinBox" name="superplacementX" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_9">
<item>
<widget class="QLabel" name="labelOffset2"> <widget class="QLabel" name="labelOffset2">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred"> <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
@ -157,11 +149,11 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text"> <property name="text">
<string>Y</string> <string>Y:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="2" column="1">
<widget class="Gui::PrefQuantitySpinBox" name="superplacementY" native="true"> <widget class="Gui::PrefQuantitySpinBox" name="superplacementY" native="true">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred"> <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
@ -169,13 +161,15 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize">
<size>
<width>0</width>
<height>5</height>
</size>
</property>
</widget> </widget>
</item> </item>
</layout> <item row="3" column="0">
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_8">
<item>
<widget class="QLabel" name="labelOffset3"> <widget class="QLabel" name="labelOffset3">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred"> <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
@ -184,11 +178,11 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text"> <property name="text">
<string>Z</string> <string>Z:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="3" column="1">
<widget class="Gui::PrefQuantitySpinBox" name="superplacementZ" native="true"> <widget class="Gui::PrefQuantitySpinBox" name="superplacementZ" native="true">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred"> <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
@ -196,13 +190,15 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize">
<size>
<width>0</width>
<height>5</height>
</size>
</property>
</widget> </widget>
</item> </item>
</layout> <item row="4" column="0">
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2_yaw">
<item>
<widget class="QLabel" name="labelYaw"> <widget class="QLabel" name="labelYaw">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred"> <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
@ -211,37 +207,11 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text"> <property name="text">
<string>Yaw</string> <string>Yaw:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="5" column="0">
<widget class="Gui::QuantitySpinBox" name="superplacementYaw" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="unit" stdset="0">
<string notr="true">deg</string>
</property>
<property name="minimum" stdset="0">
<double>-360.000000000000000</double>
</property>
<property name="maximum" stdset="0">
<double>360.000000000000000</double>
</property>
<property name="value" stdset="0">
<double>0.000000000000000</double>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2_pitch">
<item>
<widget class="QLabel" name="labelPitch"> <widget class="QLabel" name="labelPitch">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred"> <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
@ -250,37 +220,11 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text"> <property name="text">
<string>Pitch</string> <string>Pitch:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="6" column="0">
<widget class="Gui::QuantitySpinBox" name="superplacementPitch" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="unit" stdset="0">
<string notr="true">deg</string>
</property>
<property name="minimum" stdset="0">
<double>-360.000000000000000</double>
</property>
<property name="maximum" stdset="0">
<double>360.000000000000000</double>
</property>
<property name="value" stdset="0">
<double>0.000000000000000</double>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2_roll">
<item>
<widget class="QLabel" name="labelRoll"> <widget class="QLabel" name="labelRoll">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred"> <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
@ -289,12 +233,28 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text"> <property name="text">
<string>Roll</string> <string>Roll:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="1" column="1">
<widget class="Gui::QuantitySpinBox" name="superplacementRoll" native="true"> <widget class="Gui::PrefQuantitySpinBox" name="superplacementX" native="true">
<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>
</widget>
</item>
<item row="4" column="1">
<widget class="Gui::QuantitySpinBox" name="superplacementYaw">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred"> <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -304,18 +264,63 @@
<property name="unit" stdset="0"> <property name="unit" stdset="0">
<string notr="true">deg</string> <string notr="true">deg</string>
</property> </property>
<property name="minimum" stdset="0"> <property name="minimum">
<double>-360.000000000000000</double> <double>-360.000000000000000</double>
</property> </property>
<property name="maximum" stdset="0"> <property name="maximum">
<double>360.000000000000000</double> <double>360.000000000000000</double>
</property> </property>
<property name="value" stdset="0"> <property name="value">
<double>0.000000000000000</double>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="Gui::QuantitySpinBox" name="superplacementPitch">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<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>0.000000000000000</double>
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="Gui::QuantitySpinBox" name="superplacementRoll">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<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>0.000000000000000</double> <double>0.000000000000000</double>
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</widget>
</item> </item>
<item> <item>
<widget class="QCheckBox" name="checkBoxFlip"> <widget class="QCheckBox" name="checkBoxFlip">
@ -330,7 +335,7 @@
<customwidget> <customwidget>
<class>Gui::QuantitySpinBox</class> <class>Gui::QuantitySpinBox</class>
<extends>QWidget</extends> <extends>QWidget</extends>
<header location="global">Gui/QuantitySpinBox.h</header> <header>Gui/QuantitySpinBox.h</header>
</customwidget> </customwidget>
<customwidget> <customwidget>
<class>Gui::PrefQuantitySpinBox</class> <class>Gui::PrefQuantitySpinBox</class>
@ -338,6 +343,35 @@
<header>Gui/PrefWidgets.h</header> <header>Gui/PrefWidgets.h</header>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<tabstops>
<tabstop>buttonRef1</tabstop>
<tabstop>lineRef1</tabstop>
<tabstop>buttonRef2</tabstop>
<tabstop>lineRef2</tabstop>
<tabstop>buttonRef3</tabstop>
<tabstop>lineRef3</tabstop>
<tabstop>buttonRef4</tabstop>
<tabstop>lineRef4</tabstop>
<tabstop>listOfModes</tabstop>
<tabstop>checkBoxFlip</tabstop>
</tabstops>
<resources/> <resources/>
<connections/> <connections/>
<designerdata>
<property name="gridDeltaX">
<number>10</number>
</property>
<property name="gridDeltaY">
<number>10</number>
</property>
<property name="gridSnapX">
<bool>true</bool>
</property>
<property name="gridSnapY">
<bool>true</bool>
</property>
<property name="gridVisible">
<bool>true</bool>
</property>
</designerdata>
</ui> </ui>