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

Resolved build issue on OpenSuse. The method setClearButtonEnable is available

Browse Source 
only since Qt 5.2.

--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2015-12-09 12:40:43 +02:00
parent 589bf173ae
commit 6f1dcb7592
54 changed files with 135 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/tape/tmainwindow.cpp
View File

@ -101,6 +101,16 @@ TMainWindow::TMainWindow(QWidget *parent)
isInitialized(false) isInitialized(false)
{ {
ui->setupUi(this); 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<VTableSearch>(new VTableSearch(ui->tableWidget)); search = QSharedPointer<VTableSearch>(new VTableSearch(ui->tableWidget));
ui->tabWidget->setVisible(false); ui->tabWidget->setVisible(false);

21
src/app/tape/tmainwindow.ui
View File

@ -75,9 +75,6 @@
<property name="placeholderText"> <property name="placeholderText">
<string>Search</string> <string>Search</string>
</property> </property>
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item> <item>
@ -220,9 +217,6 @@
<property name="placeholderText"> <property name="placeholderText">
<string>Measurement's name in a formula.</string> <string>Measurement's name in a formula.</string>
</property> </property>
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item row="5" column="0"> <item row="5" column="0">
@ -558,9 +552,6 @@
<property name="placeholderText"> <property name="placeholderText">
<string>Measurement's human-readable name.</string> <string>Measurement's human-readable name.</string>
</property> </property>
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>
@ -626,9 +617,6 @@
<property name="placeholderText"> <property name="placeholderText">
<string notr="true">Path to the measurement file.</string> <string notr="true">Path to the measurement file.</string>
</property> </property>
<property name="clearButtonEnabled">
<bool>false</bool>
</property>
</widget> </widget>
</item> </item>
<item alignment="Qt::AlignRight"> <item alignment="Qt::AlignRight">
@ -698,9 +686,6 @@
<property name="placeholderText"> <property name="placeholderText">
<string>Customer's name.</string> <string>Customer's name.</string>
</property> </property>
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item row="6" column="0"> <item row="6" column="0">
@ -724,9 +709,6 @@
<property name="placeholderText"> <property name="placeholderText">
<string>Customer's family name.</string> <string>Customer's family name.</string>
</property> </property>
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item row="7" column="0"> <item row="7" column="0">
@ -799,9 +781,6 @@
<property name="placeholderText"> <property name="placeholderText">
<string>Customer's email address.</string> <string>Customer's email address.</string>
</property> </property>
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item row="10" column="0"> <item row="10" column="0">

5
src/app/valentina/dialogs/dialogincrements.cpp
View File

@ -60,6 +60,11 @@ DialogIncrements::DialogIncrements(VContainer *data, VPattern *doc, QWidget *par
formulaBaseHeight(0) formulaBaseHeight(0)
{ {
ui->setupUi(this); ui->setupUi(this);
#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0)
ui->lineEditName->setClearButtonEnabled(true);
#endif
formulaBaseHeight = ui->plainTextEditFormula->height(); formulaBaseHeight = ui->plainTextEditFormula->height();
qApp->Settings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale(QLocale::C)); qApp->Settings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale(QLocale::C));

3
src/app/valentina/dialogs/dialogincrements.ui
View File

@ -267,9 +267,6 @@
<property name="placeholderText"> <property name="placeholderText">
<string>Unique increment name</string> <string>Unique increment name</string>
</property> </property>
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item row="4" column="0"> <item row="4" column="0">

4
src/app/valentina/dialogs/dialognewpattern.cpp
View File

@ -45,6 +45,10 @@ DialogNewPattern::DialogNewPattern(VContainer *data, const QString &patternPiece
{ {
ui->setupUi(this); 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)); qApp->ValentinaSettings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale(QLocale::C));
QRect position = this->frameGeometry(); QRect position = this->frameGeometry();

3
src/app/valentina/dialogs/dialognewpattern.ui
View File

@ -44,9 +44,6 @@
<property name="placeholderText"> <property name="placeholderText">
<string>Choose unique pattern piece name.</string> <string>Choose unique pattern piece name.</string>
</property> </property>
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">

4
src/app/valentina/dialogs/dialogpatternproperties.cpp
View File

@ -43,6 +43,10 @@ DialogPatternProperties::DialogPatternProperties(VPattern *doc, QWidget *parent)
{ {
ui->setupUi(this); ui->setupUi(this);
#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0)
ui->lineEditAuthor->setClearButtonEnabled(true);
#endif
SCASSERT(doc != nullptr); SCASSERT(doc != nullptr);
qApp->ValentinaSettings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale(QLocale::C)); qApp->ValentinaSettings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale(QLocale::C));

3
src/app/valentina/dialogs/dialogpatternproperties.ui
View File

@ -39,9 +39,6 @@
</item> </item>
<item> <item>
<widget class="QLineEdit" name="lineEditAuthor"> <widget class="QLineEdit" name="lineEditAuthor">
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>

5
src/app/valentina/dialogs/dialogsavelayout.cpp
View File

@ -50,6 +50,11 @@ DialogSaveLayout::DialogSaveLayout(int count, const QString &fileName, QWidget *
{ {
ui->setupUi(this); 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)); qApp->ValentinaSettings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale(QLocale::C));
QPushButton *bOk = ui->buttonBox->button(QDialogButtonBox::Ok); QPushButton *bOk = ui->buttonBox->button(QDialogButtonBox::Ok);

6
src/app/valentina/dialogs/dialogsavelayout.ui
View File

@ -52,9 +52,6 @@
<property name="placeholderText"> <property name="placeholderText">
<string>Path to destination folder.</string> <string>Path to destination folder.</string>
</property> </property>
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item row="0" column="2"> <item row="0" column="2">
@ -91,9 +88,6 @@
<property name="placeholderText"> <property name="placeholderText">
<string>File base name. </string> <string>File base name. </string>
</property> </property>
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item row="2" column="2"> <item row="2" column="2">

5
src/libs/vtools/dialogs/tools/dialogalongline.cpp
View File

@ -47,6 +47,11 @@ DialogAlongLine::DialogAlongLine(const VContainer *data, const quint32 &toolId,
formula(QString()), formulaBaseHeight(0) formula(QString()), formulaBaseHeight(0)
{ {
ui->setupUi(this); ui->setupUi(this);
#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0)
ui->lineEditNamePoint->setClearButtonEnabled(true);
#endif
InitFormulaUI(ui); InitFormulaUI(ui);
ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel)); ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel));
labelEditNamePoint = ui->labelEditNamePoint; labelEditNamePoint = ui->labelEditNamePoint;

3
src/libs/vtools/dialogs/tools/dialogalongline.ui
View File

@ -329,9 +329,6 @@
<property name="placeholderText"> <property name="placeholderText">
<string>Choose unique label.</string> <string>Choose unique label.</string>
</property> </property>
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>

5
src/libs/vtools/dialogs/tools/dialogbisector.cpp
View File

@ -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) :DialogTool(data, toolId, parent), ui(new Ui::DialogBisector), formula(QString()), formulaBaseHeight(0)
{ {
ui->setupUi(this); ui->setupUi(this);
#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0)
ui->lineEditNamePoint->setClearButtonEnabled(true);
#endif
InitFormulaUI(ui); InitFormulaUI(ui);
ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel)); ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel));
labelEditNamePoint = ui->labelEditNamePoint; labelEditNamePoint = ui->labelEditNamePoint;

