diff --git a/src/app/dialogs/dialogaboutapp.cpp b/src/app/dialogs/dialogaboutapp.cpp index 847d14572..6ad3b4e8b 100644 --- a/src/app/dialogs/dialogaboutapp.cpp +++ b/src/app/dialogs/dialogaboutapp.cpp @@ -65,6 +65,10 @@ DialogAboutApp::DialogAboutApp(QWidget *parent) : FontPointSize(ui->label_contrib_label, 11); FontPointSize(ui->label_Valentina_Built, 11); FontPointSize(ui->label_QT_Version, 11); + + adjustSize(); + setMaximumSize(size()); + setMinimumSize(size()); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/dialogaboutapp.ui b/src/app/dialogs/dialogaboutapp.ui index 4f41da7c4..f9299fd1b 100644 --- a/src/app/dialogs/dialogaboutapp.ui +++ b/src/app/dialogs/dialogaboutapp.ui @@ -19,18 +19,6 @@ 0 - - - 583 - 524 - - - - - 583 - 524 - - ArrowCursor diff --git a/src/app/dialogs/dialogindividualmeasurements.cpp b/src/app/dialogs/dialogindividualmeasurements.cpp index 962c53020..6526eb1fa 100644 --- a/src/app/dialogs/dialogindividualmeasurements.cpp +++ b/src/app/dialogs/dialogindividualmeasurements.cpp @@ -73,6 +73,10 @@ DialogIndividualMeasurements::DialogIndividualMeasurements(VContainer *data, con &DialogIndividualMeasurements::CheckState); connect(ui->toolButtonOpenExist, &QToolButton::clicked, this, &DialogIndividualMeasurements::OpenTable); connect(ui->toolButtonOpenNew, &QToolButton::clicked, this, &DialogIndividualMeasurements::NewTable); + + adjustSize(); + setMaximumSize(size()); + setMinimumSize(size()); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/dialogindividualmeasurements.ui b/src/app/dialogs/dialogindividualmeasurements.ui index 2eb9260b5..5d5c25b44 100644 --- a/src/app/dialogs/dialogindividualmeasurements.ui +++ b/src/app/dialogs/dialogindividualmeasurements.ui @@ -13,18 +13,6 @@ 295 - - - 505 - 295 - - - - - 505 - 295 - - Individual measurements diff --git a/src/app/dialogs/dialoglayoutprogress.cpp b/src/app/dialogs/dialoglayoutprogress.cpp index 758b7c6d5..68b6937e1 100644 --- a/src/app/dialogs/dialoglayoutprogress.cpp +++ b/src/app/dialogs/dialoglayoutprogress.cpp @@ -58,6 +58,10 @@ DialogLayoutProgress::DialogLayoutProgress(int count, QWidget *parent) setModal(true); this->setWindowFlags(Qt::Dialog | Qt::WindowTitleHint | Qt::CustomizeWindowHint); + + adjustSize(); + setMaximumSize(size()); + setMinimumSize(size()); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/dialoglayoutprogress.ui b/src/app/dialogs/dialoglayoutprogress.ui index 1c018562a..314a36d60 100644 --- a/src/app/dialogs/dialoglayoutprogress.ui +++ b/src/app/dialogs/dialoglayoutprogress.ui @@ -13,18 +13,6 @@ 119 - - - 566 - 119 - - - - - 566 - 119 - - Create a Layout diff --git a/src/app/dialogs/dialoglayoutsettings.cpp b/src/app/dialogs/dialoglayoutsettings.cpp index eac924fa9..710dd5036 100644 --- a/src/app/dialogs/dialoglayoutsettings.cpp +++ b/src/app/dialogs/dialoglayoutsettings.cpp @@ -74,6 +74,10 @@ DialogLayoutSettings::DialogLayoutSettings(VLayoutGenerator *generator, QWidget QPushButton *bRestoreDefaults = ui->buttonBox->button(QDialogButtonBox::RestoreDefaults); connect(bRestoreDefaults, &QPushButton::clicked, this, &DialogLayoutSettings::RestoreDefaults); + + adjustSize(); + setMaximumSize(size()); + setMinimumSize(size()); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/dialoglayoutsettings.ui b/src/app/dialogs/dialoglayoutsettings.ui index 99a45aaa2..3c1b4fe68 100644 --- a/src/app/dialogs/dialoglayoutsettings.ui +++ b/src/app/dialogs/dialoglayoutsettings.ui @@ -10,18 +10,6 @@ 345 - - - 661 - 345 - - - - - 661 - 345 - - Create a layout @@ -558,7 +546,7 @@ - + diff --git a/src/app/dialogs/dialogmeasurements.cpp b/src/app/dialogs/dialogmeasurements.cpp index a59560b67..4744e6043 100644 --- a/src/app/dialogs/dialogmeasurements.cpp +++ b/src/app/dialogs/dialogmeasurements.cpp @@ -40,6 +40,10 @@ DialogMeasurements::DialogMeasurements(QWidget *parent) : connect(ui->toolButtonStandard, &QToolButton::clicked, this, &DialogMeasurements::StandardMeasurements); connect(ui->toolButtonIndividual, &QToolButton::clicked, this, &DialogMeasurements::IndividualMeasurements); + + adjustSize(); + setMaximumSize(size()); + setMinimumSize(size()); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/dialogmeasurements.ui b/src/app/dialogs/dialogmeasurements.ui index 6ef210151..9e7dfa248 100644 --- a/src/app/dialogs/dialogmeasurements.ui +++ b/src/app/dialogs/dialogmeasurements.ui @@ -13,18 +13,6 @@ 244 - - - 448 - 244 - - - - - 448 - 244 - - Measurements diff --git a/src/app/dialogs/dialogpatternproperties.cpp b/src/app/dialogs/dialogpatternproperties.cpp index ad734f559..9d77bcd11 100644 --- a/src/app/dialogs/dialogpatternproperties.cpp +++ b/src/app/dialogs/dialogpatternproperties.cpp @@ -80,6 +80,10 @@ DialogPatternProperties::DialogPatternProperties(VPattern *doc, QWidget *parent) SetOptions(sizes); gradationChanged = false;//Set to default value after initialization + + adjustSize(); + setMaximumSize(size()); + setMinimumSize(size()); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/dialogpatternproperties.ui b/src/app/dialogs/dialogpatternproperties.ui index 410184abf..9b09c2ccf 100644 --- a/src/app/dialogs/dialogpatternproperties.ui +++ b/src/app/dialogs/dialogpatternproperties.ui @@ -10,18 +10,6 @@ 562 - - - 657 - 562 - - - - - 657 - 562 - - Pattern properties diff --git a/src/app/dialogs/dialogsavelayout.cpp b/src/app/dialogs/dialogsavelayout.cpp index 929ad7491..cab670fb2 100644 --- a/src/app/dialogs/dialogsavelayout.cpp +++ b/src/app/dialogs/dialogsavelayout.cpp @@ -69,6 +69,10 @@ DialogSaveLayout::DialogSaveLayout(const QMap &formates, int c ui->lineEditPath->setText(qApp->Settings()->GetPathLayout()); ShowExample();//Show example for current format. + + adjustSize(); + setMaximumSize(size()); + setMinimumSize(size()); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/dialogsavelayout.ui b/src/app/dialogs/dialogsavelayout.ui index 4931d5ac2..6ceae066d 100644 --- a/src/app/dialogs/dialogsavelayout.ui +++ b/src/app/dialogs/dialogsavelayout.ui @@ -10,18 +10,6 @@ 179 - - - 692 - 179 - - - - - 692 - 179 - - Save Layout diff --git a/src/app/dialogs/dialogstandardmeasurements.cpp b/src/app/dialogs/dialogstandardmeasurements.cpp index 6c2c01cd4..b05277c3f 100644 --- a/src/app/dialogs/dialogstandardmeasurements.cpp +++ b/src/app/dialogs/dialogstandardmeasurements.cpp @@ -71,6 +71,10 @@ DialogStandardMeasurements::DialogStandardMeasurements(VContainer *data, const Q CheckState(); connect(ui->lineEditName, &QLineEdit::textChanged, this, &DialogStandardMeasurements::CheckState); + + adjustSize(); + setMaximumSize(size()); + setMinimumSize(size()); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/dialogstandardmeasurements.ui b/src/app/dialogs/dialogstandardmeasurements.ui index 2fdbc5757..3d858eef9 100644 --- a/src/app/dialogs/dialogstandardmeasurements.ui +++ b/src/app/dialogs/dialogstandardmeasurements.ui @@ -13,12 +13,6 @@ 113 - - - 430 - 113 - - Standard table diff --git a/src/libs/vtools/dialogs/support/dialogeditwrongformula.ui b/src/libs/vtools/dialogs/support/dialogeditwrongformula.ui index 50571b3d9..404356691 100644 --- a/src/libs/vtools/dialogs/support/dialogeditwrongformula.ui +++ b/src/libs/vtools/dialogs/support/dialogeditwrongformula.ui @@ -13,18 +13,6 @@ 449 - - - 390 - 449 - - - - - 390 - 449 - - Edit formula diff --git a/src/libs/vtools/dialogs/support/dialogundo.ui b/src/libs/vtools/dialogs/support/dialogundo.ui index b8011a668..d9826a01c 100644 --- a/src/libs/vtools/dialogs/support/dialogundo.ui +++ b/src/libs/vtools/dialogs/support/dialogundo.ui @@ -13,18 +13,6 @@ 145 - - - 387 - 145 - - - - - 387 - 145 - - Broken formula diff --git a/src/libs/vtools/dialogs/tools/dialogalongline.cpp b/src/libs/vtools/dialogs/tools/dialogalongline.cpp index 82793bb45..06e6f5aba 100644 --- a/src/libs/vtools/dialogs/tools/dialogalongline.cpp +++ b/src/libs/vtools/dialogs/tools/dialogalongline.cpp @@ -73,6 +73,8 @@ DialogAlongLine::DialogAlongLine(const VContainer *data, const quint32 &toolId, this, &DialogAlongLine::PointChanged); vis = new VisToolAlongLine(data); + + FixateSize(); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/dialogs/tools/dialogalongline.ui b/src/libs/vtools/dialogs/tools/dialogalongline.ui index 7cd62f81d..06cc73444 100644 --- a/src/libs/vtools/dialogs/tools/dialogalongline.ui +++ b/src/libs/vtools/dialogs/tools/dialogalongline.ui @@ -10,18 +10,6 @@ 284 - - - 412 - 284 - - - - - 412 - 284 - - Point at distance along line diff --git a/src/libs/vtools/dialogs/tools/dialogarc.cpp b/src/libs/vtools/dialogs/tools/dialogarc.cpp index 3224f5065..69b0ef1f9 100644 --- a/src/libs/vtools/dialogs/tools/dialogarc.cpp +++ b/src/libs/vtools/dialogs/tools/dialogarc.cpp @@ -90,6 +90,8 @@ DialogArc::DialogArc(const VContainer *data, const quint32 &toolId, QWidget *par connect(ui->pushButtonGrowLengthF2, &QPushButton::clicked, this, &DialogArc::DeployF2TextEdit); vis = new VisToolArc(data); + + FixateSize(); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/dialogs/tools/dialogarc.ui b/src/libs/vtools/dialogs/tools/dialogarc.ui index e109c121d..be883e00b 100644 --- a/src/libs/vtools/dialogs/tools/dialogarc.ui +++ b/src/libs/vtools/dialogs/tools/dialogarc.ui @@ -10,18 +10,6 @@ 329 - - - 425 - 329 - - - - - 425 - 329 - - Arc diff --git a/src/libs/vtools/dialogs/tools/dialogarcwithlength.cpp b/src/libs/vtools/dialogs/tools/dialogarcwithlength.cpp index 824e93a57..8e87f991a 100644 --- a/src/libs/vtools/dialogs/tools/dialogarcwithlength.cpp +++ b/src/libs/vtools/dialogs/tools/dialogarcwithlength.cpp @@ -85,6 +85,8 @@ DialogArcWithLength::DialogArcWithLength(const VContainer *data, const quint32 & connect(ui->pushButtonGrowLengthArcLength, &QPushButton::clicked, this, &DialogArcWithLength::DeployLengthTextEdit); vis = new VisToolArcWithLength(data); + + FixateSize(); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/dialogs/tools/dialogbisector.cpp b/src/libs/vtools/dialogs/tools/dialogbisector.cpp index 495db4c07..782788e7b 100644 --- a/src/libs/vtools/dialogs/tools/dialogbisector.cpp +++ b/src/libs/vtools/dialogs/tools/dialogbisector.cpp @@ -75,6 +75,8 @@ DialogBisector::DialogBisector(const VContainer *data, const quint32 &toolId, QW this, &DialogBisector::PointNameChanged); vis = new VisToolBisector(data); + + FixateSize(); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/dialogs/tools/dialogbisector.ui b/src/libs/vtools/dialogs/tools/dialogbisector.ui index 5ada8d3ef..d3bf1273e 100644 --- a/src/libs/vtools/dialogs/tools/dialogbisector.ui +++ b/src/libs/vtools/dialogs/tools/dialogbisector.ui @@ -10,18 +10,6 @@ 317 - - - 428 - 317 - - - - - 428 - 317 - - Point along bisector diff --git a/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.cpp b/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.cpp index 41fe7d6f3..22d8fa4c9 100644 --- a/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.cpp +++ b/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.cpp @@ -68,6 +68,8 @@ DialogCurveIntersectAxis::DialogCurveIntersectAxis(const VContainer *data, const connect(timerFormula, &QTimer::timeout, this, &DialogCurveIntersectAxis::EvalAngle); vis = new VisToolCurveIntersectAxis(data); + + FixateSize(); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.ui b/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.ui index 6ae91c45c..a2380191f 100644 --- a/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.ui +++ b/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.ui @@ -10,18 +10,6 @@ 284 - - - 419 - 284 - - - - - 419 - 284 - - Point intersect curve and axis diff --git a/src/libs/vtools/dialogs/tools/dialogcutarc.cpp b/src/libs/vtools/dialogs/tools/dialogcutarc.cpp index 371119754..e33381a5a 100644 --- a/src/libs/vtools/dialogs/tools/dialogcutarc.cpp +++ b/src/libs/vtools/dialogs/tools/dialogcutarc.cpp @@ -66,6 +66,8 @@ DialogCutArc::DialogCutArc(const VContainer *data, const quint32 &toolId, QWidge connect(ui->pushButtonGrowLength, &QPushButton::clicked, this, &DialogCutArc::DeployFormulaTextEdit); vis = new VisToolCutArc(data); + + FixateSize(); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/dialogs/tools/dialogcutarc.ui b/src/libs/vtools/dialogs/tools/dialogcutarc.ui index ca11fcace..1fa48a4d4 100644 --- a/src/libs/vtools/dialogs/tools/dialogcutarc.ui +++ b/src/libs/vtools/dialogs/tools/dialogcutarc.ui @@ -10,18 +10,6 @@ 218 - - - 412 - 218 - - - - - 412 - 218 - - Segment an arc diff --git a/src/libs/vtools/dialogs/tools/dialogcutspline.cpp b/src/libs/vtools/dialogs/tools/dialogcutspline.cpp index 3adf155de..2ecec7429 100644 --- a/src/libs/vtools/dialogs/tools/dialogcutspline.cpp +++ b/src/libs/vtools/dialogs/tools/dialogcutspline.cpp @@ -65,6 +65,8 @@ DialogCutSpline::DialogCutSpline(const VContainer *data, const quint32 &toolId, connect(ui->pushButtonGrowLength, &QPushButton::clicked, this, &DialogCutSpline::DeployFormulaTextEdit); vis = new VisToolCutSpline(data); + + FixateSize(); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/dialogs/tools/dialogcutspline.ui b/src/libs/vtools/dialogs/tools/dialogcutspline.ui index c79f33944..f66d62bd7 100644 --- a/src/libs/vtools/dialogs/tools/dialogcutspline.ui +++ b/src/libs/vtools/dialogs/tools/dialogcutspline.ui @@ -10,18 +10,6 @@ 218 - - - 412 - 218 - - - - - 412 - 218 - - Segmenting a simple curve diff --git a/src/libs/vtools/dialogs/tools/dialogcutsplinepath.cpp b/src/libs/vtools/dialogs/tools/dialogcutsplinepath.cpp index aae622330..ace8679a1 100644 --- a/src/libs/vtools/dialogs/tools/dialogcutsplinepath.cpp +++ b/src/libs/vtools/dialogs/tools/dialogcutsplinepath.cpp @@ -65,6 +65,8 @@ DialogCutSplinePath::DialogCutSplinePath(const VContainer *data, const quint32 & connect(ui->pushButtonGrowLength, &QPushButton::clicked, this, &DialogCutSplinePath::DeployFormulaTextEdit); vis = new VisToolCutSplinePath(data); + + FixateSize(); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/dialogs/tools/dialogcutsplinepath.ui b/src/libs/vtools/dialogs/tools/dialogcutsplinepath.ui index df377dbb6..6a0b5dcea 100644 --- a/src/libs/vtools/dialogs/tools/dialogcutsplinepath.ui +++ b/src/libs/vtools/dialogs/tools/dialogcutsplinepath.ui @@ -10,18 +10,6 @@ 218 - - - 412 - 218 - - - - - 412 - 218 - - Segment a curved path diff --git a/src/libs/vtools/dialogs/tools/dialogdetail.cpp b/src/libs/vtools/dialogs/tools/dialogdetail.cpp index b42229ee8..a2592508e 100644 --- a/src/libs/vtools/dialogs/tools/dialogdetail.cpp +++ b/src/libs/vtools/dialogs/tools/dialogdetail.cpp @@ -78,6 +78,8 @@ DialogDetail::DialogDetail(const VContainer *data, const quint32 &toolId, QWidge connect(ui.lineEditNameDetail, &QLineEdit::textChanged, this, &DialogDetail::NamePointChanged); connect(ui.toolButtonDelete, &QToolButton::clicked, this, &DialogDetail::DeleteItem); + + FixateSize(); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/dialogs/tools/dialogdetail.ui b/src/libs/vtools/dialogs/tools/dialogdetail.ui index 84986db68..873e7fdea 100644 --- a/src/libs/vtools/dialogs/tools/dialogdetail.ui +++ b/src/libs/vtools/dialogs/tools/dialogdetail.ui @@ -10,18 +10,6 @@ 342 - - - 565 - 342 - - - - - 565 - 342 - - Seam allowance tool diff --git a/src/libs/vtools/dialogs/tools/dialogendline.cpp b/src/libs/vtools/dialogs/tools/dialogendline.cpp index a193ed962..cd7970f59 100644 --- a/src/libs/vtools/dialogs/tools/dialogendline.cpp +++ b/src/libs/vtools/dialogs/tools/dialogendline.cpp @@ -80,6 +80,8 @@ DialogEndLine::DialogEndLine(const VContainer *data, const quint32 &toolId, QWid connect(timerFormula, &QTimer::timeout, this, &DialogEndLine::EvalAngle); vis = new VisToolEndLine(data); + + FixateSize(); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/dialogs/tools/dialogendline.ui b/src/libs/vtools/dialogs/tools/dialogendline.ui index b5987b88b..7ce5583e8 100644 --- a/src/libs/vtools/dialogs/tools/dialogendline.ui +++ b/src/libs/vtools/dialogs/tools/dialogendline.ui @@ -16,18 +16,6 @@ 0 - - - 358 - 323 - - - - - 358 - 323 - - Point at distance and angle diff --git a/src/libs/vtools/dialogs/tools/dialogheight.cpp b/src/libs/vtools/dialogs/tools/dialogheight.cpp index 54f3ef57a..45cc54d45 100644 --- a/src/libs/vtools/dialogs/tools/dialogheight.cpp +++ b/src/libs/vtools/dialogs/tools/dialogheight.cpp @@ -65,6 +65,8 @@ DialogHeight::DialogHeight(const VContainer *data, const quint32 &toolId, QWidge this, &DialogHeight::PointNameChanged); vis = new VisToolHeight(data); + + FixateSize(); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/dialogs/tools/dialogheight.ui b/src/libs/vtools/dialogs/tools/dialogheight.ui index aafacec1a..6174c5d9f 100644 --- a/src/libs/vtools/dialogs/tools/dialogheight.ui +++ b/src/libs/vtools/dialogs/tools/dialogheight.ui @@ -10,18 +10,6 @@ 245 - - - 300 - 245 - - - - - 300 - 245 - - Perpendicular point along line diff --git a/src/libs/vtools/dialogs/tools/dialogline.cpp b/src/libs/vtools/dialogs/tools/dialogline.cpp index 6f3839a5e..819da62dd 100644 --- a/src/libs/vtools/dialogs/tools/dialogline.cpp +++ b/src/libs/vtools/dialogs/tools/dialogline.cpp @@ -63,6 +63,8 @@ DialogLine::DialogLine(const VContainer *data, const quint32 &toolId, QWidget *p this, &DialogLine::PointNameChanged); vis = new VisToolLine(data); + + FixateSize(); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/dialogs/tools/dialogline.ui b/src/libs/vtools/dialogs/tools/dialogline.ui index 1c45f5ce1..9a1f341ac 100644 --- a/src/libs/vtools/dialogs/tools/dialogline.ui +++ b/src/libs/vtools/dialogs/tools/dialogline.ui @@ -13,18 +13,6 @@ 179 - - - 300 - 179 - - - - - 300 - 179 - - Line between points diff --git a/src/libs/vtools/dialogs/tools/dialoglineintersect.cpp b/src/libs/vtools/dialogs/tools/dialoglineintersect.cpp index da3a4e742..9314bb5a6 100644 --- a/src/libs/vtools/dialogs/tools/dialoglineintersect.cpp +++ b/src/libs/vtools/dialogs/tools/dialoglineintersect.cpp @@ -65,6 +65,8 @@ DialogLineIntersect::DialogLineIntersect(const VContainer *data, const quint32 & this, &DialogLineIntersect::PointNameChanged); vis = new VisToolLineIntersect(data); + + FixateSize(); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/dialogs/tools/dialoglineintersect.ui b/src/libs/vtools/dialogs/tools/dialoglineintersect.ui index 648c72d67..bea693385 100644 --- a/src/libs/vtools/dialogs/tools/dialoglineintersect.ui +++ b/src/libs/vtools/dialogs/tools/dialoglineintersect.ui @@ -10,18 +10,6 @@ 196 - - - 367 - 196 - - - - - 367 - 196 - - Point at line intersection diff --git a/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp b/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp index ebca04988..012512bbf 100644 --- a/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp +++ b/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp @@ -76,6 +76,8 @@ DialogLineIntersectAxis::DialogLineIntersectAxis(const VContainer *data, const q this, &DialogLineIntersectAxis::PointNameChanged); vis = new VisToolLineIntersectAxis(data); + + FixateSize(); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.ui b/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.ui index 4de96771e..5fef97e81 100644 --- a/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.ui +++ b/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.ui @@ -10,18 +10,6 @@ 317 - - - 457 - 317 - - - - - 457 - 317 - - Point intersect line and axis diff --git a/src/libs/vtools/dialogs/tools/dialognormal.cpp b/src/libs/vtools/dialogs/tools/dialognormal.cpp index 1480b5728..68f5686ac 100644 --- a/src/libs/vtools/dialogs/tools/dialognormal.cpp +++ b/src/libs/vtools/dialogs/tools/dialognormal.cpp @@ -71,6 +71,8 @@ DialogNormal::DialogNormal(const VContainer *data, const quint32 &toolId, QWidge this, &DialogNormal::PointNameChanged); vis = new VisToolNormal(data); + + FixateSize(); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/dialogs/tools/dialognormal.ui b/src/libs/vtools/dialogs/tools/dialognormal.ui index 6f65732ac..edfe5d44b 100644 --- a/src/libs/vtools/dialogs/tools/dialognormal.ui +++ b/src/libs/vtools/dialogs/tools/dialognormal.ui @@ -10,18 +10,6 @@ 428 - - - 517 - 428 - - - - - 517 - 428 - - Point along perpendicular diff --git a/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.cpp b/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.cpp index 86d047129..192b508c0 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.cpp @@ -54,6 +54,8 @@ DialogPointFromArcAndTangent::DialogPointFromArcAndTangent(const VContainer *dat connect(ui->lineEditNamePoint, &QLineEdit::textChanged, this, &DialogPointFromArcAndTangent::NamePointChanged); vis = new VisToolPointFromArcAndTangent(data); + + FixateSize(); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.ui b/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.ui index d6fe08701..6efc060e1 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.ui +++ b/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.ui @@ -10,18 +10,6 @@ 179 - - - 370 - 179 - - - - - 370 - 179 - - Dialog diff --git a/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.cpp b/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.cpp index fa9c61d9b..a6d49cd64 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.cpp @@ -77,6 +77,8 @@ DialogPointFromCircleAndTangent::DialogPointFromCircleAndTangent(const VContaine &DialogPointFromCircleAndTangent::DeployCircleRadiusTextEdit); vis = new VisToolPointFromCircleAndTangent(data); + + FixateSize(); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.ui b/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.ui index 09023d980..36b94b92e 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.ui +++ b/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.ui @@ -10,18 +10,6 @@ 251 - - - 430 - 251 - - - - - 430 - 251 - - Dialog diff --git a/src/libs/vtools/dialogs/tools/dialogpointofcontact.cpp b/src/libs/vtools/dialogs/tools/dialogpointofcontact.cpp index 56d9c9808..7d049fbcb 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofcontact.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpointofcontact.cpp @@ -71,6 +71,8 @@ DialogPointOfContact::DialogPointOfContact(const VContainer *data, const quint32 this, &DialogPointOfContact::PointNameChanged); vis = new VisToolPointOfContact(data); + + FixateSize(); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/dialogs/tools/dialogpointofcontact.ui b/src/libs/vtools/dialogs/tools/dialogpointofcontact.ui index 645527ba9..abac8d1c0 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofcontact.ui +++ b/src/libs/vtools/dialogs/tools/dialogpointofcontact.ui @@ -10,18 +10,6 @@ 251 - - - 498 - 251 - - - - - 498 - 251 - - Point at intersection of arc and line diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersection.cpp b/src/libs/vtools/dialogs/tools/dialogpointofintersection.cpp index ed249ae5b..cd1dbfabf 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersection.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersection.cpp @@ -61,6 +61,8 @@ DialogPointOfIntersection::DialogPointOfIntersection(const VContainer *data, con vis = new VisToolPointOfIntersection(data); vis->VisualMode(NULL_ID); + + FixateSize(); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersection.ui b/src/libs/vtools/dialogs/tools/dialogpointofintersection.ui index 504b4dfa8..544c2ffb3 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersection.ui +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersection.ui @@ -10,18 +10,6 @@ 146 - - - 300 - 146 - - - - - 300 - 146 - - Point from X and Y of two other points diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp b/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp index 640b04f4d..c7ac5b827 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp @@ -57,6 +57,8 @@ DialogPointOfIntersectionArcs::DialogPointOfIntersectionArcs(const VContainer *d this, &DialogPointOfIntersectionArcs::ArcChanged); vis = new VisToolPointOfIntersectionArcs(data); + + FixateSize(); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.ui b/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.ui index 47f1b1583..3446cd5cd 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.ui +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.ui @@ -10,18 +10,6 @@ 179 - - - 300 - 179 - - - - - 300 - 179 - - Dialog diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.cpp b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.cpp index df7e723f6..1d0186581 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.cpp @@ -93,6 +93,8 @@ DialogPointOfIntersectionCircles::DialogPointOfIntersectionCircles(const VContai &DialogPointOfIntersectionCircles::DeployCircle2RadiusTextEdit); vis = new VisToolPointOfIntersectionCircles(data); + + FixateSize(); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.ui b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.ui index a60f00351..8ab70655d 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.ui +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.ui @@ -10,18 +10,6 @@ 323 - - - 380 - 323 - - - - - 380 - 323 - - Dialog diff --git a/src/libs/vtools/dialogs/tools/dialogshoulderpoint.cpp b/src/libs/vtools/dialogs/tools/dialogshoulderpoint.cpp index e30f7c1e6..5ad18073d 100644 --- a/src/libs/vtools/dialogs/tools/dialogshoulderpoint.cpp +++ b/src/libs/vtools/dialogs/tools/dialogshoulderpoint.cpp @@ -76,6 +76,8 @@ DialogShoulderPoint::DialogShoulderPoint(const VContainer *data, const quint32 & this, &DialogShoulderPoint::PointNameChanged); vis = new VisToolShoulderPoint(data); + + FixateSize(); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/dialogs/tools/dialogshoulderpoint.ui b/src/libs/vtools/dialogs/tools/dialogshoulderpoint.ui index 27d24a8b5..60e90ccb5 100644 --- a/src/libs/vtools/dialogs/tools/dialogshoulderpoint.ui +++ b/src/libs/vtools/dialogs/tools/dialogshoulderpoint.ui @@ -10,18 +10,6 @@ 317 - - - 488 - 317 - - - - - 488 - 317 - - Special point on shoulder diff --git a/src/libs/vtools/dialogs/tools/dialogsinglepoint.cpp b/src/libs/vtools/dialogs/tools/dialogsinglepoint.cpp index d883bbb0d..9c8963033 100644 --- a/src/libs/vtools/dialogs/tools/dialogsinglepoint.cpp +++ b/src/libs/vtools/dialogs/tools/dialogsinglepoint.cpp @@ -48,6 +48,8 @@ DialogSinglePoint::DialogSinglePoint(const VContainer *data, const quint32 &tool CheckState(); connect(ui->lineEditName, &QLineEdit::textChanged, this, &DialogTool::NamePointChanged); + + FixateSize(); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/dialogs/tools/dialogsinglepoint.ui b/src/libs/vtools/dialogs/tools/dialogsinglepoint.ui index 183fb8011..fd251f7f5 100644 --- a/src/libs/vtools/dialogs/tools/dialogsinglepoint.ui +++ b/src/libs/vtools/dialogs/tools/dialogsinglepoint.ui @@ -13,18 +13,6 @@ 202 - - - 300 - 202 - - - - - 300 - 202 - - Single point diff --git a/src/libs/vtools/dialogs/tools/dialogspline.cpp b/src/libs/vtools/dialogs/tools/dialogspline.cpp index 9736f5d10..f65f13f2b 100644 --- a/src/libs/vtools/dialogs/tools/dialogspline.cpp +++ b/src/libs/vtools/dialogs/tools/dialogspline.cpp @@ -57,6 +57,8 @@ DialogSpline::DialogSpline(const VContainer *data, const quint32 &toolId, QWidge this, &DialogSpline::PointNameChanged); vis = new VisToolSpline(data); + + FixateSize(); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/dialogs/tools/dialogspline.ui b/src/libs/vtools/dialogs/tools/dialogspline.ui index 2642fd93b..24986817b 100644 --- a/src/libs/vtools/dialogs/tools/dialogspline.ui +++ b/src/libs/vtools/dialogs/tools/dialogspline.ui @@ -10,18 +10,6 @@ 233 - - - 540 - 233 - - - - - 540 - 233 - - Simple curve diff --git a/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp b/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp index 2b3a1243e..36f9c8137 100644 --- a/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp +++ b/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp @@ -61,6 +61,8 @@ DialogSplinePath::DialogSplinePath(const VContainer *data, const quint32 &toolId this, &DialogSplinePath::KAsm2Changed); vis = new VisToolSplinePath(data); + + FixateSize(); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/dialogs/tools/dialogsplinepath.ui b/src/libs/vtools/dialogs/tools/dialogsplinepath.ui index 1c2e0475d..a61dc5d91 100644 --- a/src/libs/vtools/dialogs/tools/dialogsplinepath.ui +++ b/src/libs/vtools/dialogs/tools/dialogsplinepath.ui @@ -10,18 +10,6 @@ 322 - - - 528 - 322 - - - - - 528 - 322 - - Curved path diff --git a/src/libs/vtools/dialogs/tools/dialogtool.cpp b/src/libs/vtools/dialogs/tools/dialogtool.cpp index 3b9191fec..786c1b0ee 100644 --- a/src/libs/vtools/dialogs/tools/dialogtool.cpp +++ b/src/libs/vtools/dialogs/tools/dialogtool.cpp @@ -271,6 +271,14 @@ bool DialogTool::eventFilter(QObject *object, QEvent *event) return false; } +//--------------------------------------------------------------------------------------------------------------------- +void DialogTool::FixateSize() +{ + adjustSize(); + setMaximumSize(size()); + setMinimumSize(size()); +} + //--------------------------------------------------------------------------------------------------------------------- /** * @brief ValFormulaChanged handle change formula diff --git a/src/libs/vtools/dialogs/tools/dialogtool.h b/src/libs/vtools/dialogs/tools/dialogtool.h index ff8edf75c..1688f6163 100644 --- a/src/libs/vtools/dialogs/tools/dialogtool.h +++ b/src/libs/vtools/dialogs/tools/dialogtool.h @@ -315,6 +315,7 @@ protected: virtual void SaveData(){} void MoveCursorToEnd(QPlainTextEdit *plainTextEdit); bool eventFilter(QObject *object, QEvent *event); + void FixateSize(); private: void FillList(QComboBox *box, const QMap &list)const; diff --git a/src/libs/vtools/dialogs/tools/dialogtriangle.cpp b/src/libs/vtools/dialogs/tools/dialogtriangle.cpp index 74a8bc681..52e0a8e2b 100644 --- a/src/libs/vtools/dialogs/tools/dialogtriangle.cpp +++ b/src/libs/vtools/dialogs/tools/dialogtriangle.cpp @@ -65,6 +65,8 @@ DialogTriangle::DialogTriangle(const VContainer *data, const quint32 &toolId, QW this, &DialogTriangle::PointNameChanged); vis = new VisToolTriangle(data); + + FixateSize(); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/dialogs/tools/dialogtriangle.ui b/src/libs/vtools/dialogs/tools/dialogtriangle.ui index 04eaf7a29..a8a342923 100644 --- a/src/libs/vtools/dialogs/tools/dialogtriangle.ui +++ b/src/libs/vtools/dialogs/tools/dialogtriangle.ui @@ -10,18 +10,6 @@ 212 - - - 300 - 212 - - - - - 300 - 212 - - Triangle tool diff --git a/src/libs/vtools/dialogs/tools/dialogtruedarts.cpp b/src/libs/vtools/dialogs/tools/dialogtruedarts.cpp index beeb7bc3f..bb522f7b4 100644 --- a/src/libs/vtools/dialogs/tools/dialogtruedarts.cpp +++ b/src/libs/vtools/dialogs/tools/dialogtruedarts.cpp @@ -69,6 +69,8 @@ DialogTrueDarts::DialogTrueDarts(const VContainer *data, const quint32 &toolId, this, &DialogTrueDarts::PointNameChanged); vis = new VisToolTrueDarts(data); + + FixateSize(); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/dialogs/tools/dialoguniondetails.cpp b/src/libs/vtools/dialogs/tools/dialoguniondetails.cpp index 35a33cbad..494125f8f 100644 --- a/src/libs/vtools/dialogs/tools/dialoguniondetails.cpp +++ b/src/libs/vtools/dialogs/tools/dialoguniondetails.cpp @@ -43,6 +43,8 @@ DialogUnionDetails::DialogUnionDetails(const VContainer *data, const quint32 &to { ui->setupUi(this); InitOkCancel(ui); + + FixateSize(); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/dialogs/tools/dialoguniondetails.ui b/src/libs/vtools/dialogs/tools/dialoguniondetails.ui index ebdbb9039..176caddb8 100644 --- a/src/libs/vtools/dialogs/tools/dialoguniondetails.ui +++ b/src/libs/vtools/dialogs/tools/dialoguniondetails.ui @@ -13,18 +13,6 @@ 78 - - - 300 - 78 - - - - - 300 - 78 - - Union tool