diff --git a/src/app/dialogs/tools/dialogalongline.ui b/src/app/dialogs/tools/dialogalongline.ui
index a2e13e7e6..3dec6c83a 100644
--- a/src/app/dialogs/tools/dialogalongline.ui
+++ b/src/app/dialogs/tools/dialogalongline.ui
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>428</width>
- <height>499</height>
+ <height>532</height>
</rect>
</property>
<property name="windowTitle">
@@ -223,6 +223,9 @@
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<layout class="QFormLayout" name="formLayout">
+ <property name="fieldGrowthPolicy">
+ <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+ </property>
<item row="0" column="0">
<widget class="QLabel" name="labelEditNamePoint">
<property name="text">
@@ -230,9 +233,6 @@
</property>
</widget>
</item>
- <item row="0" column="1">
- <widget class="QLineEdit" name="lineEditNamePoint"/>
- </item>
<item row="1" column="0">
<widget class="QLabel" name="labelFirstPoint">
<property name="text">
@@ -299,6 +299,19 @@
</property>
</widget>
</item>
+ <item row="4" column="0">
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>Line color</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="1">
+ <widget class="QComboBox" name="comboBoxLineColor"/>
+ </item>
+ <item row="0" column="1">
+ <widget class="QLineEdit" name="lineEditNamePoint"/>
+ </item>
</layout>
</item>
<item>
diff --git a/src/app/dialogs/tools/dialogarc.ui b/src/app/dialogs/tools/dialogarc.ui
index 4bf89a0cc..84ccc7856 100644
--- a/src/app/dialogs/tools/dialogarc.ui
+++ b/src/app/dialogs/tools/dialogarc.ui
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>423</width>
- <height>544</height>
+ <width>425</width>
+ <height>577</height>
</rect>
</property>
<property name="windowTitle">
@@ -583,32 +583,42 @@
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<layout class="QVBoxLayout" name="verticalLayout_2">
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_5">
- <item>
- <widget class="QLabel" name="label_4">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Center point</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QComboBox" name="comboBoxBasePoint">
- <property name="toolTip">
- <string>Select point of center of arc</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_3">
+ <item>
+ <layout class="QFormLayout" name="formLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_4">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Center point</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QComboBox" name="comboBoxBasePoint">
+ <property name="toolTip">
+ <string>Select point of center of arc</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QComboBox" name="comboBoxColor"/>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>Color</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
<item>
<widget class="QLabel" name="label_8">
<property name="text">
@@ -782,7 +792,6 @@
<tabstop>pushButtonGrowLengthF1</tabstop>
<tabstop>toolButtonPutHereF2</tabstop>
<tabstop>toolButtonEqualF2</tabstop>
- <tabstop>comboBoxBasePoint</tabstop>
<tabstop>radioButtonSizeGrowth</tabstop>
<tabstop>radioButtonStandardTable</tabstop>
<tabstop>radioButtonIncrements</tabstop>
diff --git a/src/app/dialogs/tools/dialogbisector.ui b/src/app/dialogs/tools/dialogbisector.ui
index c4ad6001a..40d359b8b 100644
--- a/src/app/dialogs/tools/dialogbisector.ui
+++ b/src/app/dialogs/tools/dialogbisector.ui
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>428</width>
- <height>532</height>
+ <height>565</height>
</rect>
</property>
<property name="windowTitle">
@@ -325,6 +325,16 @@
</property>
</widget>
</item>
+ <item row="5" column="0">
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>Line color</string>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="1">
+ <widget class="QComboBox" name="comboBoxLineColor"/>
+ </item>
</layout>
</item>
<item>
diff --git a/src/app/dialogs/tools/dialogcurveintersectaxis.ui b/src/app/dialogs/tools/dialogcurveintersectaxis.ui
index 39a9ccba9..514b73d75 100644
--- a/src/app/dialogs/tools/dialogcurveintersectaxis.ui
+++ b/src/app/dialogs/tools/dialogcurveintersectaxis.ui
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>419</width>
- <height>499</height>
+ <height>532</height>
</rect>
</property>
<property name="windowTitle">
@@ -308,6 +308,16 @@
</property>
</widget>
</item>
+ <item row="4" column="0">
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>Line color</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="1">
+ <widget class="QComboBox" name="comboBoxLineColor"/>
+ </item>
</layout>
</item>
<item>
diff --git a/src/app/dialogs/tools/dialogheight.ui b/src/app/dialogs/tools/dialogheight.ui
index 4338c7de7..e500e407f 100644
--- a/src/app/dialogs/tools/dialogheight.ui
+++ b/src/app/dialogs/tools/dialogheight.ui
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>285</width>
- <height>212</height>
+ <height>245</height>
</rect>
</property>
<property name="windowTitle">
@@ -134,6 +134,16 @@
</property>
</widget>
</item>
+ <item row="5" column="0">
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>Line color</string>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="1">
+ <widget class="QComboBox" name="comboBoxLineColor"/>
+ </item>
</layout>
</item>
<item>
diff --git a/src/app/dialogs/tools/dialogline.ui b/src/app/dialogs/tools/dialogline.ui
index 50dc4afe7..e57621c42 100644
--- a/src/app/dialogs/tools/dialogline.ui
+++ b/src/app/dialogs/tools/dialogline.ui
@@ -10,19 +10,19 @@
<x>0</x>
<y>0</y>
<width>286</width>
- <height>151</height>
+ <height>179</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>286</width>
- <height>151</height>
+ <height>179</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>286</width>
- <height>151</height>
+ <height>179</height>
</size>
</property>
<property name="windowTitle">
@@ -143,6 +143,16 @@
</property>
</widget>
</item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>Line color</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <widget class="QComboBox" name="comboBoxLineColor"/>
+ </item>
</layout>
</item>
<item>
diff --git a/src/app/dialogs/tools/dialoglineintersectaxis.ui b/src/app/dialogs/tools/dialoglineintersectaxis.ui
index 2ad7bac18..a31e877d1 100644
--- a/src/app/dialogs/tools/dialoglineintersectaxis.ui
+++ b/src/app/dialogs/tools/dialoglineintersectaxis.ui
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>457</width>
- <height>532</height>
+ <height>565</height>
</rect>
</property>
<property name="windowTitle">
@@ -325,6 +325,16 @@
</property>
</widget>
</item>
+ <item row="5" column="0">
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>Line color</string>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="1">
+ <widget class="QComboBox" name="comboBoxLineColor"/>
+ </item>
</layout>
</item>
<item>
diff --git a/src/app/dialogs/tools/dialognormal.ui b/src/app/dialogs/tools/dialognormal.ui
index 959714a6d..cf79e9586 100644
--- a/src/app/dialogs/tools/dialognormal.ui
+++ b/src/app/dialogs/tools/dialognormal.ui
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>517</width>
- <height>645</height>
+ <height>678</height>
</rect>
</property>
<property name="windowTitle">
@@ -472,44 +472,54 @@
</item>
</layout>
</item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_7">
- <item>
- <widget class="QLabel" name="label_7">
- <property name="text">
- <string>Type of line</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QComboBox" name="comboBoxLineType">
- <property name="minimumSize">
- <size>
- <width>80</width>
- <height>0</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>110</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="toolTip">
- <string>Show line from first point to this point</string>
- </property>
- <property name="iconSize">
- <size>
- <width>80</width>
- <height>14</height>
- </size>
- </property>
- </widget>
- </item>
- </layout>
- </item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_3">
+ <item>
+ <layout class="QFormLayout" name="formLayout_2">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_7">
+ <property name="text">
+ <string>Type of line</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QComboBox" name="comboBoxLineType">
+ <property name="minimumSize">
+ <size>
+ <width>80</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>110</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>Show line from first point to this point</string>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>80</width>
+ <height>14</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QComboBox" name="comboBoxLineColor"/>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>Line color</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
<item>
<widget class="QLabel" name="label_2">
<property name="text">
@@ -689,7 +699,6 @@
<tabstop>toolButtonArrowLeftDown</tabstop>
<tabstop>toolButtonArrowLeft</tabstop>
<tabstop>toolButtonArrowLeftUp</tabstop>
- <tabstop>comboBoxLineType</tabstop>
<tabstop>radioButtonSizeGrowth</tabstop>
<tabstop>radioButtonStandardTable</tabstop>
<tabstop>radioButtonIncrements</tabstop>
diff --git a/src/app/dialogs/tools/dialogshoulderpoint.ui b/src/app/dialogs/tools/dialogshoulderpoint.ui
index 8c306b556..c63a6d001 100644
--- a/src/app/dialogs/tools/dialogshoulderpoint.ui
+++ b/src/app/dialogs/tools/dialogshoulderpoint.ui
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>488</width>
- <height>532</height>
+ <height>565</height>
</rect>
</property>
<property name="windowTitle">
@@ -364,6 +364,16 @@
</property>
</widget>
</item>
+ <item row="5" column="0">
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>Line color</string>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="1">
+ <widget class="QComboBox" name="comboBoxLineColor"/>
+ </item>
</layout>
</item>
<item>
diff --git a/src/app/dialogs/tools/dialogspline.ui b/src/app/dialogs/tools/dialogspline.ui
index 580268256..10238a584 100644
--- a/src/app/dialogs/tools/dialogspline.ui
+++ b/src/app/dialogs/tools/dialogspline.ui
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>524</width>
- <height>254</height>
+ <width>540</width>
+ <height>233</height>
</rect>
</property>
<property name="windowTitle">
@@ -152,8 +152,11 @@
</layout>
</item>
<item>
- <layout class="QHBoxLayout" name="horizontalLayout_8">
- <item>
+ <layout class="QFormLayout" name="formLayout">
+ <property name="fieldGrowthPolicy">
+ <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+ </property>
+ <item row="0" column="0">
<widget class="QLabel" name="label_4">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
@@ -172,7 +175,7 @@
</property>
</widget>
</item>
- <item>
+ <item row="0" column="1">
<widget class="QDoubleSpinBox" name="doubleSpinBoxKcurve">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -194,6 +197,16 @@
</property>
</widget>
</item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>Color</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QComboBox" name="comboBoxColor"/>
+ </item>
</layout>
</item>
<item>
@@ -215,7 +228,6 @@
<tabstop>comboBoxP4</tabstop>
<tabstop>doubleSpinBoxKasm2</tabstop>
<tabstop>spinBoxAngle2</tabstop>
- <tabstop>doubleSpinBoxKcurve</tabstop>
<tabstop>buttonBox</tabstop>
</tabstops>
<resources>
diff --git a/src/app/dialogs/tools/dialogsplinepath.ui b/src/app/dialogs/tools/dialogsplinepath.ui
index 44c1b3459..7c00882f6 100644
--- a/src/app/dialogs/tools/dialogsplinepath.ui
+++ b/src/app/dialogs/tools/dialogsplinepath.ui
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>524</width>
- <height>321</height>
+ <width>528</width>
+ <height>322</height>
</rect>
</property>
<property name="windowTitle">
@@ -141,8 +141,11 @@
</layout>
</item>
<item>
- <layout class="QHBoxLayout" name="horizontalLayout_8">
- <item>
+ <layout class="QFormLayout" name="formLayout">
+ <property name="fieldGrowthPolicy">
+ <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+ </property>
+ <item row="0" column="0">
<widget class="QLabel" name="label_4">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
@@ -161,7 +164,7 @@
</property>
</widget>
</item>
- <item>
+ <item row="0" column="1">
<widget class="QDoubleSpinBox" name="doubleSpinBoxKcurve">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -183,6 +186,16 @@
</property>
</widget>
</item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_5">
+ <property name="text">
+ <string>Color</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QComboBox" name="comboBoxColor"/>
+ </item>
</layout>
</item>
<item>
@@ -204,7 +217,6 @@
<tabstop>doubleSpinBoxKasm2</tabstop>
<tabstop>doubleSpinBoxAngle2</tabstop>
<tabstop>listWidget</tabstop>
- <tabstop>doubleSpinBoxKcurve</tabstop>
<tabstop>buttonBox</tabstop>
</tabstops>
<resources>
diff --git a/src/app/dialogs/tools/dialogtool.h b/src/app/dialogs/tools/dialogtool.h
index b5041d7a2..aad677211 100644
--- a/src/app/dialogs/tools/dialogtool.h
+++ b/src/app/dialogs/tools/dialogtool.h
@@ -209,6 +209,7 @@ protected:
virtual void closeEvent ( QCloseEvent * event );
virtual void showEvent( QShowEvent *event );
+
void FillComboBoxPoints(QComboBox *box)const;
void FillComboBoxArcs(QComboBox *box, ComboBoxCutArc cut = ComboBoxCutArc::NoCutArc)const;
void FillComboBoxSplines(QComboBox *box, ComboBoxCutSpline cut = ComboBoxCutSpline::NoCutSpline)const;
@@ -217,8 +218,10 @@ protected:
void FillComboBoxCurves(QComboBox *box)const;
void FillComboBoxTypeLine(QComboBox *box, const QMap<QString, QIcon> &stylesPics) const;
void FillComboBoxLineColors(QComboBox *box)const;
+
virtual void CheckState();
QString GetTypeLine(const QComboBox *box)const;
+ QString GetLineColor(const QComboBox *box)const;
template <class key, class val>
void ShowVariable(const QMap<key, val> var);
void SetupTypeLine(QComboBox *box, const QString &value);