From 04ae26d1bdc8badc72775e015a521f63de6d0fa1 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 16 Feb 2016 18:08:51 +0200 Subject: [PATCH] Regesign dialogs tool 'Spline' and 'Spline Path' for avoiding text squeeze. --HG-- branch : develop --- src/libs/vtools/dialogs/tools/dialogspline.ui | 312 ++++++++++++------ .../vtools/dialogs/tools/dialogsplinepath.ui | 195 ++++++----- 2 files changed, 310 insertions(+), 197 deletions(-) diff --git a/src/libs/vtools/dialogs/tools/dialogspline.ui b/src/libs/vtools/dialogs/tools/dialogspline.ui index 839a00e72..153cbefc1 100644 --- a/src/libs/vtools/dialogs/tools/dialogspline.ui +++ b/src/libs/vtools/dialogs/tools/dialogspline.ui @@ -6,8 +6,8 @@ 0 0 - 540 - 273 + 459 + 289 @@ -20,132 +20,237 @@ - + - + + + 6 + - + - + + + + 89 + 0 + + - First point + First point: - - - - - - - - - - Length ratio of the first control point - - - true - - - - - - - 0.010000000000000 - - - 1.000000000000000 + + + + 0 + 0 + - - - - - The angle of the first control point - - - true - - - - - - - 360 - - - - + + + Control point + + + + + + + + + 0 + 0 + + + + 0.010000000000000 + + + 1.000000000000000 + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + Angle: + + + true + + + + + + + + 0 + 0 + + + + 360 + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + Length ratio: + + + true + + + + + + + - + - Second point + Second point: - - - - - - - - - - Length ratio of the second control point - - - true - - - - - - - 0.010000000000000 - - - 1.000000000000000 + + + + 0 + 0 + - - - - - The angle of the second control point - - - true - - - - - - - 360 - - - - + + + Control point + + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + Length ratio: + + + true + + + + + + + + 0 + 0 + + + + 0.010000000000000 + + + 1.000000000000000 + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + Angle: + + + true + + + + + + + + 0 + 0 + + + + 360 + + + + + + + @@ -178,7 +283,7 @@ - + 0 0 @@ -205,7 +310,14 @@ - + + + + 0 + 0 + + + @@ -242,6 +354,8 @@ comboBoxP4 doubleSpinBoxKasm2 spinBoxAngle2 + doubleSpinBoxKcurve + comboBoxColor buttonBox @@ -255,8 +369,8 @@ accept() - 248 - 254 + 257 + 246 157 @@ -271,8 +385,8 @@ reject() - 316 - 260 + 325 + 246 286 diff --git a/src/libs/vtools/dialogs/tools/dialogsplinepath.ui b/src/libs/vtools/dialogs/tools/dialogsplinepath.ui index 140fe7fac..e5e2ebb88 100644 --- a/src/libs/vtools/dialogs/tools/dialogsplinepath.ui +++ b/src/libs/vtools/dialogs/tools/dialogsplinepath.ui @@ -6,8 +6,8 @@ 0 0 - 528 - 353 + 519 + 401 @@ -20,17 +20,17 @@ - + - + - + - Point of curve + Point: @@ -40,94 +40,99 @@ - - - - - Length ratio of the first control point - - - true - - - - - - - 0.010000000000000 - - - 1.000000000000000 - - - - + + + First control point + + + + QFormLayout::AllNonFixedFieldsGrow + + + + + Angle: + + + true + + + + + + + 360.000000000000000 + + + + + + + 0.010000000000000 + + + 1.000000000000000 + + + + + + + Length ratio: + + + true + + + + + - - - - - The angle of the first control point - - - true - - - - - - - 360.000000000000000 - - - - - - - - - - - Length ratio of the second control point - - - true - - - - - - - 0.010000000000000 - - - 1.000000000000000 - - - - - - - - - - - The angle of the second control point - - - true - - - - - - - 360.000000000000000 - - - - + + + Second control point + + + + + + Length ratio: + + + true + + + + + + + 0.010000000000000 + + + 1.000000000000000 + + + + + + + Angle: + + + true + + + + + + + 360.000000000000000 + + + + + @@ -225,12 +230,6 @@ - comboBoxPoint - doubleSpinBoxKasm1 - doubleSpinBoxAngle1 - doubleSpinBoxKasm2 - doubleSpinBoxAngle2 - listWidget buttonBox