From 40bf125fdfd14f4dfdb0f9dbfb894b336348d623 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sat, 19 Dec 2015 21:26:05 +0200 Subject: [PATCH] Resolved issue #422. Date of birth: German data format. --HG-- branch : develop --- src/app/tape/tmainwindow.cpp | 1 + src/libs/vformat/vmeasurements.cpp | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/app/tape/tmainwindow.cpp b/src/app/tape/tmainwindow.cpp index 00c433bba..fa1d7145b 100644 --- a/src/app/tape/tmainwindow.cpp +++ b/src/app/tape/tmainwindow.cpp @@ -1889,6 +1889,7 @@ void TMainWindow::InitWindow() const qint32 index = ui->comboBoxGender->findData(static_cast(m->Gender())); ui->comboBoxGender->setCurrentIndex(index); + ui->dateEditBirthDate->setDisplayFormat(QLocale::system().dateFormat()); ui->dateEditBirthDate->setDate(m->BirthDate()); ui->lineEditEmail->setText(m->Email()); diff --git a/src/libs/vformat/vmeasurements.cpp b/src/libs/vformat/vmeasurements.cpp index 5c7de1eec..bf77ec920 100644 --- a/src/libs/vformat/vmeasurements.cpp +++ b/src/libs/vformat/vmeasurements.cpp @@ -64,6 +64,8 @@ const QString VMeasurements::GenderMale = QStringLiteral("male"); const QString VMeasurements::GenderFemale = QStringLiteral("female"); const QString VMeasurements::GenderUnknown = QStringLiteral("unknown"); +const QString defBirthDate = QStringLiteral("1800-01-01"); + //--------------------------------------------------------------------------------------------------------------------- VMeasurements::VMeasurements(VContainer *data) :VDomDocument(), @@ -390,7 +392,7 @@ void VMeasurements::SetGivenName(const QString &text) //--------------------------------------------------------------------------------------------------------------------- QDate VMeasurements::BirthDate() const { - return QDate::fromString(UniqueTagText(TagBirthDate), "yyyy-MM-dd"); + return QDate::fromString(UniqueTagText(TagBirthDate, defBirthDate), "yyyy-MM-dd"); } //--------------------------------------------------------------------------------------------------------------------- @@ -747,7 +749,7 @@ void VMeasurements::CreateEmptyIndividualFile(Unit unit) personal.appendChild(createElement(TagGivenName)); QDomElement date = createElement(TagBirthDate); - date.appendChild(createTextNode(QStringLiteral("1800-01-01"))); + date.appendChild(createTextNode(defBirthDate)); personal.appendChild(date); QDomElement gender = createElement(TagGender);