aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Additional changes for the issue #303.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2015-06-25 10:05:19 +03:00
parent da4d47c7ac
commit edc8664f3f
74 changed files with 98 additions and 427 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/dialogs/dialogaboutapp.cpp
View File

@ -65,6 +65,10 @@ DialogAboutApp::DialogAboutApp(QWidget *parent) :
FontPointSize(ui->label_contrib_label, 11); FontPointSize(ui->label_contrib_label, 11);
FontPointSize(ui->label_Valentina_Built, 11); FontPointSize(ui->label_Valentina_Built, 11);
FontPointSize(ui->label_QT_Version, 11); FontPointSize(ui->label_QT_Version, 11);
adjustSize();
setMaximumSize(size());
setMinimumSize(size());
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------

12
src/app/dialogs/dialogaboutapp.ui
View File

@ -19,18 +19,6 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize">
<size>
<width>583</width>
<height>524</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>583</width>
<height>524</height>
</size>
</property>
<property name="cursor"> <property name="cursor">
<cursorShape>ArrowCursor</cursorShape> <cursorShape>ArrowCursor</cursorShape>
</property> </property>

4
src/app/dialogs/dialogindividualmeasurements.cpp
View File

@ -73,6 +73,10 @@ DialogIndividualMeasurements::DialogIndividualMeasurements(VContainer *data, con
&DialogIndividualMeasurements::CheckState); &DialogIndividualMeasurements::CheckState);
connect(ui->toolButtonOpenExist, &QToolButton::clicked, this, &DialogIndividualMeasurements::OpenTable); connect(ui->toolButtonOpenExist, &QToolButton::clicked, this, &DialogIndividualMeasurements::OpenTable);
connect(ui->toolButtonOpenNew, &QToolButton::clicked, this, &DialogIndividualMeasurements::NewTable); connect(ui->toolButtonOpenNew, &QToolButton::clicked, this, &DialogIndividualMeasurements::NewTable);
adjustSize();
setMaximumSize(size());
setMinimumSize(size());
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------

12
src/app/dialogs/dialogindividualmeasurements.ui
View File

@ -13,18 +13,6 @@
<height>295</height> <height>295</height>
</rect> </rect>
</property> </property>
<property name="minimumSize">
<size>
<width>505</width>
<height>295</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>505</width>
<height>295</height>
</size>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Individual measurements</string> <string>Individual measurements</string>
</property> </property>

4
src/app/dialogs/dialoglayoutprogress.cpp
View File

@ -58,6 +58,10 @@ DialogLayoutProgress::DialogLayoutProgress(int count, QWidget *parent)
setModal(true); setModal(true);
this->setWindowFlags(Qt::Dialog | Qt::WindowTitleHint | Qt::CustomizeWindowHint); this->setWindowFlags(Qt::Dialog | Qt::WindowTitleHint | Qt::CustomizeWindowHint);
adjustSize();
setMaximumSize(size());
setMinimumSize(size());
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------

12
src/app/dialogs/dialoglayoutprogress.ui
View File

@ -13,18 +13,6 @@
<height>119</height> <height>119</height>
</rect> </rect>
</property> </property>
<property name="minimumSize">
<size>
<width>566</width>
<height>119</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>566</width>
<height>119</height>
</size>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Create a Layout</string> <string>Create a Layout</string>
</property> </property>

4
src/app/dialogs/dialoglayoutsettings.cpp
View File