3
src/libs/vtools/dialogs/tools/dialogbisector.ui
View File

@ -228,9 +228,6 @@
<property name="placeholderText"> <property name="placeholderText">
<string>Choose unique label.</string> <string>Choose unique label.</string>
</property> </property>
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">

4
src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.cpp
View File

@ -46,6 +46,10 @@ DialogCurveIntersectAxis::DialogCurveIntersectAxis(const VContainer *data, const
{ {
ui->setupUi(this); ui->setupUi(this);
#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0)
ui->lineEditNamePoint->setClearButtonEnabled(true);
#endif
InitFormulaUI(ui); InitFormulaUI(ui);
ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel)); ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel));
labelEditNamePoint = ui->labelEditNamePoint; labelEditNamePoint = ui->labelEditNamePoint;

3
src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.ui
View File

@ -270,9 +270,6 @@
<property name="placeholderText"> <property name="placeholderText">
<string>Choose unique label.</string> <string>Choose unique label.</string>
</property> </property>
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item row="3" column="0"> <item row="3" column="0">

5
src/libs/vtools/dialogs/tools/dialogcutarc.cpp
View File

@ -47,6 +47,11 @@ DialogCutArc::DialogCutArc(const VContainer *data, const quint32 &toolId, QWidge
ch1(NULL_ID), ch2(NULL_ID) ch1(NULL_ID), ch2(NULL_ID)
{ {
ui->setupUi(this); ui->setupUi(this);
#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0)
ui->lineEditNamePoint->setClearButtonEnabled(true);
#endif
InitFormulaUI(ui); InitFormulaUI(ui);
ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel)); ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel));
labelEditNamePoint = ui->labelEditNamePoint; labelEditNamePoint = ui->labelEditNamePoint;

