New pattern making system 'None' with code p998.

--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2015-10-07 20:57:18 +03:00
parent 8df6014412
commit 94f86f136e
19 changed files with 55536 additions and 3 deletions

View File

@ -788,3 +788,17 @@ TRANSLATIONS += measurements_p54.ts \
measurements_p54_es_ES.ts \ measurements_p54_es_ES.ts \
measurements_p54_fi_FI.ts \ measurements_p54_fi_FI.ts \
measurements_p54_en_US.ts measurements_p54_en_US.ts
TRANSLATIONS += measurements_p998.ts \
measurements_p998_ru_RU.ts \
measurements_p998_uk_UA.ts \
measurements_p998_de_DE.ts \
measurements_p998_cs_CZ.ts \
measurements_p998_he_IL.ts \
measurements_p998_fr_FR.ts \
measurements_p998_it_IT.ts \
measurements_p998_nl_NL.ts \
measurements_p998_id_ID.ts \
measurements_p998_es_ES.ts \
measurements_p998_fi_FI.ts \
measurements_p998_en_US.ts

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -292,6 +292,7 @@ void TapeConfigurationPage::InitPMSystems(QComboBox *systemCombo)
systemCombo->addItem(qApp->TrVars()->PMSystemName(p52_S), p52_S); systemCombo->addItem(qApp->TrVars()->PMSystemName(p52_S), p52_S);
systemCombo->addItem(qApp->TrVars()->PMSystemName(p53_S), p53_S); systemCombo->addItem(qApp->TrVars()->PMSystemName(p53_S), p53_S);
systemCombo->addItem(qApp->TrVars()->PMSystemName(p54_S), p54_S); systemCombo->addItem(qApp->TrVars()->PMSystemName(p54_S), p54_S);
systemCombo->addItem(qApp->TrVars()->PMSystemName(p998_S), p998_S);
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------

View File

