Merge branch 'refs/heads/dev-quantity'

This commit is contained in:
jriegel
2013-11-09 11:03:12 +01:00
14 changed files with 623 additions and 37 deletions

View File

@@ -93,6 +93,8 @@ void EditDatumDialog::exec(bool atCursor)
Ui::InsertDatum ui_ins_datum;
ui_ins_datum.setupUi(&dlg);
//ui_ins_datum.lineEdit->setParamGrpPath("User parameter:History/Sketcher/SetDatum");
double init_val;
if (Constr->Type == Sketcher::Angle ||
((Constr->Type == Sketcher::DistanceX || Constr->Type == Sketcher::DistanceY) &&

View File

@@ -44,7 +44,15 @@
</layout>
</widget>
<resources/>
<connections>
<customwidgets>
<customwidget>
<class>Gui::InputField</class>
<extends>QLineEdit</extends>
<header>Gui/InputField.h</header>
</customwidget>
</customwidgets>
<connections>
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>