3
src/libs/vtools/dialogs/tools/dialogcutarc.ui
View File

@ -244,9 +244,6 @@
<property name="placeholderText"> <property name="placeholderText">
<string>Choose unique label.</string> <string>Choose unique label.</string>
</property> </property>
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="2" column="0">

5
src/libs/vtools/dialogs/tools/dialogcutspline.cpp
View File

@ -46,6 +46,11 @@ DialogCutSpline::DialogCutSpline(const VContainer *data, const quint32 &toolId,
ch1(NULL_ID), ch2(NULL_ID) ch1(NULL_ID), ch2(NULL_ID)
{ {
ui->setupUi(this); ui->setupUi(this);
#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0)
ui->lineEditNamePoint->setClearButtonEnabled(true);
#endif
InitFormulaUI(ui); InitFormulaUI(ui);
ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel)); ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel));
labelEditNamePoint = ui->labelEditNamePoint; labelEditNamePoint = ui->labelEditNamePoint;

3
src/libs/vtools/dialogs/tools/dialogcutspline.ui
View File

@ -244,9 +244,6 @@
<property name="placeholderText"> <property name="placeholderText">
<string>Choose unique label.</string> <string>Choose unique label.</string>
</property> </property>
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="2" column="0">

5
src/libs/vtools/dialogs/tools/dialogcutsplinepath.cpp
View File

@ -46,6 +46,11 @@ DialogCutSplinePath::DialogCutSplinePath(const VContainer *data, const quint32 &
ch1(NULL_ID), ch2(NULL_ID) ch1(NULL_ID), ch2(NULL_ID)
{ {
ui->setupUi(this); ui->setupUi(this);
#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0)
ui->lineEditNamePoint->setClearButtonEnabled(true);
#endif
InitFormulaUI(ui); InitFormulaUI(ui);
ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel)); ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel));
labelEditNamePoint = ui->labelEditNamePoint; labelEditNamePoint = ui->labelEditNamePoint;

3
src/libs/vtools/dialogs/tools/dialogcutsplinepath.ui
View File

@ -244,9 +244,6 @@
<property name="placeholderText"> <property name="placeholderText">
<string>Choose unique label.</string> <string>Choose unique label.</string>
</property> </property>
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="2" column="0">

5
src/libs/vtools/dialogs/tools/dialogdetail.cpp
View File

