From f5bad50bc35d4a1662f1bafdf492318d7984527e Mon Sep 17 00:00:00 2001 From: dismine Date: Tue, 10 Jun 2014 15:58:48 +0300 Subject: [PATCH 1/4] No need apply button here. --HG-- branch : develop --- src/app/dialogs/app/dialogincrements.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/app/dialogs/app/dialogincrements.h b/src/app/dialogs/app/dialogincrements.h index 301fbdc9e..d53aab35d 100644 --- a/src/app/dialogs/app/dialogincrements.h +++ b/src/app/dialogs/app/dialogincrements.h @@ -48,10 +48,6 @@ public: DialogIncrements(VContainer *data, VPattern *doc, QWidget *parent = nullptr); ~DialogIncrements(); public slots: - /** TODO ISSUE 79 : create real function - * @brief DialogApply apply data and emit signal about applied dialog. - */ - virtual void DialogApply(){} void clickedToolButtonAdd(); void clickedToolButtonRemove(); void IncrementChanged ( qint32 row, qint32 column ); From 73b29b972caa1309f2e7ebcce780483993ca270d Mon Sep 17 00:00:00 2001 From: dismine Date: Tue, 10 Jun 2014 16:14:21 +0300 Subject: [PATCH 2/4] Fix radius node point in detail. --HG-- branch : develop --- src/app/tools/drawTools/vtoolpoint.cpp | 17 +---------------- src/app/tools/nodeDetails/vnodepoint.cpp | 3 ++- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/src/app/tools/drawTools/vtoolpoint.cpp b/src/app/tools/drawTools/vtoolpoint.cpp index 563e749a2..0cdc7eddf 100644 --- a/src/app/tools/drawTools/vtoolpoint.cpp +++ b/src/app/tools/drawTools/vtoolpoint.cpp @@ -37,22 +37,7 @@ const QString VToolPoint::TagName = QStringLiteral("point"); VToolPoint::VToolPoint(VPattern *doc, VContainer *data, quint32 id, QGraphicsItem *parent):VDrawTool(doc, data, id), QGraphicsEllipseItem(parent), radius(DefRadius), namePoint(0), lineName(0) { - switch (qApp->patternUnit()) - { - case Valentina::Mm: - radius = qApp->toPixel(DefRadius); - break; - case Valentina::Cm: - radius = qApp->toPixel(DefRadius/10.0); - break; - case Valentina::Inch: - radius = qApp->toPixel(DefRadius/25.4); - break; - default: - radius = qApp->toPixel(DefRadius); - break; - } - + radius = (DefRadius/*mm*/ / 25.4) * VApplication::PrintDPI; namePoint = new VGraphicsSimpleTextItem(this); connect(namePoint, &VGraphicsSimpleTextItem::ShowContextMenu, this, &VToolPoint::ShowContextMenu); namePoint->setBrush(Qt::black); diff --git a/src/app/tools/nodeDetails/vnodepoint.cpp b/src/app/tools/nodeDetails/vnodepoint.cpp index 6e03a5d7e..8dd3e1198 100644 --- a/src/app/tools/nodeDetails/vnodepoint.cpp +++ b/src/app/tools/nodeDetails/vnodepoint.cpp @@ -38,9 +38,10 @@ const QString VNodePoint::ToolType = QStringLiteral("modeling"); VNodePoint::VNodePoint(VPattern *doc, VContainer *data, quint32 id, quint32 idPoint, const Valentina::Sources &typeCreation, const quint32 &idTool, QObject *qoParent, QGraphicsItem *parent) - :VAbstractNode(doc, data, id, idPoint, idTool, qoParent), QGraphicsEllipseItem(parent), radius(qApp->toPixel(1.5)), + :VAbstractNode(doc, data, id, idPoint, idTool, qoParent), QGraphicsEllipseItem(parent), radius(0), namePoint(nullptr), lineName(nullptr) { + radius = (1.5/*mm*/ / 25.4) * VApplication::PrintDPI; namePoint = new VGraphicsSimpleTextItem(this); lineName = new QGraphicsLineItem(this); connect(namePoint, &VGraphicsSimpleTextItem::NameChangePosition, this, From 9bf4cc0dbdeadd3ed840f92d2f1858175405f479 Mon Sep 17 00:00:00 2001 From: dismine Date: Tue, 10 Jun 2014 21:20:39 +0300 Subject: [PATCH 3/4] Fixed issue #77. --HG-- branch : develop --- .../app/dialogindividualmeasurements.cpp | 8 ++ .../app/dialogindividualmeasurements.h | 2 + .../app/dialogindividualmeasurements.ui | 91 ++++++++++++++++++- 3 files changed, 99 insertions(+), 2 deletions(-) diff --git a/src/app/dialogs/app/dialogindividualmeasurements.cpp b/src/app/dialogs/app/dialogindividualmeasurements.cpp index e90db6da9..73c48818f 100644 --- a/src/app/dialogs/app/dialogindividualmeasurements.cpp +++ b/src/app/dialogs/app/dialogindividualmeasurements.cpp @@ -147,6 +147,8 @@ void DialogIndividualMeasurements::CheckState() bool flagPath = false; if (ui->radioButtonExistM->isChecked()) { + ui->labelGivenName->setEnabled(true); + ui->labelFamilyName->setEnabled(true); ui->lineEditPathExistM->setEnabled(true); ui->toolButtonOpenExist->setEnabled(true); @@ -165,6 +167,8 @@ void DialogIndividualMeasurements::CheckState() ui->toolButtonOpenNew->setEnabled(true); ui->comboBoxUnits->setEnabled(true); + ui->labelGivenName->setEnabled(false); + ui->labelFamilyName->setEnabled(false); ui->toolButtonOpenExist->setEnabled(false); ui->lineEditPathExistM->setEnabled(false); @@ -199,6 +203,10 @@ void DialogIndividualMeasurements::OpenTable() e.CriticalMessageBox(tr("File error."), this); fileName.clear(); } + VIndividualMeasurements m(data); + m.setContent(fileName); + ui->labelGivenName->setText(m.GivenName()); + ui->labelFamilyName->setText(m.FamilyName()); ui->lineEditPathExistM->setText(fileName); ui->lineEditPathExistM->setToolTip(fileName); CheckState(); diff --git a/src/app/dialogs/app/dialogindividualmeasurements.h b/src/app/dialogs/app/dialogindividualmeasurements.h index 3e2527051..f41edf414 100644 --- a/src/app/dialogs/app/dialogindividualmeasurements.h +++ b/src/app/dialogs/app/dialogindividualmeasurements.h @@ -60,11 +60,13 @@ private: void InitUnits(); }; +//--------------------------------------------------------------------------------------------------------------------- inline QString DialogIndividualMeasurements::name() const { return _name; } +//--------------------------------------------------------------------------------------------------------------------- inline QString DialogIndividualMeasurements::tablePath() const { return _tablePath; diff --git a/src/app/dialogs/app/dialogindividualmeasurements.ui b/src/app/dialogs/app/dialogindividualmeasurements.ui index 696dccacd..c1907788f 100644 --- a/src/app/dialogs/app/dialogindividualmeasurements.ui +++ b/src/app/dialogs/app/dialogindividualmeasurements.ui @@ -6,8 +6,8 @@ 0 0 - 397 - 280 + 385 + 295 @@ -73,6 +73,93 @@ + + + + QLayout::SetMinimumSize + + + + + true + + + + 0 + 0 + + + + + 90 + 0 + + + + Given name: + + + + + + + + 1 + 0 + + + + + + + true + + + + + + + + + QLayout::SetMinimumSize + + + + + + 0 + 0 + + + + + 90 + 0 + + + + Family name: + + + + + + + + 1 + 0 + + + + + + + true + + + + + From 1cee18a66b535f77d9322ba204a6f911163c76d7 Mon Sep 17 00:00:00 2001 From: dismine Date: Tue, 10 Jun 2014 23:14:16 +0300 Subject: [PATCH 4/4] Fixed issue #163. --HG-- branch : develop --- src/app/widgets/vapplication.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/widgets/vapplication.cpp b/src/app/widgets/vapplication.cpp index 9a0e51dbf..40cd580f5 100644 --- a/src/app/widgets/vapplication.cpp +++ b/src/app/widgets/vapplication.cpp @@ -162,7 +162,7 @@ QString VApplication::pathToTables() const return QApplication::applicationDirPath() + QStringLiteral("/tables/standard"); #else QDir dir(QApplication::applicationDirPath() + QStringLiteral("/tables/standard")); - if (dir.exist()) + if (dir.exists()) { return dir.absolutePath(); } @@ -185,7 +185,7 @@ QString VApplication::translationsPath() const return QApplication::applicationDirPath() + QStringLiteral("/translations"); #else QDir dir(QApplication::applicationDirPath() + QStringLiteral("/translations")); - if (dir.exist()) + if (dir.exists()) { return dir.absolutePath(); }