From bac1baf59fcafba2fd8b14240e181318c522ddf3 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 16 Feb 2015 15:54:56 +0200 Subject: [PATCH] Fixed issue #184. Delete button "Equal" in dialogs. --HG-- branch : develop --- src/app/dialogs/tools/dialogalongline.cpp | 1 - src/app/dialogs/tools/dialogalongline.ui | 19 ++----- src/app/dialogs/tools/dialogarc.cpp | 4 -- src/app/dialogs/tools/dialogarc.ui | 57 ++++--------------- src/app/dialogs/tools/dialogbisector.cpp | 1 - src/app/dialogs/tools/dialogbisector.ui | 19 ++----- .../tools/dialogcurveintersectaxis.cpp | 1 - .../dialogs/tools/dialogcurveintersectaxis.ui | 19 ++----- src/app/dialogs/tools/dialogcutarc.cpp | 1 - src/app/dialogs/tools/dialogcutarc.ui | 19 ++----- src/app/dialogs/tools/dialogcutspline.cpp | 1 - src/app/dialogs/tools/dialogcutspline.ui | 19 ++----- src/app/dialogs/tools/dialogcutsplinepath.cpp | 1 - src/app/dialogs/tools/dialogcutsplinepath.ui | 19 ++----- .../dialogs/tools/dialogeditwrongformula.cpp | 1 - .../dialogs/tools/dialogeditwrongformula.ui | 19 ++----- src/app/dialogs/tools/dialogendline.cpp | 3 - src/app/dialogs/tools/dialogendline.ui | 40 +++---------- .../dialogs/tools/dialoglineintersectaxis.cpp | 1 - .../dialogs/tools/dialoglineintersectaxis.ui | 19 ++----- src/app/dialogs/tools/dialognormal.cpp | 1 - src/app/dialogs/tools/dialognormal.ui | 19 ++----- .../dialogs/tools/dialogpointofcontact.cpp | 1 - src/app/dialogs/tools/dialogpointofcontact.ui | 19 ++----- src/app/dialogs/tools/dialogshoulderpoint.cpp | 1 - src/app/dialogs/tools/dialogshoulderpoint.ui | 19 ++----- 26 files changed, 65 insertions(+), 259 deletions(-) diff --git a/src/app/dialogs/tools/dialogalongline.cpp b/src/app/dialogs/tools/dialogalongline.cpp index 46463ff6e..ff9f3d641 100644 --- a/src/app/dialogs/tools/dialogalongline.cpp +++ b/src/app/dialogs/tools/dialogalongline.cpp @@ -64,7 +64,6 @@ DialogAlongLine::DialogAlongLine(const VContainer *data, const quint32 &toolId, connect(ui->toolButtonPutHere, &QPushButton::clicked, this, &DialogAlongLine::PutHere); 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->pushButtonGrowLength, &QPushButton::clicked, this, &DialogAlongLine::DeployFormulaTextEdit); connect(listWidget, &QListWidget::itemDoubleClicked, this, &DialogTool::PutVal); diff --git a/src/app/dialogs/tools/dialogalongline.ui b/src/app/dialogs/tools/dialogalongline.ui index 3dec6c83a..075d80cd0 100644 --- a/src/app/dialogs/tools/dialogalongline.ui +++ b/src/app/dialogs/tools/dialogalongline.ui @@ -107,22 +107,12 @@ - - - Calculate value - + - ... + - - - :/icon/24x24/equal.png:/icon/24x24/equal.png - - - - 24 - 24 - + + :/icon/24x24/equal.png @@ -476,7 +466,6 @@ plainTextEditFormula toolButtonPutHere - toolButtonEqual pushButtonGrowLength lineEditNamePoint comboBoxFirstPoint diff --git a/src/app/dialogs/tools/dialogarc.cpp b/src/app/dialogs/tools/dialogarc.cpp index 778f64c9e..728ead1ac 100644 --- a/src/app/dialogs/tools/dialogarc.cpp +++ b/src/app/dialogs/tools/dialogarc.cpp @@ -82,10 +82,6 @@ DialogArc::DialogArc(const VContainer *data, const quint32 &toolId, QWidget *par connect(ui->toolButtonPutHereF1, &QPushButton::clicked, this, &DialogArc::PutF1); 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->plainTextEditF1, &QPlainTextEdit::textChanged, this, &DialogArc::F1Changed); connect(ui->plainTextEditF2, &QPlainTextEdit::textChanged, this, &DialogArc::F2Changed); diff --git a/src/app/dialogs/tools/dialogarc.ui b/src/app/dialogs/tools/dialogarc.ui index 1926f3291..74bb663a3 100644 --- a/src/app/dialogs/tools/dialogarc.ui +++ b/src/app/dialogs/tools/dialogarc.ui @@ -107,22 +107,12 @@ - - - Calculate value - + - ... + - - - :/icon/24x24/equal.png:/icon/24x24/equal.png - - - - 24 - 24 - + + :/icon/24x24/equal.png @@ -295,22 +285,12 @@ - - - Calculate value - + - ... + - - - :/icon/24x24/equal.png:/icon/24x24/equal.png - - - - 24 - 24 - + + :/icon/24x24/equal.png @@ -483,22 +463,12 @@ - - - Calculate value - + - ... + - - - :/icon/24x24/equal.png:/icon/24x24/equal.png - - - - 24 - 24 - + + :/icon/24x24/equal.png @@ -790,15 +760,12 @@ plainTextEditFormula toolButtonPutHereRadius - toolButtonEqualRadius pushButtonGrowLength plainTextEditF1 toolButtonPutHereF1 - toolButtonEqualF1 pushButtonGrowLengthF1 plainTextEditF2 toolButtonPutHereF2 - toolButtonEqualF2 pushButtonGrowLengthF2 radioButtonSizeGrowth radioButtonStandardTable diff --git a/src/app/dialogs/tools/dialogbisector.cpp b/src/app/dialogs/tools/dialogbisector.cpp index 98e68ab91..d5fc72190 100644 --- a/src/app/dialogs/tools/dialogbisector.cpp +++ b/src/app/dialogs/tools/dialogbisector.cpp @@ -66,7 +66,6 @@ DialogBisector::DialogBisector(const VContainer *data, const quint32 &toolId, QW connect(ui->toolButtonPutHere, &QPushButton::clicked, this, &DialogBisector::PutHere); 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->plainTextEditFormula, &QPlainTextEdit::textChanged, this, &DialogBisector::FormulaTextChanged); connect(ui->pushButtonGrowLength, &QPushButton::clicked, this, &DialogBisector::DeployFormulaTextEdit); diff --git a/src/app/dialogs/tools/dialogbisector.ui b/src/app/dialogs/tools/dialogbisector.ui index 40d359b8b..5ff3ab60a 100644 --- a/src/app/dialogs/tools/dialogbisector.ui +++ b/src/app/dialogs/tools/dialogbisector.ui @@ -104,22 +104,12 @@ - - - Calculate value - + - ... + - - - :/icon/24x24/equal.png:/icon/24x24/equal.png - - - - 24 - 24 - + + :/icon/24x24/equal.png @@ -505,7 +495,6 @@ plainTextEditFormula toolButtonPutHere - toolButtonEqual pushButtonGrowLength lineEditNamePoint comboBoxFirstPoint diff --git a/src/app/dialogs/tools/dialogcurveintersectaxis.cpp b/src/app/dialogs/tools/dialogcurveintersectaxis.cpp index 839fb5dc5..43b79a5cb 100644 --- a/src/app/dialogs/tools/dialogcurveintersectaxis.cpp +++ b/src/app/dialogs/tools/dialogcurveintersectaxis.cpp @@ -61,7 +61,6 @@ DialogCurveIntersectAxis::DialogCurveIntersectAxis(const VContainer *data, const connect(ui->toolButtonPutHereAngle, &QPushButton::clicked, this, &DialogCurveIntersectAxis::PutAngle); 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->plainTextEditFormula, &QPlainTextEdit::textChanged, this, &DialogCurveIntersectAxis::AngleTextChanged); connect(ui->pushButtonGrowLengthAngle, &QPushButton::clicked, this, &DialogCurveIntersectAxis::DeployAngleTextEdit); diff --git a/src/app/dialogs/tools/dialogcurveintersectaxis.ui b/src/app/dialogs/tools/dialogcurveintersectaxis.ui index c947ba329..55721a6b1 100644 --- a/src/app/dialogs/tools/dialogcurveintersectaxis.ui +++ b/src/app/dialogs/tools/dialogcurveintersectaxis.ui @@ -97,22 +97,12 @@ - - - Calculate value - + - ... + - - - :/icon/24x24/equal.png:/icon/24x24/equal.png - - - - 24 - 24 - + + :/icon/24x24/equal.png @@ -491,7 +481,6 @@ plainTextEditFormula toolButtonPutHereAngle - toolButtonEqualAngle pushButtonGrowLengthAngle comboBoxAxisPoint comboBoxCurve diff --git a/src/app/dialogs/tools/dialogcutarc.cpp b/src/app/dialogs/tools/dialogcutarc.cpp index 6650a4751..c9ce1d94c 100644 --- a/src/app/dialogs/tools/dialogcutarc.cpp +++ b/src/app/dialogs/tools/dialogcutarc.cpp @@ -63,7 +63,6 @@ DialogCutArc::DialogCutArc(const VContainer *data, const quint32 &toolId, QWidge connect(ui->toolButtonPutHere, &QPushButton::clicked, this, &DialogCutArc::PutHere); 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->plainTextEditFormula, &QPlainTextEdit::textChanged, this, &DialogCutArc::FormulaTextChanged); connect(ui->pushButtonGrowLength, &QPushButton::clicked, this, &DialogCutArc::DeployFormulaTextEdit); diff --git a/src/app/dialogs/tools/dialogcutarc.ui b/src/app/dialogs/tools/dialogcutarc.ui index 3ee9722f0..2889981d6 100644 --- a/src/app/dialogs/tools/dialogcutarc.ui +++ b/src/app/dialogs/tools/dialogcutarc.ui @@ -101,22 +101,12 @@ - - - Calculate value - + - ... + - - - :/icon/24x24/equal.png:/icon/24x24/equal.png - - - - 24 - 24 - + + :/icon/24x24/equal.png @@ -427,7 +417,6 @@ plainTextEditFormula toolButtonPutHere - toolButtonEqual pushButtonGrowLength comboBoxArc lineEditNamePoint diff --git a/src/app/dialogs/tools/dialogcutspline.cpp b/src/app/dialogs/tools/dialogcutspline.cpp index 13a55e935..2130e25f7 100644 --- a/src/app/dialogs/tools/dialogcutspline.cpp +++ b/src/app/dialogs/tools/dialogcutspline.cpp @@ -61,7 +61,6 @@ DialogCutSpline::DialogCutSpline(const VContainer *data, const quint32 &toolId, connect(ui->toolButtonPutHere, &QPushButton::clicked, this, &DialogCutSpline::PutHere); 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->plainTextEditFormula, &QPlainTextEdit::textChanged, this, &DialogCutSpline::FormulaChanged); connect(ui->pushButtonGrowLength, &QPushButton::clicked, this, &DialogCutSpline::DeployFormulaTextEdit); diff --git a/src/app/dialogs/tools/dialogcutspline.ui b/src/app/dialogs/tools/dialogcutspline.ui index c7df135dc..ef19baea9 100644 --- a/src/app/dialogs/tools/dialogcutspline.ui +++ b/src/app/dialogs/tools/dialogcutspline.ui @@ -101,22 +101,12 @@ - - - Calculate value - + - ... + - - - :/icon/24x24/equal.png:/icon/24x24/equal.png - - - - 24 - 24 - + + :/icon/24x24/equal.png @@ -427,7 +417,6 @@ plainTextEditFormula toolButtonPutHere - toolButtonEqual pushButtonGrowLength comboBoxSpline lineEditNamePoint diff --git a/src/app/dialogs/tools/dialogcutsplinepath.cpp b/src/app/dialogs/tools/dialogcutsplinepath.cpp index 507d53a3e..9351c4102 100644 --- a/src/app/dialogs/tools/dialogcutsplinepath.cpp +++ b/src/app/dialogs/tools/dialogcutsplinepath.cpp @@ -61,7 +61,6 @@ DialogCutSplinePath::DialogCutSplinePath(const VContainer *data, const quint32 & connect(ui->toolButtonPutHere, &QPushButton::clicked, this, &DialogCutSplinePath::PutHere); 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->plainTextEditFormula, &QPlainTextEdit::textChanged, this, &DialogCutSplinePath::FormulaChanged); connect(ui->pushButtonGrowLength, &QPushButton::clicked, this, &DialogCutSplinePath::DeployFormulaTextEdit); diff --git a/src/app/dialogs/tools/dialogcutsplinepath.ui b/src/app/dialogs/tools/dialogcutsplinepath.ui index 2312d2eed..a2fdc21da 100644 --- a/src/app/dialogs/tools/dialogcutsplinepath.ui +++ b/src/app/dialogs/tools/dialogcutsplinepath.ui @@ -101,22 +101,12 @@ - - - Calculate value - + - ... + - - - :/icon/24x24/equal.png:/icon/24x24/equal.png - - - - 24 - 24 - + + :/icon/24x24/equal.png @@ -433,7 +423,6 @@ plainTextEditFormula toolButtonPutHere - toolButtonEqual pushButtonGrowLength comboBoxSplinePath lineEditNamePoint diff --git a/src/app/dialogs/tools/dialogeditwrongformula.cpp b/src/app/dialogs/tools/dialogeditwrongformula.cpp index 804a78ff6..7800625c0 100644 --- a/src/app/dialogs/tools/dialogeditwrongformula.cpp +++ b/src/app/dialogs/tools/dialogeditwrongformula.cpp @@ -47,7 +47,6 @@ DialogEditWrongFormula::DialogEditWrongFormula(const VContainer *data, const qui connect(ui->toolButtonPutHere, &QPushButton::clicked, this, &DialogEditWrongFormula::PutHere); 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->pushButtonGrowLength, &QPushButton::clicked, this, &DialogEditWrongFormula::DeployFormulaTextEdit); diff --git a/src/app/dialogs/tools/dialogeditwrongformula.ui b/src/app/dialogs/tools/dialogeditwrongformula.ui index 47d43dd6a..0c84e4d32 100644 --- a/src/app/dialogs/tools/dialogeditwrongformula.ui +++ b/src/app/dialogs/tools/dialogeditwrongformula.ui @@ -110,22 +110,12 @@ - - - Calculate value - + - ... + - - - :/icon/24x24/equal.png:/icon/24x24/equal.png - - - - 24 - 24 - + + :/icon/24x24/equal.png @@ -392,7 +382,6 @@ plainTextEditFormula toolButtonPutHere - toolButtonEqual pushButtonGrowLength radioButtonSizeGrowth radioButtonStandardTable diff --git a/src/app/dialogs/tools/dialogendline.cpp b/src/app/dialogs/tools/dialogendline.cpp index 3ecb0651d..87ab2e9ca 100644 --- a/src/app/dialogs/tools/dialogendline.cpp +++ b/src/app/dialogs/tools/dialogendline.cpp @@ -68,9 +68,6 @@ DialogEndLine::DialogEndLine(const VContainer *data, const quint32 &toolId, QWid connect(ui->toolButtonPutHereLength, &QPushButton::clicked, this, &DialogEndLine::PutHere); 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->plainTextEditFormula, &QPlainTextEdit::textChanged, this, &DialogEndLine::FormulaTextChanged); diff --git a/src/app/dialogs/tools/dialogendline.ui b/src/app/dialogs/tools/dialogendline.ui index 93dbd3f8f..6ddd69fcd 100644 --- a/src/app/dialogs/tools/dialogendline.ui +++ b/src/app/dialogs/tools/dialogendline.ui @@ -7,7 +7,7 @@ 0 0 417 - 538 + 571 @@ -110,22 +110,12 @@ - - - Calculate value - + - ... + - - - :/icon/24x24/equal.png:/icon/24x24/equal.png - - - - 24 - 24 - + + :/icon/24x24/equal.png @@ -298,22 +288,12 @@ - - - Calculate value - + - ... + - - - :/icon/24x24/equal.png:/icon/24x24/equal.png - - - - 24 - 24 - + + :/icon/24x24/equal.png @@ -665,11 +645,9 @@ plainTextEditFormula toolButtonPutHereLength - toolButtonEqualLength pushButtonGrowLength plainTextEditAngle toolButtonPutHereAngle - toolButtonEqualAngle pushButtonGrowLengthAngle comboBoxBasePoint lineEditNamePoint diff --git a/src/app/dialogs/tools/dialoglineintersectaxis.cpp b/src/app/dialogs/tools/dialoglineintersectaxis.cpp index 39e12c91b..ee14ccc22 100644 --- a/src/app/dialogs/tools/dialoglineintersectaxis.cpp +++ b/src/app/dialogs/tools/dialoglineintersectaxis.cpp @@ -61,7 +61,6 @@ DialogLineIntersectAxis::DialogLineIntersectAxis(const VContainer *data, const q connect(ui->toolButtonPutHereAngle, &QPushButton::clicked, this, &DialogLineIntersectAxis::PutAngle); 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->plainTextEditFormula, &QPlainTextEdit::textChanged, this, &DialogLineIntersectAxis::AngleTextChanged); connect(ui->pushButtonGrowLengthAngle, &QPushButton::clicked, this, &DialogLineIntersectAxis::DeployAngleTextEdit); diff --git a/src/app/dialogs/tools/dialoglineintersectaxis.ui b/src/app/dialogs/tools/dialoglineintersectaxis.ui index 93bb92747..235d515c9 100644 --- a/src/app/dialogs/tools/dialoglineintersectaxis.ui +++ b/src/app/dialogs/tools/dialoglineintersectaxis.ui @@ -97,22 +97,12 @@ - - - Calculate value - + - ... + - - - :/icon/24x24/equal.png:/icon/24x24/equal.png - - - - 24 - 24 - + + :/icon/24x24/equal.png @@ -508,7 +498,6 @@ plainTextEditFormula toolButtonPutHereAngle - toolButtonEqualAngle pushButtonGrowLengthAngle comboBoxAxisPoint comboBoxFirstLinePoint diff --git a/src/app/dialogs/tools/dialognormal.cpp b/src/app/dialogs/tools/dialognormal.cpp index 0d6ae44a6..0c456e781 100644 --- a/src/app/dialogs/tools/dialognormal.cpp +++ b/src/app/dialogs/tools/dialognormal.cpp @@ -63,7 +63,6 @@ DialogNormal::DialogNormal(const VContainer *data, const quint32 &toolId, QWidge connect(ui->toolButtonPutHere, &QPushButton::clicked, this, &DialogNormal::PutHere); 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->plainTextEditFormula, &QPlainTextEdit::textChanged, this, &DialogNormal::FormulaTextChanged); connect(ui->pushButtonGrowLength, &QPushButton::clicked, this, &DialogNormal::DeployFormulaTextEdit); diff --git a/src/app/dialogs/tools/dialognormal.ui b/src/app/dialogs/tools/dialognormal.ui index b5fb9541a..ce49c22ef 100644 --- a/src/app/dialogs/tools/dialognormal.ui +++ b/src/app/dialogs/tools/dialognormal.ui @@ -107,22 +107,12 @@ - - - Calculate value - + - ... + - - - :/icon/24x24/equal.png:/icon/24x24/equal.png - - - - 24 - 24 - + + :/icon/24x24/equal.png @@ -693,7 +683,6 @@ plainTextEditFormula toolButtonPutHere - toolButtonEqual pushButtonGrowLength lineEditNamePoint comboBoxFirstPoint diff --git a/src/app/dialogs/tools/dialogpointofcontact.cpp b/src/app/dialogs/tools/dialogpointofcontact.cpp index 84328c2f3..31581734c 100644 --- a/src/app/dialogs/tools/dialogpointofcontact.cpp +++ b/src/app/dialogs/tools/dialogpointofcontact.cpp @@ -78,7 +78,6 @@ DialogPointOfContact::DialogPointOfContact(const VContainer *data, const quint32 connect(ui->radioButtonLengthLine, &QRadioButton::clicked, this, &DialogPointOfContact::LengthLines); connect(ui->radioButtonLengthArc, &QRadioButton::clicked, this, &DialogPointOfContact::LengthArcs); 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->plainTextEditFormula, &QPlainTextEdit::textChanged, this, &DialogPointOfContact::FormulaTextChanged); connect(ui->pushButtonGrowLength, &QPushButton::clicked, this, &DialogPointOfContact::DeployFormulaTextEdit); diff --git a/src/app/dialogs/tools/dialogpointofcontact.ui b/src/app/dialogs/tools/dialogpointofcontact.ui index 3b5b1c350..cd0d23b27 100644 --- a/src/app/dialogs/tools/dialogpointofcontact.ui +++ b/src/app/dialogs/tools/dialogpointofcontact.ui @@ -107,22 +107,12 @@ - - - Calculate value - + - ... + - - - :/icon/24x24/equal.png:/icon/24x24/equal.png - - - - 24 - 24 - + + :/icon/24x24/equal.png @@ -502,7 +492,6 @@ plainTextEditFormula toolButtonPutHere - toolButtonEqual pushButtonGrowLength lineEditNamePoint comboBoxCenter diff --git a/src/app/dialogs/tools/dialogshoulderpoint.cpp b/src/app/dialogs/tools/dialogshoulderpoint.cpp index ad92e20c8..0fa24a2b5 100644 --- a/src/app/dialogs/tools/dialogshoulderpoint.cpp +++ b/src/app/dialogs/tools/dialogshoulderpoint.cpp @@ -65,7 +65,6 @@ DialogShoulderPoint::DialogShoulderPoint(const VContainer *data, const quint32 & connect(ui->toolButtonPutHere, &QPushButton::clicked, this, &DialogShoulderPoint::PutHere); 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->plainTextEditFormula, &QPlainTextEdit::textChanged, this, &DialogShoulderPoint::FormulaTextChanged); connect(ui->pushButtonGrowLength, &QPushButton::clicked, this, &DialogShoulderPoint::DeployFormulaTextEdit); diff --git a/src/app/dialogs/tools/dialogshoulderpoint.ui b/src/app/dialogs/tools/dialogshoulderpoint.ui index c63a6d001..f39cd5281 100644 --- a/src/app/dialogs/tools/dialogshoulderpoint.ui +++ b/src/app/dialogs/tools/dialogshoulderpoint.ui @@ -107,22 +107,12 @@ - - - Calculate value - + - ... + - - - :/icon/24x24/equal.png:/icon/24x24/equal.png - - - - 24 - 24 - + + :/icon/24x24/equal.png @@ -541,7 +531,6 @@ plainTextEditFormula toolButtonPutHere - toolButtonEqual pushButtonGrowLength lineEditNamePoint comboBoxP1Line