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

Correction of some french and english notions and correction of typos. Variable %machine changed in %plant.

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5629 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
nuri
2018-12-04 19:07:14 +00:00
parent cdfdd6f22a
commit f27954e507
29 changed files with 142 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sources/SearchAndReplace/searchandreplaceworker.cpp
View File

@@ -57,7 +57,7 @@ void SearchAndReplaceWorker::replaceDiagram(QList<Diagram *> diagram_list)
} }
QUndoStack *us = project->undoStack(); 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) for (Diagram *d : diagram_list)
{ {
TitleBlockProperties old_propertie = d->border_and_titleblock.exportTitleBlock(); TitleBlockProperties old_propertie = d->border_and_titleblock.exportTitleBlock();
@@ -87,12 +87,12 @@ void SearchAndReplaceWorker::replaceDiagram(QList<Diagram *> diagram_list)
new_properties.filename = m_titleblock_properties.filename; 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()) { if (m_titleblock_properties.plant == eraseText()) {
new_properties.machine.clear(); new_properties.plant.clear();
} else { } else {
new_properties.machine = m_titleblock_properties.machine; new_properties.plant = m_titleblock_properties.plant;
} }
} }
if (!m_titleblock_properties.locmach.isEmpty()) if (!m_titleblock_properties.locmach.isEmpty())
@@ -168,7 +168,7 @@ void SearchAndReplaceWorker::replaceElement(QList<Element *> 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) for (Element *elmt : list)
{ {
//We apply change only for master, slave, and terminal element. //We apply change only for master, slave, and terminal element.
@@ -228,7 +228,7 @@ void SearchAndReplaceWorker::replaceIndiText(QList<IndependentTextItem *> 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) for (IndependentTextItem *text : list)
{ {
QString before = text->toPlainText(); QString before = text->toPlainText();

10
sources/SearchAndReplace/ui/replacefoliowidget.cpp
View File

@@ -46,7 +46,7 @@ TitleBlockProperties ReplaceFolioWidget::titleBlockProperties() const
prop.title = ui->m_title_le ->text(); prop.title = ui->m_title_le ->text();
prop.author = ui->m_author_le->text(); prop.author = ui->m_author_le->text();
prop.filename = ui->m_file_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.locmach = ui->m_loc ->text();
prop.indexrev = ui->m_indice ->text(); prop.indexrev = ui->m_indice ->text();
prop.folio = ui->m_folio_le ->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_title_le ->setText (properties.title);
ui->m_author_le->setText (properties.author); ui->m_author_le->setText (properties.author);
ui->m_file_le ->setText (properties.filename); 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_loc ->setText (properties.locmach);
ui->m_indice ->setText (properties.indexrev); ui->m_indice ->setText (properties.indexrev);
ui->m_folio_le ->setText (properties.folio); 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()); ui->m_folio_le->setDisabled(ui->m_folio_cb->isChecked());
} }
void ReplaceFolioWidget::on_m_mach_cb_clicked() { void ReplaceFolioWidget::on_m_plant_cb_clicked() {
ui->m_mach->setText(ui->m_mach_cb->isChecked() ? SearchAndReplaceWorker::eraseText() : QString()); ui->m_plant->setText(ui->m_plant_cb->isChecked() ? SearchAndReplaceWorker::eraseText() : QString());
ui->m_mach->setDisabled(ui->m_mach_cb->isChecked()); ui->m_plant->setDisabled(ui->m_plant_cb->isChecked());
} }
void ReplaceFolioWidget::on_m_loc_cb_clicked() { void ReplaceFolioWidget::on_m_loc_cb_clicked() {

2
sources/SearchAndReplace/ui/replacefoliowidget.h
View File

@@ -47,7 +47,7 @@ class ReplaceFolioWidget : public QWidget
void on_m_author_cb_clicked(); void on_m_author_cb_clicked();
void on_m_file_cb_clicked(); void on_m_file_cb_clicked();
void on_m_folio_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_loc_cb_clicked();
void on_m_indice_cb_clicked(); void on_m_indice_cb_clicked();

8
sources/SearchAndReplace/ui/replacefoliowidget.ui
View File

@@ -6,7 +6,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>710</width> <width>744</width>
<height>705</height> <height>705</height>
</rect> </rect>
</property> </property>
@@ -219,9 +219,9 @@ Les variables suivantes sont utilisables :
</widget> </widget>
</item> </item>
<item row="6" column="3"> <item row="6" column="3">
<widget class="QLineEdit" name="m_mach"> <widget class="QLineEdit" name="m_plant">
<property name="toolTip"> <property name="toolTip">
<string>Disponible en tant que %machine pour les modèles de cartouches</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Disponible en tant que %plant pour les modèles de cartouches&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="placeholderText"> <property name="placeholderText">
<string>Ne pas modifier</string> <string>Ne pas modifier</string>
@@ -276,7 +276,7 @@ Les variables suivantes sont utilisables :
</widget> </widget>
</item> </item>
<item row="6" column="4"> <item row="6" column="4">
<widget class="QCheckBox" name="m_mach_cb"> <widget class="QCheckBox" name="m_plant_cb">
<property name="toolTip"> <property name="toolTip">
<string>Supprimer ce texte</string> <string>Supprimer ce texte</string>
</property> </property>

2
sources/SearchAndReplace/ui/searchandreplacewidget.cpp
View File

@@ -659,7 +659,7 @@ QStringList SearchAndReplaceWidget::searchTerms(Diagram *diagram) const
list.append(prop.title); list.append(prop.title);
list.append(prop.author); list.append(prop.author);
list.append(prop.filename); list.append(prop.filename);
list.append(prop.machine); list.append(prop.plant);
list.append(prop.locmach); list.append(prop.locmach);
list.append(prop.indexrev); list.append(prop.indexrev);
list.append(prop.folio); list.append(prop.folio);

9
sources/SearchAndReplace/ui/searchandreplacewidget.ui
View File

@@ -169,6 +169,9 @@
<property name="enabled"> <property name="enabled">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Définir les propriétés à remplacer dans les éléments&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text"> <property name="text">
<string>Élément</string> <string>Élément</string>
</property> </property>
@@ -196,6 +199,9 @@
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Définir les propriétés à remplacer dans les conducteurs&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text"> <property name="text">
<string>Conducteur</string> <string>Conducteur</string>
</property> </property>
@@ -210,6 +216,9 @@
</item> </item>
<item row="1" column="4"> <item row="1" column="4">
<widget class="QPushButton" name="m_folio_pb"> <widget class="QPushButton" name="m_folio_pb">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Définir les propriétés à remplacer dans les folios&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text"> <property name="text">
<string>Folio</string> <string>Folio</string>
</property> </property>

8
sources/autoNum/assignvariables.cpp
View File

@@ -178,13 +178,13 @@ namespace autonum
{ {
QString str = formula; QString str = formula;
str.replace("%{label}", dc.value("label").toString()); 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("%{comment}", dc.value("comment").toString());
str.replace("%{description}", dc.value("description").toString()); str.replace("%{description}", dc.value("description").toString());
str.replace("%{designation}", dc.value("designation").toString()); str.replace("%{designation}", dc.value("designation").toString());
str.replace("%{manufacturer}", dc.value("manufacturer").toString()); str.replace("%{manufacturer}", dc.value("manufacturer").toString());
str.replace("%{manufacturer-reference}", dc.value("manufacturer-reference").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("%{quantity}", dc.value("quantity").toString());
str.replace("%{unity}", dc.value("unity").toString()); str.replace("%{unity}", dc.value("unity").toString());
str.replace("%{auxiliary1}", dc.value("auxiliary1").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("%f", QString::number(m_diagram->folioIndex()+1));
m_assigned_label.replace("%id", 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("%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()); m_assigned_label.replace("%LM", m_diagram -> border_and_titleblock.locmach());
QSettings settings; QSettings settings;
@@ -426,7 +426,7 @@ namespace autonum
else if (type == "folio") { else if (type == "folio") {
formula.append("%F"); formula.append("%F");
} }
else if (type == "machine") { else if (type == "plant") {
formula.append("%M"); formula.append("%M");
} }
else if (type == "locmach") { else if (type == "locmach") {

2
sources/autoNum/numerotationcontext.cpp
View File

@@ -101,7 +101,7 @@ QStringList NumerotationContext::itemAt(const int i) const {
* @return all type use to numerotation * @return all type use to numerotation
*/ */
QString NumerotationContext::validRegExpNum () const { 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");
} }
/** /**

18
sources/autoNum/numerotationcontextcommands.cpp
View File

@@ -124,8 +124,8 @@ void NumerotationContextCommands::setNumStrategy(const QString &str) {
strategy_ = new FolioNum (diagram_); strategy_ = new FolioNum (diagram_);
return; return;
} }
else if (str=="machine"){ else if (str=="plant"){
strategy_ = new MachineNum (diagram_); strategy_ = new PlantNum (diagram_);
return; return;
} }
else if (str=="locmach"){ else if (str=="locmach"){
@@ -499,32 +499,32 @@ NumerotationContext FolioNum::previous(const NumerotationContext &nc, const int
/** /**
* Constructor * Constructor
*/ */
MachineNum::MachineNum (Diagram *d): PlantNum::PlantNum (Diagram *d):
NumStrategy (d) NumStrategy (d)
{} {}
/** /**
* @brief MachineNum::toRepresentedString * @brief PlantNum::toRepresentedString
* @return the represented string of folio * @return the represented string of folio
*/ */
QString MachineNum::toRepresentedString(const QString str) const { QString PlantNum::toRepresentedString(const QString str) const {
Q_UNUSED(str); Q_UNUSED(str);
return "%M"; return "%M";
} }
/** /**
* @brief MachineNum::next * @brief PlantNum::next
* @return the next NumerotationContext nc at position i * @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)); return (nextString(nc, i));
} }
/** /**
* @brief MachineNum::previous * @brief PlantNum::previous
* @return the previous NumerotationContext nc at posiiton i * @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)); return (nextString(nc, i));
} }

4
sources/autoNum/numerotationcontextcommands.h
View File

@@ -141,10 +141,10 @@ class FolioNum: public NumStrategy
NumerotationContext previous (const NumerotationContext &, const int) const override; NumerotationContext previous (const NumerotationContext &, const int) const override;
}; };
class MachineNum: public NumStrategy class PlantNum: public NumStrategy
{ {
public: public:
MachineNum (Diagram *); PlantNum (Diagram *);
QString toRepresentedString(const QString) const override; QString toRepresentedString(const QString) const override;
NumerotationContext next (const NumerotationContext &, const int) const override; NumerotationContext next (const NumerotationContext &, const int) const override;
NumerotationContext previous (const NumerotationContext &, const int) const override; NumerotationContext previous (const NumerotationContext &, const int) const override;

26
sources/autoNum/ui/numparteditorw.cpp
View File

@@ -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)=="string") setType(NumPartEditorW::string);
else if (strl.at(0)=="idfolio") setType(NumPartEditorW::idfolio); else if (strl.at(0)=="idfolio") setType(NumPartEditorW::idfolio);
else if (strl.at(0)=="folio") setType(NumPartEditorW::folio); 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)=="locmach") setType(NumPartEditorW::locmach);
else if (strl.at(0)=="elementline") setType(NumPartEditorW::elementline); else if (strl.at(0)=="elementline") setType(NumPartEditorW::elementline);
else if (strl.at(0)=="elementcolumn") setType(NumPartEditorW::elementcolumn); 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") items << tr("Chiffre 1") << tr("Chiffre 1 - Folio") << tr("Chiffre 01")
<< tr("Chiffre 01 - Folio") << tr("Chiffre 001") << tr("Chiffre 001 - Folio") << 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 else
items << tr("Chiffre 1") << tr("Chiffre 1 - Folio") << tr("Chiffre 01") items << tr("Chiffre 1") << tr("Chiffre 1 - Folio") << tr("Chiffre 01")
<< tr("Chiffre 01 - Folio") << tr("Chiffre 001") << tr("Chiffre 001 - Folio") << 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"); << tr("Element Line") << tr("Element Column") << tr("Element Prefix");
ui->type_cb->insertItems(0,items); ui->type_cb->insertItems(0,items);
} }
@@ -136,8 +136,8 @@ NumerotationContext NumPartEditorW::toNumContext() {
case folio: case folio:
type_str = "folio"; type_str = "folio";
break; break;
case machine: case plant:
type_str = "machine"; type_str = "plant";
break; break;
case locmach: case locmach:
type_str = "locmach"; type_str = "locmach";
@@ -164,7 +164,7 @@ NumerotationContext NumPartEditorW::toNumContext() {
* @return true if value field isn't empty or if type is folio * @return true if value field isn't empty or if type is folio
*/ */
bool NumPartEditorW::isValid() { 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;} type_ == elementcolumn || type_ == elementprefix) {return true;}
else if(ui -> value_field -> text().isEmpty()) {return false;} else if(ui -> value_field -> text().isEmpty()) {return false;}
else return true; else return true;
@@ -193,8 +193,8 @@ void NumPartEditorW::on_type_cb_activated(int) {
setType(idfolio); setType(idfolio);
else if (ui->type_cb->currentText() == tr("Folio")) else if (ui->type_cb->currentText() == tr("Folio"))
setType(folio); setType(folio);
else if (ui->type_cb->currentText() == tr("Machine")) else if (ui->type_cb->currentText() == tr("Installation"))
setType(machine); setType(plant);
else if (ui->type_cb->currentText() == tr("Locmach")) else if (ui->type_cb->currentText() == tr("Locmach"))
setType(locmach); setType(locmach);
else if (ui->type_cb->currentText() == tr("Element Line")) 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 //if @t is a numeric type and preview type @type_ isn't a numeric type
//or @fnum is true, we set numeric behavior //or @fnum is true, we set numeric behavior
if ( ((t==unit || t==unitfolio || t==ten || t==tenfolio || t==hundred || t==hundredfolio) && 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)) type_==elementcolumn || type_==elementline || type_==elementprefix))
|| fnum) { || fnum) {
ui -> value_field -> clear(); ui -> value_field -> clear();
@@ -244,7 +244,7 @@ void NumPartEditorW::setType(NumPartEditorW::type t, bool fnum) {
ui -> increase_spinBox -> setValue(1); ui -> increase_spinBox -> setValue(1);
} }
//@t isn't a numeric type //@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) { t == elementcolumn || t == elementprefix) {
ui -> value_field -> clear(); ui -> value_field -> clear();
ui -> increase_spinBox -> setDisabled(true); ui -> increase_spinBox -> setDisabled(true);
@@ -256,7 +256,7 @@ void NumPartEditorW::setType(NumPartEditorW::type t, bool fnum) {
ui -> value_field -> setDisabled(true); ui -> value_field -> setDisabled(true);
ui -> increase_spinBox -> setDisabled(true); ui -> increase_spinBox -> setDisabled(true);
} }
else if (t==machine) { else if (t==plant) {
ui -> value_field -> setDisabled(true); ui -> value_field -> setDisabled(true);
ui -> increase_spinBox -> 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")); i = ui->type_cb->findText(tr("N° folio"));
else if (t == folio) else if (t == folio)
i = ui->type_cb->findText(tr("Folio")); i = ui->type_cb->findText(tr("Folio"));
else if (t == machine) else if (t == plant)
i = ui->type_cb->findText(tr("Machine")); i = ui->type_cb->findText(tr("Installation"));
else if (t == locmach) else if (t == locmach)
i = ui->type_cb->findText(tr("Locmach")); i = ui->type_cb->findText(tr("Locmach"));
else if (t == elementline) else if (t == elementline)

2
sources/autoNum/ui/numparteditorw.h
View File

@@ -42,7 +42,7 @@ class NumPartEditorW : public QWidget
~NumPartEditorW() override; ~NumPartEditorW() override;
enum type {unit,unitfolio,ten,tenfolio, hundred, hundredfolio, enum type {unit,unitfolio,ten,tenfolio, hundred, hundredfolio,
string,idfolio,folio,machine,locmach, string,idfolio,folio,plant,locmach,
elementline,elementcolumn,elementprefix, elementline,elementcolumn,elementprefix,
}; };
NumerotationContext toNumContext(); NumerotationContext toNumContext();

6
sources/bordertitleblock.cpp
View File

@@ -241,7 +241,7 @@ TitleBlockProperties BorderTitleBlock::exportTitleBlock() {
ip.date = date(); ip.date = date();
ip.title = title(); ip.title = title();
ip.filename = fileName(); ip.filename = fileName();
ip.machine = machine(); ip.plant = plant();
ip.locmach = locmach(); ip.locmach = locmach();
ip.indexrev = indexrev(); ip.indexrev = indexrev();
ip.version = version(); ip.version = version();
@@ -264,7 +264,7 @@ void BorderTitleBlock::importTitleBlock(const TitleBlockProperties &ip) {
setDate(ip.date); setDate(ip.date);
setTitle(ip.title); setTitle(ip.title);
setFileName(ip.filename); setFileName(ip.filename);
setMachine(ip.machine); setPlant(ip.plant);
setLocMach(ip.locmach); setLocMach(ip.locmach);
setIndicerev(ip.indexrev); setIndicerev(ip.indexrev);
setVersion(QET::displayedVersion); setVersion(QET::displayedVersion);
@@ -715,7 +715,7 @@ void BorderTitleBlock::updateDiagramContextForTitleBlock(const DiagramContext &i
context.addValue("date", btb_date_.toString(Qt::SystemLocaleShortDate)); context.addValue("date", btb_date_.toString(Qt::SystemLocaleShortDate));
context.addValue("title", btb_title_); context.addValue("title", btb_title_);
context.addValue("filename", btb_filename_); context.addValue("filename", btb_filename_);
context.addValue("machine", btb_machine_); context.addValue("plant", btb_plant_);
context.addValue("locmach", btb_locmach_); context.addValue("locmach", btb_locmach_);
context.addValue("indexrev", btb_indexrev_); context.addValue("indexrev", btb_indexrev_);
context.addValue("version", btb_version_); context.addValue("version", btb_version_);

8
sources/bordertitleblock.h
View File

@@ -97,8 +97,8 @@ class BorderTitleBlock : public QObject
QString folio() const { return(btb_folio_); } QString folio() const { return(btb_folio_); }
/// @return the value of the title block "Folio" field as displayed /// @return the value of the title block "Folio" field as displayed
QString finalfolio() const { return(btb_final_folio_); } QString finalfolio() const { return(btb_final_folio_); }
/// @return the value of the title block "Machine" field /// @return the value of the title block "Plant" field
QString machine() const { return(btb_machine_); } QString plant() const { return(btb_plant_); }
/// @return the value of the title block "Locmach" field /// @return the value of the title block "Locmach" field
QString locmach() const { return(btb_locmach_); } QString locmach() const { return(btb_locmach_); }
/// @return the value of the revision index block "Folio" field /// @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()); void setFolioData(int, int, const QString& = nullptr, const DiagramContext & = DiagramContext());
/// @param author the new value of the "File" field /// @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 setLocMach(const QString &locmach) { btb_locmach_ = locmach; }
void setIndicerev(const QString &indexrev){ btb_indexrev_ = indexrev; } void setIndicerev(const QString &indexrev){ btb_indexrev_ = indexrev; }
void setFileName(const QString &filename) { btb_filename_ = filename; } void setFileName(const QString &filename) { btb_filename_ = filename; }
@@ -237,7 +237,7 @@ class BorderTitleBlock : public QObject
QDate btb_date_; QDate btb_date_;
QString btb_title_; QString btb_title_;
QString btb_folio_; QString btb_folio_;
QString btb_machine_; QString btb_plant_;
QString btb_locmach_; QString btb_locmach_;
QString btb_indexrev_; QString btb_indexrev_;
QString btb_final_folio_; QString btb_final_folio_;

8
sources/diagramcontext.h
View File

@@ -35,7 +35,7 @@
* formula -> formula used to create the label (formula is make with variable) * formula -> formula used to create the label (formula is make with variable)
* designation -> exhaustive comment used to explain what the element does. * designation -> exhaustive comment used to explain what the element does.
* description -> exhaustive description 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 * comment -> a little comment wich can be displayed in the folio
* manufacturer -> the manufacturer of the element * manufacturer -> the manufacturer of the element
* manufacturer-reference -> the manufacturer reference of the element * manufacturer-reference -> the manufacturer reference of the element
@@ -43,10 +43,10 @@
* unity -> unity of the element * unity -> unity of the element
* auxiliary1 -> auxiliary 1 of element * auxiliary1 -> auxiliary 1 of element
* auxiliary2 -> auxiliary 2 of element * auxiliary2 -> auxiliary 2 of element
* machine-manufacturer-reference -> reference of the manufacturer machine * machine-manufacturer-reference -> reference of the machine manufacturer
* provider -> the provider of the element * supplier -> the supplier of the element
* function -> the function of 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 * frozenLabel -> label locked at a given time
* *
*/ */

16
sources/diagramfoliolist.cpp
View File

@@ -93,7 +93,7 @@ void DiagramFolioList::drawBackground(QPainter *p, const QRectF &r)
fillRow(p, row_rect, diagram_list[i] -> border_and_titleblock.author(), fillRow(p, row_rect, diagram_list[i] -> border_and_titleblock.author(),
diagram_list[i] -> title(), diagram_list[i] -> title(),
diagram_list[i] -> border_and_titleblock.finalfolio(), 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.locmach(),
diagram_list[i] -> border_and_titleblock.indexrev(), diagram_list[i] -> border_and_titleblock.indexrev(),
diagram_list[i] -> border_and_titleblock.date().toString(Qt::SystemLocaleShortDate)); 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(), fillRow(p, row_rect, diagram_list[i] -> border_and_titleblock.author(),
diagram_list[i] -> title(), diagram_list[i] -> title(),
QString::number(diagram_list[i] ->folioIndex()+1), 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.locmach(),
diagram_list[i] -> border_and_titleblock.indexrev(), diagram_list[i] -> border_and_titleblock.indexrev(),
diagram_list[i] -> border_and_titleblock.date().toString(Qt::SystemLocaleShortDate)); 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 * @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, 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 x = row_rect.topLeft().x();
qreal y = row_rect.topLeft().y(); 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(); x += colWidths[1]*row_rect.width();
if (origFontMetrics.width(machine) > 0.95*colWidths[2]*row_rect.width()) if (origFontMetrics.width(plant) > 0.95*colWidths[2]*row_rect.width())
workingFont.setPointSizeF(origFontSize * 0.95*colWidths[2]*row_rect.width() / origFontMetrics.width(machine)); workingFont.setPointSizeF(origFontSize * 0.95*colWidths[2]*row_rect.width() / origFontMetrics.width(plant));
else else
workingFont.setPointSizeF(origFontSize); workingFont.setPointSizeF(origFontSize);
qp -> setFont(workingFont); 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(); 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 authorTranslatable(QObject::tr("Auteur"));
QString titleTranslatable(QObject::tr("Titre")); QString titleTranslatable(QObject::tr("Titre"));
QString folioTranslatable(QObject::tr("Folio")); QString folioTranslatable(QObject::tr("Folio"));
QString machineTranslatable(QObject::tr("Installation")); QString plantTranslatable(QObject::tr("Installation"));
QString locTranslatable(QObject::tr("Localisation")); QString locTranslatable(QObject::tr("Localisation"));
QString indexrevTranslatable(QObject::tr("Rev")); QString indexrevTranslatable(QObject::tr("Rev"));
QString dateTranslatable(QObject::tr("Date")); QString dateTranslatable(QObject::tr("Date"));
qp->save(); qp->save();
qp->setFont(QETApp::diagramTextsFont(13)); 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(); qp->restore();
} }

2
sources/editor/qetelementeditor.cpp
View File

@@ -741,7 +741,7 @@ bool QETElementEditor::checkElement()
if (errors.size()) if (errors.size())
dialog_message += QString (tr(" et")); 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 += " :"; dialog_message += " :";

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

@@ -152,7 +152,7 @@ void ElementPropertiesEditorWidget::updateTree()
*/ */
void ElementPropertiesEditorWidget::populateTree() 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) for(const QString& key : keys)
{ {

2
sources/elementtextpattern.cpp
View File

@@ -62,7 +62,7 @@ ExportElementTextPattern::ExportElementTextPattern(Element *elmt) :
{ {
bool r = QMessageBox::question(parentWidget(), bool r = QMessageBox::question(parentWidget(),
QObject::tr("Configuration de textes"), 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)); "Voulez-vous la remplacer ?").arg(m_name));
if(r == false) if(r == false)

14
sources/nomenclature.cpp
View File

@@ -60,7 +60,7 @@ bool nomenclature::saveToCSVFile()
if(!QFile::remove ( filename ) ){ if(!QFile::remove ( filename ) ){
QMessageBox::critical(this->m_parent, QObject::tr("Erreur"), QMessageBox::critical(this->m_parent, QObject::tr("Erreur"),
QObject::tr("Impossible de remplacer le fichier!\n\n")+ QObject::tr("Impossible de remplacer le fichier!\n\n")+
"Destination: "+filename+"\n"); "Destination : "+filename+"\n");
return false; return false;
} }
} }
@@ -84,9 +84,9 @@ QString nomenclature::getNomenclature()
{ {
//Process... //Process...
QString data = QObject::tr("NOMENCLATURE : ") + m_project -> title() + "\n\n"; 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("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("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("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 ""+ 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("N001")+";" //:Don't translate this text! //ID for internal number
""+ QObject::tr("O001")+";" //:Don't translate this text! //ID for location ""+ QObject::tr("O001")+";" //:Don't translate this text! //ID for location
""+ QObject::tr("P001") +"\n"; //:Don't translate this text! //ID for function ""+ 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("Titre de folio") +";"
""+ QObject::tr("Label de folio") +";" ""+ QObject::tr("Numéro de folio") +";"
""+ QObject::tr("Désignation qet") +";" ""+ QObject::tr("Désignation qet") +";"
""+ QObject::tr("Position") +";" ""+ QObject::tr("Position") +";"
""+ QObject::tr("Label") +";" ""+ 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["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["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["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["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"].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["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["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["unity"].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["auxiliary1"].toString(), elmt->rSequenceStruct(), elmt->diagram(), elmt) + ";";

12
sources/qetapp.cpp
View File

@@ -294,7 +294,7 @@ QStringList QETApp::elementInfoKeys()
QStringList info_list; QStringList info_list;
info_list << "formula" info_list << "formula"
<< "label" << "label"
<< "group-function" << "plant"
<< "location" << "location"
<< "comment" << "comment"
@@ -308,7 +308,7 @@ QStringList QETApp::elementInfoKeys()
<< "manufacturer" << "manufacturer"
<< "manufacturer-reference" << "manufacturer-reference"
<< "machine-manufacturer-reference" << "machine-manufacturer-reference"
<< "provider" << "supplier"
<< "quantity" << "quantity"
<< "unity"; << "unity";
return info_list; return info_list;
@@ -325,7 +325,7 @@ QString QETApp::elementTranslatedInfoKey(const QString &info)
{ {
if (info == "formula") return tr("Formule du label"); if (info == "formula") return tr("Formule du label");
else if (info == "label") return tr("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 == "location") return tr("Localisation");
else if (info == "comment") return tr("Commentaire"); 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") return tr("Fabricant");
else if (info == "manufacturer-reference") return tr("Numéro de commande"); 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 == "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 == "quantity") return tr("Quantité");
else if (info == "unity") return tr("Unité"); else if (info == "unity") return tr("Unité");
@@ -359,13 +359,13 @@ QString QETApp::elementInfoToVar(const QString &info)
{ {
if (info == "formula") return QString("%{formula}"); if (info == "formula") return QString("%{formula}");
else if (info == "label") return QString("%{label}"); 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 == "comment") return QString("%{comment}");
else if (info == "description") return QString("%{description}"); else if (info == "description") return QString("%{description}");
else if (info == "designation") return QString("%{designation}"); else if (info == "designation") return QString("%{designation}");
else if (info == "manufacturer") return QString("%{manufacturer}"); else if (info == "manufacturer") return QString("%{manufacturer}");
else if (info == "manufacturer-reference") return QString("%{manufacturer-reference}"); 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 == "quantity") return QString("%{quantity}");
else if (info == "unity") return QString("%{unity}"); else if (info == "unity") return QString("%{unity}");
else if (info == "auxiliary1") return QString("%{auxiliary1}"); else if (info == "auxiliary1") return QString("%{auxiliary1}");

4
sources/qetdiagrameditor.cpp
View File

@@ -399,7 +399,7 @@ void QETDiagramEditor::setUpActions()
}); });
//Lauch the plugin of terminal generator //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); connect(m_project_terminalBloc, &QAction::triggered, this, &QETDiagramEditor::generateTerminalBlock);
//MDI view style //MDI view style
@@ -614,7 +614,7 @@ void QETDiagramEditor::setUpActions()
this->currentDiagramView()->diagram()->changeZValue(action->data().value<QET::DepthOption>()); this->currentDiagramView()->diagram()->changeZValue(action->data().value<QET::DepthOption>());
}); });
m_find = new QAction(tr("Chercher"), this); m_find = new QAction(tr("Chercher/remplacer"), this);
m_find->setShortcut(QKeySequence::Find); m_find->setShortcut(QKeySequence::Find);
connect(m_find, &QAction::triggered, [this]() { connect(m_find, &QAction::triggered, [this]() {
this->m_search_and_replace_widget.setHidden(!m_search_and_replace_widget.isHidden()); this->m_search_and_replace_widget.setHidden(!m_search_and_replace_widget.isHidden());

6
sources/titleblock/templatecellwidget.cpp
View File

@@ -437,11 +437,11 @@ QString TitleBlockTemplateCellWidget::defaultVariablesString() const {
"<li>%{date} : date du folio</li>" "<li>%{date} : date du folio</li>"
"<li>%{title} : titre du folio</li>" "<li>%{title} : titre du folio</li>"
"<li>%{filename} : nom de fichier du projet</li>" "<li>%{filename} : nom de fichier du projet</li>"
"<li>%{machine} : nom du groupe fonctionnel du projet</li>" "<li>%{plant} : nom de l'installation (=) dans laquelle se trouve le folio</li>"
"<li>%{locmach} : nom de la localisation dans le groupe fonctionnel du projet</li>" "<li>%{locmach} : nom de la localisation (+) dans laquelle se trouve le folio</li>"
"<li>%{indexrev} : indice de révision du folio</li>" "<li>%{indexrev} : indice de révision du folio</li>"
"<li>%{version} : version du logiciel</li>" "<li>%{version} : version du logiciel</li>"
"<li>%{folio} : indications relatives au folio</li>" "<li>%{folio} : numéro du folio</li>"
"<li>%{folio-id} : position du folio dans le projet</li>" "<li>%{folio-id} : position du folio dans le projet</li>"
"<li>%{folio-total} : nombre total de folios dans le projet</li>" "<li>%{folio-total} : nombre total de folios dans le projet</li>"
"<li>%{projecttitle} : titre du projet</li>" "<li>%{projecttitle} : titre du projet</li>"

14
sources/titleblockproperties.cpp
View File

@@ -47,7 +47,7 @@ bool TitleBlockProperties::operator==(const TitleBlockProperties &ip) {
ip.author == author &&\ ip.author == author &&\
ip.date == date &&\ ip.date == date &&\
ip.filename == filename &&\ ip.filename == filename &&\
ip.machine == machine &&\ ip.plant == plant &&\
ip.locmach == locmach &&\ ip.locmach == locmach &&\
ip.indexrev == indexrev &&\ ip.indexrev == indexrev &&\
ip.version == version &&\ ip.version == version &&\
@@ -77,7 +77,7 @@ void TitleBlockProperties::toXml(QDomElement &e) const {
e.setAttribute("author", author); e.setAttribute("author", author);
e.setAttribute("title", title); e.setAttribute("title", title);
e.setAttribute("filename", filename); e.setAttribute("filename", filename);
e.setAttribute("machine", machine); e.setAttribute("plant", plant);
e.setAttribute("locmach", locmach); e.setAttribute("locmach", locmach);
e.setAttribute("indexrev",indexrev); e.setAttribute("indexrev",indexrev);
e.setAttribute("version", version); 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("author")) author = e.attribute("author");
if (e.hasAttribute("title")) title = e.attribute("title"); if (e.hasAttribute("title")) title = e.attribute("title");
if (e.hasAttribute("filename")) filename = e.attribute("filename"); 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("locmach")) locmach = e.attribute("locmach");
if (e.hasAttribute("indexrev")) indexrev = e.attribute("indexrev"); if (e.hasAttribute("indexrev")) indexrev = e.attribute("indexrev");
if (e.hasAttribute("version")) version = e.attribute("version"); if (e.hasAttribute("version")) version = e.attribute("version");
if (e.hasAttribute("folio")) folio = e.attribute("folio"); 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("auto_page_num")) auto_page_num = e.attribute("auto_page_num");
if (e.hasAttribute("date")) setDateFromString(e.attribute("date")); 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 + "title", title);
settings.setValue(prefix + "author", author); settings.setValue(prefix + "author", author);
settings.setValue(prefix + "filename", filename); settings.setValue(prefix + "filename", filename);
settings.setValue(prefix + "machine", machine); settings.setValue(prefix + "plant", plant);
settings.setValue(prefix + "locmach", locmach); settings.setValue(prefix + "locmach", locmach);
settings.setValue(prefix + "indexrev", indexrev); settings.setValue(prefix + "indexrev", indexrev);
settings.setValue(prefix + "version", version); settings.setValue(prefix + "version", version);
@@ -162,7 +162,7 @@ void TitleBlockProperties::fromSettings(QSettings &settings, const QString &pref
title = settings.value(prefix + "title").toString(); title = settings.value(prefix + "title").toString();
author = settings.value(prefix + "author").toString(); author = settings.value(prefix + "author").toString();
filename = settings.value(prefix + "filename").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(); locmach = settings.value(prefix + "locmach").toString();
indexrev = settings.value(prefix + "indexrev").toString(); indexrev = settings.value(prefix + "indexrev").toString();
version = settings.value(prefix + "version").toString(); version = settings.value(prefix + "version").toString();

2
sources/titleblockproperties.h
View File

@@ -54,7 +54,7 @@ class TitleBlockProperties {
QString author; ///< Author of the diagram/folio (displayed by the default template) QString author; ///< Author of the diagram/folio (displayed by the default template)
QDate date; ///< Date (displayed by the default template) QDate date; ///< Date (displayed by the default template)
QString filename; ///< Filename (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 locmach; ///< Location(displayed by the default template)
QString indexrev; ///< Revision Index (displayed by the default template) QString indexrev; ///< Revision Index (displayed by the default template)
QString version; ///< Version (displayed by the default template) QString version; ///< Version (displayed by the default template)

18
sources/ui/configpage/generalconfigurationpage.ui
View File

@@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>998</width> <width>1958</width>
<height>500</height> <height>1438</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@@ -133,14 +133,14 @@
<item row="1" column="0"> <item row="1" column="0">
<widget class="QCheckBox" name="m_use_folio_label"> <widget class="QCheckBox" name="m_use_folio_label">
<property name="text"> <property name="text">
<string>Utiliser les labels de folio à la place de leurs ID</string> <string>Utiliser les numéros de folio à la place de leur position dans le projet</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0"> <item row="3" column="0">
<widget class="QCheckBox" name="m_border_0"> <widget class="QCheckBox" name="m_border_0">
<property name="text"> <property name="text">
<string extracomment="Choix de l'increment de depart 1 ou 0">Activer la numérotation à partir de 0 pour la colonne des cartouches au lieu de 1</string> <string extracomment="Choix de l'increment de depart 1 ou 0">Numéroter les colonnes de cartouche à partir de 0 (1 sinon)</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -223,13 +223,13 @@
</widget> </widget>
<widget class="QWidget" name="tab_5"> <widget class="QWidget" name="tab_5">
<attribute name="title"> <attribute name="title">
<string>Elements</string> <string>Collections</string>
</attribute> </attribute>
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_2">
<item> <item>
<widget class="QGroupBox" name="groupBox_5"> <widget class="QGroupBox" name="groupBox_5">
<property name="title"> <property name="title">
<string>Collections d'éléments</string> <string>Accès aux collections</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
@@ -241,7 +241,7 @@
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="label_7"> <widget class="QLabel" name="label_7">
<property name="text"> <property name="text">
<string>Chemin de la collection commune</string> <string>Répertoire de la collection commune</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -262,7 +262,7 @@
<item row="2" column="0"> <item row="2" column="0">
<widget class="QLabel" name="label_8"> <widget class="QLabel" name="label_8">
<property name="text"> <property name="text">
<string>Chemin de la collection utilisateur</string> <string>Répertoire de la collection utilisateur</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -304,7 +304,7 @@
<item row="3" column="0"> <item row="3" column="0">
<widget class="QLabel" name="label_10"> <widget class="QLabel" name="label_10">
<property name="text"> <property name="text">
<string>Chemin des cartouches utilisateur</string> <string>Répertoire des cartouches utilisateur</string>
</property> </property>
</widget> </widget>
</item> </item>

12
sources/ui/reportpropertiewidget.ui
View File

@@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>400</width> <width>783</width>
<height>300</height> <height>1175</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@@ -34,10 +34,10 @@
<property name="text"> <property name="text">
<string>Vous pouvez définir un label personnalisé pour les reports de folio. <string>Vous pouvez définir un label personnalisé pour les reports de folio.
Créer votre propre texte en vous aidant des variables suivantes : Créer votre propre texte en vous aidant des variables suivantes :
%f : le numéro de folio %f : la position du folio dans le projet
%F: le label de folio %F : le numéro de folio
%M: Machine %M : l'installation
%LM: Location %LM : la localisation
%l : le numéro de ligne %l : le numéro de ligne
%c : le numéro de colonne</string> %c : le numéro de colonne</string>
</property> </property>

8
sources/ui/titleblockpropertieswidget.cpp
View File

@@ -96,7 +96,7 @@ void TitleBlockPropertiesWidget::setProperties(const TitleBlockProperties &prope
ui -> m_title_le -> setText (properties.title); ui -> m_title_le -> setText (properties.title);
ui -> m_author_le -> setText (properties.author); ui -> m_author_le -> setText (properties.author);
ui -> m_file_le -> setText (properties.filename); 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_loc -> setText (properties.locmach);
ui -> m_indice -> setText (properties.indexrev); ui -> m_indice -> setText (properties.indexrev);
ui -> m_folio_le -> setText (properties.folio); ui -> m_folio_le -> setText (properties.folio);
@@ -154,7 +154,7 @@ TitleBlockProperties TitleBlockPropertiesWidget::properties() const {
prop.title = ui -> m_title_le -> text(); prop.title = ui -> m_title_le -> text();
prop.author = ui -> m_author_le -> text(); prop.author = ui -> m_author_le -> text();
prop.filename = ui -> m_file_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.locmach = ui -> m_loc -> text();
prop.indexrev = ui -> m_indice -> text(); prop.indexrev = ui -> m_indice -> text();
prop.folio = ui -> m_folio_le -> 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.title = ui -> m_title_le -> text();
prop.author = ui -> m_author_le -> text(); prop.author = ui -> m_author_le -> text();
prop.filename = ui -> m_file_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.locmach = ui -> m_loc -> text();
prop.indexrev = ui -> m_indice -> text(); prop.indexrev = ui -> m_indice -> text();
prop.folio = "%autonum"; prop.folio = "%autonum";
@@ -294,7 +294,7 @@ void TitleBlockPropertiesWidget::initDialog(const bool &current_date, QETProjec
ui -> m_current_date_rb -> setVisible(current_date); ui -> m_current_date_rb -> setVisible(current_date);
m_tbt_edit = new QAction(tr("Éditer ce modèle", "menu entry"), this); 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_edit, SIGNAL(triggered()), this, SLOT(editCurrentTitleBlockTemplate()));
connect(m_tbt_duplicate, SIGNAL(triggered()), this, SLOT(duplicateCurrentTitleBlockTemplate())); connect(m_tbt_duplicate, SIGNAL(triggered()), this, SLOT(duplicateCurrentTitleBlockTemplate()));

29
sources/ui/titleblockpropertieswidget.ui
View File

@@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>654</width> <width>753</width>
<height>611</height> <height>901</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@@ -51,19 +51,26 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QComboBox" name="m_tbt_cb"/> <widget class="QComboBox" name="m_tbt_cb">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item> </item>
<item> <item>
<widget class="QComboBox" name="m_display_at_cb"> <widget class="QComboBox" name="m_display_at_cb">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>40</width> <width>0</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
@@ -84,7 +91,7 @@
</property> </property>
<item> <item>
<property name="text"> <property name="text">
<string notr="true"> </string> <string notr="true"/>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../../qelectrotech.qrc"> <iconset resource="../../qelectrotech.qrc">
@@ -93,7 +100,7 @@
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string notr="true"> </string> <string notr="true"/>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../../qelectrotech.qrc"> <iconset resource="../../qelectrotech.qrc">
@@ -105,7 +112,7 @@
<item> <item>
<widget class="QPushButton" name="m_tbt_pb"> <widget class="QPushButton" name="m_tbt_pb">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@@ -232,9 +239,9 @@
</widget> </widget>
</item> </item>
<item row="6" column="3"> <item row="6" column="3">
<widget class="QLineEdit" name="m_mach"> <widget class="QLineEdit" name="m_plant">
<property name="toolTip"> <property name="toolTip">
<string>Disponible en tant que %machine pour les modèles de cartouches</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Disponible en tant que %plant pour les modèles de cartouches&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -433,7 +440,7 @@ associer le nom &quot;volta&quot; et la valeur &quot;1745&quot; remplacera %{vol
<tabstop>m_date_now_pb</tabstop> <tabstop>m_date_now_pb</tabstop>
<tabstop>m_file_le</tabstop> <tabstop>m_file_le</tabstop>
<tabstop>m_folio_le</tabstop> <tabstop>m_folio_le</tabstop>
<tabstop>m_mach</tabstop> <tabstop>m_plant</tabstop>
<tabstop>m_loc</tabstop> <tabstop>m_loc</tabstop>
<tabstop>m_indice</tabstop> <tabstop>m_indice</tabstop>
<tabstop>auto_page_cb</tabstop> <tabstop>auto_page_cb</tabstop>