@ -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) :DialogTool(data, toolId, parent), ui(), detail(VDetail()), supplement(true), closed(true), flagWidth(true)
{ {
ui.setupUi(this); ui.setupUi(this);
#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0)
ui.lineEditNameDetail->setClearButtonEnabled(true);
#endif
labelEditNamePoint = ui.labelEditNameDetail; labelEditNamePoint = ui.labelEditNameDetail;
ui.labelUnit->setText( VDomDocument::UnitsToStr(qApp->patternUnit(), true)); ui.labelUnit->setText( VDomDocument::UnitsToStr(qApp->patternUnit(), true));
ui.labelUnitX->setText(VDomDocument::UnitsToStr(qApp->patternUnit(), true)); ui.labelUnitX->setText(VDomDocument::UnitsToStr(qApp->patternUnit(), true));

3
src/libs/vtools/dialogs/tools/dialogdetail.ui
View File

@ -236,9 +236,6 @@
<property name="text"> <property name="text">
<string>Detail</string> <string>Detail</string>
</property> </property>
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>

5
src/libs/vtools/dialogs/tools/dialogendline.cpp
View File

@ -49,6 +49,11 @@ DialogEndLine::DialogEndLine(const VContainer *data, const quint32 &toolId, QWid
formulaLength(QString()), formulaAngle(QString()), formulaBaseHeight(0), formulaBaseHeightAngle(0) formulaLength(QString()), formulaAngle(QString()), formulaBaseHeight(0), formulaBaseHeightAngle(0)
{ {
ui->setupUi(this); ui->setupUi(this);
#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0)
ui->lineEditNamePoint->setClearButtonEnabled(true);
#endif
InitFormulaUI(ui); InitFormulaUI(ui);
ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel)); ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel));
labelEditNamePoint = ui->labelEditNamePoint; labelEditNamePoint = ui->labelEditNamePoint;

3
src/libs/vtools/dialogs/tools/dialogendline.ui
View File

@ -464,9 +464,6 @@
<property name="placeholderText"> <property name="placeholderText">
<string>Choose unique label.</string> <string>Choose unique label.</string>
</property> </property>
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="2" column="0">

5
src/libs/vtools/dialogs/tools/dialogheight.cpp
View File

@ -45,6 +45,11 @@ DialogHeight::DialogHeight(const VContainer *data, const quint32 &toolId, QWidge
:DialogTool(data, toolId, parent), ui(new Ui::DialogHeight) :DialogTool(data, toolId, parent), ui(new Ui::DialogHeight)
{ {
ui->setupUi(this); 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)); ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel));
labelEditNamePoint = ui->labelEditNamePoint; labelEditNamePoint = ui->labelEditNamePoint;
InitOkCancelApply(ui); InitOkCancelApply(ui);

3
src/libs/vtools/dialogs/tools/dialogheight.ui
View File

@ -50,9 +50,6 @@
<property name="placeholderText"> <property name="placeholderText">
<string>Choose unique label.</string> <string>Choose unique label.</string>
</property> </property>
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">

5
src/libs/vtools/dialogs/tools/dialoglineintersect.cpp
View File

@ -44,6 +44,11 @@ DialogLineIntersect::DialogLineIntersect(const VContainer *data, const quint32 &
:DialogTool(data, toolId, parent), ui(new Ui::DialogLineIntersect), flagPoint(true) :DialogTool(data, toolId, parent), ui(new Ui::DialogLineIntersect), flagPoint(true)
{ {
ui->setupUi(this); ui->setupUi(this);
#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0)
ui->lineEditNamePoint->setClearButtonEnabled(true);
#endif
number = 0; number = 0;
InitOkCancelApply(ui); InitOkCancelApply(ui);
ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel)); ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel));

3
src/libs/vtools/dialogs/tools/dialoglineintersect.ui
View File

@ -44,9 +44,6 @@
<property name="placeholderText"> <property name="placeholderText">
<string>Choose unique label.</string> <string>Choose unique label.</string>
</property> </property>
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>

5
src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp
View File

@ -45,6 +45,11 @@ DialogLineIntersectAxis::DialogLineIntersectAxis(const VContainer *data, const q
formulaBaseHeightAngle(0) formulaBaseHeightAngle(0)
{ {
ui->setupUi(this); ui->setupUi(this);
#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0)
ui->lineEditNamePoint->setClearButtonEnabled(true);
#endif
InitFormulaUI(ui); InitFormulaUI(ui);
ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel)); ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel));
labelEditNamePoint = ui->labelEditNamePoint; labelEditNamePoint = ui->labelEditNamePoint;

3
src/libs/vtools/dialogs/tools/dialoglineintersectaxis.ui
View File

@ -294,9 +294,6 @@
<property name="placeholderText"> <property name="placeholderText">
<string>Choose unique label.</string> <string>Choose unique label.</string>
</property> </property>
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item row="4" column="0"> <item row="4" column="0">

5
src/libs/vtools/dialogs/tools/dialognormal.cpp
View File

@ -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) :DialogTool(data, toolId, parent), ui(new Ui::DialogNormal), formula(QString()), angle(0), formulaBaseHeight(0)
{ {
ui->setupUi(this); ui->setupUi(this);
#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0)
ui->lineEditNamePoint->setClearButtonEnabled(true);
#endif
InitFormulaUI(ui); InitFormulaUI(ui);
ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel)); ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel));
labelEditNamePoint = ui->labelEditNamePoint; labelEditNamePoint = ui->labelEditNamePoint;

3
src/libs/vtools/dialogs/tools/dialognormal.ui
View File

