kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-18 13:30:34 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Nomenclature bug fix

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4219 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
scorpio810
2015-09-29 09:20:38 +00:00
parent 13b0c42ba3
commit d3b34f6cb4
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sources/nomenclature.cpp
View File

@@ -91,8 +91,8 @@ QString nomenclature::getNomenclature()
""+ QObject::tr("Commentaire") +";" ""+ QObject::tr("Commentaire") +";"
""+ QObject::tr("Fabricant") +";" ""+ QObject::tr("Fabricant") +";"
""+ QObject::tr("Reference") +";" ""+ QObject::tr("Reference") +";"
""+ QObject::tr("Bloc auxilliaire 1") +";" ""+ QObject::tr("Bloc auxiliaire 1") +";"
""+ QObject::tr("Bloc auxilliaire 2") +";" ""+ QObject::tr("Bloc auxiliaire 2") +";"
""+ QObject::tr("Machine-reference") +";" ""+ QObject::tr("Machine-reference") +";"
""+ QObject::tr("Localisation") +";" ""+ QObject::tr("Localisation") +";"
""+ QObject::tr("Fonction") +"\n"; ""+ QObject::tr("Fonction") +"\n";
@@ -135,8 +135,8 @@ QString nomenclature::getElementInfo(const Element *elmt) {
info += elmt_info["comment"].toString() + ";"; info += elmt_info["comment"].toString() + ";";
info += elmt_info["manufacturer"].toString() + ";"; info += elmt_info["manufacturer"].toString() + ";";
info += elmt_info["manufacturer-reference"].toString() + ";"; info += elmt_info["manufacturer-reference"].toString() + ";";
info += elmt_info["Auxiliary_1-contact-bloc"].toString() + ";"; info += elmt_info["auxiliary1"].toString() + ";";
info += elmt_info["Auxiliary_2-contact-bloc"].toString() + ";"; info += elmt_info["auxiliary2"].toString() + ";";
info += elmt_info["machine-manufacturer-reference"].toString() + ";"; info += elmt_info["machine-manufacturer-reference"].toString() + ";";
info += elmt_info["location"].toString() + ";"; info += elmt_info["location"].toString() + ";";
info += elmt_info["function"].toString() + "\n"; info += elmt_info["function"].toString() + "\n";

8
sources/qetapp.cpp
View File

@@ -351,8 +351,8 @@ QStringList QETApp::elementInfoKeys() {
<< "designation" << "designation"
<< "manufacturer" << "manufacturer"
<< "manufacturer-reference" << "manufacturer-reference"
<< "Auxiliary_1-contact-bloc" << "auxiliary1"
<< "Auxiliary_2-contact-bloc" << "auxiliary2"
<< "machine-manufacturer-reference" << "machine-manufacturer-reference"
<< "location" << "location"
<< "function"; << "function";
@@ -372,8 +372,8 @@ QString QETApp::elementTranslatedInfoKey(QString &info) {
else if (info == "designation") return tr("Désignation"); else if (info == "designation") return tr("Désignation");
else if (info == "manufacturer") return tr("Fabricant"); else if (info == "manufacturer") return tr("Fabricant");
else if (info == "manufacturer-reference") return tr("Référence 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 == "auxiliary1") return tr("Bloc auxiliaire 1");
else if (info == "Auxiliary_2-contact-bloc") return tr("Bloc auxilliaire 2"); 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 == "machine-manufacturer-reference") return tr("Référence fabricant machine");
else if (info == "location") return tr("Localisation"); else if (info == "location") return tr("Localisation");
else if (info == "function") return tr("Fonction"); else if (info == "function") return tr("Fonction");