@ -973,6 +973,20 @@ INSTALL_TRANSLATIONS += \
$${TRANSLATIONS_PATH}/measurements_p54_fi_FI.qm \ $${TRANSLATIONS_PATH}/measurements_p54_fi_FI.qm \
$${TRANSLATIONS_PATH}/measurements_p54_en_US.qm $${TRANSLATIONS_PATH}/measurements_p54_en_US.qm
INSTALL_TRANSLATIONS += \
$${TRANSLATIONS_PATH}/measurements_p998_ru_RU.qm \
$${TRANSLATIONS_PATH}/measurements_p998_uk_UA.qm \
$${TRANSLATIONS_PATH}/measurements_p998_de_DE.qm \
$${TRANSLATIONS_PATH}/measurements_p998_cs_CZ.qm \
$${TRANSLATIONS_PATH}/measurements_p998_he_IL.qm \
$${TRANSLATIONS_PATH}/measurements_p998_fr_FR.qm \
$${TRANSLATIONS_PATH}/measurements_p998_it_IT.qm \
$${TRANSLATIONS_PATH}/measurements_p998_nl_NL.qm \
$${TRANSLATIONS_PATH}/measurements_p998_id_ID.qm \
$${TRANSLATIONS_PATH}/measurements_p998_es_ES.qm \
$${TRANSLATIONS_PATH}/measurements_p998_fi_FI.qm \
$${TRANSLATIONS_PATH}/measurements_p998_en_US.qm
# Set "make install" command for Unix-like systems. # Set "make install" command for Unix-like systems.
unix{ unix{
# Prefix for binary file. # Prefix for binary file.
@ -1087,6 +1101,7 @@ unix{
$${TRANSLATIONS_PATH}/measurements_p52_ru_RU.qm \ $${TRANSLATIONS_PATH}/measurements_p52_ru_RU.qm \
$${TRANSLATIONS_PATH}/measurements_p53_ru_RU.qm \ $${TRANSLATIONS_PATH}/measurements_p53_ru_RU.qm \
$${TRANSLATIONS_PATH}/measurements_p54_ru_RU.qm \ $${TRANSLATIONS_PATH}/measurements_p54_ru_RU.qm \
$${TRANSLATIONS_PATH}/measurements_p998_ru_RU.qm \
$${TRANSLATIONS_PATH}/Localizable.strings $${TRANSLATIONS_PATH}/Localizable.strings
TRANSLATION_ru_RU.path = "$$RESOURCES_DIR/translations/ru_RU.lproj" TRANSLATION_ru_RU.path = "$$RESOURCES_DIR/translations/ru_RU.lproj"
QMAKE_BUNDLE_DATA += TRANSLATION_ru_RU QMAKE_BUNDLE_DATA += TRANSLATION_ru_RU
@ -1150,6 +1165,7 @@ unix{
$${TRANSLATIONS_PATH}/measurements_p52_uk_UA.qm \ $${TRANSLATIONS_PATH}/measurements_p52_uk_UA.qm \
$${TRANSLATIONS_PATH}/measurements_p53_uk_UA.qm \ $${TRANSLATIONS_PATH}/measurements_p53_uk_UA.qm \
$${TRANSLATIONS_PATH}/measurements_p54_uk_UA.qm \ $${TRANSLATIONS_PATH}/measurements_p54_uk_UA.qm \
$${TRANSLATIONS_PATH}/measurements_p998_uk_UA.qm \
$${TRANSLATIONS_PATH}/Localizable.strings $${TRANSLATIONS_PATH}/Localizable.strings
TRANSLATION_uk_UA.path = "$$RESOURCES_DIR/translations/uk_UA.lproj" TRANSLATION_uk_UA.path = "$$RESOURCES_DIR/translations/uk_UA.lproj"
QMAKE_BUNDLE_DATA += TRANSLATION_uk_UA QMAKE_BUNDLE_DATA += TRANSLATION_uk_UA
@ -1213,6 +1229,7 @@ unix{
$${TRANSLATIONS_PATH}/measurements_p52_de_DE.qm \ $${TRANSLATIONS_PATH}/measurements_p52_de_DE.qm \
$${TRANSLATIONS_PATH}/measurements_p53_de_DE.qm \ $${TRANSLATIONS_PATH}/measurements_p53_de_DE.qm \
$${TRANSLATIONS_PATH}/measurements_p54_de_DE.qm \ $${TRANSLATIONS_PATH}/measurements_p54_de_DE.qm \
$${TRANSLATIONS_PATH}/measurements_p998_de_DE.qm \
$${TRANSLATIONS_PATH}/Localizable.strings $${TRANSLATIONS_PATH}/Localizable.strings
TRANSLATION_de_DE.path = "$$RESOURCES_DIR/translations/de_DE.lproj" TRANSLATION_de_DE.path = "$$RESOURCES_DIR/translations/de_DE.lproj"
QMAKE_BUNDLE_DATA += TRANSLATION_de_DE QMAKE_BUNDLE_DATA += TRANSLATION_de_DE
@ -1276,6 +1293,7 @@ unix{
$${TRANSLATIONS_PATH}/measurements_p52_cs_CZ.qm \ $${TRANSLATIONS_PATH}/measurements_p52_cs_CZ.qm \
$${TRANSLATIONS_PATH}/measurements_p53_cs_CZ.qm \ $${TRANSLATIONS_PATH}/measurements_p53_cs_CZ.qm \
$${TRANSLATIONS_PATH}/measurements_p54_cs_CZ.qm \ $${TRANSLATIONS_PATH}/measurements_p54_cs_CZ.qm \
$${TRANSLATIONS_PATH}/measurements_p998_cs_CZ.qm \
$${TRANSLATIONS_PATH}/Localizable.strings $${TRANSLATIONS_PATH}/Localizable.strings
TRANSLATION_cs_CZ.path = "$$RESOURCES_DIR/translations/cs_CZ.lproj" TRANSLATION_cs_CZ.path = "$$RESOURCES_DIR/translations/cs_CZ.lproj"
QMAKE_BUNDLE_DATA += TRANSLATION_cs_CZ QMAKE_BUNDLE_DATA += TRANSLATION_cs_CZ
@ -1339,6 +1357,7 @@ unix{
$${TRANSLATIONS_PATH}/measurements_p52_he_IL.qm \ $${TRANSLATIONS_PATH}/measurements_p52_he_IL.qm \
$${TRANSLATIONS_PATH}/measurements_p53_he_IL.qm \ $${TRANSLATIONS_PATH}/measurements_p53_he_IL.qm \
$${TRANSLATIONS_PATH}/measurements_p54_he_IL.qm \ $${TRANSLATIONS_PATH}/measurements_p54_he_IL.qm \
$${TRANSLATIONS_PATH}/measurements_p998_he_IL.qm \
$${TRANSLATIONS_PATH}/Localizable.strings $${TRANSLATIONS_PATH}/Localizable.strings
TRANSLATION_he_IL.path = "$$RESOURCES_DIR/translations/he_IL.lproj" TRANSLATION_he_IL.path = "$$RESOURCES_DIR/translations/he_IL.lproj"
QMAKE_BUNDLE_DATA += TRANSLATION_he_IL QMAKE_BUNDLE_DATA += TRANSLATION_he_IL
@ -1402,6 +1421,7 @@ unix{
$${TRANSLATIONS_PATH}/measurements_p52_fr_FR.qm \ $${TRANSLATIONS_PATH}/measurements_p52_fr_FR.qm \
$${TRANSLATIONS_PATH}/measurements_p53_fr_FR.qm \ $${TRANSLATIONS_PATH}/measurements_p53_fr_FR.qm \
$${TRANSLATIONS_PATH}/measurements_p54_fr_FR.qm \ $${TRANSLATIONS_PATH}/measurements_p54_fr_FR.qm \
$${TRANSLATIONS_PATH}/measurements_p998_fr_FR.qm \
$${TRANSLATIONS_PATH}/Localizable.strings $${TRANSLATIONS_PATH}/Localizable.strings
TRANSLATION_fr_FR.path = "$$RESOURCES_DIR/translations/fr_FR.lproj" TRANSLATION_fr_FR.path = "$$RESOURCES_DIR/translations/fr_FR.lproj"
QMAKE_BUNDLE_DATA += TRANSLATION_fr_FR QMAKE_BUNDLE_DATA += TRANSLATION_fr_FR
@ -1465,6 +1485,7 @@ unix{
$${TRANSLATIONS_PATH}/measurements_p52_it_IT.qm \ $${TRANSLATIONS_PATH}/measurements_p52_it_IT.qm \
$${TRANSLATIONS_PATH}/measurements_p53_it_IT.qm \ $${TRANSLATIONS_PATH}/measurements_p53_it_IT.qm \
$${TRANSLATIONS_PATH}/measurements_p54_it_IT.qm \ $${TRANSLATIONS_PATH}/measurements_p54_it_IT.qm \
$${TRANSLATIONS_PATH}/measurements_p998_it_IT.qm \
$${TRANSLATIONS_PATH}/Localizable.strings $${TRANSLATIONS_PATH}/Localizable.strings
TRANSLATION_it_IT.path = "$$RESOURCES_DIR/translations/it_IT.lproj" TRANSLATION_it_IT.path = "$$RESOURCES_DIR/translations/it_IT.lproj"
QMAKE_BUNDLE_DATA += TRANSLATION_it_IT QMAKE_BUNDLE_DATA += TRANSLATION_it_IT
@ -1528,6 +1549,7 @@ unix{
$${TRANSLATIONS_PATH}/measurements_p52_nl_NL.qm \ $${TRANSLATIONS_PATH}/measurements_p52_nl_NL.qm \
$${TRANSLATIONS_PATH}/measurements_p53_nl_NL.qm \ $${TRANSLATIONS_PATH}/measurements_p53_nl_NL.qm \
$${TRANSLATIONS_PATH}/measurements_p54_nl_NL.qm \ $${TRANSLATIONS_PATH}/measurements_p54_nl_NL.qm \
$${TRANSLATIONS_PATH}/measurements_p998_nl_NL.qm \
$${TRANSLATIONS_PATH}/Localizable.strings $${TRANSLATIONS_PATH}/Localizable.strings
TRANSLATION_nl_NL.path = "$$RESOURCES_DIR/translations/nl_NL.lproj" TRANSLATION_nl_NL.path = "$$RESOURCES_DIR/translations/nl_NL.lproj"
QMAKE_BUNDLE_DATA += TRANSLATION_nl_NL QMAKE_BUNDLE_DATA += TRANSLATION_nl_NL
@ -1591,6 +1613,7 @@ unix{
$${TRANSLATIONS_PATH}/measurements_p52_id_ID.qm \ $${TRANSLATIONS_PATH}/measurements_p52_id_ID.qm \
$${TRANSLATIONS_PATH}/measurements_p53_id_ID.qm \ $${TRANSLATIONS_PATH}/measurements_p53_id_ID.qm \
$${TRANSLATIONS_PATH}/measurements_p54_id_ID.qm \ $${TRANSLATIONS_PATH}/measurements_p54_id_ID.qm \
$${TRANSLATIONS_PATH}/measurements_p998_id_ID.qm \
$${TRANSLATIONS_PATH}/Localizable.strings $${TRANSLATIONS_PATH}/Localizable.strings
TRANSLATION_id_ID.path = "$$RESOURCES_DIR/translations/id_ID.lproj" TRANSLATION_id_ID.path = "$$RESOURCES_DIR/translations/id_ID.lproj"
QMAKE_BUNDLE_DATA += TRANSLATION_id_ID QMAKE_BUNDLE_DATA += TRANSLATION_id_ID
@ -1654,6 +1677,7 @@ unix{
$${TRANSLATIONS_PATH}/measurements_p52_es_ES.qm \ $${TRANSLATIONS_PATH}/measurements_p52_es_ES.qm \
$${TRANSLATIONS_PATH}/measurements_p53_es_ES.qm \ $${TRANSLATIONS_PATH}/measurements_p53_es_ES.qm \
$${TRANSLATIONS_PATH}/measurements_p54_es_ES.qm \ $${TRANSLATIONS_PATH}/measurements_p54_es_ES.qm \
$${TRANSLATIONS_PATH}/measurements_p998_es_ES.qm \
$${TRANSLATIONS_PATH}/Localizable.strings $${TRANSLATIONS_PATH}/Localizable.strings
TRANSLATION_es_ES.path = "$$RESOURCES_DIR/translations/es_ES.lproj" TRANSLATION_es_ES.path = "$$RESOURCES_DIR/translations/es_ES.lproj"
QMAKE_BUNDLE_DATA += TRANSLATION_es_ES QMAKE_BUNDLE_DATA += TRANSLATION_es_ES
@ -1717,6 +1741,7 @@ unix{
$${TRANSLATIONS_PATH}/measurements_p52_fi_FI.qm \ $${TRANSLATIONS_PATH}/measurements_p52_fi_FI.qm \
$${TRANSLATIONS_PATH}/measurements_p53_fi_FI.qm \ $${TRANSLATIONS_PATH}/measurements_p53_fi_FI.qm \
$${TRANSLATIONS_PATH}/measurements_p54_fi_FI.qm \ $${TRANSLATIONS_PATH}/measurements_p54_fi_FI.qm \
$${TRANSLATIONS_PATH}/measurements_p998_fi_FI.qm \
$${TRANSLATIONS_PATH}/Localizable.strings $${TRANSLATIONS_PATH}/Localizable.strings
TRANSLATION_fi_FI.path = "$$RESOURCES_DIR/translations/fi_FI.lproj" TRANSLATION_fi_FI.path = "$$RESOURCES_DIR/translations/fi_FI.lproj"
QMAKE_BUNDLE_DATA += TRANSLATION_fi_FI QMAKE_BUNDLE_DATA += TRANSLATION_fi_FI
@ -1780,6 +1805,7 @@ unix{
$${TRANSLATIONS_PATH}/measurements_p52_en_US.qm \ $${TRANSLATIONS_PATH}/measurements_p52_en_US.qm \
$${TRANSLATIONS_PATH}/measurements_p53_en_US.qm \ $${TRANSLATIONS_PATH}/measurements_p53_en_US.qm \
$${TRANSLATIONS_PATH}/measurements_p54_en_US.qm \ $${TRANSLATIONS_PATH}/measurements_p54_en_US.qm \
$${TRANSLATIONS_PATH}/measurements_p998_en_US.qm \
$${TRANSLATIONS_PATH}/Localizable.strings $${TRANSLATIONS_PATH}/Localizable.strings
TRANSLATION_en_US.path = "$$RESOURCES_DIR/translations/en_US.lproj" TRANSLATION_en_US.path = "$$RESOURCES_DIR/translations/en_US.lproj"
QMAKE_BUNDLE_DATA += TRANSLATION_en_US QMAKE_BUNDLE_DATA += TRANSLATION_en_US

View File

@ -349,6 +349,7 @@ const QString p51_S = QStringLiteral("p51");
const QString p52_S = QStringLiteral("p52"); const QString p52_S = QStringLiteral("p52");
const QString p53_S = QStringLiteral("p53"); const QString p53_S = QStringLiteral("p53");
const QString p54_S = QStringLiteral("p54"); const QString p54_S = QStringLiteral("p54");
const QString p998_S = QStringLiteral("p998");
//functions //functions
const QString sin_F = QStringLiteral("sin"); const QString sin_F = QStringLiteral("sin");

View File

@ -515,6 +515,7 @@ extern const QString p51_S;
extern const QString p52_S; extern const QString p52_S;
extern const QString p53_S; extern const QString p53_S;
extern const QString p54_S; extern const QString p54_S;
extern const QString p998_S;
// functions // functions
extern const QString sin_F; extern const QString sin_F;

View File

@ -347,9 +347,10 @@ void VTranslateVars::InitPatternMakingSystems()
"The Art and Science of Garment Cutting", "Book name"); "The Art and Science of Garment Cutting", "Book name");
InitSystem(p50_S, name, author, book); InitSystem(p50_S, name, author, book);
//================================================================================================================= //=================================================================================================================
name = QmuTranslation::translate("Pattern_making_systems", "system_P51", "System name"); name = QmuTranslation::translate("Pattern_making_systems", "GOST 17917-86", "System name");
author = QmuTranslation::translate("Pattern_making_systems", "system_P51", "Author name"); author = QmuTranslation::translate("Pattern_making_systems", "Ministry of consumer industry of the USSR",
book = QmuTranslation::translate("Pattern_making_systems", "system_P51", "Book name"); "Author name");
book = QmuTranslation::translate("Pattern_making_systems", "Standard figure boys", "Book name");
InitSystem(p51_S, name, author, book); InitSystem(p51_S, name, author, book);
//================================================================================================================= //=================================================================================================================
name = QmuTranslation::translate("Pattern_making_systems", "Eddy", "System name"); name = QmuTranslation::translate("Pattern_making_systems", "Eddy", "System name");
@ -370,6 +371,11 @@ void VTranslateVars::InitPatternMakingSystems()
"Book name"); "Book name");
InitSystem(p54_S, name, author, book); InitSystem(p54_S, name, author, book);
//================================================================================================================= //=================================================================================================================
name = QmuTranslation::translate("Pattern_making_systems", "None", "System name");
author = QmuTranslation::translate("Pattern_making_systems", "Valentina team", "Author name");
book = QmuTranslation::translate("Pattern_making_systems", "Valentina's internal standard", "Book name");
InitSystem(p998_S, name, author, book);
//=================================================================================================================
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------