@ -228,9 +228,6 @@
<property name="placeholderText"> <property name="placeholderText">
<string>Choose unique label.</string> <string>Choose unique label.</string>
</property> </property>
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">

4
src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.cpp
View File

@ -41,6 +41,10 @@ DialogPointFromArcAndTangent::DialogPointFromArcAndTangent(const VContainer *dat
{ {
ui->setupUi(this); 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)); ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel));
labelEditNamePoint = ui->labelEditNamePoint; labelEditNamePoint = ui->labelEditNamePoint;

3
src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.ui
View File

@ -44,9 +44,6 @@
<property name="placeholderText"> <property name="placeholderText">
<string>Choose unique label.</string> <string>Choose unique label.</string>
</property> </property>
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">

4
src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.cpp
View File

@ -46,6 +46,10 @@ DialogPointFromCircleAndTangent::DialogPointFromCircleAndTangent(const VContaine
{ {
ui->setupUi(this); 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)); ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel));
labelEditNamePoint = ui->labelEditNamePoint; labelEditNamePoint = ui->labelEditNamePoint;

3
src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.ui
View File

@ -225,9 +225,6 @@
<property name="placeholderText"> <property name="placeholderText">
<string>Choose unique label.</string> <string>Choose unique label.</string>
</property> </property>
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">

5
src/libs/vtools/dialogs/tools/dialogpointofcontact.cpp
View File

@ -45,6 +45,11 @@ DialogPointOfContact::DialogPointOfContact(const VContainer *data, const quint32
:DialogTool(data, toolId, parent), ui(new Ui::DialogPointOfContact), radius(QString()), formulaBaseHeight(0) :DialogTool(data, toolId, parent), ui(new Ui::DialogPointOfContact), radius(QString()), formulaBaseHeight(0)
{ {
ui->setupUi(this); ui->setupUi(this);
#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0)
ui->lineEditNamePoint->setClearButtonEnabled(true);
#endif
InitFormulaUI(ui); InitFormulaUI(ui);
ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel)); ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel));
labelEditNamePoint = ui->labelEditNamePoint; labelEditNamePoint = ui->labelEditNamePoint;

3
src/libs/vtools/dialogs/tools/dialogpointofcontact.ui
View File

@ -228,9 +228,6 @@
<property name="placeholderText"> <property name="placeholderText">
<string>Choose unique label.</string> <string>Choose unique label.</string>
</property> </property>
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">

5
src/libs/vtools/dialogs/tools/dialogpointofintersection.cpp
View File

@ -44,6 +44,11 @@ DialogPointOfIntersection::DialogPointOfIntersection(const VContainer *data, con
:DialogTool(data, toolId, parent), ui(new Ui::DialogPointOfIntersection) :DialogTool(data, toolId, parent), ui(new Ui::DialogPointOfIntersection)
{ {
ui->setupUi(this); 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)); ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel));
labelEditNamePoint = ui->labelEditNamePoint; labelEditNamePoint = ui->labelEditNamePoint;

3
src/libs/vtools/dialogs/tools/dialogpointofintersection.ui
View File

@ -50,9 +50,6 @@
<property name="placeholderText"> <property name="placeholderText">
<string>Choose unique label.</string> <string>Choose unique label.</string>
</property> </property>
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">

5
src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp
View File

@ -40,6 +40,11 @@ DialogPointOfIntersectionArcs::DialogPointOfIntersectionArcs(const VContainer *d
:DialogTool(data, toolId, parent), ui(new Ui::DialogPointOfIntersectionArcs) :DialogTool(data, toolId, parent), ui(new Ui::DialogPointOfIntersectionArcs)
{ {
ui->setupUi(this); 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)); ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel));
labelEditNamePoint = ui->labelEditNamePoint; labelEditNamePoint = ui->labelEditNamePoint;

3
src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.ui
View File

@ -44,9 +44,6 @@
<property name="placeholderText"> <property name="placeholderText">
<string>Choose unique label.</string> <string>Choose unique label.</string>
</property> </property>
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">

4
src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.cpp
View File

@ -48,6 +48,10 @@ DialogPointOfIntersectionCircles::DialogPointOfIntersectionCircles(const VContai
{ {
ui->setupUi(this); 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)); ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel));
labelEditNamePoint = ui->labelEditNamePoint; labelEditNamePoint = ui->labelEditNamePoint;