@ -74,6 +74,10 @@ DialogLayoutSettings::DialogLayoutSettings(VLayoutGenerator *generator, QWidget
QPushButton *bRestoreDefaults = ui->buttonBox->button(QDialogButtonBox::RestoreDefaults); QPushButton *bRestoreDefaults = ui->buttonBox->button(QDialogButtonBox::RestoreDefaults);
connect(bRestoreDefaults, &QPushButton::clicked, this, &DialogLayoutSettings::RestoreDefaults); connect(bRestoreDefaults, &QPushButton::clicked, this, &DialogLayoutSettings::RestoreDefaults);
adjustSize();
setMaximumSize(size());
setMinimumSize(size());
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------

14
src/app/dialogs/dialoglayoutsettings.ui
View File

@ -10,18 +10,6 @@
<height>345</height> <height>345</height>
</rect> </rect>
</property> </property>
<property name="minimumSize">
<size>
<width>661</width>
<height>345</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>661</width>
<height>345</height>
</size>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Create a layout</string> <string>Create a layout</string>
</property> </property>
@ -558,7 +546,7 @@
</connection> </connection>
</connections> </connections>
<buttongroups> <buttongroups>
<buttongroup name="buttonGroup"/>
<buttongroup name="buttonGroupPrinciple"/> <buttongroup name="buttonGroupPrinciple"/>
<buttongroup name="buttonGroup"/>
</buttongroups> </buttongroups>
</ui> </ui>

4
src/app/dialogs/dialogmeasurements.cpp
View File

@ -40,6 +40,10 @@ DialogMeasurements::DialogMeasurements(QWidget *parent) :
connect(ui->toolButtonStandard, &QToolButton::clicked, this, &DialogMeasurements::StandardMeasurements); connect(ui->toolButtonStandard, &QToolButton::clicked, this, &DialogMeasurements::StandardMeasurements);
connect(ui->toolButtonIndividual, &QToolButton::clicked, this, &DialogMeasurements::IndividualMeasurements); connect(ui->toolButtonIndividual, &QToolButton::clicked, this, &DialogMeasurements::IndividualMeasurements);
adjustSize();
setMaximumSize(size());
setMinimumSize(size());
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------

12
src/app/dialogs/dialogmeasurements.ui
View File

@ -13,18 +13,6 @@
<height>244</height> <height>244</height>
</rect> </rect>
</property> </property>
<property name="minimumSize">
<size>
<width>448</width>
<height>244</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>448</width>
<height>244</height>
</size>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Measurements</string> <string>Measurements</string>
</property> </property>

4
src/app/dialogs/dialogpatternproperties.cpp
View File

@ -80,6 +80,10 @@ DialogPatternProperties::DialogPatternProperties(VPattern *doc, QWidget *parent)
SetOptions(sizes); SetOptions(sizes);
gradationChanged = false;//Set to default value after initialization gradationChanged = false;//Set to default value after initialization
adjustSize();
setMaximumSize(size());
setMinimumSize(size());
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------

12
src/app/dialogs/dialogpatternproperties.ui
View File

@ -10,18 +10,6 @@
<height>562</height> <height>562</height>
</rect> </rect>
</property> </property>
<property name="minimumSize">
<size>
<width>657</width>
<height>562</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>657</width>
<height>562</height>
</size>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Pattern properties</string> <string>Pattern properties</string>
</property> </property>

4
src/app/dialogs/dialogsavelayout.cpp
View File

@ -69,6 +69,10 @@ DialogSaveLayout::DialogSaveLayout(const QMap<QString, QString> &formates, int c
ui->lineEditPath->setText(qApp->Settings()->GetPathLayout()); ui->lineEditPath->setText(qApp->Settings()->GetPathLayout());
ShowExample();//Show example for current format. ShowExample();//Show example for current format.
adjustSize();
setMaximumSize(size());
setMinimumSize(size());
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------

12
src/app/dialogs/dialogsavelayout.ui
View File

@ -10,18 +10,6 @@
<height>179</height> <height>179</height>
</rect> </rect>
</property> </property>
<property name="minimumSize">
<size>
<width>692</width>
<height>179</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>692</width>
<height>179</height>
</size>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Save Layout</string> <string>Save Layout</string>
</property> </property>

4
src/app/dialogs/dialogstandardmeasurements.cpp
View File

@ -71,6 +71,10 @@ DialogStandardMeasurements::DialogStandardMeasurements(VContainer *data, const Q
CheckState(); CheckState();
connect(ui->lineEditName, &QLineEdit::textChanged, this, &DialogStandardMeasurements::CheckState); connect(ui->lineEditName, &QLineEdit::textChanged, this, &DialogStandardMeasurements::CheckState);
adjustSize();
setMaximumSize(size());
setMinimumSize(size());
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------

6
src/app/dialogs/dialogstandardmeasurements.ui
View File

@ -13,12 +13,6 @@
<height>113</height> <height>113</height>
</rect> </rect>
</property> </property>
<property name="maximumSize">
<size>
<width>430</width>
<height>113</height>
</size>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Standard table</string> <string>Standard table</string>
</property> </property>

12
src/libs/vtools/dialogs/support/dialogeditwrongformula.ui
View File

@ -13,18 +13,6 @@
<height>449</height> <height>449</height>
</rect> </rect>
</property> </property>
<property name="minimumSize">
<size>
<width>390</width>
<height>449</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>390</width>
<height>449</height>
</size>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Edit formula</string> <string>Edit formula</string>
</property> </property>

12
src/libs/vtools/dialogs/support/dialogundo.ui
View File

@ -13,18 +13,6 @@
<height>145</height> <height>145</height>
</rect> </rect>
</property> </property>
<property name="minimumSize">
<size>
<width>387</width>
<height>145</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>387</width>
<height>145</height>
</size>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Broken formula</string> <string>Broken formula</string>
</property> </property>

2
src/libs/vtools/dialogs/tools/dialogalongline.cpp
View File

@ -73,6 +73,8 @@ DialogAlongLine::DialogAlongLine(const VContainer *data, const quint32 &toolId,
this, &DialogAlongLine::PointChanged); this, &DialogAlongLine::PointChanged);
vis = new VisToolAlongLine(data); vis = new VisToolAlongLine(data);
FixateSize();
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------

12
src/libs/vtools/dialogs/tools/dialogalongline.ui
View File

@ -10,18 +10,6 @@
<height>284</height> <height>284</height>
</rect> </rect>
</property> </property>
<property name="minimumSize">
<size>
<width>412</width>
<height>284</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>412</width>
<height>284</height>
</size>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Point at distance along line</string> <string>Point at distance along line</string>
</property> </property>

2
src/libs/vtools/dialogs/tools/dialogarc.cpp
View File

@ -90,6 +90,8 @@ DialogArc::DialogArc(const VContainer *data, const quint32 &toolId, QWidget *par
connect(ui->pushButtonGrowLengthF2, &QPushButton::clicked, this, &DialogArc::DeployF2TextEdit); connect(ui->pushButtonGrowLengthF2, &QPushButton::clicked, this, &DialogArc::DeployF2TextEdit);
vis = new VisToolArc(data); vis = new VisToolArc(data);
FixateSize();
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------

12
src/libs/vtools/dialogs/tools/dialogarc.ui
View File

@ -10,18 +10,6 @@
<height>329</height> <height>329</height>
</rect> </rect>
</property> </property>
<property name="minimumSize">
<size>
<width>425</width>
<height>329</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>425</width>
<height>329</height>
</size>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Arc</string> <string>Arc</string>
</property> </property>

2
src/libs/vtools/dialogs/tools/dialogarcwithlength.cpp
View File

@ -85,6 +85,8 @@ DialogArcWithLength::DialogArcWithLength(const VContainer *data, const quint32 &
connect(ui->pushButtonGrowLengthArcLength, &QPushButton::clicked, this, &DialogArcWithLength::DeployLengthTextEdit); connect(ui->pushButtonGrowLengthArcLength, &QPushButton::clicked, this, &DialogArcWithLength::DeployLengthTextEdit);
vis = new VisToolArcWithLength(data); vis = new VisToolArcWithLength(data);
FixateSize();
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------

2
src/libs/vtools/dialogs/tools/dialogbisector.cpp
View File

@ -75,6 +75,8 @@ DialogBisector::DialogBisector(const VContainer *data, const quint32 &toolId, QW
this, &DialogBisector::PointNameChanged); this, &DialogBisector::PointNameChanged);
vis = new VisToolBisector(data); vis = new VisToolBisector(data);
FixateSize();
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------

12
src/libs/vtools/dialogs/tools/dialogbisector.ui
View File

@ -10,18 +10,6 @@
<height>317</height> <height>317</height>
</rect> </rect>
</property> </property>
<property name="minimumSize">
<size>
<width>428</width>
<height>317</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>428</width>
<height>317</height>
</size>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Point along bisector</string> <string>Point along bisector</string>
</property> </property>

2
src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.cpp
View File

@ -68,6 +68,8 @@ DialogCurveIntersectAxis::DialogCurveIntersectAxis(const VContainer *data, const
connect(timerFormula, &QTimer::timeout, this, &DialogCurveIntersectAxis::EvalAngle); connect(timerFormula, &QTimer::timeout, this, &DialogCurveIntersectAxis::EvalAngle);
vis = new VisToolCurveIntersectAxis(data); vis = new VisToolCurveIntersectAxis(data);
FixateSize();
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------

12
src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.ui
View File

@ -10,18 +10,6 @@
<height>284</height> <height>284</height>
</rect> </rect>
</property> </property>
<property name="minimumSize">
<size>
<width>419</width>
<height>284</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>419</width>
<height>284</height>
</size>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Point intersect curve and axis</string> <string>Point intersect curve and axis</string>
</property> </property>

2
src/libs/vtools/dialogs/tools/dialogcutarc.cpp
View File

@ -66,6 +66,8 @@ DialogCutArc::DialogCutArc(const VContainer *data, const quint32 &toolId, QWidge
connect(ui->pushButtonGrowLength, &QPushButton::clicked, this, &DialogCutArc::DeployFormulaTextEdit); connect(ui->pushButtonGrowLength, &QPushButton::clicked, this, &DialogCutArc::DeployFormulaTextEdit);
vis = new VisToolCutArc(data); vis = new VisToolCutArc(data);
FixateSize();
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------

12
src/libs/vtools/dialogs/tools/dialogcutarc.ui
View File

@ -10,18 +10,6 @@
<height>218</height> <height>218</height>
</rect> </rect>
</property> </property>
<property name="minimumSize">
<size>
<width>412</width>
<height>218</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>412</width>
<height>218</height>
</size>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Segment an arc</string> <string>Segment an arc</string>
</property> </property>

2
src/libs/vtools/dialogs/tools/dialogcutspline.cpp
View File

@ -65,6 +65,8 @@ DialogCutSpline::DialogCutSpline(const VContainer *data, const quint32 &toolId,
connect(ui->pushButtonGrowLength, &QPushButton::clicked, this, &DialogCutSpline::DeployFormulaTextEdit); connect(ui->pushButtonGrowLength, &QPushButton::clicked, this, &DialogCutSpline::DeployFormulaTextEdit);
vis = new VisToolCutSpline(data); vis = new VisToolCutSpline(data);
FixateSize();
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------

12
src/libs/vtools/dialogs/tools/dialogcutspline.ui
View File

@ -10,18 +10,6 @@
<height>218</height> <height>218</height>
</rect> </rect>
</property> </property>
<property name="minimumSize">
<size>
<width>412</width>
<height>218</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>412</width>
<height>218</height>
</size>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Segmenting a simple curve</string> <string>Segmenting a simple curve</string>
</property> </property>

2
src/libs/vtools/dialogs/tools/dialogcutsplinepath.cpp
View File

@ -65,6 +65,8 @@ DialogCutSplinePath::DialogCutSplinePath(const VContainer *data, const quint32 &
connect(ui->pushButtonGrowLength, &QPushButton::clicked, this, &DialogCutSplinePath::DeployFormulaTextEdit); connect(ui->pushButtonGrowLength, &QPushButton::clicked, this, &DialogCutSplinePath::DeployFormulaTextEdit);
vis = new VisToolCutSplinePath(data); vis = new VisToolCutSplinePath(data);
FixateSize();
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------

12
src/libs/vtools/dialogs/tools/dialogcutsplinepath.ui
View File

@ -10,18 +10,6 @@
<height>218</height> <height>218</height>
</rect> </rect>
</property> </property>
<property name="minimumSize">
<size>
<width>412</width>
<height>218</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>412</width>
<height>218</height>
</size>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Segment a curved path</string> <string>Segment a curved path</string>
</property> </property>

2
src/libs/vtools/dialogs/tools/dialogdetail.cpp
View File

@ -78,6 +78,8 @@ DialogDetail::DialogDetail(const VContainer *data, const quint32 &toolId, QWidge
connect(ui.lineEditNameDetail, &QLineEdit::textChanged, this, &DialogDetail::NamePointChanged); connect(ui.lineEditNameDetail, &QLineEdit::textChanged, this, &DialogDetail::NamePointChanged);
connect(ui.toolButtonDelete, &QToolButton::clicked, this, &DialogDetail::DeleteItem); connect(ui.toolButtonDelete, &QToolButton::clicked, this, &DialogDetail::DeleteItem);
FixateSize();
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------

12
src/libs/vtools/dialogs/tools/dialogdetail.ui
View File

@ -10,18 +10,6 @@
<height>342</height> <height>342</height>
</rect> </rect>
</property> </property>
<property name="minimumSize">
<size>
<width>565</width>
<height>342</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>565</width>
<height>342</height>
</size>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Seam allowance tool</string> <string>Seam allowance tool</string>
</property> </property>

2
src/libs/vtools/dialogs/tools/dialogendline.cpp
View File

@ -80,6 +80,8 @@ DialogEndLine::DialogEndLine(const VContainer *data, const quint32 &toolId, QWid
connect(timerFormula, &QTimer::timeout, this, &DialogEndLine::EvalAngle); connect(timerFormula, &QTimer::timeout, this, &DialogEndLine::EvalAngle);
vis = new VisToolEndLine(data); vis = new VisToolEndLine(data);
FixateSize();
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------

12
src/libs/vtools/dialogs/tools/dialogendline.ui
View File

@ -16,18 +16,6 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize">
<size>
<width>358</width>
<height>323</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>358</width>
<height>323</height>
</size>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Point at distance and angle</string> <string>Point at distance and angle</string>
</property> </property>

2
src/libs/vtools/dialogs/tools/dialogheight.cpp
View File

@ -65,6 +65,8 @@ DialogHeight::DialogHeight(const VContainer *data, const quint32 &toolId, QWidge
this, &DialogHeight::PointNameChanged); this, &DialogHeight::PointNameChanged);
vis = new VisToolHeight(data); vis = new VisToolHeight(data);
FixateSize();
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------

12
src/libs/vtools/dialogs/tools/dialogheight.ui
View File

@ -10,18 +10,6 @@
<height>245</height> <height>245</height>
</rect> </rect>
</property> </property>
<property name="minimumSize">
<size>
<width>300</width>
<height>245</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>300</width>
<height>245</height>
</size>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Perpendicular point along line</string> <string>Perpendicular point along line</string>
</property> </property>

2
src/libs/vtools/dialogs/tools/dialogline.cpp
View File

@ -63,6 +63,8 @@ DialogLine::DialogLine(const VContainer *data, const quint32 &toolId, QWidget *p
this, &DialogLine::PointNameChanged); this, &DialogLine::PointNameChanged);
vis = new VisToolLine(data); vis = new VisToolLine(data);
FixateSize();
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------

12
src/libs/vtools/dialogs/tools/dialogline.ui
View File

@ -13,18 +13,6 @@
<height>179</height> <height>179</height>
</rect> </rect>
</property> </property>
<property name="minimumSize">
<size>
<width>300</width>
<height>179</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>300</width>
<height>179</height>
</size>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Line between points</string> <string>Line between points</string>
</property> </property>

2
src/libs/vtools/dialogs/tools/dialoglineintersect.cpp
View File

@ -65,6 +65,8 @@ DialogLineIntersect::DialogLineIntersect(const VContainer *data, const quint32 &
this, &DialogLineIntersect::PointNameChanged); this, &DialogLineIntersect::PointNameChanged);
vis = new VisToolLineIntersect(data); vis = new VisToolLineIntersect(data);
FixateSize();
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------

12
src/libs/vtools/dialogs/tools/dialoglineintersect.ui
View File

@ -10,18 +10,6 @@
<height>196</height> <height>196</height>
</rect> </rect>
</property> </property>
<property name="minimumSize">
<size>
<width>367</width>
<height>196</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>367</width>
<height>196</height>
</size>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Point at line intersection</string> <string>Point at line intersection</string>
</property> </property>

2
src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp
View File

@ -76,6 +76,8 @@ DialogLineIntersectAxis::DialogLineIntersectAxis(const VContainer *data, const q
this, &DialogLineIntersectAxis::PointNameChanged); this, &DialogLineIntersectAxis::PointNameChanged);
vis = new VisToolLineIntersectAxis(data); vis = new VisToolLineIntersectAxis(data);
FixateSize();
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------

12
src/libs/vtools/dialogs/tools/dialoglineintersectaxis.ui
View File

@ -10,18 +10,6 @@
<height>317</height> <height>317</height>
</rect> </rect>
</property> </property>
<property name="minimumSize">
<size>
<width>457</width>
<height>317</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>457</width>
<height>317</height>
</size>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Point intersect line and axis</string> <string>Point intersect line and axis</string>
</property> </property>

2
src/libs/vtools/dialogs/tools/dialognormal.cpp
View File

@ -71,6 +71,8 @@ DialogNormal::DialogNormal(const VContainer *data, const quint32 &toolId, QWidge
this, &DialogNormal::PointNameChanged); this, &DialogNormal::PointNameChanged);
vis = new VisToolNormal(data); vis = new VisToolNormal(data);
FixateSize();
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------

12
src/libs/vtools/dialogs/tools/dialognormal.ui
View File

@ -10,18 +10,6 @@
<height>428</height> <height>428</height>
</rect> </rect>
</property> </property>
<property name="minimumSize">
<size>
<width>517</width>
<height>428</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>517</width>
<height>428</height>
</size>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Point along perpendicular</string> <string>Point along perpendicular</string>
</property> </property>

2
src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.cpp
View File

@ -54,6 +54,8 @@ DialogPointFromArcAndTangent::DialogPointFromArcAndTangent(const VContainer *dat
connect(ui->lineEditNamePoint, &QLineEdit::textChanged, this, &DialogPointFromArcAndTangent::NamePointChanged); connect(ui->lineEditNamePoint, &QLineEdit::textChanged, this, &DialogPointFromArcAndTangent::NamePointChanged);
vis = new VisToolPointFromArcAndTangent(data); vis = new VisToolPointFromArcAndTangent(data);
FixateSize();
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------

12
src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.ui
View File

@ -10,18 +10,6 @@
<height>179</height> <height>179</height>
</rect> </rect>
</property> </property>
<property name="minimumSize">
<size>
<width>370</width>
<height>179</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>370</width>
<height>179</height>
</size>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Dialog</string> <string>Dialog</string>
</property> </property>

2
src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.cpp
View File

@ -77,6 +77,8 @@ DialogPointFromCircleAndTangent::DialogPointFromCircleAndTangent(const VContaine
&DialogPointFromCircleAndTangent::DeployCircleRadiusTextEdit); &DialogPointFromCircleAndTangent::DeployCircleRadiusTextEdit);
vis = new VisToolPointFromCircleAndTangent(data); vis = new VisToolPointFromCircleAndTangent(data);
FixateSize();
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------

12
src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.ui
View File

@ -10,18 +10,6 @@
<height>251</height> <height>251</height>
</rect> </rect>
</property> </property>
<property name="minimumSize">
<size>
<width>430</width>
<height>251</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>430</width>
<height>251</height>
</size>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Dialog</string> <string>Dialog</string>
</property> </property>

2
src/libs/vtools/dialogs/tools/dialogpointofcontact.cpp
View File

@ -71,6 +71,8 @@ DialogPointOfContact::DialogPointOfContact(const VContainer *data, const quint32
this, &DialogPointOfContact::PointNameChanged); this, &DialogPointOfContact::PointNameChanged);
vis = new VisToolPointOfContact(data); vis = new VisToolPointOfContact(data);
FixateSize();
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------

12
src/libs/vtools/dialogs/tools/dialogpointofcontact.ui
View File

@ -10,18 +10,6 @@
<height>251</height> <height>251</height>
</rect> </rect>
</property> </property>
<property name="minimumSize">
<size>
<width>498</width>
<height>251</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>498</width>
<height>251</height>
</size>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Point at intersection of arc and line</string> <string>Point at intersection of arc and line</string>
</property> </property>

2
src/libs/vtools/dialogs/tools/dialogpointofintersection.cpp
View File

@ -61,6 +61,8 @@ DialogPointOfIntersection::DialogPointOfIntersection(const VContainer *data, con
vis = new VisToolPointOfIntersection(data); vis = new VisToolPointOfIntersection(data);
vis->VisualMode(NULL_ID); vis->VisualMode(NULL_ID);
FixateSize();
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------

12
src/libs/vtools/dialogs/tools/dialogpointofintersection.ui
View File

@ -10,18 +10,6 @@
<height>146</height> <height>146</height>
</rect> </rect>
</property> </property>
<property name="minimumSize">
<size>
<width>300</width>
<height>146</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>300</width>
<height>146</height>
</size>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Point from X and Y of two other points</string> <string>Point from X and Y of two other points</string>
</property> </property>

2
src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp
View File

@ -57,6 +57,8 @@ DialogPointOfIntersectionArcs::DialogPointOfIntersectionArcs(const VContainer *d
this, &DialogPointOfIntersectionArcs::ArcChanged); this, &DialogPointOfIntersectionArcs::ArcChanged);
vis = new VisToolPointOfIntersectionArcs(data); vis = new VisToolPointOfIntersectionArcs(data);
FixateSize();
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------

12
src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.ui
View File

@ -10,18 +10,6 @@
<height>179</height> <height>179</height>
</rect> </rect>
</property> </property>
<property name="minimumSize">
<size>
<width>300</width>
<height>179</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>300</width>
<height>179</height>
</size>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Dialog</string> <string>Dialog</string>
</property> </property>

2
src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.cpp
View File

@ -93,6 +93,8 @@ DialogPointOfIntersectionCircles::DialogPointOfIntersectionCircles(const VContai
&DialogPointOfIntersectionCircles::DeployCircle2RadiusTextEdit); &DialogPointOfIntersectionCircles::DeployCircle2RadiusTextEdit);
vis = new VisToolPointOfIntersectionCircles(data); vis = new VisToolPointOfIntersectionCircles(data);
FixateSize();
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------

12
src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.ui
View File

@ -10,18 +10,6 @@
<height>323</height> <height>323</height>
</rect> </rect>
</property> </property>
<property name="minimumSize">
<size>
<width>380</width>
<height>323</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>380</width>
<height>323</height>
</size>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Dialog</string> <string>Dialog</string>
</property> </property>

2
src/libs/vtools/dialogs/tools/dialogshoulderpoint.cpp
View File

@ -76,6 +76,8 @@ DialogShoulderPoint::DialogShoulderPoint(const VContainer *data, const quint32 &
this, &DialogShoulderPoint::PointNameChanged); this, &DialogShoulderPoint::PointNameChanged);
vis = new VisToolShoulderPoint(data); vis = new VisToolShoulderPoint(data);
FixateSize();
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------

12
src/libs/vtools/dialogs/tools/dialogshoulderpoint.ui
View File

@ -10,18 +10,6 @@
<height>317</height> <height>317</height>
</rect> </rect>
</property> </property>
<property name="minimumSize">
<size>
<width>488</width>
<height>317</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>488</width>
<height>317</height>
</size>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Special point on shoulder</string> <string>Special point on shoulder</string>
</property> </property>

2
src/libs/vtools/dialogs/tools/dialogsinglepoint.cpp
View File

@ -48,6 +48,8 @@ DialogSinglePoint::DialogSinglePoint(const VContainer *data, const quint32 &tool
CheckState(); CheckState();
connect(ui->lineEditName, &QLineEdit::textChanged, this, &DialogTool::NamePointChanged); connect(ui->lineEditName, &QLineEdit::textChanged, this, &DialogTool::NamePointChanged);
FixateSize();
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------

12
src/libs/vtools/dialogs/tools/dialogsinglepoint.ui
View File

@ -13,18 +13,6 @@
<height>202</height> <height>202</height>
</rect> </rect>
</property> </property>
<property name="minimumSize">
<size>
<width>300</width>
<height>202</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>300</width>
<height>202</height>
</size>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Single point</string> <string>Single point</string>
</property> </property>

2
src/libs/vtools/dialogs/tools/dialogspline.cpp
View File

@ -57,6 +57,8 @@ DialogSpline::DialogSpline(const VContainer *data, const quint32 &toolId, QWidge
this, &DialogSpline::PointNameChanged); this, &DialogSpline::PointNameChanged);
vis = new VisToolSpline(data); vis = new VisToolSpline(data);
FixateSize();
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------

12
src/libs/vtools/dialogs/tools/dialogspline.ui
View File

@ -10,18 +10,6 @@
<height>233</height> <height>233</height>
</rect> </rect>
</property> </property>
<property name="minimumSize">
<size>
<width>540</width>
<height>233</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>540</width>
<height>233</height>
</size>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Simple curve</string> <string>Simple curve</string>
</property> </property>

2
src/libs/vtools/dialogs/tools/dialogsplinepath.cpp
View File

@ -61,6 +61,8 @@ DialogSplinePath::DialogSplinePath(const VContainer *data, const quint32 &toolId
this, &DialogSplinePath::KAsm2Changed); this, &DialogSplinePath::KAsm2Changed);
vis = new VisToolSplinePath(data); vis = new VisToolSplinePath(data);
FixateSize();
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------

