From 7a2c9a356913181c662ea85851f4645c62248873 Mon Sep 17 00:00:00 2001 From: dismine Date: Fri, 24 Oct 2014 16:48:49 +0300 Subject: [PATCH] Use form layout in dialogs. --HG-- branch : develop --- src/app/dialogs/tools/dialogalongline.ui | 144 ++++----- src/app/dialogs/tools/dialogarc.ui | 6 - src/app/dialogs/tools/dialogbisector.ui | 213 ++++++------- src/app/dialogs/tools/dialogcutarc.ui | 86 +++--- src/app/dialogs/tools/dialogcutspline.ui | 86 +++--- src/app/dialogs/tools/dialogcutsplinepath.ui | 86 +++--- src/app/dialogs/tools/dialogendline.ui | 25 +- src/app/dialogs/tools/dialogheight.ui | 38 +-- src/app/dialogs/tools/dialogline.ui | 234 +++++++------- src/app/dialogs/tools/dialognormal.ui | 25 +- src/app/dialogs/tools/dialogpointofcontact.ui | 238 +++++++-------- .../tools/dialogpointofintersection.ui | 24 +- src/app/dialogs/tools/dialogshoulderpoint.ui | 289 ++++++++---------- src/app/dialogs/tools/dialogtriangle.ui | 38 +-- 14 files changed, 678 insertions(+), 854 deletions(-) diff --git a/src/app/dialogs/tools/dialogalongline.ui b/src/app/dialogs/tools/dialogalongline.ui index 682d0f249..dd407a16b 100644 --- a/src/app/dialogs/tools/dialogalongline.ui +++ b/src/app/dialogs/tools/dialogalongline.ui @@ -6,7 +6,7 @@ 0 0 - 426 + 422 505 @@ -157,7 +157,7 @@ - + @@ -219,82 +219,70 @@ - - - - - - Point label - - - - - - - - - - - - - - First point - - - - - - - First point of line - - - - - - - - - - - Second point - - - - - - - Second point of line - - - - - - - - - - - Type of line - - - - - - - - 0 - 0 - - - - Show line from first point to this point - - - - - + + + + + + Point label + + + + + + + + + + First point + + + + + + + First point of line + + + + + + + Second point + + + + + + + Second point of line + + + + + + + Type of line + + + + + + + + 0 + 0 + + + + Show line from first point to this point + + + + + @@ -456,10 +444,6 @@ toolButtonEqual - lineEditNamePoint - comboBoxFirstPoint - comboBoxSecondPoint - comboBoxLineType radioButtonSizeGrowth radioButtonStandardTable radioButtonIncrements diff --git a/src/app/dialogs/tools/dialogarc.ui b/src/app/dialogs/tools/dialogarc.ui index 2eb108414..834036032 100644 --- a/src/app/dialogs/tools/dialogarc.ui +++ b/src/app/dialogs/tools/dialogarc.ui @@ -354,9 +354,6 @@ 24 - - true - @@ -545,9 +542,6 @@ 24 - - true - diff --git a/src/app/dialogs/tools/dialogbisector.ui b/src/app/dialogs/tools/dialogbisector.ui index ff45cc7c1..3420d84f5 100644 --- a/src/app/dialogs/tools/dialogbisector.ui +++ b/src/app/dialogs/tools/dialogbisector.ui @@ -6,7 +6,7 @@ 0 0 - 426 + 424 540 @@ -151,7 +151,7 @@ - + @@ -213,118 +213,102 @@ - - - - - - - 0 - 0 - - - - Point label - - - - - - - - - - - - - - - 0 - 0 - - - - First point - - - - - - - First point of angle - - - - - - - - - - - - 0 - 0 - - - - Second point - - - - - - - Second point of angle - - - - - - - - - - - - 0 - 0 - - - - Third point - - - - - - - Third point of angle - - - - - - - - - - - Type of line - - - - - - - Show line from second point to this point - - - - - + + + + + + + 0 + 0 + + + + Point label + + + + + + + + + + + 0 + 0 + + + + First point + + + + + + + First point of angle + + + + + + + + 0 + 0 + + + + Second point + + + + + + + Second point of angle + + + + + + + + 0 + 0 + + + + Third point + + + + + + + Third point of angle + + + + + + + Type of line + + + + + + + Show line from second point to this point + + + + + @@ -491,11 +475,6 @@ - lineEditNamePoint - comboBoxFirstPoint - comboBoxSecondPoint - comboBoxThirdPoint - comboBoxLineType radioButtonSizeGrowth radioButtonStandardTable radioButtonIncrements diff --git a/src/app/dialogs/tools/dialogcutarc.ui b/src/app/dialogs/tools/dialogcutarc.ui index 3016c25f1..aae56f094 100644 --- a/src/app/dialogs/tools/dialogcutarc.ui +++ b/src/app/dialogs/tools/dialogcutarc.ui @@ -6,7 +6,7 @@ 0 0 - 390 + 412 435 @@ -210,52 +210,48 @@ - - - - - - - 0 - 0 - - - - Arc - - - - - - - Selected curve - - - - - - - - - - - - 0 - 0 - - - - Point label - - - - - - - - + + + + + + + 0 + 0 + + + + Arc + + + + + + + Selected curve + + + + + + + + 0 + 0 + + + + Point label + + + + + + + + diff --git a/src/app/dialogs/tools/dialogcutspline.ui b/src/app/dialogs/tools/dialogcutspline.ui index 111a1d30d..3dec2b93a 100644 --- a/src/app/dialogs/tools/dialogcutspline.ui +++ b/src/app/dialogs/tools/dialogcutspline.ui @@ -6,7 +6,7 @@ 0 0 - 428 + 422 435 @@ -210,52 +210,48 @@ - - - - - - - 0 - 0 - - - - Curve - - - - - - - Selected curve - - - - - - - - - - - - 0 - 0 - - - - Point label - - - - - - - - + + + + + + + 0 + 0 + + + + Curve + + + + + + + Selected curve + + + + + + + + 0 + 0 + + + + Point label + + + + + + + + diff --git a/src/app/dialogs/tools/dialogcutsplinepath.ui b/src/app/dialogs/tools/dialogcutsplinepath.ui index d98824307..4119b0a29 100644 --- a/src/app/dialogs/tools/dialogcutsplinepath.ui +++ b/src/app/dialogs/tools/dialogcutsplinepath.ui @@ -6,7 +6,7 @@ 0 0 - 428 + 412 435 @@ -210,52 +210,48 @@ - - - - - - - 0 - 0 - - - - Curve - - - - - - - Selected curve path - - - - - - - - - - - - 0 - 0 - - - - Point label - - - - - - - - + + + + + + + 0 + 0 + + + + Curve + + + + + + + Selected curve path + + + + + + + + 0 + 0 + + + + Point label + + + + + + + + diff --git a/src/app/dialogs/tools/dialogendline.ui b/src/app/dialogs/tools/dialogendline.ui index dcd80ecfc..1884e2899 100644 --- a/src/app/dialogs/tools/dialogendline.ui +++ b/src/app/dialogs/tools/dialogendline.ui @@ -396,8 +396,8 @@ - - + + @@ -410,18 +410,14 @@ - + First point of line - - - - - + @@ -434,21 +430,17 @@ - + - - - - - + Type of line - + Show line from first point to this point @@ -628,9 +620,6 @@ - comboBoxBasePoint - lineEditNamePoint - comboBoxLineType radioButtonSizeGrowth radioButtonStandardTable radioButtonIncrements diff --git a/src/app/dialogs/tools/dialogheight.ui b/src/app/dialogs/tools/dialogheight.ui index 5acad9cd7..836673144 100644 --- a/src/app/dialogs/tools/dialogheight.ui +++ b/src/app/dialogs/tools/dialogheight.ui @@ -22,8 +22,8 @@ - - + + @@ -36,14 +36,10 @@ - + - - - - - + @@ -56,18 +52,14 @@ - + First point of line - - - - - + @@ -80,18 +72,14 @@ - + First point of line - - - - - + @@ -104,25 +92,21 @@ - + First point of line - - - - - + Type of line - + Show line from first point to our point diff --git a/src/app/dialogs/tools/dialogline.ui b/src/app/dialogs/tools/dialogline.ui index f4e6d9d39..ad072a5c4 100644 --- a/src/app/dialogs/tools/dialogline.ui +++ b/src/app/dialogs/tools/dialogline.ui @@ -38,135 +38,113 @@ true - - - - 9 - 9 - 269 - 134 - - - - - - - - - - 90 - 0 - - - - First point - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - - - - - - - - - 90 - 0 - - - - Second point - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - - - - - - - - - 90 - 0 - - - - Type of line - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - Show line from first point to this point - - - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - + + + + + + + + 90 + 0 + + + + First point + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + + + + + 90 + 0 + + + + Second point + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + + + + + 90 + 0 + + + + Type of line + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + Show line from first point to this point + + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + - - comboBoxFirstPoint - comboBoxSecondPoint - diff --git a/src/app/dialogs/tools/dialognormal.ui b/src/app/dialogs/tools/dialognormal.ui index 8001409ff..60559cc34 100644 --- a/src/app/dialogs/tools/dialognormal.ui +++ b/src/app/dialogs/tools/dialognormal.ui @@ -214,8 +214,8 @@ - - + + @@ -228,14 +228,10 @@ - + - - - - - + @@ -248,14 +244,10 @@ - + - - - - - + @@ -268,7 +260,7 @@ - + @@ -660,9 +652,6 @@ - lineEditNamePoint - comboBoxFirstPoint - comboBoxSecondPoint doubleSpinBoxAngle toolButtonArrowRight toolButtonArrowRightUp diff --git a/src/app/dialogs/tools/dialogpointofcontact.ui b/src/app/dialogs/tools/dialogpointofcontact.ui index bc85fc283..da842499b 100644 --- a/src/app/dialogs/tools/dialogpointofcontact.ui +++ b/src/app/dialogs/tools/dialogpointofcontact.ui @@ -6,7 +6,7 @@ 0 0 - 496 + 498 505 @@ -213,130 +213,118 @@ - - - - - - - 0 - 0 - - - - Point label - - - - - - - - - - - - - - - 0 - 0 - - - - Center of arc - - - - - - - - 0 - 0 - - - - - 145 - 0 - - - - Select point of center of arc - - - - - - - - - - - - 0 - 0 - - - - Top of the line - - - - - - - - 0 - 0 - - - - - 143 - 0 - - - - - - - - - - - - - 0 - 0 - - - - End of the line - - - - - - - - 0 - 0 - - - - - 145 - 0 - - - - - - + + + + + + + 0 + 0 + + + + Point label + + + + + + + + + + + 0 + 0 + + + + Center of arc + + + + + + + + 0 + 0 + + + + + 145 + 0 + + + + Select point of center of arc + + + + + + + + 0 + 0 + + + + Top of the line + + + + + + + + 0 + 0 + + + + + 143 + 0 + + + + + + + + + 0 + 0 + + + + End of the line + + + + + + + + 0 + 0 + + + + + 145 + 0 + + + + + + @@ -500,10 +488,6 @@ - lineEditNamePoint - comboBoxCenter - comboBoxFirstPoint - comboBoxSecondPoint radioButtonSizeGrowth radioButtonStandardTable radioButtonIncrements diff --git a/src/app/dialogs/tools/dialogpointofintersection.ui b/src/app/dialogs/tools/dialogpointofintersection.ui index f31727a7c..c50bacf1f 100644 --- a/src/app/dialogs/tools/dialogpointofintersection.ui +++ b/src/app/dialogs/tools/dialogpointofintersection.ui @@ -7,7 +7,7 @@ 0 0 285 - 180 + 146 @@ -19,8 +19,8 @@ - - + + @@ -33,7 +33,7 @@ - + @@ -43,11 +43,7 @@ - - - - - + @@ -66,18 +62,14 @@ - + First point of angle - - - - - + @@ -90,7 +82,7 @@ - + Second point of angle diff --git a/src/app/dialogs/tools/dialogshoulderpoint.ui b/src/app/dialogs/tools/dialogshoulderpoint.ui index c803626ae..2747159b2 100644 --- a/src/app/dialogs/tools/dialogshoulderpoint.ui +++ b/src/app/dialogs/tools/dialogshoulderpoint.ui @@ -6,7 +6,7 @@ 0 0 - 515 + 488 540 @@ -213,157 +213,141 @@ - - - - - - - 0 - 0 - - - - Point label - - - - - - - - - - - - - - - 0 - 0 - - - - First point - - - - - - - - 0 - 0 - - - - - 145 - 0 - - - - - - - - - - - - - 0 - 0 - - - - Second point - - - - - - - - 0 - 0 - - - - - 143 - 0 - - - - - - - - - - - - - 0 - 0 - - - - Third point - - - - - - - - 0 - 0 - - - - - 145 - 0 - - - - - - - - - - - - - 0 - 0 - - - - Type of line - - - - - - - - 0 - 0 - - - - Show line from first point to our point - - - - - + + + + + + + 0 + 0 + + + + Point label + + + + + + + + + + + 0 + 0 + + + + First point + + + + + + + + 0 + 0 + + + + + 145 + 0 + + + + + + + + + 0 + 0 + + + + Second point + + + + + + + + 0 + 0 + + + + + 143 + 0 + + + + + + + + + 0 + 0 + + + + Third point + + + + + + + + 0 + 0 + + + + + 145 + 0 + + + + + + + + + 0 + 0 + + + + Type of line + + + + + + + + 0 + 0 + + + + Show line from first point to our point + + + + + @@ -527,11 +511,6 @@ - lineEditNamePoint - comboBoxP1Line - comboBoxP2Line - comboBoxP3 - comboBoxLineType radioButtonSizeGrowth radioButtonStandardTable radioButtonIncrements diff --git a/src/app/dialogs/tools/dialogtriangle.ui b/src/app/dialogs/tools/dialogtriangle.ui index b743f48f3..b13e718e9 100644 --- a/src/app/dialogs/tools/dialogtriangle.ui +++ b/src/app/dialogs/tools/dialogtriangle.ui @@ -22,8 +22,8 @@ - - + + @@ -36,14 +36,10 @@ - + - - - - - + @@ -56,18 +52,14 @@ - + First point of line - - - - - + @@ -80,18 +72,14 @@ - + First point of line - - - - - + @@ -104,18 +92,14 @@ - + First point of line - - - - - + @@ -128,7 +112,7 @@ - + First point of line