3
src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.ui
View File

@ -406,9 +406,6 @@
<property name="placeholderText"> <property name="placeholderText">
<string>Choose unique label.</string> <string>Choose unique label.</string>
</property> </property>
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">

5
src/libs/vtools/dialogs/tools/dialogshoulderpoint.cpp
View File

@ -48,6 +48,11 @@ DialogShoulderPoint::DialogShoulderPoint(const VContainer *data, const quint32 &
formulaBaseHeight(0) formulaBaseHeight(0)
{ {
ui->setupUi(this); ui->setupUi(this);
#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0)
ui->lineEditNamePoint->setClearButtonEnabled(true);
#endif
InitFormulaUI(ui); InitFormulaUI(ui);
ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel)); ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel));
labelEditNamePoint = ui->labelEditNamePoint; labelEditNamePoint = ui->labelEditNamePoint;

3
src/libs/vtools/dialogs/tools/dialogshoulderpoint.ui
View File

@ -228,9 +228,6 @@
<property name="placeholderText"> <property name="placeholderText">
<string>Choose unique label.</string> <string>Choose unique label.</string>
</property> </property>
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">

5
src/libs/vtools/dialogs/tools/dialogsinglepoint.cpp
View File

@ -39,6 +39,11 @@ DialogSinglePoint::DialogSinglePoint(const VContainer *data, const quint32 &tool
:DialogTool(data, toolId, parent), ui(new Ui::DialogSinglePoint), point(QPointF()) :DialogTool(data, toolId, parent), ui(new Ui::DialogSinglePoint), point(QPointF())
{ {
ui->setupUi(this); 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->doubleSpinBoxX->setRange(0, qApp->fromPixel(SceneSize));
ui->doubleSpinBoxY->setRange(0, qApp->fromPixel(SceneSize)); ui->doubleSpinBoxY->setRange(0, qApp->fromPixel(SceneSize));
labelEditNamePoint = ui->labelEditName; labelEditNamePoint = ui->labelEditName;

3
src/libs/vtools/dialogs/tools/dialogsinglepoint.ui
View File

@ -40,9 +40,6 @@
<property name="placeholderText"> <property name="placeholderText">
<string>Choose unique label.</string> <string>Choose unique label.</string>
</property> </property>
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item> <item>

5
src/libs/vtools/dialogs/tools/dialogtriangle.cpp
View File

@ -43,6 +43,11 @@ DialogTriangle::DialogTriangle(const VContainer *data, const quint32 &toolId, QW
:DialogTool(data, toolId, parent), ui(new Ui::DialogTriangle) :DialogTool(data, toolId, parent), ui(new Ui::DialogTriangle)
{ {
ui->setupUi(this); 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)); ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel));
labelEditNamePoint = ui->labelEditNamePoint; labelEditNamePoint = ui->labelEditNamePoint;

3
src/libs/vtools/dialogs/tools/dialogtriangle.ui
View File

@ -47,9 +47,6 @@
<property name="placeholderText"> <property name="placeholderText">
<string>Choose unique label.</string> <string>Choose unique label.</string>
</property> </property>
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">

6
src/libs/vtools/dialogs/tools/dialogtruedarts.cpp
View File

@ -40,6 +40,12 @@ DialogTrueDarts::DialogTrueDarts(const VContainer *data, const quint32 &toolId,
ch2(NULL_ID), flagName1(true), flagName2(true) ch2(NULL_ID), flagName1(true), flagName2(true)
{ {
ui->setupUi(this); 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 name1 = qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel);
const QString name2 = qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel, name1); const QString name2 = qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel, name1);
ui->lineEditFirstNewDartPoint->setText(name1); ui->lineEditFirstNewDartPoint->setText(name1);

6
src/libs/vtools/dialogs/tools/dialogtruedarts.ui
View File

@ -131,9 +131,6 @@
<property name="placeholderText"> <property name="placeholderText">
<string>Choose unique label.</string> <string>Choose unique label.</string>
</property> </property>
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item row="6" column="0"> <item row="6" column="0">
@ -151,9 +148,6 @@
<property name="placeholderText"> <property name="placeholderText">
<string>Choose unique label.</string> <string>Choose unique label.</string>
</property> </property>
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>