From f27954e507f645eab55414b082d7c9a6e9b797a9 Mon Sep 17 00:00:00 2001 From: nuri Date: Tue, 4 Dec 2018 19:07:14 +0000 Subject: [PATCH] Correction of some french and english notions and correction of typos. Variable %machine changed in %plant. git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5629 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- .../searchandreplaceworker.cpp | 14 ++++----- .../ui/replacefoliowidget.cpp | 10 +++---- .../SearchAndReplace/ui/replacefoliowidget.h | 2 +- .../SearchAndReplace/ui/replacefoliowidget.ui | 8 ++--- .../ui/searchandreplacewidget.cpp | 2 +- .../ui/searchandreplacewidget.ui | 9 ++++++ sources/autoNum/assignvariables.cpp | 8 ++--- sources/autoNum/numerotationcontext.cpp | 2 +- .../autoNum/numerotationcontextcommands.cpp | 18 ++++++------ sources/autoNum/numerotationcontextcommands.h | 4 +-- sources/autoNum/ui/numparteditorw.cpp | 26 ++++++++--------- sources/autoNum/ui/numparteditorw.h | 2 +- sources/bordertitleblock.cpp | 6 ++-- sources/bordertitleblock.h | 8 ++--- sources/diagramcontext.h | 8 ++--- sources/diagramfoliolist.cpp | 16 +++++----- sources/editor/qetelementeditor.cpp | 2 +- .../ui/elementpropertieseditorwidget.cpp | 2 +- sources/elementtextpattern.cpp | 2 +- sources/nomenclature.cpp | 14 ++++----- sources/qetapp.cpp | 12 ++++---- sources/qetdiagrameditor.cpp | 4 +-- sources/titleblock/templatecellwidget.cpp | 6 ++-- sources/titleblockproperties.cpp | 14 ++++----- sources/titleblockproperties.h | 2 +- .../ui/configpage/generalconfigurationpage.ui | 18 ++++++------ sources/ui/reportpropertiewidget.ui | 12 ++++---- sources/ui/titleblockpropertieswidget.cpp | 8 ++--- sources/ui/titleblockpropertieswidget.ui | 29 ++++++++++++------- 29 files changed, 142 insertions(+), 126 deletions(-) diff --git a/sources/SearchAndReplace/searchandreplaceworker.cpp b/sources/SearchAndReplace/searchandreplaceworker.cpp index 9e329cbfb..166ac660a 100644 --- a/sources/SearchAndReplace/searchandreplaceworker.cpp +++ b/sources/SearchAndReplace/searchandreplaceworker.cpp @@ -57,7 +57,7 @@ void SearchAndReplaceWorker::replaceDiagram(QList diagram_list) } QUndoStack *us = project->undoStack(); - us->beginMacro(QObject::tr("Chercher remplacer les propriétés de folio")); + us->beginMacro(QObject::tr("Chercher/remplacer les propriétés de folio")); for (Diagram *d : diagram_list) { TitleBlockProperties old_propertie = d->border_and_titleblock.exportTitleBlock(); @@ -87,12 +87,12 @@ void SearchAndReplaceWorker::replaceDiagram(QList diagram_list) new_properties.filename = m_titleblock_properties.filename; } } - if (!m_titleblock_properties.machine.isEmpty()) + if (!m_titleblock_properties.plant.isEmpty()) { - if (m_titleblock_properties.machine == eraseText()) { - new_properties.machine.clear(); + if (m_titleblock_properties.plant == eraseText()) { + new_properties.plant.clear(); } else { - new_properties.machine = m_titleblock_properties.machine; + new_properties.plant = m_titleblock_properties.plant; } } if (!m_titleblock_properties.locmach.isEmpty()) @@ -168,7 +168,7 @@ void SearchAndReplaceWorker::replaceElement(QList list) } } - project_->undoStack()->beginMacro(QObject::tr("Chercher remplacer les propriétés d'éléments")); + project_->undoStack()->beginMacro(QObject::tr("Chercher/remplacer les propriétés d'éléments")); for (Element *elmt : list) { //We apply change only for master, slave, and terminal element. @@ -228,7 +228,7 @@ void SearchAndReplaceWorker::replaceIndiText(QList list) } } - project_->undoStack()->beginMacro(QObject::tr("Chercher remplacer des textes independant")); + project_->undoStack()->beginMacro(QObject::tr("Chercher/remplacer des textes independants")); for (IndependentTextItem *text : list) { QString before = text->toPlainText(); diff --git a/sources/SearchAndReplace/ui/replacefoliowidget.cpp b/sources/SearchAndReplace/ui/replacefoliowidget.cpp index 0533f9232..4e9156d43 100644 --- a/sources/SearchAndReplace/ui/replacefoliowidget.cpp +++ b/sources/SearchAndReplace/ui/replacefoliowidget.cpp @@ -46,7 +46,7 @@ TitleBlockProperties ReplaceFolioWidget::titleBlockProperties() const prop.title = ui->m_title_le ->text(); prop.author = ui->m_author_le->text(); prop.filename = ui->m_file_le ->text(); - prop.machine = ui->m_mach ->text(); + prop.plant = ui->m_plant ->text(); prop.locmach = ui->m_loc ->text(); prop.indexrev = ui->m_indice ->text(); prop.folio = ui->m_folio_le ->text(); @@ -78,7 +78,7 @@ void ReplaceFolioWidget::setTitleBlockProperties(const TitleBlockProperties &pro ui->m_title_le ->setText (properties.title); ui->m_author_le->setText (properties.author); ui->m_file_le ->setText (properties.filename); - ui->m_mach ->setText (properties.machine); + ui->m_plant ->setText (properties.plant); ui->m_loc ->setText (properties.locmach); ui->m_indice ->setText (properties.indexrev); ui->m_folio_le ->setText (properties.folio); @@ -162,9 +162,9 @@ void ReplaceFolioWidget::on_m_folio_cb_clicked() { ui->m_folio_le->setDisabled(ui->m_folio_cb->isChecked()); } -void ReplaceFolioWidget::on_m_mach_cb_clicked() { - ui->m_mach->setText(ui->m_mach_cb->isChecked() ? SearchAndReplaceWorker::eraseText() : QString()); - ui->m_mach->setDisabled(ui->m_mach_cb->isChecked()); +void ReplaceFolioWidget::on_m_plant_cb_clicked() { + ui->m_plant->setText(ui->m_plant_cb->isChecked() ? SearchAndReplaceWorker::eraseText() : QString()); + ui->m_plant->setDisabled(ui->m_plant_cb->isChecked()); } void ReplaceFolioWidget::on_m_loc_cb_clicked() { diff --git a/sources/SearchAndReplace/ui/replacefoliowidget.h b/sources/SearchAndReplace/ui/replacefoliowidget.h index a529221e5..650690ce9 100644 --- a/sources/SearchAndReplace/ui/replacefoliowidget.h +++ b/sources/SearchAndReplace/ui/replacefoliowidget.h @@ -47,7 +47,7 @@ class ReplaceFolioWidget : public QWidget void on_m_author_cb_clicked(); void on_m_file_cb_clicked(); void on_m_folio_cb_clicked(); - void on_m_mach_cb_clicked(); + void on_m_plant_cb_clicked(); void on_m_loc_cb_clicked(); void on_m_indice_cb_clicked(); diff --git a/sources/SearchAndReplace/ui/replacefoliowidget.ui b/sources/SearchAndReplace/ui/replacefoliowidget.ui index e7ac8e609..b5ee7e0df 100644 --- a/sources/SearchAndReplace/ui/replacefoliowidget.ui +++ b/sources/SearchAndReplace/ui/replacefoliowidget.ui @@ -6,7 +6,7 @@ 0 0 - 710 + 744 705 @@ -219,9 +219,9 @@ Les variables suivantes sont utilisables : - + - Disponible en tant que %machine pour les modèles de cartouches + <html><head/><body><p>Disponible en tant que %plant pour les modèles de cartouches</p></body></html> Ne pas modifier @@ -276,7 +276,7 @@ Les variables suivantes sont utilisables : - + Supprimer ce texte diff --git a/sources/SearchAndReplace/ui/searchandreplacewidget.cpp b/sources/SearchAndReplace/ui/searchandreplacewidget.cpp index 5b5c68a54..5d6269d1d 100644 --- a/sources/SearchAndReplace/ui/searchandreplacewidget.cpp +++ b/sources/SearchAndReplace/ui/searchandreplacewidget.cpp @@ -659,7 +659,7 @@ QStringList SearchAndReplaceWidget::searchTerms(Diagram *diagram) const list.append(prop.title); list.append(prop.author); list.append(prop.filename); - list.append(prop.machine); + list.append(prop.plant); list.append(prop.locmach); list.append(prop.indexrev); list.append(prop.folio); diff --git a/sources/SearchAndReplace/ui/searchandreplacewidget.ui b/sources/SearchAndReplace/ui/searchandreplacewidget.ui index ca35a20e0..f11fc68af 100644 --- a/sources/SearchAndReplace/ui/searchandreplacewidget.ui +++ b/sources/SearchAndReplace/ui/searchandreplacewidget.ui @@ -169,6 +169,9 @@ true + + <html><head/><body><p>Définir les propriétés à remplacer dans les éléments</p></body></html> + Élément @@ -196,6 +199,9 @@ false + + <html><head/><body><p>Définir les propriétés à remplacer dans les conducteurs</p></body></html> + Conducteur @@ -210,6 +216,9 @@ + + <html><head/><body><p>Définir les propriétés à remplacer dans les folios</p></body></html> + Folio diff --git a/sources/autoNum/assignvariables.cpp b/sources/autoNum/assignvariables.cpp index 5639853fb..e8d22d337 100644 --- a/sources/autoNum/assignvariables.cpp +++ b/sources/autoNum/assignvariables.cpp @@ -178,13 +178,13 @@ namespace autonum { QString str = formula; str.replace("%{label}", dc.value("label").toString()); - str.replace("%{group-function}", dc.value("group-function").toString()); + str.replace("%{plant}", dc.value("plant").toString()); str.replace("%{comment}", dc.value("comment").toString()); str.replace("%{description}", dc.value("description").toString()); 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("%{supplier}", dc.value("supplier").toString()); str.replace("%{quantity}", dc.value("quantity").toString()); str.replace("%{unity}", dc.value("unity").toString()); str.replace("%{auxiliary1}", dc.value("auxiliary1").toString()); @@ -212,7 +212,7 @@ namespace autonum m_assigned_label.replace("%f", QString::number(m_diagram->folioIndex()+1)); m_assigned_label.replace("%id", QString::number(m_diagram->folioIndex()+1)); m_assigned_label.replace("%total", QString::number(m_diagram->border_and_titleblock.folioTotal())); - m_assigned_label.replace("%M", m_diagram -> border_and_titleblock.machine()); + m_assigned_label.replace("%M", m_diagram -> border_and_titleblock.plant()); m_assigned_label.replace("%LM", m_diagram -> border_and_titleblock.locmach()); QSettings settings; @@ -426,7 +426,7 @@ namespace autonum else if (type == "folio") { formula.append("%F"); } - else if (type == "machine") { + else if (type == "plant") { formula.append("%M"); } else if (type == "locmach") { diff --git a/sources/autoNum/numerotationcontext.cpp b/sources/autoNum/numerotationcontext.cpp index 92ebc2133..9ffb49b2a 100644 --- a/sources/autoNum/numerotationcontext.cpp +++ b/sources/autoNum/numerotationcontext.cpp @@ -101,7 +101,7 @@ QStringList NumerotationContext::itemAt(const int i) const { * @return all type use to numerotation */ QString NumerotationContext::validRegExpNum () const { - return ("unit|unitfolio|ten|tenfolio|hundred|hundredfolio|string|idfolio|folio|machine|locmach|elementline|elementcolumn|elementprefix"); + return ("unit|unitfolio|ten|tenfolio|hundred|hundredfolio|string|idfolio|folio|plant|locmach|elementline|elementcolumn|elementprefix"); } /** diff --git a/sources/autoNum/numerotationcontextcommands.cpp b/sources/autoNum/numerotationcontextcommands.cpp index 6c16a6bcf..73d67bf62 100644 --- a/sources/autoNum/numerotationcontextcommands.cpp +++ b/sources/autoNum/numerotationcontextcommands.cpp @@ -124,8 +124,8 @@ void NumerotationContextCommands::setNumStrategy(const QString &str) { strategy_ = new FolioNum (diagram_); return; } - else if (str=="machine"){ - strategy_ = new MachineNum (diagram_); + else if (str=="plant"){ + strategy_ = new PlantNum (diagram_); return; } else if (str=="locmach"){ @@ -499,32 +499,32 @@ NumerotationContext FolioNum::previous(const NumerotationContext &nc, const int /** * Constructor */ -MachineNum::MachineNum (Diagram *d): +PlantNum::PlantNum (Diagram *d): NumStrategy (d) {} /** - * @brief MachineNum::toRepresentedString + * @brief PlantNum::toRepresentedString * @return the represented string of folio */ -QString MachineNum::toRepresentedString(const QString str) const { +QString PlantNum::toRepresentedString(const QString str) const { Q_UNUSED(str); return "%M"; } /** - * @brief MachineNum::next + * @brief PlantNum::next * @return the next NumerotationContext nc at position i */ -NumerotationContext MachineNum::next (const NumerotationContext &nc, const int i) const { +NumerotationContext PlantNum::next (const NumerotationContext &nc, const int i) const { return (nextString(nc, i)); } /** - * @brief MachineNum::previous + * @brief PlantNum::previous * @return the previous NumerotationContext nc at posiiton i */ -NumerotationContext MachineNum::previous(const NumerotationContext &nc, const int i) const { +NumerotationContext PlantNum::previous(const NumerotationContext &nc, const int i) const { return (nextString(nc, i)); } diff --git a/sources/autoNum/numerotationcontextcommands.h b/sources/autoNum/numerotationcontextcommands.h index 4bd71a080..f776fdc56 100644 --- a/sources/autoNum/numerotationcontextcommands.h +++ b/sources/autoNum/numerotationcontextcommands.h @@ -141,10 +141,10 @@ class FolioNum: public NumStrategy NumerotationContext previous (const NumerotationContext &, const int) const override; }; -class MachineNum: public NumStrategy +class PlantNum: public NumStrategy { public: - MachineNum (Diagram *); + PlantNum (Diagram *); QString toRepresentedString(const QString) const override; NumerotationContext next (const NumerotationContext &, const int) const override; NumerotationContext previous (const NumerotationContext &, const int) const override; diff --git a/sources/autoNum/ui/numparteditorw.cpp b/sources/autoNum/ui/numparteditorw.cpp index 9257247dd..ae126b4ef 100644 --- a/sources/autoNum/ui/numparteditorw.cpp +++ b/sources/autoNum/ui/numparteditorw.cpp @@ -58,7 +58,7 @@ NumPartEditorW::NumPartEditorW (NumerotationContext &context, int i, int type, Q else if (strl.at(0)=="string") setType(NumPartEditorW::string); else if (strl.at(0)=="idfolio") setType(NumPartEditorW::idfolio); else if (strl.at(0)=="folio") setType(NumPartEditorW::folio); - else if (strl.at(0)=="machine") setType(NumPartEditorW::machine); + else if (strl.at(0)=="plant") setType(NumPartEditorW::plant); else if (strl.at(0)=="locmach") setType(NumPartEditorW::locmach); else if (strl.at(0)=="elementline") setType(NumPartEditorW::elementline); else if (strl.at(0)=="elementcolumn") setType(NumPartEditorW::elementcolumn); @@ -91,12 +91,12 @@ void NumPartEditorW::setVisibleItems() { items << tr("Chiffre 1") << tr("Chiffre 1 - Folio") << tr("Chiffre 01") << tr("Chiffre 01 - Folio") << tr("Chiffre 001") << tr("Chiffre 001 - Folio") - << tr("Texte") << tr("N° folio") << tr("Folio") << tr("Machine") << tr("Locmach"); + << tr("Texte") << tr("N° folio") << tr("Folio") << tr("Installation") << tr("Locmach"); } else items << tr("Chiffre 1") << tr("Chiffre 1 - Folio") << tr("Chiffre 01") << tr("Chiffre 01 - Folio") << tr("Chiffre 001") << tr("Chiffre 001 - Folio") - << tr("Texte") << tr("N° folio") << tr("Folio") << tr("Machine") << tr("Locmach") + << tr("Texte") << tr("N° folio") << tr("Folio") << tr("Installation") << tr("Locmach") << tr("Element Line") << tr("Element Column") << tr("Element Prefix"); ui->type_cb->insertItems(0,items); } @@ -136,8 +136,8 @@ NumerotationContext NumPartEditorW::toNumContext() { case folio: type_str = "folio"; break; - case machine: - type_str = "machine"; + case plant: + type_str = "plant"; break; case locmach: type_str = "locmach"; @@ -164,7 +164,7 @@ NumerotationContext NumPartEditorW::toNumContext() { * @return true if value field isn't empty or if type is folio */ bool NumPartEditorW::isValid() { - if (type_ == folio || type_ == idfolio || type_ == elementline || type_ == machine || type_ == locmach || + if (type_ == folio || type_ == idfolio || type_ == elementline || type_ == plant || type_ == locmach || type_ == elementcolumn || type_ == elementprefix) {return true;} else if(ui -> value_field -> text().isEmpty()) {return false;} else return true; @@ -193,8 +193,8 @@ void NumPartEditorW::on_type_cb_activated(int) { setType(idfolio); else if (ui->type_cb->currentText() == tr("Folio")) setType(folio); - else if (ui->type_cb->currentText() == tr("Machine")) - setType(machine); + else if (ui->type_cb->currentText() == tr("Installation")) + setType(plant); else if (ui->type_cb->currentText() == tr("Locmach")) setType(locmach); else if (ui->type_cb->currentText() == tr("Element Line")) @@ -234,7 +234,7 @@ void NumPartEditorW::setType(NumPartEditorW::type t, bool fnum) { //if @t is a numeric type and preview type @type_ isn't a numeric type //or @fnum is true, we set numeric behavior if ( ((t==unit || t==unitfolio || t==ten || t==tenfolio || t==hundred || t==hundredfolio) && - (type_==string || type_==folio || type_==machine || type_==locmach ||type_==idfolio || + (type_==string || type_==folio || type_==plant || type_==locmach ||type_==idfolio || type_==elementcolumn || type_==elementline || type_==elementprefix)) || fnum) { ui -> value_field -> clear(); @@ -244,7 +244,7 @@ void NumPartEditorW::setType(NumPartEditorW::type t, bool fnum) { ui -> increase_spinBox -> setValue(1); } //@t isn't a numeric type - else if (t == string || t == folio || t == idfolio || t == elementline || t == machine || t == locmach || + else if (t == string || t == folio || t == idfolio || t == elementline || t == plant || t == locmach || t == elementcolumn || t == elementprefix) { ui -> value_field -> clear(); ui -> increase_spinBox -> setDisabled(true); @@ -256,7 +256,7 @@ void NumPartEditorW::setType(NumPartEditorW::type t, bool fnum) { ui -> value_field -> setDisabled(true); ui -> increase_spinBox -> setDisabled(true); } - else if (t==machine) { + else if (t==plant) { ui -> value_field -> setDisabled(true); ui -> increase_spinBox -> setDisabled(true); } @@ -309,8 +309,8 @@ void NumPartEditorW::setCurrentIndex(NumPartEditorW::type t) { i = ui->type_cb->findText(tr("N° folio")); else if (t == folio) i = ui->type_cb->findText(tr("Folio")); - else if (t == machine) - i = ui->type_cb->findText(tr("Machine")); + else if (t == plant) + i = ui->type_cb->findText(tr("Installation")); else if (t == locmach) i = ui->type_cb->findText(tr("Locmach")); else if (t == elementline) diff --git a/sources/autoNum/ui/numparteditorw.h b/sources/autoNum/ui/numparteditorw.h index 165c99d35..0e28abea6 100644 --- a/sources/autoNum/ui/numparteditorw.h +++ b/sources/autoNum/ui/numparteditorw.h @@ -42,7 +42,7 @@ class NumPartEditorW : public QWidget ~NumPartEditorW() override; enum type {unit,unitfolio,ten,tenfolio, hundred, hundredfolio, - string,idfolio,folio,machine,locmach, + string,idfolio,folio,plant,locmach, elementline,elementcolumn,elementprefix, }; NumerotationContext toNumContext(); diff --git a/sources/bordertitleblock.cpp b/sources/bordertitleblock.cpp index 822e97097..1d57adb96 100644 --- a/sources/bordertitleblock.cpp +++ b/sources/bordertitleblock.cpp @@ -241,7 +241,7 @@ TitleBlockProperties BorderTitleBlock::exportTitleBlock() { ip.date = date(); ip.title = title(); ip.filename = fileName(); - ip.machine = machine(); + ip.plant = plant(); ip.locmach = locmach(); ip.indexrev = indexrev(); ip.version = version(); @@ -264,7 +264,7 @@ void BorderTitleBlock::importTitleBlock(const TitleBlockProperties &ip) { setDate(ip.date); setTitle(ip.title); setFileName(ip.filename); - setMachine(ip.machine); + setPlant(ip.plant); setLocMach(ip.locmach); setIndicerev(ip.indexrev); setVersion(QET::displayedVersion); @@ -715,7 +715,7 @@ void BorderTitleBlock::updateDiagramContextForTitleBlock(const DiagramContext &i context.addValue("date", btb_date_.toString(Qt::SystemLocaleShortDate)); context.addValue("title", btb_title_); context.addValue("filename", btb_filename_); - context.addValue("machine", btb_machine_); + context.addValue("plant", btb_plant_); context.addValue("locmach", btb_locmach_); context.addValue("indexrev", btb_indexrev_); context.addValue("version", btb_version_); diff --git a/sources/bordertitleblock.h b/sources/bordertitleblock.h index c0cadaad5..aed2c8f56 100644 --- a/sources/bordertitleblock.h +++ b/sources/bordertitleblock.h @@ -97,8 +97,8 @@ class BorderTitleBlock : public QObject QString folio() const { return(btb_folio_); } /// @return the value of the title block "Folio" field as displayed QString finalfolio() const { return(btb_final_folio_); } - /// @return the value of the title block "Machine" field - QString machine() const { return(btb_machine_); } + /// @return the value of the title block "Plant" field + QString plant() const { return(btb_plant_); } /// @return the value of the title block "Locmach" field QString locmach() const { return(btb_locmach_); } /// @return the value of the revision index block "Folio" field @@ -155,7 +155,7 @@ class BorderTitleBlock : public QObject } void setFolioData(int, int, const QString& = nullptr, const DiagramContext & = DiagramContext()); /// @param author the new value of the "File" field - void setMachine(const QString &machine) { btb_machine_ = machine; } + void setPlant(const QString &plant) { btb_plant_ = plant; } void setLocMach(const QString &locmach) { btb_locmach_ = locmach; } void setIndicerev(const QString &indexrev){ btb_indexrev_ = indexrev; } void setFileName(const QString &filename) { btb_filename_ = filename; } @@ -237,7 +237,7 @@ class BorderTitleBlock : public QObject QDate btb_date_; QString btb_title_; QString btb_folio_; - QString btb_machine_; + QString btb_plant_; QString btb_locmach_; QString btb_indexrev_; QString btb_final_folio_; diff --git a/sources/diagramcontext.h b/sources/diagramcontext.h index 57122b102..bcf72f84a 100644 --- a/sources/diagramcontext.h +++ b/sources/diagramcontext.h @@ -35,7 +35,7 @@ * formula -> formula used to create the label (formula is make with variable) * designation -> exhaustive comment used to explain what the element does. * description -> exhaustive description used to explain what the element does. - * group-function -> the group function of element + * plant -> the plant assigned to the element * comment -> a little comment wich can be displayed in the folio * manufacturer -> the manufacturer of the element * manufacturer-reference -> the manufacturer reference of the element @@ -43,10 +43,10 @@ * unity -> unity of the element * auxiliary1 -> auxiliary 1 of element * auxiliary2 -> auxiliary 2 of element - * machine-manufacturer-reference -> reference of the manufacturer machine - * provider -> the provider of the element + * machine-manufacturer-reference -> reference of the machine manufacturer + * supplier -> the supplier of the element * function -> the function of element - * location -> the location of the element + * location -> the location assigned to the element * frozenLabel -> label locked at a given time * */ diff --git a/sources/diagramfoliolist.cpp b/sources/diagramfoliolist.cpp index 7759d43d3..63be82ea8 100644 --- a/sources/diagramfoliolist.cpp +++ b/sources/diagramfoliolist.cpp @@ -93,7 +93,7 @@ void DiagramFolioList::drawBackground(QPainter *p, const QRectF &r) fillRow(p, row_rect, diagram_list[i] -> border_and_titleblock.author(), diagram_list[i] -> title(), diagram_list[i] -> border_and_titleblock.finalfolio(), - diagram_list[i] -> border_and_titleblock.machine(), + diagram_list[i] -> border_and_titleblock.plant(), diagram_list[i] -> border_and_titleblock.locmach(), diagram_list[i] -> border_and_titleblock.indexrev(), diagram_list[i] -> border_and_titleblock.date().toString(Qt::SystemLocaleShortDate)); @@ -101,7 +101,7 @@ void DiagramFolioList::drawBackground(QPainter *p, const QRectF &r) fillRow(p, row_rect, diagram_list[i] -> border_and_titleblock.author(), diagram_list[i] -> title(), QString::number(diagram_list[i] ->folioIndex()+1), - diagram_list[i] -> border_and_titleblock.machine(), + diagram_list[i] -> border_and_titleblock.plant(), diagram_list[i] -> border_and_titleblock.locmach(), diagram_list[i] -> border_and_titleblock.indexrev(), diagram_list[i] -> border_and_titleblock.date().toString(Qt::SystemLocaleShortDate)); @@ -120,7 +120,7 @@ void DiagramFolioList::drawBackground(QPainter *p, const QRectF &r) * @param row_rect rectangle where we must draw the new row */ void DiagramFolioList::fillRow(QPainter *qp, const QRectF &row_rect, const QString& author, const QString& title, - const QString& folio, const QString& machine, const QString& loc, const QString& indexrev, const QString& date) + const QString& folio, const QString& plant, const QString& loc, const QString& indexrev, const QString& date) { qreal x = row_rect.topLeft().x(); qreal y = row_rect.topLeft().y(); @@ -166,12 +166,12 @@ void DiagramFolioList::fillRow(QPainter *qp, const QRectF &row_rect, const QStri x += colWidths[1]*row_rect.width(); - if (origFontMetrics.width(machine) > 0.95*colWidths[2]*row_rect.width()) - workingFont.setPointSizeF(origFontSize * 0.95*colWidths[2]*row_rect.width() / origFontMetrics.width(machine)); + if (origFontMetrics.width(plant) > 0.95*colWidths[2]*row_rect.width()) + workingFont.setPointSizeF(origFontSize * 0.95*colWidths[2]*row_rect.width() / origFontMetrics.width(plant)); else workingFont.setPointSizeF(origFontSize); qp -> setFont(workingFont); - qp -> drawText(QRectF(x, y, colWidths[3]*row_rect.width(), row_rect.height()), Qt::AlignCenter, machine); + qp -> drawText(QRectF(x, y, colWidths[3]*row_rect.width(), row_rect.height()), Qt::AlignCenter, plant); x += colWidths[2]*row_rect.width(); @@ -264,13 +264,13 @@ void DiagramFolioList::fillHeader(QPainter *qp, const QRectF &row_RectF) { QString authorTranslatable(QObject::tr("Auteur")); QString titleTranslatable(QObject::tr("Titre")); QString folioTranslatable(QObject::tr("Folio")); - QString machineTranslatable(QObject::tr("Installation")); + QString plantTranslatable(QObject::tr("Installation")); QString locTranslatable(QObject::tr("Localisation")); QString indexrevTranslatable(QObject::tr("Rev")); QString dateTranslatable(QObject::tr("Date")); qp->save(); qp->setFont(QETApp::diagramTextsFont(13)); - fillRow(qp, row_RectF, authorTranslatable, titleTranslatable, folioTranslatable, machineTranslatable, locTranslatable, indexrevTranslatable, dateTranslatable); + fillRow(qp, row_RectF, authorTranslatable, titleTranslatable, folioTranslatable, plantTranslatable, locTranslatable, indexrevTranslatable, dateTranslatable); qp->restore(); } diff --git a/sources/editor/qetelementeditor.cpp b/sources/editor/qetelementeditor.cpp index e1c35fbc2..cb1f38ed7 100644 --- a/sources/editor/qetelementeditor.cpp +++ b/sources/editor/qetelementeditor.cpp @@ -741,7 +741,7 @@ bool QETElementEditor::checkElement() if (errors.size()) dialog_message += QString (tr(" et")); - dialog_message += QString (tr(" %n avertissment(s)", "warnings", warnings.size())); + dialog_message += QString (tr(" %n avertissement(s)", "warnings", warnings.size())); } dialog_message += " :"; diff --git a/sources/editor/ui/elementpropertieseditorwidget.cpp b/sources/editor/ui/elementpropertieseditorwidget.cpp index 4d89d24f5..dc4f99006 100644 --- a/sources/editor/ui/elementpropertieseditorwidget.cpp +++ b/sources/editor/ui/elementpropertieseditorwidget.cpp @@ -152,7 +152,7 @@ void ElementPropertiesEditorWidget::updateTree() */ void ElementPropertiesEditorWidget::populateTree() { - QStringList keys{"label", "group-function", "comment", "description", "designation", "manufacturer", "manufacturer-reference", "provider", "quantity", "unity", "machine-manufacturer-reference"}; + QStringList keys{"label", "plant", "comment", "description", "designation", "manufacturer", "manufacturer-reference", "supplier", "quantity", "unity", "machine-manufacturer-reference"}; for(const QString& key : keys) { diff --git a/sources/elementtextpattern.cpp b/sources/elementtextpattern.cpp index 25922bc02..c139ba4d4 100644 --- a/sources/elementtextpattern.cpp +++ b/sources/elementtextpattern.cpp @@ -62,7 +62,7 @@ ExportElementTextPattern::ExportElementTextPattern(Element *elmt) : { bool r = QMessageBox::question(parentWidget(), QObject::tr("Configuration de textes"), - QObject::tr("Une configuration de textes nommé << %1 >> existe déjà.\n" + QObject::tr("Une configuration de textes nommée << %1 >> existe déjà.\n" "Voulez-vous la remplacer ?").arg(m_name)); if(r == false) diff --git a/sources/nomenclature.cpp b/sources/nomenclature.cpp index 6f8d0b4c7..0b6fca7c4 100644 --- a/sources/nomenclature.cpp +++ b/sources/nomenclature.cpp @@ -60,7 +60,7 @@ bool nomenclature::saveToCSVFile() if(!QFile::remove ( filename ) ){ QMessageBox::critical(this->m_parent, QObject::tr("Erreur"), QObject::tr("Impossible de remplacer le fichier!\n\n")+ - "Destination: "+filename+"\n"); + "Destination : "+filename+"\n"); return false; } } @@ -84,9 +84,9 @@ QString nomenclature::getNomenclature() { //Process... QString data = QObject::tr("NOMENCLATURE : ") + m_project -> title() + "\n\n"; - data += QObject::tr("A001") +";" //:Don't translate this text! //ID for folio number + data += QObject::tr("A001") +";" //:Don't translate this text! //ID for folio position in project ""+ QObject::tr("B001") +";" //:Don't translate this text! //ID for folio title - ""+ QObject::tr("C001") +";" //:Don't translate this text! //ID for folio label + ""+ QObject::tr("C001") +";" //:Don't translate this text! //ID for folio number ""+ QObject::tr("D001") +";" //:Don't translate this text! //ID for qet designation ""+ QObject::tr("E001") +";" //:Don't translate this text! //ID for position of element on the folio ""+ QObject::tr("F001") +";" //:Don't translate this text! //ID for label of element @@ -105,9 +105,9 @@ QString nomenclature::getNomenclature() ""+ QObject::tr("N001")+";" //:Don't translate this text! //ID for internal number ""+ QObject::tr("O001")+";" //:Don't translate this text! //ID for location ""+ QObject::tr("P001") +"\n"; //:Don't translate this text! //ID for function - data += QObject::tr("N° de folio") +";" + data += QObject::tr("Position du folio") +";" ""+ QObject::tr("Titre de folio") +";" - ""+ QObject::tr("Label de folio") +";" + ""+ QObject::tr("Numéro de folio") +";" ""+ QObject::tr("Désignation qet") +";" ""+ QObject::tr("Position") +";" ""+ QObject::tr("Label") +";" @@ -176,11 +176,11 @@ QString nomenclature::getElementInfo(Element *elmt) { info += autonum::AssignVariables::formulaToLabel(elmt_info["formula"].toString(), elmt->rSequenceStruct(), elmt->diagram(), elmt) + ";"; info += autonum::AssignVariables::formulaToLabel(elmt_info["designation"].toString(), elmt->rSequenceStruct(), elmt->diagram(), elmt) + ";"; info += autonum::AssignVariables::formulaToLabel(elmt_info["description"].toString(), elmt->rSequenceStruct(), elmt->diagram(), elmt) + ";"; - info += autonum::AssignVariables::formulaToLabel(elmt_info["group-function"].toString(), elmt->rSequenceStruct(), elmt->diagram(), elmt) + ";"; + info += autonum::AssignVariables::formulaToLabel(elmt_info["plant"].toString(), elmt->rSequenceStruct(), elmt->diagram(), 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["supplier"].toString(), elmt->rSequenceStruct(), elmt->diagram(), elmt) + ";"; info += autonum::AssignVariables::formulaToLabel(elmt_info["quantity"].toString(), elmt->rSequenceStruct(), elmt->diagram(), elmt) + ";"; info += autonum::AssignVariables::formulaToLabel(elmt_info["unity"].toString(), elmt->rSequenceStruct(), elmt->diagram(), elmt) + ";"; info += autonum::AssignVariables::formulaToLabel(elmt_info["auxiliary1"].toString(), elmt->rSequenceStruct(), elmt->diagram(), elmt) + ";"; diff --git a/sources/qetapp.cpp b/sources/qetapp.cpp index 07020ec88..8d32e9760 100644 --- a/sources/qetapp.cpp +++ b/sources/qetapp.cpp @@ -294,7 +294,7 @@ QStringList QETApp::elementInfoKeys() QStringList info_list; info_list << "formula" << "label" - << "group-function" + << "plant" << "location" << "comment" @@ -308,7 +308,7 @@ QStringList QETApp::elementInfoKeys() << "manufacturer" << "manufacturer-reference" << "machine-manufacturer-reference" - << "provider" + << "supplier" << "quantity" << "unity"; return info_list; @@ -325,7 +325,7 @@ QString QETApp::elementTranslatedInfoKey(const QString &info) { if (info == "formula") return tr("Formule du label"); else if (info == "label") return tr("Label"); - else if (info == "group-function") return tr("Installation"); + else if (info == "plant") return tr("Installation"); else if (info == "location") return tr("Localisation"); else if (info == "comment") return tr("Commentaire"); @@ -339,7 +339,7 @@ QString QETApp::elementTranslatedInfoKey(const QString &info) else if (info == "manufacturer") return tr("Fabricant"); else if (info == "manufacturer-reference") return tr("Numéro de commande"); else if (info == "machine-manufacturer-reference") return tr("Numéro interne"); - else if (info == "provider") return tr("Fournisseur"); + else if (info == "supplier") return tr("Fournisseur"); else if (info == "quantity") return tr("Quantité"); else if (info == "unity") return tr("Unité"); @@ -359,13 +359,13 @@ QString QETApp::elementInfoToVar(const QString &info) { if (info == "formula") return QString("%{formula}"); else if (info == "label") return QString("%{label}"); - else if (info == "group-function") return QString("%{group-function}"); + else if (info == "plant") return QString("%{plant}"); else if (info == "comment") return QString("%{comment}"); else if (info == "description") return QString("%{description}"); 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 == "supplier") return QString("%{supplier}"); else if (info == "quantity") return QString("%{quantity}"); else if (info == "unity") return QString("%{unity}"); else if (info == "auxiliary1") return QString("%{auxiliary1}"); diff --git a/sources/qetdiagrameditor.cpp b/sources/qetdiagrameditor.cpp index 9fc639a4b..ef43e4a9a 100644 --- a/sources/qetdiagrameditor.cpp +++ b/sources/qetdiagrameditor.cpp @@ -399,7 +399,7 @@ void QETDiagramEditor::setUpActions() }); //Lauch the plugin of terminal generator - m_project_terminalBloc = new QAction(QET::Icons::TerminalStrip, tr("Lancer le plugin de creation de bornier"), this); + m_project_terminalBloc = new QAction(QET::Icons::TerminalStrip, tr("Lancer le plugin de création de borniers"), this); connect(m_project_terminalBloc, &QAction::triggered, this, &QETDiagramEditor::generateTerminalBlock); //MDI view style @@ -614,7 +614,7 @@ void QETDiagramEditor::setUpActions() this->currentDiagramView()->diagram()->changeZValue(action->data().value()); }); - m_find = new QAction(tr("Chercher"), this); + m_find = new QAction(tr("Chercher/remplacer"), this); m_find->setShortcut(QKeySequence::Find); connect(m_find, &QAction::triggered, [this]() { this->m_search_and_replace_widget.setHidden(!m_search_and_replace_widget.isHidden()); diff --git a/sources/titleblock/templatecellwidget.cpp b/sources/titleblock/templatecellwidget.cpp index e8ae7b774..b8af3a572 100644 --- a/sources/titleblock/templatecellwidget.cpp +++ b/sources/titleblock/templatecellwidget.cpp @@ -437,11 +437,11 @@ QString TitleBlockTemplateCellWidget::defaultVariablesString() const { "
  • %{date} : date du folio
    • " "
  • %{title} : titre du folio
    • " "
  • %{filename} : nom de fichier du projet
    • " - "
  • %{machine} : nom du groupe fonctionnel du projet
    • " - "
  • %{locmach} : nom de la localisation dans le groupe fonctionnel du projet
    • " + "
  • %{plant} : nom de l'installation (=) dans laquelle se trouve le folio
    • " + "
  • %{locmach} : nom de la localisation (+) dans laquelle se trouve le folio
    • " "
  • %{indexrev} : indice de révision du folio
    • " "
  • %{version} : version du logiciel
    • " - "
  • %{folio} : indications relatives au folio
    • " + "
  • %{folio} : numéro du folio
    • " "
  • %{folio-id} : position du folio dans le projet
    • " "
  • %{folio-total} : nombre total de folios dans le projet
    • " "
  • %{projecttitle} : titre du projet
    • " diff --git a/sources/titleblockproperties.cpp b/sources/titleblockproperties.cpp index 189062684..f3abb6e65 100644 --- a/sources/titleblockproperties.cpp +++ b/sources/titleblockproperties.cpp @@ -47,7 +47,7 @@ bool TitleBlockProperties::operator==(const TitleBlockProperties &ip) { ip.author == author &&\ ip.date == date &&\ ip.filename == filename &&\ - ip.machine == machine &&\ + ip.plant == plant &&\ ip.locmach == locmach &&\ ip.indexrev == indexrev &&\ ip.version == version &&\ @@ -77,7 +77,7 @@ void TitleBlockProperties::toXml(QDomElement &e) const { e.setAttribute("author", author); e.setAttribute("title", title); e.setAttribute("filename", filename); - e.setAttribute("machine", machine); + e.setAttribute("plant", plant); e.setAttribute("locmach", locmach); e.setAttribute("indexrev",indexrev); e.setAttribute("version", version); @@ -107,10 +107,10 @@ void TitleBlockProperties::fromXml(const QDomElement &e) { if (e.hasAttribute("author")) author = e.attribute("author"); if (e.hasAttribute("title")) title = e.attribute("title"); if (e.hasAttribute("filename")) filename = e.attribute("filename"); - if (e.hasAttribute("machine")) machine = e.attribute("machine"); + if (e.hasAttribute("plant")) plant = e.attribute("plant"); if (e.hasAttribute("locmach")) locmach = e.attribute("locmach"); - if (e.hasAttribute("indexrev")) indexrev = e.attribute("indexrev"); - if (e.hasAttribute("version")) version = e.attribute("version"); + if (e.hasAttribute("indexrev")) indexrev = e.attribute("indexrev"); + if (e.hasAttribute("version")) version = e.attribute("version"); if (e.hasAttribute("folio")) folio = e.attribute("folio"); if (e.hasAttribute("auto_page_num")) auto_page_num = e.attribute("auto_page_num"); if (e.hasAttribute("date")) setDateFromString(e.attribute("date")); @@ -140,7 +140,7 @@ void TitleBlockProperties::toSettings(QSettings &settings, const QString &prefix settings.setValue(prefix + "title", title); settings.setValue(prefix + "author", author); settings.setValue(prefix + "filename", filename); - settings.setValue(prefix + "machine", machine); + settings.setValue(prefix + "plant", plant); settings.setValue(prefix + "locmach", locmach); settings.setValue(prefix + "indexrev", indexrev); settings.setValue(prefix + "version", version); @@ -162,7 +162,7 @@ void TitleBlockProperties::fromSettings(QSettings &settings, const QString &pref title = settings.value(prefix + "title").toString(); author = settings.value(prefix + "author").toString(); filename = settings.value(prefix + "filename").toString(); - machine = settings.value(prefix + "machine").toString(); + plant = settings.value(prefix + "plant").toString(); locmach = settings.value(prefix + "locmach").toString(); indexrev = settings.value(prefix + "indexrev").toString(); version = settings.value(prefix + "version").toString(); diff --git a/sources/titleblockproperties.h b/sources/titleblockproperties.h index a06d3421d..73c4d1e85 100644 --- a/sources/titleblockproperties.h +++ b/sources/titleblockproperties.h @@ -54,7 +54,7 @@ class TitleBlockProperties { QString author; ///< Author of the diagram/folio (displayed by the default template) QDate date; ///< Date (displayed by the default template) QString filename; ///< Filename (displayed by the default template) - QString machine; ///< Machine (displayed by the default template) + QString plant; ///< Plant (displayed by the default template) QString locmach; ///< Location(displayed by the default template) QString indexrev; ///< Revision Index (displayed by the default template) QString version; ///< Version (displayed by the default template) diff --git a/sources/ui/configpage/generalconfigurationpage.ui b/sources/ui/configpage/generalconfigurationpage.ui index d77fb7c1b..27112f7f0 100644 --- a/sources/ui/configpage/generalconfigurationpage.ui +++ b/sources/ui/configpage/generalconfigurationpage.ui @@ -6,8 +6,8 @@ 0 0 - 998 - 500 + 1958 + 1438 @@ -133,14 +133,14 @@ - Utiliser les labels de folio à la place de leurs ID + Utiliser les numéros de folio à la place de leur position dans le projet - Activer la numérotation à partir de 0 pour la colonne des cartouches au lieu de 1 + Numéroter les colonnes de cartouche à partir de 0 (1 sinon) @@ -223,13 +223,13 @@     - Elements + Collections - Collections d'éléments + Accès aux collections Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop @@ -241,7 +241,7 @@ - Chemin de la collection commune + Répertoire de la collection commune @@ -262,7 +262,7 @@ - Chemin de la collection utilisateur + Répertoire de la collection utilisateur @@ -304,7 +304,7 @@ - Chemin des cartouches utilisateur + Répertoire des cartouches utilisateur diff --git a/sources/ui/reportpropertiewidget.ui b/sources/ui/reportpropertiewidget.ui index d261a4ba1..549d85081 100644 --- a/sources/ui/reportpropertiewidget.ui +++ b/sources/ui/reportpropertiewidget.ui @@ -6,8 +6,8 @@ 0 0 - 400 - 300 + 783 + 1175 @@ -34,10 +34,10 @@ Vous pouvez définir un label personnalisé pour les reports de folio. Créer votre propre texte en vous aidant des variables suivantes : -%f : le numéro de folio -%F: le label de folio -%M: Machine -%LM: Location +%f : la position du folio dans le projet +%F : le numéro de folio +%M : l'installation +%LM : la localisation %l : le numéro de ligne %c : le numéro de colonne diff --git a/sources/ui/titleblockpropertieswidget.cpp b/sources/ui/titleblockpropertieswidget.cpp index 47c4ac706..d0ed171ba 100644 --- a/sources/ui/titleblockpropertieswidget.cpp +++ b/sources/ui/titleblockpropertieswidget.cpp @@ -96,7 +96,7 @@ void TitleBlockPropertiesWidget::setProperties(const TitleBlockProperties &prope ui -> m_title_le -> setText (properties.title); ui -> m_author_le -> setText (properties.author); ui -> m_file_le -> setText (properties.filename); - ui -> m_mach -> setText (properties.machine); + ui -> m_plant -> setText (properties.plant); ui -> m_loc -> setText (properties.locmach); ui -> m_indice -> setText (properties.indexrev); ui -> m_folio_le -> setText (properties.folio); @@ -154,7 +154,7 @@ TitleBlockProperties TitleBlockPropertiesWidget::properties() const { prop.title = ui -> m_title_le -> text(); prop.author = ui -> m_author_le -> text(); prop.filename = ui -> m_file_le -> text(); - prop.machine = ui -> m_mach -> text(); + prop.plant = ui -> m_plant -> text(); prop.locmach = ui -> m_loc -> text(); prop.indexrev = ui -> m_indice -> text(); prop.folio = ui -> m_folio_le -> text(); @@ -195,7 +195,7 @@ TitleBlockProperties TitleBlockPropertiesWidget::propertiesAutoNum(QString autoN prop.title = ui -> m_title_le -> text(); prop.author = ui -> m_author_le -> text(); prop.filename = ui -> m_file_le -> text(); - prop.machine = ui -> m_mach -> text(); + prop.plant = ui -> m_plant -> text(); prop.locmach = ui -> m_loc -> text(); prop.indexrev = ui -> m_indice -> text(); prop.folio = "%autonum"; @@ -294,7 +294,7 @@ void TitleBlockPropertiesWidget::initDialog(const bool ¤t_date, QETProjec ui -> m_current_date_rb -> setVisible(current_date); m_tbt_edit = new QAction(tr("Éditer ce modèle", "menu entry"), this); - m_tbt_duplicate = new QAction(tr("Dupliquer et editer ce modèle", "menu entry"), this); + m_tbt_duplicate = new QAction(tr("Dupliquer et éditer ce modèle", "menu entry"), this); connect(m_tbt_edit, SIGNAL(triggered()), this, SLOT(editCurrentTitleBlockTemplate())); connect(m_tbt_duplicate, SIGNAL(triggered()), this, SLOT(duplicateCurrentTitleBlockTemplate())); diff --git a/sources/ui/titleblockpropertieswidget.ui b/sources/ui/titleblockpropertieswidget.ui index c37347704..d72f3e7ad 100644 --- a/sources/ui/titleblockpropertieswidget.ui +++ b/sources/ui/titleblockpropertieswidget.ui @@ -6,8 +6,8 @@ 0 0 - 654 - 611 + 753 + 901 @@ -51,19 +51,26 @@ - + + + + 0 + 0 + + + - + 0 0 - 40 + 0 0 @@ -84,7 +91,7 @@ - + @@ -93,7 +100,7 @@ - + @@ -105,7 +112,7 @@ - + 0 0 @@ -232,9 +239,9 @@ - + - Disponible en tant que %machine pour les modèles de cartouches + <html><head/><body><p>Disponible en tant que %plant pour les modèles de cartouches</p></body></html> @@ -433,7 +440,7 @@ associer le nom "volta" et la valeur "1745" remplacera %{vol m_date_now_pb m_file_le m_folio_le - m_mach + m_plant m_loc m_indice auto_page_cb