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

Add new field Name of provider,

Browse Source 
rename fields,
update *TS files


git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5061 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
scorpio810
2017-10-03 12:11:28 +00:00
parent 7f92c1af7d
commit 9351ba63b7
18 changed files with 12718 additions and 7700 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1544
lang/qet_be.ts
View File

File diff suppressed because it is too large Load Diff

1625
lang/qet_cs.ts
View File

File diff suppressed because it is too large Load Diff

1544
lang/qet_de.ts
View File

File diff suppressed because it is too large Load Diff

1544
lang/qet_el.ts
View File

File diff suppressed because it is too large Load Diff

1620
lang/qet_en.ts
View File

File diff suppressed because it is too large Load Diff

1622
lang/qet_es.ts
View File

File diff suppressed because it is too large Load Diff

1574
lang/qet_fr.ts
View File

File diff suppressed because it is too large Load Diff

1544
lang/qet_it.ts
View File

File diff suppressed because it is too large Load Diff

1598
lang/qet_nl.ts
View File

File diff suppressed because it is too large Load Diff

1547
lang/qet_pl.ts
View File

File diff suppressed because it is too large Load Diff

1546
lang/qet_pt.ts
View File

File diff suppressed because it is too large Load Diff

1541
lang/qet_ro.ts
View File

File diff suppressed because it is too large Load Diff

1549
lang/qet_ru.ts
View File

File diff suppressed because it is too large Load Diff

1
sources/autoNum/assignvariables.cpp
View File

@@ -171,6 +171,7 @@ namespace autonum
str.replace("%{designation}", dc.value("designation").toString());
str.replace("%{manufacturer}", dc.value("manufacturer").toString());
str.replace("%{manufacturer-reference}", dc.value("manufacturer-reference").toString());
str.replace("%{provider}", dc.value("provider").toString());
str.replace("%{auxiliary1}", dc.value("auxiliary1").toString());
str.replace("%{auxiliary2}", dc.value("auxiliary2").toString());
str.replace("%{machine-manufacturer-reference}", dc.value("machine-manufacturer-reference").toString());

1
sources/diagramcontext.h
View File

@@ -41,6 +41,7 @@
* auxiliary1 -> auxiliary 1 of element
* auxiliary2 -> auxiliary 2 of element
* machine-manufacturer-reference -> reference of the manufacturer machine
* provider -> the provider of the element
* function -> the function of element
* location -> the location of the element
* frozenLabel -> label locked at a given time

2
sources/editor/ui/elementpropertieseditorwidget.cpp
View File

@@ -152,7 +152,7 @@ void ElementPropertiesEditorWidget::updateTree()
*/
void ElementPropertiesEditorWidget::populateTree()
{
QStringList keys{"label", "comment", "description", "designation", "manufacturer", "manufacturer-reference", "machine-manufacturer-reference"};
QStringList keys{"label", "comment", "description", "designation", "manufacturer", "manufacturer-reference", "provider", "machine-manufacturer-reference"};
for(QString key : keys)
{

1
sources/nomenclature.cpp
View File

@@ -152,6 +152,7 @@ QString nomenclature::getElementInfo(Element *elmt) {
info += autonum::AssignVariables::formulaToLabel(elmt_info["comment"].toString(), elmt->rSequenceStruct(), elmt->diagram(), elmt) + ";";
info += autonum::AssignVariables::formulaToLabel(elmt_info["manufacturer"].toString(), elmt->rSequenceStruct(), elmt->diagram(), elmt) + ";";
info += autonum::AssignVariables::formulaToLabel(elmt_info["manufacturer-reference"].toString(), elmt->rSequenceStruct(), elmt->diagram(), elmt) + ";";
info += autonum::AssignVariables::formulaToLabel(elmt_info["provider"].toString(), elmt->rSequenceStruct(), elmt->diagram(), elmt) + ";";
info += autonum::AssignVariables::formulaToLabel(elmt_info["auxiliary1"].toString(), elmt->rSequenceStruct(), elmt->diagram(), elmt) + ";";
info += autonum::AssignVariables::formulaToLabel(elmt_info["auxiliary2"].toString(), elmt->rSequenceStruct(), elmt->diagram(), elmt) + ";";
info += autonum::AssignVariables::formulaToLabel(elmt_info["machine-manufacturer-reference"].toString(), elmt->rSequenceStruct(), elmt->diagram(), elmt) + ";";

13
sources/qetapp.cpp
View File

@@ -288,6 +288,7 @@ QStringList QETApp::elementInfoKeys()
<< "designation"
<< "manufacturer"
<< "manufacturer-reference"
<< "provider"
<< "auxiliary1"
<< "auxiliary2"
<< "machine-manufacturer-reference"
@@ -308,13 +309,14 @@ QString QETApp::elementTranslatedInfoKey(const QString &info)
if (info == "formula") return tr("formule du label");
else if (info == "label") return tr("Label");
else if (info == "comment") return tr("Commentaire");
else if (info == "descrition") return tr("Descrition");
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 == "description") return tr("Description textuelle");
else if (info == "designation") return tr("Numéro d'article");
else if (info == "manufacturer") return tr("Nom du Fabricant");
else if (info == "manufacturer-reference") return tr("Numéro de commande");
else if (info == "provider") return tr("Nom du Fournisseur");
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 == "machine-manufacturer-reference") return tr("Numéro interne");
else if (info == "location") return tr("Localisation");
else if (info == "function") return tr("Fonction");
else if (info == "tension-protocol") return tr("Tension / Protocole");
@@ -336,6 +338,7 @@ QString QETApp::elementInfoToVar(const QString &info)
else if (info == "designation") return QString("%{designation}");
else if (info == "manufacturer") return QString("%{manufacturer}");
else if (info == "manufacturer-reference") return QString("%{manufacturer-reference}");
else if (info == "provider") return QString("%{provider}");
else if (info == "auxiliary1") return QString("%{auxiliary1}");
else if (info == "auxiliary2") return QString("%{auxiliary2}");
else if (info == "machine-manufacturer-reference") return QString("%{machine-manufacturer-reference}");