diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw2.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw2.ui index e8cde08fcb..e7b561aa8d 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw2.ui +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw2.ui @@ -54,78 +54,7 @@ - - - QLayout::SetDefaultConstraint - - - 24 - - - - - - 0 - 0 - - - - Default scale for new views - - - DefaultScaleType - - - Mod/TechDraw/General - - - - Page - - - - - Auto - - - - - Custom - - - - - - - - - 0 - 0 - - - - Default scale for views if Scale Type is Custom - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 2 - - - 1.000000000000000 - - - DefaultViewScale - - - Mod/TechDraw/General - - - + @@ -146,6 +75,12 @@ 0 + + + 174 + 0 + + Default scale for new pages @@ -178,6 +113,49 @@ + + + + true + + + + 0 + 0 + + + + + 174 + 0 + + + + Default scale for new views + + + DefaultScaleType + + + Mod/TechDraw/General + + + + Page + + + + + Auto + + + + + Custom + + + + @@ -203,6 +181,46 @@ + + + + false + + + + 0 + 0 + + + + + 174 + 0 + + + + Default scale for views if 'View Scale Type' is 'Custom' + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 2 + + + 1.000000000000000 + + + DefaultViewScale + + + Mod/TechDraw/General + + + @@ -233,57 +251,7 @@ - - - 24 - - - - - OverLap Radius (TBI) - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 0 - 33 - - - - Area to be inspected for overlap object selection. (not implemented yet) - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 20.000000000000000 - - - OverlapRadius - - - Mod/TechDraw/General - - - + @@ -303,12 +271,18 @@ - - - - Mark Fuzz + + + + Qt::Horizontal - + + + 40 + 20 + + + @@ -320,7 +294,7 @@ - 0 + 174 0 @@ -350,6 +324,13 @@ + + + + Mark Fuzz + + + @@ -360,7 +341,7 @@ - 0 + 174 0 @@ -390,24 +371,81 @@ - - - - Qt::Horizontal + + + + Overlap Radius - + + + + + + false + + + + 0 + 0 + + + - 40 - 20 + 174 + 0 - + + + 0 + 33 + + + + Area to be inspected for overlap object selection. +(not implemented yet) + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 20.000000000000000 + + + OverlapRadius + + + Mod/TechDraw/General + + + + + + + 12 + true + + + + QFrame::Box + + + Items in italics are default values for new objects. They have no effect on existing objects. + + + true + + + @@ -425,9 +463,75 @@ Size Adjustments - + - + + + + + Vertex Scale + + + + + + + + 0 + 0 + + + + + 174 + 0 + + + + Scale of vertex dots. Multiplier of line width. + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 5.000000000000000 + + + VertexScale + + + Mod/TechDraw/General + + + + + + + + true + + + + Center Mark Scale + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + @@ -436,8 +540,14 @@ 0 + + + 174 + 0 + + - Size of center marks. Multiplier of vertex size. + Size of center marks. Multiplier of vertex size. @@ -456,65 +566,6 @@ - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 0 - 0 - - - - Tolerance font size adjustment. Multiplier of dimension font size. - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 0.500000000000000 - - - TolSizeAdjust - - - Mod/TechDraw/Dimensions - - - - - - - Vertex Scale - - - - - - - - true - - - - Center Mark Scale - - - @@ -539,43 +590,8 @@ - - - - Template Edit Mark - - - - - - - - 0 - 0 - - - - Scale of vertex dots. Multiplier of line width. - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 5.000000000000000 - - - VertexScale - - - Mod/TechDraw/General - - - - - + + 0 @@ -584,7 +600,7 @@ - 0 + 174 0 @@ -595,12 +611,50 @@ - Size of template field click handles in mm + Tolerance font size adjustment. Multiplier of dimension font size. + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + 0.500000000000000 + + + TolSizeAdjust + + + Mod/TechDraw/Dimensions + + + + + + + Template Edit Mark + + + + + + + + 0 + 0 + + + + + 174 + 0 + + + + Size of template field click handles + + 3.000000000000000 @@ -611,43 +665,11 @@ - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 12 - true - - - - QFrame::Box - - - Items in italics are default values for new objects. They have no effect on existing objects. - - - true - - - @@ -674,6 +696,11 @@ QDoubleSpinBox
Gui/PrefWidgets.h
+ + Gui::PrefUnitSpinBox + Gui::QuantitySpinBox +
Gui/PrefWidgets.h
+ diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw2Imp.cpp b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw2Imp.cpp index 06634cc7cd..b738849311 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw2Imp.cpp +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw2Imp.cpp @@ -34,8 +34,10 @@ DlgPrefsTechDraw2Imp::DlgPrefsTechDraw2Imp( QWidget* parent ) : PreferencePage( parent ) { this->setupUi(this); -// pdsbTemplateMark->setUnit(Base::Unit::Length); + this->pdsbTemplateMark->setUnit(Base::Unit::Length); + connect(this->cbViewScaleType, SIGNAL(currentIndexChanged(int)), + this, SLOT(onScaleTypeChanged(int))); } DlgPrefsTechDraw2Imp::~DlgPrefsTechDraw2Imp() @@ -43,6 +45,16 @@ DlgPrefsTechDraw2Imp::~DlgPrefsTechDraw2Imp() // no need to delete child widgets, Qt does it all for us } +void DlgPrefsTechDraw2Imp::onScaleTypeChanged(int index) +{ + // disable custom scale if the scale type is not custom + + if (index == 2) // if custom + this->pdsbViewScale->setEnabled(true); + else + this->pdsbViewScale->setEnabled(false); +} + void DlgPrefsTechDraw2Imp::saveSettings() { pdsbToleranceScale->onSave(); diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw2Imp.h b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw2Imp.h index 9d7a42e5ee..04c8dec00b 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw2Imp.h +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw2Imp.h @@ -39,6 +39,9 @@ public: DlgPrefsTechDraw2Imp( QWidget* parent = 0 ); ~DlgPrefsTechDraw2Imp(); +protected Q_SLOTS: + void onScaleTypeChanged(int index); + protected: void saveSettings(); void loadSettings(); diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw3.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw3.ui index 1fb0ad68cd..23a7f067cc 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw3.ui +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw3.ui @@ -716,7 +716,7 @@ - + 0 diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw3Imp.cpp b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw3Imp.cpp index bbd3871cc9..085c6ab2be 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw3Imp.cpp +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw3Imp.cpp @@ -44,6 +44,7 @@ DlgPrefsTechDraw3Imp::DlgPrefsTechDraw3Imp( QWidget* parent ) this->setupUi(this); plsb_FontSize->setUnit(Base::Unit::Length); plsb_ArrowSize->setUnit(Base::Unit::Length); + pdsbBalloonKink->setUnit(Base::Unit::Length); } DlgPrefsTechDraw3Imp::~DlgPrefsTechDraw3Imp()