From 1ba9855d22307303afd074df80fc430d35ca8d09 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 12 Oct 2015 20:06:12 +0300 Subject: [PATCH] Resolved issue #377. Add blank option for 'sex' field in Tape.exe. --HG-- branch : develop --- share/translations/valentina.ts | 23 ++++++++++++------- share/translations/valentina_cs_CZ.ts | 19 +++++++++++++-- share/translations/valentina_de_DE.ts | 19 +++++++++++++-- share/translations/valentina_en_US.ts | 19 +++++++++++++-- share/translations/valentina_es_ES.ts | 19 +++++++++++++-- share/translations/valentina_fi_FI.ts | 19 +++++++++++++-- share/translations/valentina_fr_FR.ts | 19 +++++++++++++-- share/translations/valentina_he_IL.ts | 23 ++++++++++++------- share/translations/valentina_id_ID.ts | 23 ++++++++++++------- share/translations/valentina_it_IT.ts | 23 ++++++++++++------- share/translations/valentina_nl_NL.ts | 19 +++++++++++++-- share/translations/valentina_ru_RU.ts | 19 +++++++++++++-- share/translations/valentina_uk_UA.ts | 19 +++++++++++++-- src/app/tape/tmainwindow.cpp | 5 ++-- .../schema/individual_measurements/v0.3.0.xsd | 1 + src/libs/vformat/vmeasurements.cpp | 8 +++---- 16 files changed, 220 insertions(+), 57 deletions(-) diff --git a/share/translations/valentina.ts b/share/translations/valentina.ts index d0bb3138c..3f15e8c1a 100644 --- a/share/translations/valentina.ts +++ b/share/translations/valentina.ts @@ -4322,14 +4322,6 @@ Do you want to save your changes? Individual measurements - - male - - - - female - - untitled @@ -4475,6 +4467,21 @@ Do you want to save your changes? CAlculated value + + unknown + gender + + + + male + gender + + + + female + gender + + TapeConfigDialog diff --git a/share/translations/valentina_cs_CZ.ts b/share/translations/valentina_cs_CZ.ts index 501b4fcdc..349ba825d 100644 --- a/share/translations/valentina_cs_CZ.ts +++ b/share/translations/valentina_cs_CZ.ts @@ -6390,11 +6390,11 @@ Chcete uložit své změny? male - muž + muž female - žena + žena untitled @@ -6541,6 +6541,21 @@ Do you want to save your changes? CAlculated value + + unknown + gender + + + + male + gender + muž + + + female + gender + žena + TableWindow diff --git a/share/translations/valentina_de_DE.ts b/share/translations/valentina_de_DE.ts index d7ec6b482..d50ca371a 100644 --- a/share/translations/valentina_de_DE.ts +++ b/share/translations/valentina_de_DE.ts @@ -5683,11 +5683,11 @@ Sollen die Änderungen gespeichert werden? male - männlich + männlich female - weiblich + weiblich untitled @@ -5834,6 +5834,21 @@ Do you want to save your changes? CAlculated value + + unknown + gender + + + + male + gender + männlich + + + female + gender + weiblich + TableWindow diff --git a/share/translations/valentina_en_US.ts b/share/translations/valentina_en_US.ts index 72d8ff0e5..10ddd90cf 100644 --- a/share/translations/valentina_en_US.ts +++ b/share/translations/valentina_en_US.ts @@ -7613,11 +7613,11 @@ Do you want to save your changes? male - male + male female - female + female untitled @@ -7764,6 +7764,21 @@ Do you want to save your changes? CAlculated value + + unknown + gender + + + + male + gender + male + + + female + gender + female + TableWindow diff --git a/share/translations/valentina_es_ES.ts b/share/translations/valentina_es_ES.ts index faca37081..9acdfa90f 100644 --- a/share/translations/valentina_es_ES.ts +++ b/share/translations/valentina_es_ES.ts @@ -5896,11 +5896,11 @@ Quiere guardar los cambios? male - hombre + hombre female - mujer + mujer untitled @@ -6047,6 +6047,21 @@ Do you want to save your changes? CAlculated value + + unknown + gender + + + + male + gender + hombre + + + female + gender + mujer + TableWindow diff --git a/share/translations/valentina_fi_FI.ts b/share/translations/valentina_fi_FI.ts index 3046776b5..7cb904858 100644 --- a/share/translations/valentina_fi_FI.ts +++ b/share/translations/valentina_fi_FI.ts @@ -6145,11 +6145,11 @@ Haluatko tallentaa muutokset? male - Mies + Mies female - Nainen + Nainen untitled @@ -6296,6 +6296,21 @@ Do you want to save your changes? CAlculated value + + unknown + gender + + + + male + gender + Mies + + + female + gender + Nainen + TableWindow diff --git a/share/translations/valentina_fr_FR.ts b/share/translations/valentina_fr_FR.ts index d814ee1b9..c3a454fa8 100644 --- a/share/translations/valentina_fr_FR.ts +++ b/share/translations/valentina_fr_FR.ts @@ -5953,11 +5953,11 @@ Voulez-vous sauvegarder les changements ? male - homme + homme female - femme + femme untitled @@ -6104,6 +6104,21 @@ Do you want to save your changes? CAlculated value + + unknown + gender + + + + male + gender + homme + + + female + gender + femme + TableWindow diff --git a/share/translations/valentina_he_IL.ts b/share/translations/valentina_he_IL.ts index dda07c159..266865bad 100644 --- a/share/translations/valentina_he_IL.ts +++ b/share/translations/valentina_he_IL.ts @@ -4438,14 +4438,6 @@ Do you want to save your changes? Individual measurements - - male - - - - female - - untitled @@ -4591,6 +4583,21 @@ Do you want to save your changes? CAlculated value + + unknown + gender + + + + male + gender + + + + female + gender + + TableWindow diff --git a/share/translations/valentina_id_ID.ts b/share/translations/valentina_id_ID.ts index 14666b5b1..9fa162aad 100644 --- a/share/translations/valentina_id_ID.ts +++ b/share/translations/valentina_id_ID.ts @@ -4856,14 +4856,6 @@ Apakah anda ingin menyimpan perubahan anda? Individual measurements - - male - - - - female - - untitled @@ -5009,6 +5001,21 @@ Do you want to save your changes? CAlculated value + + unknown + gender + + + + male + gender + + + + female + gender + + TableWindow diff --git a/share/translations/valentina_it_IT.ts b/share/translations/valentina_it_IT.ts index 0e598c8af..665dcc098 100644 --- a/share/translations/valentina_it_IT.ts +++ b/share/translations/valentina_it_IT.ts @@ -4409,14 +4409,6 @@ Do you want to save your changes? Individual measurements - - male - - - - female - - untitled @@ -4562,6 +4554,21 @@ Do you want to save your changes? CAlculated value + + unknown + gender + + + + male + gender + + + + female + gender + + TapeConfigDialog diff --git a/share/translations/valentina_nl_NL.ts b/share/translations/valentina_nl_NL.ts index 06dfe9eef..651d0d6de 100644 --- a/share/translations/valentina_nl_NL.ts +++ b/share/translations/valentina_nl_NL.ts @@ -7587,11 +7587,11 @@ Do you want to save your changes? male - Mannelijk + Mannelijk female - Vrouwelijk + Vrouwelijk untitled @@ -7738,6 +7738,21 @@ Do you want to save your changes? CAlculated value + + unknown + gender + + + + male + gender + Mannelijk + + + female + gender + Vrouwelijk + TableWindow diff --git a/share/translations/valentina_ru_RU.ts b/share/translations/valentina_ru_RU.ts index 8185e450d..850083039 100644 --- a/share/translations/valentina_ru_RU.ts +++ b/share/translations/valentina_ru_RU.ts @@ -9460,11 +9460,11 @@ Do you want to save your changes? male - мужчина + мужчина female - женщина + женщина untitled @@ -9611,6 +9611,21 @@ Do you want to save your changes? CAlculated value + + unknown + gender + + + + male + gender + мужчина + + + female + gender + женщина + TableWindow diff --git a/share/translations/valentina_uk_UA.ts b/share/translations/valentina_uk_UA.ts index 924633698..b405ac33b 100644 --- a/share/translations/valentina_uk_UA.ts +++ b/share/translations/valentina_uk_UA.ts @@ -8429,11 +8429,11 @@ Do you want to save your changes? male - чоловік + чоловік female - жінка + жінка untitled @@ -8580,6 +8580,21 @@ Do you want to save your changes? CAlculated value + + unknown + gender + + + + male + gender + чоловік + + + female + gender + жінка + TableWindow diff --git a/src/app/tape/tmainwindow.cpp b/src/app/tape/tmainwindow.cpp index c837ffeeb..31ae81326 100644 --- a/src/app/tape/tmainwindow.cpp +++ b/src/app/tape/tmainwindow.cpp @@ -1705,8 +1705,9 @@ void TMainWindow::InitWindow() ui->lineEditGivenName->setText(m->GivenName()); ui->lineEditFamilyName->setText(m->FamilyName()); - ui->comboBoxSex->addItem(tr("male"), QVariant(static_cast(SexType::Male))); - ui->comboBoxSex->addItem(tr("female"), QVariant(static_cast(SexType::Female))); + ui->comboBoxSex->addItem(tr("unknown", "gender"), QVariant(static_cast(SexType::Unknown))); + ui->comboBoxSex->addItem(tr("male", "gender"), QVariant(static_cast(SexType::Male))); + ui->comboBoxSex->addItem(tr("female", "gender"), QVariant(static_cast(SexType::Female))); const qint32 index = ui->comboBoxSex->findData(static_cast(m->Sex())); ui->comboBoxSex->setCurrentIndex(index); diff --git a/src/libs/ifc/schema/individual_measurements/v0.3.0.xsd b/src/libs/ifc/schema/individual_measurements/v0.3.0.xsd index 063c6a49e..233613464 100644 --- a/src/libs/ifc/schema/individual_measurements/v0.3.0.xsd +++ b/src/libs/ifc/schema/individual_measurements/v0.3.0.xsd @@ -58,6 +58,7 @@ + diff --git a/src/libs/vformat/vmeasurements.cpp b/src/libs/vformat/vmeasurements.cpp index d4bf623af..c19d5b542 100644 --- a/src/libs/vformat/vmeasurements.cpp +++ b/src/libs/vformat/vmeasurements.cpp @@ -381,7 +381,7 @@ void VMeasurements::SetBirthDate(const QDate &date) //--------------------------------------------------------------------------------------------------------------------- SexType VMeasurements::Sex() const { - return StrToGender(UniqueTagText(TagSex, "")); + return StrToGender(UniqueTagText(TagSex, SexUnknown)); } //--------------------------------------------------------------------------------------------------------------------- @@ -542,7 +542,6 @@ QString VMeasurements::GenderToStr(const SexType &sex) case SexType::Female: return SexFemale; case SexType::Unknown: - return SexUnknown; default: return SexUnknown; } @@ -551,7 +550,7 @@ QString VMeasurements::GenderToStr(const SexType &sex) //--------------------------------------------------------------------------------------------------------------------- SexType VMeasurements::StrToGender(const QString &sex) { - QStringList genders = QStringList() << SexMale << SexFemale << SexUnknown; + const QStringList genders = QStringList() << SexMale << SexFemale << SexUnknown; switch (genders.indexOf(sex)) { case 0: // SexMale @@ -559,7 +558,6 @@ SexType VMeasurements::StrToGender(const QString &sex) case 1: // SexFemale return SexType::Female; case 2: // SexUnknown - return SexType::Unknown; default: return SexType::Unknown; } @@ -708,7 +706,7 @@ void VMeasurements::CreateEmptyIndividualFile(Unit unit) personal.appendChild(date); QDomElement sex = createElement(TagSex); - const QDomText newSex = createTextNode(GenderToStr(SexType::Male)); + const QDomText newSex = createTextNode(GenderToStr(SexType::Unknown)); sex.appendChild(newSex); personal.appendChild(sex);