12
src/libs/vtools/dialogs/tools/dialogsplinepath.ui
View File

@ -10,18 +10,6 @@
<height>322</height> <height>322</height>
</rect> </rect>
</property> </property>
<property name="minimumSize">
<size>
<width>528</width>
<height>322</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>528</width>
<height>322</height>
</size>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Curved path</string> <string>Curved path</string>
</property> </property>

8
src/libs/vtools/dialogs/tools/dialogtool.cpp
View File

@ -271,6 +271,14 @@ bool DialogTool::eventFilter(QObject *object, QEvent *event)
return false; return false;
} }
//---------------------------------------------------------------------------------------------------------------------
void DialogTool::FixateSize()
{
adjustSize();
setMaximumSize(size());
setMinimumSize(size());
}
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
/** /**
* @brief ValFormulaChanged handle change formula * @brief ValFormulaChanged handle change formula

1
src/libs/vtools/dialogs/tools/dialogtool.h
View File

@ -315,6 +315,7 @@ protected:
virtual void SaveData(){} virtual void SaveData(){}
void MoveCursorToEnd(QPlainTextEdit *plainTextEdit); void MoveCursorToEnd(QPlainTextEdit *plainTextEdit);
bool eventFilter(QObject *object, QEvent *event); bool eventFilter(QObject *object, QEvent *event);
void FixateSize();
private: private:
void FillList(QComboBox *box, const QMap<QString, quint32> &list)const; void FillList(QComboBox *box, const QMap<QString, quint32> &list)const;

2
src/libs/vtools/dialogs/tools/dialogtriangle.cpp
View File

@ -65,6 +65,8 @@ DialogTriangle::DialogTriangle(const VContainer *data, const quint32 &toolId, QW
this, &DialogTriangle::PointNameChanged); this, &DialogTriangle::PointNameChanged);
vis = new VisToolTriangle(data); vis = new VisToolTriangle(data);
FixateSize();
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------

12
src/libs/vtools/dialogs/tools/dialogtriangle.ui
View File

@ -10,18 +10,6 @@
<height>212</height> <height>212</height>
</rect> </rect>
</property> </property>
<property name="minimumSize">
<size>
<width>300</width>
<height>212</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>300</width>
<height>212</height>
</size>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Triangle tool</string> <string>Triangle tool</string>
</property> </property>

2
src/libs/vtools/dialogs/tools/dialogtruedarts.cpp
View File

@ -69,6 +69,8 @@ DialogTrueDarts::DialogTrueDarts(const VContainer *data, const quint32 &toolId,
this, &DialogTrueDarts::PointNameChanged); this, &DialogTrueDarts::PointNameChanged);
vis = new VisToolTrueDarts(data); vis = new VisToolTrueDarts(data);
FixateSize();
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------

2
src/libs/vtools/dialogs/tools/dialoguniondetails.cpp
View File

@ -43,6 +43,8 @@ DialogUnionDetails::DialogUnionDetails(const VContainer *data, const quint32 &to
{ {
ui->setupUi(this); ui->setupUi(this);
InitOkCancel(ui); InitOkCancel(ui);
FixateSize();
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------

12
src/libs/vtools/dialogs/tools/dialoguniondetails.ui
View File

@ -13,18 +13,6 @@
<height>78</height> <height>78</height>
</rect> </rect>
</property> </property>
<property name="minimumSize">
<size>
<width>300</width>
<height>78</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>300</width>
<height>78</height>
</size>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Union tool</string> <string>Union tool</string>
</property> </property>