From 6f1dcb759219c436358f11c3943448edb72ef190 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Wed, 9 Dec 2015 12:40:43 +0200 Subject: [PATCH] Resolved build issue on OpenSuse. The method setClearButtonEnable is available only since Qt 5.2. --HG-- branch : develop --- src/app/tape/tmainwindow.cpp | 10 +++++++++ src/app/tape/tmainwindow.ui | 21 ------------------- .../valentina/dialogs/dialogincrements.cpp | 5 +++++ src/app/valentina/dialogs/dialogincrements.ui | 3 --- .../valentina/dialogs/dialognewpattern.cpp | 4 ++++ src/app/valentina/dialogs/dialognewpattern.ui | 3 --- .../dialogs/dialogpatternproperties.cpp | 4 ++++ .../dialogs/dialogpatternproperties.ui | 3 --- .../valentina/dialogs/dialogsavelayout.cpp | 5 +++++ src/app/valentina/dialogs/dialogsavelayout.ui | 6 ------ .../vtools/dialogs/tools/dialogalongline.cpp | 5 +++++ .../vtools/dialogs/tools/dialogalongline.ui | 3 --- .../vtools/dialogs/tools/dialogbisector.cpp | 5 +++++ .../vtools/dialogs/tools/dialogbisector.ui | 3 --- .../tools/dialogcurveintersectaxis.cpp | 4 ++++ .../dialogs/tools/dialogcurveintersectaxis.ui | 3 --- .../vtools/dialogs/tools/dialogcutarc.cpp | 5 +++++ src/libs/vtools/dialogs/tools/dialogcutarc.ui | 3 --- .../vtools/dialogs/tools/dialogcutspline.cpp | 5 +++++ .../vtools/dialogs/tools/dialogcutspline.ui | 3 --- .../dialogs/tools/dialogcutsplinepath.cpp | 5 +++++ .../dialogs/tools/dialogcutsplinepath.ui | 3 --- .../vtools/dialogs/tools/dialogdetail.cpp | 5 +++++ src/libs/vtools/dialogs/tools/dialogdetail.ui | 3 --- .../vtools/dialogs/tools/dialogendline.cpp | 5 +++++ .../vtools/dialogs/tools/dialogendline.ui | 3 --- .../vtools/dialogs/tools/dialogheight.cpp | 5 +++++ src/libs/vtools/dialogs/tools/dialogheight.ui | 3 --- .../dialogs/tools/dialoglineintersect.cpp | 5 +++++ .../dialogs/tools/dialoglineintersect.ui | 3 --- .../dialogs/tools/dialoglineintersectaxis.cpp | 5 +++++ .../dialogs/tools/dialoglineintersectaxis.ui | 3 --- .../vtools/dialogs/tools/dialognormal.cpp | 5 +++++ src/libs/vtools/dialogs/tools/dialognormal.ui | 3 --- .../tools/dialogpointfromarcandtangent.cpp | 4 ++++ .../tools/dialogpointfromarcandtangent.ui | 3 --- .../tools/dialogpointfromcircleandtangent.cpp | 4 ++++ .../tools/dialogpointfromcircleandtangent.ui | 3 --- .../dialogs/tools/dialogpointofcontact.cpp | 5 +++++ .../dialogs/tools/dialogpointofcontact.ui | 3 --- .../tools/dialogpointofintersection.cpp | 5 +++++ .../tools/dialogpointofintersection.ui | 3 --- .../tools/dialogpointofintersectionarcs.cpp | 5 +++++ .../tools/dialogpointofintersectionarcs.ui | 3 --- .../dialogpointofintersectioncircles.cpp | 4 ++++ .../tools/dialogpointofintersectioncircles.ui | 3 --- .../dialogs/tools/dialogshoulderpoint.cpp | 5 +++++ .../dialogs/tools/dialogshoulderpoint.ui | 3 --- .../dialogs/tools/dialogsinglepoint.cpp | 5 +++++ .../vtools/dialogs/tools/dialogsinglepoint.ui | 3 --- .../vtools/dialogs/tools/dialogtriangle.cpp | 5 +++++ .../vtools/dialogs/tools/dialogtriangle.ui | 3 --- .../vtools/dialogs/tools/dialogtruedarts.cpp | 6 ++++++ .../vtools/dialogs/tools/dialogtruedarts.ui | 6 ------ 54 files changed, 135 insertions(+), 105 deletions(-) diff --git a/src/app/tape/tmainwindow.cpp b/src/app/tape/tmainwindow.cpp index dc10d2c7a..00c433bba 100644 --- a/src/app/tape/tmainwindow.cpp +++ b/src/app/tape/tmainwindow.cpp @@ -101,6 +101,16 @@ TMainWindow::TMainWindow(QWidget *parent) isInitialized(false) { ui->setupUi(this); + +#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0) + ui->lineEditFind->setClearButtonEnabled(true); + ui->lineEditName->setClearButtonEnabled(true); + ui->lineEditFullName->setClearButtonEnabled(true); + ui->lineEditGivenName->setClearButtonEnabled(true); + ui->lineEditFamilyName->setClearButtonEnabled(true); + ui->lineEditEmail->setClearButtonEnabled(true); +#endif + search = QSharedPointer(new VTableSearch(ui->tableWidget)); ui->tabWidget->setVisible(false); diff --git a/src/app/tape/tmainwindow.ui b/src/app/tape/tmainwindow.ui index c2637e773..7896c9dbf 100644 --- a/src/app/tape/tmainwindow.ui +++ b/src/app/tape/tmainwindow.ui @@ -75,9 +75,6 @@ Search - - true - @@ -220,9 +217,6 @@ Measurement's name in a formula. - - true - @@ -558,9 +552,6 @@ Measurement's human-readable name. - - true - @@ -626,9 +617,6 @@ Path to the measurement file. - - false - @@ -698,9 +686,6 @@ Customer's name. - - true - @@ -724,9 +709,6 @@ Customer's family name. - - true - @@ -799,9 +781,6 @@ Customer's email address. - - true - diff --git a/src/app/valentina/dialogs/dialogincrements.cpp b/src/app/valentina/dialogs/dialogincrements.cpp index f129d167b..1a9118413 100644 --- a/src/app/valentina/dialogs/dialogincrements.cpp +++ b/src/app/valentina/dialogs/dialogincrements.cpp @@ -60,6 +60,11 @@ DialogIncrements::DialogIncrements(VContainer *data, VPattern *doc, QWidget *par formulaBaseHeight(0) { ui->setupUi(this); + +#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0) + ui->lineEditName->setClearButtonEnabled(true); +#endif + formulaBaseHeight = ui->plainTextEditFormula->height(); qApp->Settings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale(QLocale::C)); diff --git a/src/app/valentina/dialogs/dialogincrements.ui b/src/app/valentina/dialogs/dialogincrements.ui index a7e45c07b..b5569c169 100644 --- a/src/app/valentina/dialogs/dialogincrements.ui +++ b/src/app/valentina/dialogs/dialogincrements.ui @@ -267,9 +267,6 @@ Unique increment name - - true - diff --git a/src/app/valentina/dialogs/dialognewpattern.cpp b/src/app/valentina/dialogs/dialognewpattern.cpp index f37dd127a..fcf9b8334 100644 --- a/src/app/valentina/dialogs/dialognewpattern.cpp +++ b/src/app/valentina/dialogs/dialognewpattern.cpp @@ -45,6 +45,10 @@ DialogNewPattern::DialogNewPattern(VContainer *data, const QString &patternPiece { ui->setupUi(this); +#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0) + ui->lineEditName->setClearButtonEnabled(true); +#endif + qApp->ValentinaSettings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale(QLocale::C)); QRect position = this->frameGeometry(); diff --git a/src/app/valentina/dialogs/dialognewpattern.ui b/src/app/valentina/dialogs/dialognewpattern.ui index c6fe3aa48..efcbd1cd0 100644 --- a/src/app/valentina/dialogs/dialognewpattern.ui +++ b/src/app/valentina/dialogs/dialognewpattern.ui @@ -44,9 +44,6 @@ Choose unique pattern piece name. - - true - diff --git a/src/app/valentina/dialogs/dialogpatternproperties.cpp b/src/app/valentina/dialogs/dialogpatternproperties.cpp index 49e612efd..f3205ad68 100644 --- a/src/app/valentina/dialogs/dialogpatternproperties.cpp +++ b/src/app/valentina/dialogs/dialogpatternproperties.cpp @@ -43,6 +43,10 @@ DialogPatternProperties::DialogPatternProperties(VPattern *doc, QWidget *parent) { ui->setupUi(this); +#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0) + ui->lineEditAuthor->setClearButtonEnabled(true); +#endif + SCASSERT(doc != nullptr); qApp->ValentinaSettings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale(QLocale::C)); diff --git a/src/app/valentina/dialogs/dialogpatternproperties.ui b/src/app/valentina/dialogs/dialogpatternproperties.ui index 4307a51de..88dbf2060 100644 --- a/src/app/valentina/dialogs/dialogpatternproperties.ui +++ b/src/app/valentina/dialogs/dialogpatternproperties.ui @@ -39,9 +39,6 @@ - - true - diff --git a/src/app/valentina/dialogs/dialogsavelayout.cpp b/src/app/valentina/dialogs/dialogsavelayout.cpp index 7e407755f..d5378ae12 100644 --- a/src/app/valentina/dialogs/dialogsavelayout.cpp +++ b/src/app/valentina/dialogs/dialogsavelayout.cpp @@ -50,6 +50,11 @@ DialogSaveLayout::DialogSaveLayout(int count, const QString &fileName, QWidget * { ui->setupUi(this); +#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0) + ui->lineEditPath->setClearButtonEnabled(true); + ui->lineEditFileName->setClearButtonEnabled(true); +#endif + qApp->ValentinaSettings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale(QLocale::C)); QPushButton *bOk = ui->buttonBox->button(QDialogButtonBox::Ok); diff --git a/src/app/valentina/dialogs/dialogsavelayout.ui b/src/app/valentina/dialogs/dialogsavelayout.ui index dd23b8e1e..bd7279f92 100644 --- a/src/app/valentina/dialogs/dialogsavelayout.ui +++ b/src/app/valentina/dialogs/dialogsavelayout.ui @@ -52,9 +52,6 @@ Path to destination folder. - - true - @@ -91,9 +88,6 @@ File base name. - - true - diff --git a/src/libs/vtools/dialogs/tools/dialogalongline.cpp b/src/libs/vtools/dialogs/tools/dialogalongline.cpp index d64143f6f..a78a27a58 100644 --- a/src/libs/vtools/dialogs/tools/dialogalongline.cpp +++ b/src/libs/vtools/dialogs/tools/dialogalongline.cpp @@ -47,6 +47,11 @@ DialogAlongLine::DialogAlongLine(const VContainer *data, const quint32 &toolId, formula(QString()), formulaBaseHeight(0) { ui->setupUi(this); + +#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0) + ui->lineEditNamePoint->setClearButtonEnabled(true); +#endif + InitFormulaUI(ui); ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel)); labelEditNamePoint = ui->labelEditNamePoint; diff --git a/src/libs/vtools/dialogs/tools/dialogalongline.ui b/src/libs/vtools/dialogs/tools/dialogalongline.ui index b306d4e17..44b9e04df 100644 --- a/src/libs/vtools/dialogs/tools/dialogalongline.ui +++ b/src/libs/vtools/dialogs/tools/dialogalongline.ui @@ -329,9 +329,6 @@ Choose unique label. - - true - diff --git a/src/libs/vtools/dialogs/tools/dialogbisector.cpp b/src/libs/vtools/dialogs/tools/dialogbisector.cpp index 18f051123..245322ff2 100644 --- a/src/libs/vtools/dialogs/tools/dialogbisector.cpp +++ b/src/libs/vtools/dialogs/tools/dialogbisector.cpp @@ -47,6 +47,11 @@ DialogBisector::DialogBisector(const VContainer *data, const quint32 &toolId, QW :DialogTool(data, toolId, parent), ui(new Ui::DialogBisector), formula(QString()), formulaBaseHeight(0) { ui->setupUi(this); + +#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0) + ui->lineEditNamePoint->setClearButtonEnabled(true); +#endif + InitFormulaUI(ui); ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel)); labelEditNamePoint = ui->labelEditNamePoint; diff --git a/src/libs/vtools/dialogs/tools/dialogbisector.ui b/src/libs/vtools/dialogs/tools/dialogbisector.ui index 7fc7f99a5..c27b65290 100644 --- a/src/libs/vtools/dialogs/tools/dialogbisector.ui +++ b/src/libs/vtools/dialogs/tools/dialogbisector.ui @@ -228,9 +228,6 @@ Choose unique label. - - true - diff --git a/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.cpp b/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.cpp index 8385a9fbe..2fd9aaec4 100644 --- a/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.cpp +++ b/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.cpp @@ -46,6 +46,10 @@ DialogCurveIntersectAxis::DialogCurveIntersectAxis(const VContainer *data, const { ui->setupUi(this); +#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0) + ui->lineEditNamePoint->setClearButtonEnabled(true); +#endif + InitFormulaUI(ui); ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel)); labelEditNamePoint = ui->labelEditNamePoint; diff --git a/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.ui b/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.ui index 76b22807f..bd7e58b62 100644 --- a/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.ui +++ b/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.ui @@ -270,9 +270,6 @@ Choose unique label. - - true - diff --git a/src/libs/vtools/dialogs/tools/dialogcutarc.cpp b/src/libs/vtools/dialogs/tools/dialogcutarc.cpp index 4a897e86e..6afba27f1 100644 --- a/src/libs/vtools/dialogs/tools/dialogcutarc.cpp +++ b/src/libs/vtools/dialogs/tools/dialogcutarc.cpp @@ -47,6 +47,11 @@ DialogCutArc::DialogCutArc(const VContainer *data, const quint32 &toolId, QWidge ch1(NULL_ID), ch2(NULL_ID) { ui->setupUi(this); + +#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0) + ui->lineEditNamePoint->setClearButtonEnabled(true); +#endif + InitFormulaUI(ui); ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel)); labelEditNamePoint = ui->labelEditNamePoint; diff --git a/src/libs/vtools/dialogs/tools/dialogcutarc.ui b/src/libs/vtools/dialogs/tools/dialogcutarc.ui index e7d11734f..76379aeab 100644 --- a/src/libs/vtools/dialogs/tools/dialogcutarc.ui +++ b/src/libs/vtools/dialogs/tools/dialogcutarc.ui @@ -244,9 +244,6 @@ Choose unique label. - - true - diff --git a/src/libs/vtools/dialogs/tools/dialogcutspline.cpp b/src/libs/vtools/dialogs/tools/dialogcutspline.cpp index fbb028b63..85bf03225 100644 --- a/src/libs/vtools/dialogs/tools/dialogcutspline.cpp +++ b/src/libs/vtools/dialogs/tools/dialogcutspline.cpp @@ -46,6 +46,11 @@ DialogCutSpline::DialogCutSpline(const VContainer *data, const quint32 &toolId, ch1(NULL_ID), ch2(NULL_ID) { ui->setupUi(this); + +#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0) + ui->lineEditNamePoint->setClearButtonEnabled(true); +#endif + InitFormulaUI(ui); ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel)); labelEditNamePoint = ui->labelEditNamePoint; diff --git a/src/libs/vtools/dialogs/tools/dialogcutspline.ui b/src/libs/vtools/dialogs/tools/dialogcutspline.ui index 14c08ae82..805d4f727 100644 --- a/src/libs/vtools/dialogs/tools/dialogcutspline.ui +++ b/src/libs/vtools/dialogs/tools/dialogcutspline.ui @@ -244,9 +244,6 @@ Choose unique label. - - true - diff --git a/src/libs/vtools/dialogs/tools/dialogcutsplinepath.cpp b/src/libs/vtools/dialogs/tools/dialogcutsplinepath.cpp index 586572036..7e2e2a737 100644 --- a/src/libs/vtools/dialogs/tools/dialogcutsplinepath.cpp +++ b/src/libs/vtools/dialogs/tools/dialogcutsplinepath.cpp @@ -46,6 +46,11 @@ DialogCutSplinePath::DialogCutSplinePath(const VContainer *data, const quint32 & ch1(NULL_ID), ch2(NULL_ID) { ui->setupUi(this); + +#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0) + ui->lineEditNamePoint->setClearButtonEnabled(true); +#endif + InitFormulaUI(ui); ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel)); labelEditNamePoint = ui->labelEditNamePoint; diff --git a/src/libs/vtools/dialogs/tools/dialogcutsplinepath.ui b/src/libs/vtools/dialogs/tools/dialogcutsplinepath.ui index af86cd070..9fd940a71 100644 --- a/src/libs/vtools/dialogs/tools/dialogcutsplinepath.ui +++ b/src/libs/vtools/dialogs/tools/dialogcutsplinepath.ui @@ -244,9 +244,6 @@ Choose unique label. - - true - diff --git a/src/libs/vtools/dialogs/tools/dialogdetail.cpp b/src/libs/vtools/dialogs/tools/dialogdetail.cpp index c4c4c9829..46e5dcdc1 100644 --- a/src/libs/vtools/dialogs/tools/dialogdetail.cpp +++ b/src/libs/vtools/dialogs/tools/dialogdetail.cpp @@ -47,6 +47,11 @@ DialogDetail::DialogDetail(const VContainer *data, const quint32 &toolId, QWidge :DialogTool(data, toolId, parent), ui(), detail(VDetail()), supplement(true), closed(true), flagWidth(true) { ui.setupUi(this); + +#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0) + ui.lineEditNameDetail->setClearButtonEnabled(true); +#endif + labelEditNamePoint = ui.labelEditNameDetail; ui.labelUnit->setText( VDomDocument::UnitsToStr(qApp->patternUnit(), true)); ui.labelUnitX->setText(VDomDocument::UnitsToStr(qApp->patternUnit(), true)); diff --git a/src/libs/vtools/dialogs/tools/dialogdetail.ui b/src/libs/vtools/dialogs/tools/dialogdetail.ui index 7f10fd054..ed5c303bc 100644 --- a/src/libs/vtools/dialogs/tools/dialogdetail.ui +++ b/src/libs/vtools/dialogs/tools/dialogdetail.ui @@ -236,9 +236,6 @@ Detail - - true - diff --git a/src/libs/vtools/dialogs/tools/dialogendline.cpp b/src/libs/vtools/dialogs/tools/dialogendline.cpp index d727b4cd9..479701454 100644 --- a/src/libs/vtools/dialogs/tools/dialogendline.cpp +++ b/src/libs/vtools/dialogs/tools/dialogendline.cpp @@ -49,6 +49,11 @@ DialogEndLine::DialogEndLine(const VContainer *data, const quint32 &toolId, QWid formulaLength(QString()), formulaAngle(QString()), formulaBaseHeight(0), formulaBaseHeightAngle(0) { ui->setupUi(this); + +#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0) + ui->lineEditNamePoint->setClearButtonEnabled(true); +#endif + InitFormulaUI(ui); ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel)); labelEditNamePoint = ui->labelEditNamePoint; diff --git a/src/libs/vtools/dialogs/tools/dialogendline.ui b/src/libs/vtools/dialogs/tools/dialogendline.ui index 34d874bad..86c562509 100644 --- a/src/libs/vtools/dialogs/tools/dialogendline.ui +++ b/src/libs/vtools/dialogs/tools/dialogendline.ui @@ -464,9 +464,6 @@ Choose unique label. - - true - diff --git a/src/libs/vtools/dialogs/tools/dialogheight.cpp b/src/libs/vtools/dialogs/tools/dialogheight.cpp index 28efdc481..56475eb4c 100644 --- a/src/libs/vtools/dialogs/tools/dialogheight.cpp +++ b/src/libs/vtools/dialogs/tools/dialogheight.cpp @@ -45,6 +45,11 @@ DialogHeight::DialogHeight(const VContainer *data, const quint32 &toolId, QWidge :DialogTool(data, toolId, parent), ui(new Ui::DialogHeight) { ui->setupUi(this); + +#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0) + ui->lineEditNamePoint->setClearButtonEnabled(true); +#endif + ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel)); labelEditNamePoint = ui->labelEditNamePoint; InitOkCancelApply(ui); diff --git a/src/libs/vtools/dialogs/tools/dialogheight.ui b/src/libs/vtools/dialogs/tools/dialogheight.ui index b5f5f99b6..064eca26b 100644 --- a/src/libs/vtools/dialogs/tools/dialogheight.ui +++ b/src/libs/vtools/dialogs/tools/dialogheight.ui @@ -50,9 +50,6 @@ Choose unique label. - - true - diff --git a/src/libs/vtools/dialogs/tools/dialoglineintersect.cpp b/src/libs/vtools/dialogs/tools/dialoglineintersect.cpp index 023f5fac9..cd67c5760 100644 --- a/src/libs/vtools/dialogs/tools/dialoglineintersect.cpp +++ b/src/libs/vtools/dialogs/tools/dialoglineintersect.cpp @@ -44,6 +44,11 @@ DialogLineIntersect::DialogLineIntersect(const VContainer *data, const quint32 & :DialogTool(data, toolId, parent), ui(new Ui::DialogLineIntersect), flagPoint(true) { ui->setupUi(this); + +#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0) + ui->lineEditNamePoint->setClearButtonEnabled(true); +#endif + number = 0; InitOkCancelApply(ui); ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel)); diff --git a/src/libs/vtools/dialogs/tools/dialoglineintersect.ui b/src/libs/vtools/dialogs/tools/dialoglineintersect.ui index 2a148cc00..54fb74999 100644 --- a/src/libs/vtools/dialogs/tools/dialoglineintersect.ui +++ b/src/libs/vtools/dialogs/tools/dialoglineintersect.ui @@ -44,9 +44,6 @@ Choose unique label. - - true - diff --git a/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp b/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp index ccd2fe9b7..98662d6a7 100644 --- a/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp +++ b/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp @@ -45,6 +45,11 @@ DialogLineIntersectAxis::DialogLineIntersectAxis(const VContainer *data, const q formulaBaseHeightAngle(0) { ui->setupUi(this); + +#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0) + ui->lineEditNamePoint->setClearButtonEnabled(true); +#endif + InitFormulaUI(ui); ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel)); labelEditNamePoint = ui->labelEditNamePoint; diff --git a/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.ui b/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.ui index b4159f1ae..d725d98f3 100644 --- a/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.ui +++ b/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.ui @@ -294,9 +294,6 @@ Choose unique label. - - true - diff --git a/src/libs/vtools/dialogs/tools/dialognormal.cpp b/src/libs/vtools/dialogs/tools/dialognormal.cpp index c7d8681da..1c6940534 100644 --- a/src/libs/vtools/dialogs/tools/dialognormal.cpp +++ b/src/libs/vtools/dialogs/tools/dialognormal.cpp @@ -44,6 +44,11 @@ DialogNormal::DialogNormal(const VContainer *data, const quint32 &toolId, QWidge :DialogTool(data, toolId, parent), ui(new Ui::DialogNormal), formula(QString()), angle(0), formulaBaseHeight(0) { ui->setupUi(this); + +#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0) + ui->lineEditNamePoint->setClearButtonEnabled(true); +#endif + InitFormulaUI(ui); ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel)); labelEditNamePoint = ui->labelEditNamePoint; diff --git a/src/libs/vtools/dialogs/tools/dialognormal.ui b/src/libs/vtools/dialogs/tools/dialognormal.ui index df8a3164e..074037541 100644 --- a/src/libs/vtools/dialogs/tools/dialognormal.ui +++ b/src/libs/vtools/dialogs/tools/dialognormal.ui @@ -228,9 +228,6 @@ Choose unique label. - - true - diff --git a/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.cpp b/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.cpp index 3743ed5fd..5f2b35c31 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.cpp @@ -41,6 +41,10 @@ DialogPointFromArcAndTangent::DialogPointFromArcAndTangent(const VContainer *dat { ui->setupUi(this); +#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0) + ui->lineEditNamePoint->setClearButtonEnabled(true); +#endif + ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel)); labelEditNamePoint = ui->labelEditNamePoint; diff --git a/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.ui b/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.ui index 21141f566..3a3d120a2 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.ui +++ b/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.ui @@ -44,9 +44,6 @@ Choose unique label. - - true - diff --git a/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.cpp b/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.cpp index 14ae2bab2..22605555d 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.cpp @@ -46,6 +46,10 @@ DialogPointFromCircleAndTangent::DialogPointFromCircleAndTangent(const VContaine { ui->setupUi(this); +#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0) + ui->lineEditNamePoint->setClearButtonEnabled(true); +#endif + ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel)); labelEditNamePoint = ui->labelEditNamePoint; diff --git a/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.ui b/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.ui index 5b138aff0..c2c3af048 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.ui +++ b/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.ui @@ -225,9 +225,6 @@ Choose unique label. - - true - diff --git a/src/libs/vtools/dialogs/tools/dialogpointofcontact.cpp b/src/libs/vtools/dialogs/tools/dialogpointofcontact.cpp index eaa3302dd..24ba8f55f 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofcontact.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpointofcontact.cpp @@ -45,6 +45,11 @@ DialogPointOfContact::DialogPointOfContact(const VContainer *data, const quint32 :DialogTool(data, toolId, parent), ui(new Ui::DialogPointOfContact), radius(QString()), formulaBaseHeight(0) { ui->setupUi(this); + +#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0) + ui->lineEditNamePoint->setClearButtonEnabled(true); +#endif + InitFormulaUI(ui); ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel)); labelEditNamePoint = ui->labelEditNamePoint; diff --git a/src/libs/vtools/dialogs/tools/dialogpointofcontact.ui b/src/libs/vtools/dialogs/tools/dialogpointofcontact.ui index 35ac3efb9..4f8f51680 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofcontact.ui +++ b/src/libs/vtools/dialogs/tools/dialogpointofcontact.ui @@ -228,9 +228,6 @@ Choose unique label. - - true - diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersection.cpp b/src/libs/vtools/dialogs/tools/dialogpointofintersection.cpp index a65fd2b4d..cf350c8b4 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersection.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersection.cpp @@ -44,6 +44,11 @@ DialogPointOfIntersection::DialogPointOfIntersection(const VContainer *data, con :DialogTool(data, toolId, parent), ui(new Ui::DialogPointOfIntersection) { ui->setupUi(this); + +#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0) + ui->lineEditNamePoint->setClearButtonEnabled(true); +#endif + ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel)); labelEditNamePoint = ui->labelEditNamePoint; diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersection.ui b/src/libs/vtools/dialogs/tools/dialogpointofintersection.ui index 5c2f83ab6..ce231b260 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersection.ui +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersection.ui @@ -50,9 +50,6 @@ Choose unique label. - - true - diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp b/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp index da5c27180..ac04334a2 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp @@ -40,6 +40,11 @@ DialogPointOfIntersectionArcs::DialogPointOfIntersectionArcs(const VContainer *d :DialogTool(data, toolId, parent), ui(new Ui::DialogPointOfIntersectionArcs) { ui->setupUi(this); + +#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0) + ui->lineEditNamePoint->setClearButtonEnabled(true); +#endif + ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel)); labelEditNamePoint = ui->labelEditNamePoint; diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.ui b/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.ui index b2ac21e1c..d24b9cc01 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.ui +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.ui @@ -44,9 +44,6 @@ Choose unique label. - - true - diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.cpp b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.cpp index 5afb71289..c2d00a8f6 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.cpp @@ -48,6 +48,10 @@ DialogPointOfIntersectionCircles::DialogPointOfIntersectionCircles(const VContai { ui->setupUi(this); +#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0) + ui->lineEditNamePoint->setClearButtonEnabled(true); +#endif + ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel)); labelEditNamePoint = ui->labelEditNamePoint; diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.ui b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.ui index 489e55fb4..558f0984f 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.ui +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.ui @@ -406,9 +406,6 @@ Choose unique label. - - true - diff --git a/src/libs/vtools/dialogs/tools/dialogshoulderpoint.cpp b/src/libs/vtools/dialogs/tools/dialogshoulderpoint.cpp index 3f603b4e1..dd7154bce 100644 --- a/src/libs/vtools/dialogs/tools/dialogshoulderpoint.cpp +++ b/src/libs/vtools/dialogs/tools/dialogshoulderpoint.cpp @@ -48,6 +48,11 @@ DialogShoulderPoint::DialogShoulderPoint(const VContainer *data, const quint32 & formulaBaseHeight(0) { ui->setupUi(this); + +#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0) + ui->lineEditNamePoint->setClearButtonEnabled(true); +#endif + InitFormulaUI(ui); ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel)); labelEditNamePoint = ui->labelEditNamePoint; diff --git a/src/libs/vtools/dialogs/tools/dialogshoulderpoint.ui b/src/libs/vtools/dialogs/tools/dialogshoulderpoint.ui index 0258e0820..dad3acc8f 100644 --- a/src/libs/vtools/dialogs/tools/dialogshoulderpoint.ui +++ b/src/libs/vtools/dialogs/tools/dialogshoulderpoint.ui @@ -228,9 +228,6 @@ Choose unique label. - - true - diff --git a/src/libs/vtools/dialogs/tools/dialogsinglepoint.cpp b/src/libs/vtools/dialogs/tools/dialogsinglepoint.cpp index d883bbb0d..6dabbaa38 100644 --- a/src/libs/vtools/dialogs/tools/dialogsinglepoint.cpp +++ b/src/libs/vtools/dialogs/tools/dialogsinglepoint.cpp @@ -39,6 +39,11 @@ DialogSinglePoint::DialogSinglePoint(const VContainer *data, const quint32 &tool :DialogTool(data, toolId, parent), ui(new Ui::DialogSinglePoint), point(QPointF()) { ui->setupUi(this); + +#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0) + ui->lineEditName->setClearButtonEnabled(true); +#endif + ui->doubleSpinBoxX->setRange(0, qApp->fromPixel(SceneSize)); ui->doubleSpinBoxY->setRange(0, qApp->fromPixel(SceneSize)); labelEditNamePoint = ui->labelEditName; diff --git a/src/libs/vtools/dialogs/tools/dialogsinglepoint.ui b/src/libs/vtools/dialogs/tools/dialogsinglepoint.ui index 94edab910..d8bd7b484 100644 --- a/src/libs/vtools/dialogs/tools/dialogsinglepoint.ui +++ b/src/libs/vtools/dialogs/tools/dialogsinglepoint.ui @@ -40,9 +40,6 @@ Choose unique label. - - true - diff --git a/src/libs/vtools/dialogs/tools/dialogtriangle.cpp b/src/libs/vtools/dialogs/tools/dialogtriangle.cpp index d80c9c948..c11db6b9e 100644 --- a/src/libs/vtools/dialogs/tools/dialogtriangle.cpp +++ b/src/libs/vtools/dialogs/tools/dialogtriangle.cpp @@ -43,6 +43,11 @@ DialogTriangle::DialogTriangle(const VContainer *data, const quint32 &toolId, QW :DialogTool(data, toolId, parent), ui(new Ui::DialogTriangle) { ui->setupUi(this); + +#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0) + ui->lineEditNamePoint->setClearButtonEnabled(true); +#endif + ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel)); labelEditNamePoint = ui->labelEditNamePoint; diff --git a/src/libs/vtools/dialogs/tools/dialogtriangle.ui b/src/libs/vtools/dialogs/tools/dialogtriangle.ui index de5597638..532db8b6c 100644 --- a/src/libs/vtools/dialogs/tools/dialogtriangle.ui +++ b/src/libs/vtools/dialogs/tools/dialogtriangle.ui @@ -47,9 +47,6 @@ Choose unique label. - - true - diff --git a/src/libs/vtools/dialogs/tools/dialogtruedarts.cpp b/src/libs/vtools/dialogs/tools/dialogtruedarts.cpp index 9a984e068..ed9b1318a 100644 --- a/src/libs/vtools/dialogs/tools/dialogtruedarts.cpp +++ b/src/libs/vtools/dialogs/tools/dialogtruedarts.cpp @@ -40,6 +40,12 @@ DialogTrueDarts::DialogTrueDarts(const VContainer *data, const quint32 &toolId, ch2(NULL_ID), flagName1(true), flagName2(true) { ui->setupUi(this); + +#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0) + ui->lineEditFirstNewDartPoint->setClearButtonEnabled(true); + ui->lineEditSecondNewDartPoint->setClearButtonEnabled(true); +#endif + const QString name1 = qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel); const QString name2 = qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel, name1); ui->lineEditFirstNewDartPoint->setText(name1); diff --git a/src/libs/vtools/dialogs/tools/dialogtruedarts.ui b/src/libs/vtools/dialogs/tools/dialogtruedarts.ui index 57d4551c5..a75950742 100644 --- a/src/libs/vtools/dialogs/tools/dialogtruedarts.ui +++ b/src/libs/vtools/dialogs/tools/dialogtruedarts.ui @@ -131,9 +131,6 @@ Choose unique label. - - true - @@ -151,9 +148,6 @@ Choose unique label. - - true -