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

Fixed issue #184. Delete button "Equal" in dialogs.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2015-02-16 15:54:56 +02:00
parent 0db66e1946
commit bac1baf59f
26 changed files with 65 additions and 259 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/app/dialogs/tools/dialogalongline.cpp
View File

@ -64,7 +64,6 @@ DialogAlongLine::DialogAlongLine(const VContainer *data, const quint32 &toolId,
connect(ui->toolButtonPutHere, &QPushButton::clicked, this, &DialogAlongLine::PutHere); connect(ui->toolButtonPutHere, &QPushButton::clicked, this, &DialogAlongLine::PutHere);
connect(ui->lineEditNamePoint, &QLineEdit::textChanged, this, &DialogAlongLine::NamePointChanged); connect(ui->lineEditNamePoint, &QLineEdit::textChanged, this, &DialogAlongLine::NamePointChanged);
connect(ui->toolButtonEqual, &QPushButton::clicked, this, &DialogAlongLine::EvalFormula);
connect(ui->plainTextEditFormula, &QPlainTextEdit::textChanged, this, &DialogAlongLine::FormulaTextChanged); connect(ui->plainTextEditFormula, &QPlainTextEdit::textChanged, this, &DialogAlongLine::FormulaTextChanged);
connect(ui->pushButtonGrowLength, &QPushButton::clicked, this, &DialogAlongLine::DeployFormulaTextEdit); connect(ui->pushButtonGrowLength, &QPushButton::clicked, this, &DialogAlongLine::DeployFormulaTextEdit);
connect(listWidget, &QListWidget::itemDoubleClicked, this, &DialogTool::PutVal); connect(listWidget, &QListWidget::itemDoubleClicked, this, &DialogTool::PutVal);

19
src/app/dialogs/tools/dialogalongline.ui
View File

@ -107,22 +107,12 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QToolButton" name="toolButtonEqual"> <widget class="QLabel" name="labelEqual">
<property name="toolTip">
<string>Calculate value</string>
</property>
<property name="text"> <property name="text">
<string notr="true">...</string> <string/>
</property> </property>
<property name="icon"> <property name="pixmap">
<iconset resource="../../share/resources/icon.qrc"> <pixmap resource="../../share/resources/icon.qrc">:/icon/24x24/equal.png</pixmap>
<normaloff>:/icon/24x24/equal.png</normaloff>:/icon/24x24/equal.png</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property> </property>
</widget> </widget>
</item> </item>
@ -476,7 +466,6 @@
<tabstops> <tabstops>
<tabstop>plainTextEditFormula</tabstop> <tabstop>plainTextEditFormula</tabstop>
<tabstop>toolButtonPutHere</tabstop> <tabstop>toolButtonPutHere</tabstop>
<tabstop>toolButtonEqual</tabstop>
<tabstop>pushButtonGrowLength</tabstop> <tabstop>pushButtonGrowLength</tabstop>
<tabstop>lineEditNamePoint</tabstop> <tabstop>lineEditNamePoint</tabstop>
<tabstop>comboBoxFirstPoint</tabstop> <tabstop>comboBoxFirstPoint</tabstop>

4
src/app/dialogs/tools/dialogarc.cpp
View File

@ -82,10 +82,6 @@ DialogArc::DialogArc(const VContainer *data, const quint32 &toolId, QWidget *par
connect(ui->toolButtonPutHereF1, &QPushButton::clicked, this, &DialogArc::PutF1); connect(ui->toolButtonPutHereF1, &QPushButton::clicked, this, &DialogArc::PutF1);
connect(ui->toolButtonPutHereF2, &QPushButton::clicked, this, &DialogArc::PutF2); connect(ui->toolButtonPutHereF2, &QPushButton::clicked, this, &DialogArc::PutF2);
connect(ui->toolButtonEqualRadius, &QPushButton::clicked, this, &DialogArc::EvalRadius);
connect(ui->toolButtonEqualF1, &QPushButton::clicked, this, &DialogArc::EvalF);
connect(ui->toolButtonEqualF2, &QPushButton::clicked, this, &DialogArc::EvalF);
connect(ui->plainTextEditFormula, &QPlainTextEdit::textChanged, this, &DialogArc::RadiusChanged); connect(ui->plainTextEditFormula, &QPlainTextEdit::textChanged, this, &DialogArc::RadiusChanged);
connect(ui->plainTextEditF1, &QPlainTextEdit::textChanged, this, &DialogArc::F1Changed); connect(ui->plainTextEditF1, &QPlainTextEdit::textChanged, this, &DialogArc::F1Changed);
connect(ui->plainTextEditF2, &QPlainTextEdit::textChanged, this, &DialogArc::F2Changed); connect(ui->plainTextEditF2, &QPlainTextEdit::textChanged, this, &DialogArc::F2Changed);

57
src/app/dialogs/tools/dialogarc.ui
View File

@ -107,22 +107,12 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QToolButton" name="toolButtonEqualRadius"> <widget class="QLabel" name="label_2">
<property name="toolTip">
<string>Calculate value</string>
</property>
<property name="text"> <property name="text">
<string notr="true">...</string> <string/>
</property> </property>
<property name="icon"> <property name="pixmap">
<iconset resource="../../share/resources/icon.qrc"> <pixmap resource="../../share/resources/icon.qrc">:/icon/24x24/equal.png</pixmap>
<normaloff>:/icon/24x24/equal.png</normaloff>:/icon/24x24/equal.png</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property> </property>
</widget> </widget>
</item> </item>
@ -295,22 +285,12 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QToolButton" name="toolButtonEqualF1"> <widget class="QLabel" name="label_3">
<property name="toolTip">
<string>Calculate value</string>
</property>
<property name="text"> <property name="text">
<string notr="true">...</string> <string/>
</property> </property>
<property name="icon"> <property name="pixmap">
<iconset resource="../../share/resources/icon.qrc"> <pixmap resource="../../share/resources/icon.qrc">:/icon/24x24/equal.png</pixmap>
<normaloff>:/icon/24x24/equal.png</normaloff>:/icon/24x24/equal.png</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property> </property>
</widget> </widget>
</item> </item>
@ -483,22 +463,12 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QToolButton" name="toolButtonEqualF2"> <widget class="QLabel" name="label_5">
<property name="toolTip">
<string>Calculate value</string>
</property>
<property name="text"> <property name="text">
<string notr="true">...</string> <string/>
</property> </property>
<property name="icon"> <property name="pixmap">
<iconset resource="../../share/resources/icon.qrc"> <pixmap resource="../../share/resources/icon.qrc">:/icon/24x24/equal.png</pixmap>
<normaloff>:/icon/24x24/equal.png</normaloff>:/icon/24x24/equal.png</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property> </property>
</widget> </widget>
</item> </item>
@ -790,15 +760,12 @@
<tabstops> <tabstops>
<tabstop>plainTextEditFormula</tabstop> <tabstop>plainTextEditFormula</tabstop>
<tabstop>toolButtonPutHereRadius</tabstop> <tabstop>toolButtonPutHereRadius</tabstop>
<tabstop>toolButtonEqualRadius</tabstop>
<tabstop>pushButtonGrowLength</tabstop> <tabstop>pushButtonGrowLength</tabstop>
<tabstop>plainTextEditF1</tabstop> <tabstop>plainTextEditF1</tabstop>
<tabstop>toolButtonPutHereF1</tabstop> <tabstop>toolButtonPutHereF1</tabstop>
<tabstop>toolButtonEqualF1</tabstop>
<tabstop>pushButtonGrowLengthF1</tabstop> <tabstop>pushButtonGrowLengthF1</tabstop>
<tabstop>plainTextEditF2</tabstop> <tabstop>plainTextEditF2</tabstop>
<tabstop>toolButtonPutHereF2</tabstop> <tabstop>toolButtonPutHereF2</tabstop>
<tabstop>toolButtonEqualF2</tabstop>
<tabstop>pushButtonGrowLengthF2</tabstop> <tabstop>pushButtonGrowLengthF2</tabstop>
<tabstop>radioButtonSizeGrowth</tabstop> <tabstop>radioButtonSizeGrowth</tabstop>
<tabstop>radioButtonStandardTable</tabstop> <tabstop>radioButtonStandardTable</tabstop>

1
src/app/dialogs/tools/dialogbisector.cpp
View File

@ -66,7 +66,6 @@ DialogBisector::DialogBisector(const VContainer *data, const quint32 &toolId, QW
connect(ui->toolButtonPutHere, &QPushButton::clicked, this, &DialogBisector::PutHere); connect(ui->toolButtonPutHere, &QPushButton::clicked, this, &DialogBisector::PutHere);
connect(listWidget, &QListWidget::itemDoubleClicked, this, &DialogBisector::PutVal); connect(listWidget, &QListWidget::itemDoubleClicked, this, &DialogBisector::PutVal);
connect(ui->toolButtonEqual, &QPushButton::clicked, this, &DialogBisector::EvalFormula);
connect(ui->lineEditNamePoint, &QLineEdit::textChanged, this, &DialogBisector::NamePointChanged); connect(ui->lineEditNamePoint, &QLineEdit::textChanged, this, &DialogBisector::NamePointChanged);
connect(ui->plainTextEditFormula, &QPlainTextEdit::textChanged, this, &DialogBisector::FormulaTextChanged); connect(ui->plainTextEditFormula, &QPlainTextEdit::textChanged, this, &DialogBisector::FormulaTextChanged);
connect(ui->pushButtonGrowLength, &QPushButton::clicked, this, &DialogBisector::DeployFormulaTextEdit); connect(ui->pushButtonGrowLength, &QPushButton::clicked, this, &DialogBisector::DeployFormulaTextEdit);

19
src/app/dialogs/tools/dialogbisector.ui
View File

@ -104,22 +104,12 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QToolButton" name="toolButtonEqual"> <widget class="QLabel" name="label_3">
<property name="toolTip">
<string>Calculate value</string>
</property>
<property name="text"> <property name="text">
<string notr="true">...</string> <string/>
</property> </property>
<property name="icon"> <property name="pixmap">
<iconset resource="../../share/resources/icon.qrc"> <pixmap resource="../../share/resources/icon.qrc">:/icon/24x24/equal.png</pixmap>
<normaloff>:/icon/24x24/equal.png</normaloff>:/icon/24x24/equal.png</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property> </property>
</widget> </widget>
</item> </item>
@ -505,7 +495,6 @@
<tabstops> <tabstops>
<tabstop>plainTextEditFormula</tabstop> <tabstop>plainTextEditFormula</tabstop>
<tabstop>toolButtonPutHere</tabstop> <tabstop>toolButtonPutHere</tabstop>
<tabstop>toolButtonEqual</tabstop>
<tabstop>pushButtonGrowLength</tabstop> <tabstop>pushButtonGrowLength</tabstop>
<tabstop>lineEditNamePoint</tabstop> <tabstop>lineEditNamePoint</tabstop>
<tabstop>comboBoxFirstPoint</tabstop> <tabstop>comboBoxFirstPoint</tabstop>

1
src/app/dialogs/tools/dialogcurveintersectaxis.cpp
View File

@ -61,7 +61,6 @@ DialogCurveIntersectAxis::DialogCurveIntersectAxis(const VContainer *data, const
connect(ui->toolButtonPutHereAngle, &QPushButton::clicked, this, &DialogCurveIntersectAxis::PutAngle); connect(ui->toolButtonPutHereAngle, &QPushButton::clicked, this, &DialogCurveIntersectAxis::PutAngle);
connect(listWidget, &QListWidget::itemDoubleClicked, this, &DialogCurveIntersectAxis::PutVal); connect(listWidget, &QListWidget::itemDoubleClicked, this, &DialogCurveIntersectAxis::PutVal);
connect(ui->toolButtonEqualAngle, &QPushButton::clicked, this, &DialogCurveIntersectAxis::EvalAngle);
connect(ui->lineEditNamePoint, &QLineEdit::textChanged, this, &DialogCurveIntersectAxis::NamePointChanged); connect(ui->lineEditNamePoint, &QLineEdit::textChanged, this, &DialogCurveIntersectAxis::NamePointChanged);
connect(ui->plainTextEditFormula, &QPlainTextEdit::textChanged, this, &DialogCurveIntersectAxis::AngleTextChanged); connect(ui->plainTextEditFormula, &QPlainTextEdit::textChanged, this, &DialogCurveIntersectAxis::AngleTextChanged);
connect(ui->pushButtonGrowLengthAngle, &QPushButton::clicked, this, &DialogCurveIntersectAxis::DeployAngleTextEdit); connect(ui->pushButtonGrowLengthAngle, &QPushButton::clicked, this, &DialogCurveIntersectAxis::DeployAngleTextEdit);

19
src/app/dialogs/tools/dialogcurveintersectaxis.ui
View File

@ -97,22 +97,12 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QToolButton" name="toolButtonEqualAngle"> <widget class="QLabel" name="label_3">
<property name="toolTip">
<string>Calculate value</string>
</property>
<property name="text"> <property name="text">
<string notr="true">...</string> <string/>
</property> </property>
<property name="icon"> <property name="pixmap">
<iconset resource="../../share/resources/icon.qrc"> <pixmap resource="../../share/resources/icon.qrc">:/icon/24x24/equal.png</pixmap>
<normaloff>:/icon/24x24/equal.png</normaloff>:/icon/24x24/equal.png</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property> </property>
</widget> </widget>
</item> </item>
@ -491,7 +481,6 @@
<tabstops> <tabstops>
<tabstop>plainTextEditFormula</tabstop> <tabstop>plainTextEditFormula</tabstop>
<tabstop>toolButtonPutHereAngle</tabstop> <tabstop>toolButtonPutHereAngle</tabstop>
<tabstop>toolButtonEqualAngle</tabstop>
<tabstop>pushButtonGrowLengthAngle</tabstop> <tabstop>pushButtonGrowLengthAngle</tabstop>
<tabstop>comboBoxAxisPoint</tabstop> <tabstop>comboBoxAxisPoint</tabstop>
<tabstop>comboBoxCurve</tabstop> <tabstop>comboBoxCurve</tabstop>

1
src/app/dialogs/tools/dialogcutarc.cpp
View File

@ -63,7 +63,6 @@ DialogCutArc::DialogCutArc(const VContainer *data, const quint32 &toolId, QWidge
connect(ui->toolButtonPutHere, &QPushButton::clicked, this, &DialogCutArc::PutHere); connect(ui->toolButtonPutHere, &QPushButton::clicked, this, &DialogCutArc::PutHere);
connect(ui->listWidget, &QListWidget::itemDoubleClicked, this, &DialogCutArc::PutVal); connect(ui->listWidget, &QListWidget::itemDoubleClicked, this, &DialogCutArc::PutVal);
connect(ui->toolButtonEqual, &QPushButton::clicked, this, &DialogCutArc::EvalFormula);
connect(ui->lineEditNamePoint, &QLineEdit::textChanged, this, &DialogCutArc::NamePointChanged); connect(ui->lineEditNamePoint, &QLineEdit::textChanged, this, &DialogCutArc::NamePointChanged);
connect(ui->plainTextEditFormula, &QPlainTextEdit::textChanged, this, &DialogCutArc::FormulaTextChanged); connect(ui->plainTextEditFormula, &QPlainTextEdit::textChanged, this, &DialogCutArc::FormulaTextChanged);
connect(ui->pushButtonGrowLength, &QPushButton::clicked, this, &DialogCutArc::DeployFormulaTextEdit); connect(ui->pushButtonGrowLength, &QPushButton::clicked, this, &DialogCutArc::DeployFormulaTextEdit);

19
src/app/dialogs/tools/dialogcutarc.ui
View File

@ -101,22 +101,12 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QToolButton" name="toolButtonEqual"> <widget class="QLabel" name="label_4">
<property name="toolTip">
<string>Calculate value</string>
</property>
<property name="text"> <property name="text">
<string notr="true">...</string> <string/>
</property> </property>
<property name="icon"> <property name="pixmap">
<iconset resource="../../share/resources/icon.qrc"> <pixmap resource="../../share/resources/icon.qrc">:/icon/24x24/equal.png</pixmap>
<normaloff>:/icon/24x24/equal.png</normaloff>:/icon/24x24/equal.png</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property> </property>
</widget> </widget>
</item> </item>
@ -427,7 +417,6 @@
<tabstops> <tabstops>
<tabstop>plainTextEditFormula</tabstop> <tabstop>plainTextEditFormula</tabstop>
<tabstop>toolButtonPutHere</tabstop> <tabstop>toolButtonPutHere</tabstop>
<tabstop>toolButtonEqual</tabstop>
<tabstop>pushButtonGrowLength</tabstop> <tabstop>pushButtonGrowLength</tabstop>
<tabstop>comboBoxArc</tabstop> <tabstop>comboBoxArc</tabstop>
<tabstop>lineEditNamePoint</tabstop> <tabstop>lineEditNamePoint</tabstop>

1
src/app/dialogs/tools/dialogcutspline.cpp
View File

@ -61,7 +61,6 @@ DialogCutSpline::DialogCutSpline(const VContainer *data, const quint32 &toolId,
connect(ui->toolButtonPutHere, &QPushButton::clicked, this, &DialogCutSpline::PutHere); connect(ui->toolButtonPutHere, &QPushButton::clicked, this, &DialogCutSpline::PutHere);
connect(ui->listWidget, &QListWidget::itemDoubleClicked, this, &DialogCutSpline::PutVal); connect(ui->listWidget, &QListWidget::itemDoubleClicked, this, &DialogCutSpline::PutVal);
connect(ui->toolButtonEqual, &QPushButton::clicked, this, &DialogCutSpline::EvalFormula);
connect(ui->lineEditNamePoint, &QLineEdit::textChanged, this, &DialogCutSpline::NamePointChanged); connect(ui->lineEditNamePoint, &QLineEdit::textChanged, this, &DialogCutSpline::NamePointChanged);
connect(ui->plainTextEditFormula, &QPlainTextEdit::textChanged, this, &DialogCutSpline::FormulaChanged); connect(ui->plainTextEditFormula, &QPlainTextEdit::textChanged, this, &DialogCutSpline::FormulaChanged);
connect(ui->pushButtonGrowLength, &QPushButton::clicked, this, &DialogCutSpline::DeployFormulaTextEdit); connect(ui->pushButtonGrowLength, &QPushButton::clicked, this, &DialogCutSpline::DeployFormulaTextEdit);

19
src/app/dialogs/tools/dialogcutspline.ui
View File

@ -101,22 +101,12 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QToolButton" name="toolButtonEqual"> <widget class="QLabel" name="label_4">
<property name="toolTip">
<string>Calculate value</string>
</property>
<property name="text"> <property name="text">
<string notr="true">...</string> <string/>
</property> </property>
<property name="icon"> <property name="pixmap">
<iconset resource="../../share/resources/icon.qrc"> <pixmap resource="../../share/resources/icon.qrc">:/icon/24x24/equal.png</pixmap>
<normaloff>:/icon/24x24/equal.png</normaloff>:/icon/24x24/equal.png</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property> </property>
</widget> </widget>
</item> </item>
@ -427,7 +417,6 @@
<tabstops> <tabstops>
<tabstop>plainTextEditFormula</tabstop> <tabstop>plainTextEditFormula</tabstop>
<tabstop>toolButtonPutHere</tabstop> <tabstop>toolButtonPutHere</tabstop>
<tabstop>toolButtonEqual</tabstop>
<tabstop>pushButtonGrowLength</tabstop> <tabstop>pushButtonGrowLength</tabstop>
<tabstop>comboBoxSpline</tabstop> <tabstop>comboBoxSpline</tabstop>
<tabstop>lineEditNamePoint</tabstop> <tabstop>lineEditNamePoint</tabstop>

1
src/app/dialogs/tools/dialogcutsplinepath.cpp
View File

@ -61,7 +61,6 @@ DialogCutSplinePath::DialogCutSplinePath(const VContainer *data, const quint32 &
connect(ui->toolButtonPutHere, &QPushButton::clicked, this, &DialogCutSplinePath::PutHere); connect(ui->toolButtonPutHere, &QPushButton::clicked, this, &DialogCutSplinePath::PutHere);
connect(ui->listWidget, &QListWidget::itemDoubleClicked, this, &DialogCutSplinePath::PutVal); connect(ui->listWidget, &QListWidget::itemDoubleClicked, this, &DialogCutSplinePath::PutVal);
connect(ui->toolButtonEqual, &QPushButton::clicked, this, &DialogCutSplinePath::EvalFormula);
connect(ui->lineEditNamePoint, &QLineEdit::textChanged, this, &DialogCutSplinePath::NamePointChanged); connect(ui->lineEditNamePoint, &QLineEdit::textChanged, this, &DialogCutSplinePath::NamePointChanged);
connect(ui->plainTextEditFormula, &QPlainTextEdit::textChanged, this, &DialogCutSplinePath::FormulaChanged); connect(ui->plainTextEditFormula, &QPlainTextEdit::textChanged, this, &DialogCutSplinePath::FormulaChanged);
connect(ui->pushButtonGrowLength, &QPushButton::clicked, this, &DialogCutSplinePath::DeployFormulaTextEdit); connect(ui->pushButtonGrowLength, &QPushButton::clicked, this, &DialogCutSplinePath::DeployFormulaTextEdit);

19
src/app/dialogs/tools/dialogcutsplinepath.ui
View File

@ -101,22 +101,12 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QToolButton" name="toolButtonEqual"> <widget class="QLabel" name="label_4">
<property name="toolTip">
<string>Calculate value</string>
</property>
<property name="text"> <property name="text">
<string notr="true">...</string> <string/>
</property> </property>
<property name="icon"> <property name="pixmap">
<iconset resource="../../share/resources/icon.qrc"> <pixmap resource="../../share/resources/icon.qrc">:/icon/24x24/equal.png</pixmap>
<normaloff>:/icon/24x24/equal.png</normaloff>:/icon/24x24/equal.png</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property> </property>
</widget> </widget>
</item> </item>
@ -433,7 +423,6 @@
<tabstops> <tabstops>
<tabstop>plainTextEditFormula</tabstop> <tabstop>plainTextEditFormula</tabstop>
<tabstop>toolButtonPutHere</tabstop> <tabstop>toolButtonPutHere</tabstop>
<tabstop>toolButtonEqual</tabstop>
<tabstop>pushButtonGrowLength</tabstop> <tabstop>pushButtonGrowLength</tabstop>
<tabstop>comboBoxSplinePath</tabstop> <tabstop>comboBoxSplinePath</tabstop>
<tabstop>lineEditNamePoint</tabstop> <tabstop>lineEditNamePoint</tabstop>

1
src/app/dialogs/tools/dialogeditwrongformula.cpp
View File

@ -47,7 +47,6 @@ DialogEditWrongFormula::DialogEditWrongFormula(const VContainer *data, const qui
connect(ui->toolButtonPutHere, &QPushButton::clicked, this, &DialogEditWrongFormula::PutHere); connect(ui->toolButtonPutHere, &QPushButton::clicked, this, &DialogEditWrongFormula::PutHere);
connect(ui->listWidget, &QListWidget::itemDoubleClicked, this, &DialogEditWrongFormula::PutVal); connect(ui->listWidget, &QListWidget::itemDoubleClicked, this, &DialogEditWrongFormula::PutVal);
connect(ui->toolButtonEqual, &QPushButton::clicked, this, &DialogEditWrongFormula::EvalFormula);
connect(ui->plainTextEditFormula, &QPlainTextEdit::textChanged, this, &DialogEditWrongFormula::FormulaChanged); connect(ui->plainTextEditFormula, &QPlainTextEdit::textChanged, this, &DialogEditWrongFormula::FormulaChanged);
connect(ui->pushButtonGrowLength, &QPushButton::clicked, this, &DialogEditWrongFormula::DeployFormulaTextEdit); connect(ui->pushButtonGrowLength, &QPushButton::clicked, this, &DialogEditWrongFormula::DeployFormulaTextEdit);

19
src/app/dialogs/tools/dialogeditwrongformula.ui
View File

@ -110,22 +110,12 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QToolButton" name="toolButtonEqual"> <widget class="QLabel" name="label">
<property name="toolTip">
<string>Calculate value</string>
</property>
<property name="text"> <property name="text">
<string notr="true">...</string> <string/>
</property> </property>
<property name="icon"> <property name="pixmap">
<iconset resource="../../share/resources/icon.qrc"> <pixmap resource="../../share/resources/icon.qrc">:/icon/24x24/equal.png</pixmap>
<normaloff>:/icon/24x24/equal.png</normaloff>:/icon/24x24/equal.png</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property> </property>
</widget> </widget>
</item> </item>
@ -392,7 +382,6 @@
<tabstops> <tabstops>
<tabstop>plainTextEditFormula</tabstop> <tabstop>plainTextEditFormula</tabstop>
<tabstop>toolButtonPutHere</tabstop> <tabstop>toolButtonPutHere</tabstop>
<tabstop>toolButtonEqual</tabstop>
<tabstop>pushButtonGrowLength</tabstop> <tabstop>pushButtonGrowLength</tabstop>
<tabstop>radioButtonSizeGrowth</tabstop> <tabstop>radioButtonSizeGrowth</tabstop>
<tabstop>radioButtonStandardTable</tabstop> <tabstop>radioButtonStandardTable</tabstop>

3
src/app/dialogs/tools/dialogendline.cpp
View File

@ -68,9 +68,6 @@ DialogEndLine::DialogEndLine(const VContainer *data, const quint32 &toolId, QWid
connect(ui->toolButtonPutHereLength, &QPushButton::clicked, this, &DialogEndLine::PutHere); connect(ui->toolButtonPutHereLength, &QPushButton::clicked, this, &DialogEndLine::PutHere);
connect(ui->toolButtonPutHereAngle, &QPushButton::clicked, this, &DialogEndLine::PutAngle); connect(ui->toolButtonPutHereAngle, &QPushButton::clicked, this, &DialogEndLine::PutAngle);
connect(ui->toolButtonEqualLength, &QPushButton::clicked, this, &DialogEndLine::EvalFormula);
connect(ui->toolButtonEqualAngle, &QPushButton::clicked, this, &DialogEndLine::EvalAngle);
connect(ui->lineEditNamePoint, &QLineEdit::textChanged, this, &DialogEndLine::NamePointChanged); connect(ui->lineEditNamePoint, &QLineEdit::textChanged, this, &DialogEndLine::NamePointChanged);
connect(ui->plainTextEditFormula, &QPlainTextEdit::textChanged, this, &DialogEndLine::FormulaTextChanged); connect(ui->plainTextEditFormula, &QPlainTextEdit::textChanged, this, &DialogEndLine::FormulaTextChanged);

40
src/app/dialogs/tools/dialogendline.ui
View File

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>417</width> <width>417</width>
<height>538</height> <height>571</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -110,22 +110,12 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QToolButton" name="toolButtonEqualLength"> <widget class="QLabel" name="label_4">
<property name="toolTip">
<string>Calculate value</string>
</property>
<property name="text"> <property name="text">
<string notr="true">...</string> <string/>
</property> </property>
<property name="icon"> <property name="pixmap">
<iconset resource="../../share/resources/icon.qrc"> <pixmap resource="../../share/resources/icon.qrc">:/icon/24x24/equal.png</pixmap>
<normaloff>:/icon/24x24/equal.png</normaloff>:/icon/24x24/equal.png</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property> </property>
</widget> </widget>
</item> </item>
@ -298,22 +288,12 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QToolButton" name="toolButtonEqualAngle"> <widget class="QLabel" name="label_5">
<property name="toolTip">
<string>Calculate value</string>
</property>
<property name="text"> <property name="text">
<string notr="true">...</string> <string/>
</property> </property>
<property name="icon"> <property name="pixmap">
<iconset resource="../../share/resources/icon.qrc"> <pixmap resource="../../share/resources/icon.qrc">:/icon/24x24/equal.png</pixmap>
<normaloff>:/icon/24x24/equal.png</normaloff>:/icon/24x24/equal.png</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property> </property>
</widget> </widget>
</item> </item>
@ -665,11 +645,9 @@
<tabstops> <tabstops>
<tabstop>plainTextEditFormula</tabstop> <tabstop>plainTextEditFormula</tabstop>
<tabstop>toolButtonPutHereLength</tabstop> <tabstop>toolButtonPutHereLength</tabstop>
<tabstop>toolButtonEqualLength</tabstop>
<tabstop>pushButtonGrowLength</tabstop> <tabstop>pushButtonGrowLength</tabstop>
<tabstop>plainTextEditAngle</tabstop> <tabstop>plainTextEditAngle</tabstop>
<tabstop>toolButtonPutHereAngle</tabstop> <tabstop>toolButtonPutHereAngle</tabstop>
<tabstop>toolButtonEqualAngle</tabstop>
<tabstop>pushButtonGrowLengthAngle</tabstop> <tabstop>pushButtonGrowLengthAngle</tabstop>
<tabstop>comboBoxBasePoint</tabstop> <tabstop>comboBoxBasePoint</tabstop>
<tabstop>lineEditNamePoint</tabstop> <tabstop>lineEditNamePoint</tabstop>

1
src/app/dialogs/tools/dialoglineintersectaxis.cpp
View File

@ -61,7 +61,6 @@ DialogLineIntersectAxis::DialogLineIntersectAxis(const VContainer *data, const q
connect(ui->toolButtonPutHereAngle, &QPushButton::clicked, this, &DialogLineIntersectAxis::PutAngle); connect(ui->toolButtonPutHereAngle, &QPushButton::clicked, this, &DialogLineIntersectAxis::PutAngle);
connect(listWidget, &QListWidget::itemDoubleClicked, this, &DialogLineIntersectAxis::PutVal); connect(listWidget, &QListWidget::itemDoubleClicked, this, &DialogLineIntersectAxis::PutVal);
connect(ui->toolButtonEqualAngle, &QPushButton::clicked, this, &DialogLineIntersectAxis::EvalAngle);
connect(ui->lineEditNamePoint, &QLineEdit::textChanged, this, &DialogLineIntersectAxis::NamePointChanged); connect(ui->lineEditNamePoint, &QLineEdit::textChanged, this, &DialogLineIntersectAxis::NamePointChanged);
connect(ui->plainTextEditFormula, &QPlainTextEdit::textChanged, this, &DialogLineIntersectAxis::AngleTextChanged); connect(ui->plainTextEditFormula, &QPlainTextEdit::textChanged, this, &DialogLineIntersectAxis::AngleTextChanged);
connect(ui->pushButtonGrowLengthAngle, &QPushButton::clicked, this, &DialogLineIntersectAxis::DeployAngleTextEdit); connect(ui->pushButtonGrowLengthAngle, &QPushButton::clicked, this, &DialogLineIntersectAxis::DeployAngleTextEdit);

19
src/app/dialogs/tools/dialoglineintersectaxis.ui
View File

@ -97,22 +97,12 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QToolButton" name="toolButtonEqualAngle"> <widget class="QLabel" name="label_3">
<property name="toolTip">
<string>Calculate value</string>
</property>
<property name="text"> <property name="text">
<string notr="true">...</string> <string/>
</property> </property>
<property name="icon"> <property name="pixmap">
<iconset resource="../../share/resources/icon.qrc"> <pixmap resource="../../share/resources/icon.qrc">:/icon/24x24/equal.png</pixmap>
<normaloff>:/icon/24x24/equal.png</normaloff>:/icon/24x24/equal.png</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property> </property>
</widget> </widget>
</item> </item>
@ -508,7 +498,6 @@
<tabstops> <tabstops>
<tabstop>plainTextEditFormula</tabstop> <tabstop>plainTextEditFormula</tabstop>
<tabstop>toolButtonPutHereAngle</tabstop> <tabstop>toolButtonPutHereAngle</tabstop>
<tabstop>toolButtonEqualAngle</tabstop>
<tabstop>pushButtonGrowLengthAngle</tabstop> <tabstop>pushButtonGrowLengthAngle</tabstop>
<tabstop>comboBoxAxisPoint</tabstop> <tabstop>comboBoxAxisPoint</tabstop>
<tabstop>comboBoxFirstLinePoint</tabstop> <tabstop>comboBoxFirstLinePoint</tabstop>

1
src/app/dialogs/tools/dialognormal.cpp
View File

@ -63,7 +63,6 @@ DialogNormal::DialogNormal(const VContainer *data, const quint32 &toolId, QWidge
connect(ui->toolButtonPutHere, &QPushButton::clicked, this, &DialogNormal::PutHere); connect(ui->toolButtonPutHere, &QPushButton::clicked, this, &DialogNormal::PutHere);
connect(ui->listWidget, &QListWidget::itemDoubleClicked, this, &DialogNormal::PutVal); connect(ui->listWidget, &QListWidget::itemDoubleClicked, this, &DialogNormal::PutVal);
connect(ui->toolButtonEqual, &QPushButton::clicked, this, &DialogNormal::EvalFormula);
connect(ui->lineEditNamePoint, &QLineEdit::textChanged, this, &DialogNormal::NamePointChanged); connect(ui->lineEditNamePoint, &QLineEdit::textChanged, this, &DialogNormal::NamePointChanged);
connect(ui->plainTextEditFormula, &QPlainTextEdit::textChanged, this, &DialogNormal::FormulaTextChanged); connect(ui->plainTextEditFormula, &QPlainTextEdit::textChanged, this, &DialogNormal::FormulaTextChanged);
connect(ui->pushButtonGrowLength, &QPushButton::clicked, this, &DialogNormal::DeployFormulaTextEdit); connect(ui->pushButtonGrowLength, &QPushButton::clicked, this, &DialogNormal::DeployFormulaTextEdit);

19
src/app/dialogs/tools/dialognormal.ui
View File

@ -107,22 +107,12 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QToolButton" name="toolButtonEqual"> <widget class="QLabel" name="label_3">
<property name="toolTip">
<string>Calculate value</string>
</property>
<property name="text"> <property name="text">
<string notr="true">...</string> <string/>
</property> </property>
<property name="icon"> <property name="pixmap">
<iconset resource="../../share/resources/icon.qrc"> <pixmap resource="../../share/resources/icon.qrc">:/icon/24x24/equal.png</pixmap>
<normaloff>:/icon/24x24/equal.png</normaloff>:/icon/24x24/equal.png</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property> </property>
</widget> </widget>
</item> </item>
@ -693,7 +683,6 @@
<tabstops> <tabstops>
<tabstop>plainTextEditFormula</tabstop> <tabstop>plainTextEditFormula</tabstop>
<tabstop>toolButtonPutHere</tabstop> <tabstop>toolButtonPutHere</tabstop>
<tabstop>toolButtonEqual</tabstop>
<tabstop>pushButtonGrowLength</tabstop> <tabstop>pushButtonGrowLength</tabstop>
<tabstop>lineEditNamePoint</tabstop> <tabstop>lineEditNamePoint</tabstop>
<tabstop>comboBoxFirstPoint</tabstop> <tabstop>comboBoxFirstPoint</tabstop>

1
src/app/dialogs/tools/dialogpointofcontact.cpp
View File

@ -78,7 +78,6 @@ DialogPointOfContact::DialogPointOfContact(const VContainer *data, const quint32
connect(ui->radioButtonLengthLine, &QRadioButton::clicked, this, &DialogPointOfContact::LengthLines); connect(ui->radioButtonLengthLine, &QRadioButton::clicked, this, &DialogPointOfContact::LengthLines);
connect(ui->radioButtonLengthArc, &QRadioButton::clicked, this, &DialogPointOfContact::LengthArcs); connect(ui->radioButtonLengthArc, &QRadioButton::clicked, this, &DialogPointOfContact::LengthArcs);
connect(ui->radioButtonLengthSpline, &QRadioButton::clicked, this, &DialogPointOfContact::LengthCurves); connect(ui->radioButtonLengthSpline, &QRadioButton::clicked, this, &DialogPointOfContact::LengthCurves);
connect(ui->toolButtonEqual, &QPushButton::clicked, this, &DialogPointOfContact::EvalFormula);
connect(ui->lineEditNamePoint, &QLineEdit::textChanged, this, &DialogPointOfContact::NamePointChanged); connect(ui->lineEditNamePoint, &QLineEdit::textChanged, this, &DialogPointOfContact::NamePointChanged);
connect(ui->plainTextEditFormula, &QPlainTextEdit::textChanged, this, &DialogPointOfContact::FormulaTextChanged); connect(ui->plainTextEditFormula, &QPlainTextEdit::textChanged, this, &DialogPointOfContact::FormulaTextChanged);
connect(ui->pushButtonGrowLength, &QPushButton::clicked, this, &DialogPointOfContact::DeployFormulaTextEdit); connect(ui->pushButtonGrowLength, &QPushButton::clicked, this, &DialogPointOfContact::DeployFormulaTextEdit);

19
src/app/dialogs/tools/dialogpointofcontact.ui
View File

@ -107,22 +107,12 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QToolButton" name="toolButtonEqual"> <widget class="QLabel" name="label">
<property name="toolTip">
<string>Calculate value</string>
</property>
<property name="text"> <property name="text">
<string notr="true">...</string> <string/>
</property> </property>
<property name="icon"> <property name="pixmap">
<iconset resource="../../share/resources/icon.qrc"> <pixmap resource="../../share/resources/icon.qrc">:/icon/24x24/equal.png</pixmap>
<normaloff>:/icon/24x24/equal.png</normaloff>:/icon/24x24/equal.png</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property> </property>
</widget> </widget>
</item> </item>
@ -502,7 +492,6 @@
<tabstops> <tabstops>
<tabstop>plainTextEditFormula</tabstop> <tabstop>plainTextEditFormula</tabstop>
<tabstop>toolButtonPutHere</tabstop> <tabstop>toolButtonPutHere</tabstop>
<tabstop>toolButtonEqual</tabstop>
<tabstop>pushButtonGrowLength</tabstop> <tabstop>pushButtonGrowLength</tabstop>
<tabstop>lineEditNamePoint</tabstop> <tabstop>lineEditNamePoint</tabstop>
<tabstop>comboBoxCenter</tabstop> <tabstop>comboBoxCenter</tabstop>

1
src/app/dialogs/tools/dialogshoulderpoint.cpp
View File

@ -65,7 +65,6 @@ DialogShoulderPoint::DialogShoulderPoint(const VContainer *data, const quint32 &
connect(ui->toolButtonPutHere, &QPushButton::clicked, this, &DialogShoulderPoint::PutHere); connect(ui->toolButtonPutHere, &QPushButton::clicked, this, &DialogShoulderPoint::PutHere);
connect(ui->listWidget, &QListWidget::itemDoubleClicked, this, &DialogShoulderPoint::PutVal); connect(ui->listWidget, &QListWidget::itemDoubleClicked, this, &DialogShoulderPoint::PutVal);
connect(ui->toolButtonEqual, &QPushButton::clicked, this, &DialogShoulderPoint::EvalFormula);
connect(ui->lineEditNamePoint, &QLineEdit::textChanged, this, &DialogShoulderPoint::NamePointChanged); connect(ui->lineEditNamePoint, &QLineEdit::textChanged, this, &DialogShoulderPoint::NamePointChanged);
connect(ui->plainTextEditFormula, &QPlainTextEdit::textChanged, this, &DialogShoulderPoint::FormulaTextChanged); connect(ui->plainTextEditFormula, &QPlainTextEdit::textChanged, this, &DialogShoulderPoint::FormulaTextChanged);
connect(ui->pushButtonGrowLength, &QPushButton::clicked, this, &DialogShoulderPoint::DeployFormulaTextEdit); connect(ui->pushButtonGrowLength, &QPushButton::clicked, this, &DialogShoulderPoint::DeployFormulaTextEdit);

19
src/app/dialogs/tools/dialogshoulderpoint.ui
View File

@ -107,22 +107,12 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QToolButton" name="toolButtonEqual"> <widget class="QLabel" name="label_3">
<property name="toolTip">
<string>Calculate value</string>
</property>
<property name="text"> <property name="text">
<string notr="true">...</string> <string/>
</property> </property>
<property name="icon"> <property name="pixmap">
<iconset resource="../../share/resources/icon.qrc"> <pixmap resource="../../share/resources/icon.qrc">:/icon/24x24/equal.png</pixmap>
<normaloff>:/icon/24x24/equal.png</normaloff>:/icon/24x24/equal.png</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property> </property>
</widget> </widget>
</item> </item>
@ -541,7 +531,6 @@
<tabstops> <tabstops>
<tabstop>plainTextEditFormula</tabstop> <tabstop>plainTextEditFormula</tabstop>
<tabstop>toolButtonPutHere</tabstop> <tabstop>toolButtonPutHere</tabstop>
<tabstop>toolButtonEqual</tabstop>
<tabstop>pushButtonGrowLength</tabstop> <tabstop>pushButtonGrowLength</tabstop>
<tabstop>lineEditNamePoint</tabstop> <tabstop>lineEditNamePoint</tabstop>
<tabstop>comboBoxP1Line</tabstop> <tabstop>comboBoxP1Line</tabstop>