From d3b34f6cb491a32c53ca92ee5d7480eaa9af332a Mon Sep 17 00:00:00 2001 From: scorpio810 Date: Tue, 29 Sep 2015 09:20:38 +0000 Subject: [PATCH] Nomenclature bug fix git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4219 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- sources/nomenclature.cpp | 8 ++++---- sources/qetapp.cpp | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sources/nomenclature.cpp b/sources/nomenclature.cpp index 8dc3e2221..ab9921dc8 100644 --- a/sources/nomenclature.cpp +++ b/sources/nomenclature.cpp @@ -91,8 +91,8 @@ QString nomenclature::getNomenclature() ""+ QObject::tr("Commentaire") +";" ""+ QObject::tr("Fabricant") +";" ""+ QObject::tr("Reference") +";" - ""+ QObject::tr("Bloc auxilliaire 1") +";" - ""+ QObject::tr("Bloc auxilliaire 2") +";" + ""+ QObject::tr("Bloc auxiliaire 1") +";" + ""+ QObject::tr("Bloc auxiliaire 2") +";" ""+ QObject::tr("Machine-reference") +";" ""+ QObject::tr("Localisation") +";" ""+ QObject::tr("Fonction") +"\n"; @@ -135,8 +135,8 @@ QString nomenclature::getElementInfo(const Element *elmt) { info += elmt_info["comment"].toString() + ";"; info += elmt_info["manufacturer"].toString() + ";"; info += elmt_info["manufacturer-reference"].toString() + ";"; - info += elmt_info["Auxiliary_1-contact-bloc"].toString() + ";"; - info += elmt_info["Auxiliary_2-contact-bloc"].toString() + ";"; + info += elmt_info["auxiliary1"].toString() + ";"; + info += elmt_info["auxiliary2"].toString() + ";"; info += elmt_info["machine-manufacturer-reference"].toString() + ";"; info += elmt_info["location"].toString() + ";"; info += elmt_info["function"].toString() + "\n"; diff --git a/sources/qetapp.cpp b/sources/qetapp.cpp index d3ae345b2..9108703c8 100644 --- a/sources/qetapp.cpp +++ b/sources/qetapp.cpp @@ -351,8 +351,8 @@ QStringList QETApp::elementInfoKeys() { << "designation" << "manufacturer" << "manufacturer-reference" - << "Auxiliary_1-contact-bloc" - << "Auxiliary_2-contact-bloc" + << "auxiliary1" + << "auxiliary2" << "machine-manufacturer-reference" << "location" << "function"; @@ -372,8 +372,8 @@ QString QETApp::elementTranslatedInfoKey(QString &info) { else if (info == "designation") return tr("Désignation"); else if (info == "manufacturer") return tr("Fabricant"); else if (info == "manufacturer-reference") return tr("Référence fabricant"); - else if (info == "Auxiliary_1-contact-bloc") return tr("Bloc auxilliaire 1"); - else if (info == "Auxiliary_2-contact-bloc") return tr("Bloc auxilliaire 2"); + else if (info == "auxiliary1") return tr("Bloc auxiliaire 1"); + else if (info == "auxiliary2") return tr("Bloc auxiliaire 2"); else if (info == "machine-manufacturer-reference") return tr("Référence fabricant machine"); else if (info == "location") return tr("Localisation"); else if (info == "function") return tr("Fonction");