Mod some qWarning add QObject::tr

This commit is contained in:
Simon De Backer
2020-09-24 22:39:11 +02:00
parent 3b9ba6a261
commit 30b8205f82
6 changed files with 159 additions and 128 deletions

View File

@@ -245,7 +245,7 @@ void ElementsLocation::setPath(const QString &path)
("^project(?<project_id>[0-9])\\+(?<collection_path>embed://*.*)$"); ("^project(?<project_id>[0-9])\\+(?<collection_path>embed://*.*)$");
if (!re.isValid()) if (!re.isValid())
{ {
qWarning() <<"this is an error in the code" qWarning() <<QObject::tr("this is an error in the code")
<< re.errorString() << re.errorString()
<< re.patternErrorOffset(); << re.patternErrorOffset();
return; return;

View File

@@ -1,17 +1,17 @@
/* /*
Copyright 2006-2020 The QElectroTech Team Copyright 2006-2020 The QElectroTech Team
This file is part of QElectroTech. This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify QElectroTech is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or the Free Software Foundation, either version 2 of the License, or
(at your option) any later version. (at your option) any later version.
QElectroTech is distributed in the hope that it will be useful, QElectroTech is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>. along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
*/ */
@@ -43,21 +43,21 @@ void SearchAndReplaceWorker::replaceDiagram(QList<Diagram *> diagram_list)
if (diagram_list.isEmpty()) { if (diagram_list.isEmpty()) {
return; return;
} }
QETProject *project = diagram_list.first()->project(); QETProject *project = diagram_list.first()->project();
for (Diagram *d : diagram_list) { for (Diagram *d : diagram_list) {
if (d->project() != project) { if (d->project() != project) {
return; return;
} }
} }
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();
TitleBlockProperties new_properties = old_propertie; TitleBlockProperties new_properties = old_propertie;
new_properties.title = applyChange(new_properties.title, m_titleblock_properties.title); new_properties.title = applyChange(new_properties.title, m_titleblock_properties.title);
new_properties.author = applyChange(new_properties.author, m_titleblock_properties.author); new_properties.author = applyChange(new_properties.author, m_titleblock_properties.author);
new_properties.filename = applyChange(new_properties.filename, m_titleblock_properties.filename); new_properties.filename = applyChange(new_properties.filename, m_titleblock_properties.filename);
@@ -74,9 +74,9 @@ void SearchAndReplaceWorker::replaceDiagram(QList<Diagram *> diagram_list)
new_properties.date = m_titleblock_properties.date; new_properties.date = m_titleblock_properties.date;
} }
} }
new_properties.context.add(m_titleblock_properties.context); new_properties.context.add(m_titleblock_properties.context);
if (old_propertie != new_properties) { if (old_propertie != new_properties) {
project->undoStack()->push(new ChangeTitleBlockCommand(d, old_propertie, new_properties)); project->undoStack()->push(new ChangeTitleBlockCommand(d, old_propertie, new_properties));
} }
@@ -105,7 +105,7 @@ void SearchAndReplaceWorker::replaceElement(QList<Element *> list)
if (list.isEmpty() || !list.first()->diagram()) { if (list.isEmpty() || !list.first()->diagram()) {
return; return;
} }
QETProject *project_ = list.first()->diagram()->project(); QETProject *project_ = list.first()->diagram()->project();
for (Element *elmt : list) for (Element *elmt : list)
{ {
@@ -115,7 +115,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)
{ {
@@ -131,7 +131,7 @@ void SearchAndReplaceWorker::replaceElement(QList<Element *> list)
new_context.addValue(key, applyChange(old_context.value(key).toString(), new_context.addValue(key, applyChange(old_context.value(key).toString(),
m_element_context.value(key).toString())); m_element_context.value(key).toString()));
} }
if (old_context != new_context) if (old_context != new_context)
{ {
ChangeElementInformationCommand *undo = new ChangeElementInformationCommand(elmt, old_context, new_context); ChangeElementInformationCommand *undo = new ChangeElementInformationCommand(elmt, old_context, new_context);
@@ -167,7 +167,7 @@ void SearchAndReplaceWorker::replaceIndiText(QList<IndependentTextItem *> list)
return; return;
} }
} }
project_->undoStack()->beginMacro(QObject::tr("Chercher/remplacer des textes independants")); project_->undoStack()->beginMacro(QObject::tr("Chercher/remplacer des textes independants"));
for (IndependentTextItem *text : list) for (IndependentTextItem *text : list)
{ {
@@ -199,7 +199,7 @@ void SearchAndReplaceWorker::replaceConductor(QList<Conductor *> list)
if (list.isEmpty() || !list.first()->diagram()) { if (list.isEmpty() || !list.first()->diagram()) {
return; return;
} }
QETProject *project_ = list.first()->diagram()->project(); QETProject *project_ = list.first()->diagram()->project();
for (Conductor *c : list) { for (Conductor *c : list) {
if (!c->diagram() || if (!c->diagram() ||
@@ -207,12 +207,12 @@ void SearchAndReplaceWorker::replaceConductor(QList<Conductor *> list)
return; return;
} }
} }
project_->undoStack()->beginMacro(QObject::tr("Chercher/remplacer les propriétés de conducteurs.")); project_->undoStack()->beginMacro(QObject::tr("Chercher/remplacer les propriétés de conducteurs."));
for (Conductor *c : list) for (Conductor *c : list)
{ {
ConductorProperties cp = applyChange(c->properties(), m_conductor_properties); ConductorProperties cp = applyChange(c->properties(), m_conductor_properties);
if (cp != c->properties()) if (cp != c->properties())
{ {
QSet <Conductor *> conductors_list = c->relatedPotentialConductors(true); QSet <Conductor *> conductors_list = c->relatedPotentialConductors(true);
@@ -253,7 +253,7 @@ void SearchAndReplaceWorker::replaceAdvanced(
QList<Conductor *> conductors) QList<Conductor *> conductors)
{ {
QETProject *project_ = nullptr; QETProject *project_ = nullptr;
//Some test to check if a least one list have one item //Some test to check if a least one list have one item
//and if all items belong to the same project //and if all items belong to the same project
if (!diagrams.isEmpty()) { if (!diagrams.isEmpty()) {
@@ -267,7 +267,7 @@ void SearchAndReplaceWorker::replaceAdvanced(
} else { } else {
return; return;
} }
for (Diagram *dd : diagrams) { for (Diagram *dd : diagrams) {
if (dd->project() != project_) { if (dd->project() != project_) {
return; return;
@@ -289,12 +289,12 @@ void SearchAndReplaceWorker::replaceAdvanced(
} }
} }
//The end of the test //The end of the test
int who = m_advanced_struct.who; int who = m_advanced_struct.who;
if (who == -1) { if (who == -1) {
return; return;
} }
project_->undoStack()->beginMacro(QObject::tr("Rechercher / remplacer avancé")); project_->undoStack()->beginMacro(QObject::tr("Rechercher / remplacer avancé"));
if (who == 0) if (who == 0)
{ {
@@ -328,7 +328,7 @@ void SearchAndReplaceWorker::replaceAdvanced(
{ {
QSet <Conductor *> potential_conductors = conductor->relatedPotentialConductors(true); QSet <Conductor *> potential_conductors = conductor->relatedPotentialConductors(true);
potential_conductors << conductor; potential_conductors << conductor;
for (Conductor *c : potential_conductors) for (Conductor *c : potential_conductors)
{ {
QVariant old_value, new_value; QVariant old_value, new_value;
@@ -344,10 +344,16 @@ void SearchAndReplaceWorker::replaceAdvanced(
for (IndependentTextItem *text : texts) for (IndependentTextItem *text : texts)
{ {
QRegularExpression rx(m_advanced_struct.search); QRegularExpression rx(m_advanced_struct.search);
if (!rx.isValid())
{
qWarning() <<QObject::tr("this is an error in the code")
<< rx.errorString()
<< rx.patternErrorOffset();
}
QString replace = m_advanced_struct.replace; QString replace = m_advanced_struct.replace;
QString after = text->toPlainText(); QString after = text->toPlainText();
after = after.replace(rx, replace); after = after.replace(rx, replace);
if (after != text->toPlainText()) { if (after != text->toPlainText()) {
project_->undoStack()->push(new ChangeDiagramTextCommand(text, text->toPlainText(), after)); project_->undoStack()->push(new ChangeDiagramTextCommand(text, text->toPlainText(), after));
} }
@@ -380,7 +386,7 @@ void SearchAndReplaceWorker::setupLineEdit(QLineEdit *l,
ConductorProperties SearchAndReplaceWorker::invalidConductorProperties() ConductorProperties SearchAndReplaceWorker::invalidConductorProperties()
{ {
ConductorProperties cp; ConductorProperties cp;
//init with invalid value the conductor properties //init with invalid value the conductor properties
cp.text_size = 0; cp.text_size = 0;
cp.text.clear(); cp.text.clear();
@@ -393,7 +399,7 @@ ConductorProperties SearchAndReplaceWorker::invalidConductorProperties()
cp.cond_size = 0; cp.cond_size = 0;
cp.m_color_2 = QColor(); cp.m_color_2 = QColor();
cp.m_dash_size = 0; cp.m_dash_size = 0;
return cp; return cp;
} }
@@ -408,7 +414,7 @@ ConductorProperties SearchAndReplaceWorker::applyChange(
const ConductorProperties &change) const ConductorProperties &change)
{ {
ConductorProperties new_properties = original; ConductorProperties new_properties = original;
if (change.text_size > 2) {new_properties.text_size = change.text_size;} if (change.text_size > 2) {new_properties.text_size = change.text_size;}
new_properties.m_formula = applyChange(new_properties.m_formula, change.m_formula); new_properties.m_formula = applyChange(new_properties.m_formula, change.m_formula);
new_properties.text = applyChange(new_properties.text, change.text); new_properties.text = applyChange(new_properties.text, change.text);
@@ -430,7 +436,7 @@ ConductorProperties SearchAndReplaceWorker::applyChange(
if (change.m_color_2.isValid()) {new_properties.m_color_2 = change.m_color_2;} if (change.m_color_2.isValid()) {new_properties.m_color_2 = change.m_color_2;}
if (change.m_dash_size >= 2) {new_properties.m_dash_size = change.m_dash_size;} if (change.m_dash_size >= 2) {new_properties.m_dash_size = change.m_dash_size;}
new_properties.singleLineProperties = change.singleLineProperties; new_properties.singleLineProperties = change.singleLineProperties;
return new_properties; return new_properties;
} }
@@ -457,10 +463,16 @@ QString SearchAndReplaceWorker::applyChange(const QString &original,
TitleBlockProperties SearchAndReplaceWorker::replaceAdvanced(Diagram *diagram) TitleBlockProperties SearchAndReplaceWorker::replaceAdvanced(Diagram *diagram)
{ {
TitleBlockProperties p = diagram->border_and_titleblock.exportTitleBlock(); TitleBlockProperties p = diagram->border_and_titleblock.exportTitleBlock();
if (m_advanced_struct.who == 0) if (m_advanced_struct.who == 0)
{ {
QRegularExpression rx(m_advanced_struct.search); QRegularExpression rx(m_advanced_struct.search);
if (!rx.isValid())
{
qWarning() <<QObject::tr("this is an error in the code")
<< rx.errorString()
<< rx.patternErrorOffset();
}
QString replace = m_advanced_struct.replace; QString replace = m_advanced_struct.replace;
QString what = m_advanced_struct.what; QString what = m_advanced_struct.what;
if (what == "title") {p.title = p.title.replace(rx, replace);} if (what == "title") {p.title = p.title.replace(rx, replace);}
@@ -483,19 +495,25 @@ TitleBlockProperties SearchAndReplaceWorker::replaceAdvanced(Diagram *diagram)
DiagramContext SearchAndReplaceWorker::replaceAdvanced(Element *element) DiagramContext SearchAndReplaceWorker::replaceAdvanced(Element *element)
{ {
DiagramContext context = element->elementInformations(); DiagramContext context = element->elementInformations();
if (m_advanced_struct.who == 1) if (m_advanced_struct.who == 1)
{ {
QString what = m_advanced_struct.what; QString what = m_advanced_struct.what;
if (context.contains(what)) if (context.contains(what))
{ {
QRegularExpression rx(m_advanced_struct.search); QRegularExpression rx(m_advanced_struct.search);
if (!rx.isValid())
{
qWarning() <<QObject::tr("this is an error in the code")
<< rx.errorString()
<< rx.patternErrorOffset();
}
QString replace = m_advanced_struct.replace; QString replace = m_advanced_struct.replace;
QString value = context[what].toString(); QString value = context[what].toString();
context.addValue(what, value.replace(rx, replace)); context.addValue(what, value.replace(rx, replace));
} }
} }
return context; return context;
} }
@@ -509,13 +527,19 @@ ConductorProperties SearchAndReplaceWorker::replaceAdvanced(
Conductor *conductor) Conductor *conductor)
{ {
ConductorProperties properties = conductor->properties(); ConductorProperties properties = conductor->properties();
if (m_advanced_struct.who == 2) if (m_advanced_struct.who == 2)
{ {
QRegularExpression rx(m_advanced_struct.search); QRegularExpression rx(m_advanced_struct.search);
if (!rx.isValid())
{
qWarning() <<QObject::tr("this is an error in the code")
<< rx.errorString()
<< rx.patternErrorOffset();
}
QString what = m_advanced_struct.what; QString what = m_advanced_struct.what;
QString replace = m_advanced_struct.replace; QString replace = m_advanced_struct.replace;
if (what == "formula") {properties.m_formula.replace(rx, replace);} if (what == "formula") {properties.m_formula.replace(rx, replace);}
else if (what == "text") {properties.text.replace(rx, replace);} else if (what == "text") {properties.text.replace(rx, replace);}
else if (what == "function") {properties.m_function.replace(rx, replace);} else if (what == "function") {properties.m_function.replace(rx, replace);}
@@ -523,6 +547,6 @@ ConductorProperties SearchAndReplaceWorker::replaceAdvanced(
else if (what == "conductor_color") {properties.m_wire_color.replace(rx, replace);} else if (what == "conductor_color") {properties.m_wire_color.replace(rx, replace);}
else if (what == "conductor_section") {properties.m_wire_section.replace(rx, replace);} else if (what == "conductor_section") {properties.m_wire_section.replace(rx, replace);}
} }
return properties; return properties;
} }

View File

@@ -1,17 +1,17 @@
/* /*
Copyright 2006-2020 The QElectroTech Team Copyright 2006-2020 The QElectroTech Team
This file is part of QElectroTech. This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify QElectroTech is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or the Free Software Foundation, either version 2 of the License, or
(at your option) any later version. (at your option) any later version.
QElectroTech is distributed in the hope that it will be useful, QElectroTech is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>. along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
*/ */
@@ -61,7 +61,7 @@ SearchAndReplaceWidget::SearchAndReplaceWidget(QWidget *parent) :
setHideAdvanced(true); setHideAdvanced(true);
setUpTreeItems(); setUpTreeItems();
connect(ui->m_search_le, &QLineEdit::textEdited, connect(ui->m_search_le, &QLineEdit::textEdited,
this, &SearchAndReplaceWidget::search); this, &SearchAndReplaceWidget::search);
} }
@@ -99,7 +99,7 @@ bool SearchAndReplaceWidget::event(QEvent *event)
fillItemsList(); fillItemsList();
m_root_qtwi->setExpanded(true); m_root_qtwi->setExpanded(true);
} }
return QWidget::event(event); return QWidget::event(event);
} }
@@ -112,25 +112,25 @@ void SearchAndReplaceWidget::clear()
{ {
disconnect(ui->m_tree_widget, &QTreeWidget::itemChanged, disconnect(ui->m_tree_widget, &QTreeWidget::itemChanged,
this, &SearchAndReplaceWidget::itemChanged); this, &SearchAndReplaceWidget::itemChanged);
qDeleteAll(m_diagram_hash.keys()); qDeleteAll(m_diagram_hash.keys());
m_diagram_hash.clear(); m_diagram_hash.clear();
qDeleteAll(m_element_hash.keys()); qDeleteAll(m_element_hash.keys());
m_element_hash.clear(); m_element_hash.clear();
qDeleteAll(m_text_hash.keys()); qDeleteAll(m_text_hash.keys());
m_text_hash.clear(); m_text_hash.clear();
qDeleteAll(m_conductor_hash.keys()); qDeleteAll(m_conductor_hash.keys());
m_conductor_hash.clear(); m_conductor_hash.clear();
for (QTreeWidgetItem *qtwi : m_category_qtwi) for (QTreeWidgetItem *qtwi : m_category_qtwi)
qtwi->setHidden(false); qtwi->setHidden(false);
ui->m_tree_widget->collapseAll(); ui->m_tree_widget->collapseAll();
ui->m_tree_widget->clearSelection(); ui->m_tree_widget->clearSelection();
ui->m_search_le->clear(); ui->m_search_le->clear();
ui->m_replace_le->clear(); ui->m_replace_le->clear();
updateNextPreviousButtons(); updateNextPreviousButtons();
@@ -157,62 +157,62 @@ void SearchAndReplaceWidget::setUpTreeItems()
m_root_qtwi->setText(0, tr("Correspondance :")); m_root_qtwi->setText(0, tr("Correspondance :"));
m_root_qtwi->setCheckState(0, Qt::Checked); m_root_qtwi->setCheckState(0, Qt::Checked);
m_category_qtwi.append(m_root_qtwi); m_category_qtwi.append(m_root_qtwi);
m_folio_qtwi = new QTreeWidgetItem(m_root_qtwi); m_folio_qtwi = new QTreeWidgetItem(m_root_qtwi);
m_folio_qtwi->setIcon(0, QET::Icons::Diagram); m_folio_qtwi->setIcon(0, QET::Icons::Diagram);
m_folio_qtwi->setText(0, tr("Folios")); m_folio_qtwi->setText(0, tr("Folios"));
m_folio_qtwi->setCheckState(0, Qt::Checked); m_folio_qtwi->setCheckState(0, Qt::Checked);
m_category_qtwi.append(m_folio_qtwi); m_category_qtwi.append(m_folio_qtwi);
m_indi_text_qtwi = new QTreeWidgetItem(m_root_qtwi); m_indi_text_qtwi = new QTreeWidgetItem(m_root_qtwi);
m_indi_text_qtwi->setIcon(0, QET::Icons::PartText); m_indi_text_qtwi->setIcon(0, QET::Icons::PartText);
m_indi_text_qtwi->setText(0, tr("Champs texte")); m_indi_text_qtwi->setText(0, tr("Champs texte"));
m_indi_text_qtwi->setCheckState(0, Qt::Checked); m_indi_text_qtwi->setCheckState(0, Qt::Checked);
m_category_qtwi.append(m_indi_text_qtwi); m_category_qtwi.append(m_indi_text_qtwi);
m_elements_qtwi = new QTreeWidgetItem(m_root_qtwi); m_elements_qtwi = new QTreeWidgetItem(m_root_qtwi);
m_elements_qtwi->setIcon(0, QET::Icons::Element); m_elements_qtwi->setIcon(0, QET::Icons::Element);
m_elements_qtwi->setText(0, tr("Eléments")); m_elements_qtwi->setText(0, tr("Eléments"));
m_elements_qtwi->setCheckState(0, Qt::Checked); m_elements_qtwi->setCheckState(0, Qt::Checked);
m_category_qtwi.append(m_elements_qtwi); m_category_qtwi.append(m_elements_qtwi);
m_simple_elmt_qtwi = new QTreeWidgetItem(m_elements_qtwi); m_simple_elmt_qtwi = new QTreeWidgetItem(m_elements_qtwi);
m_simple_elmt_qtwi->setText(0, tr("Eléments simple")); m_simple_elmt_qtwi->setText(0, tr("Eléments simple"));
m_simple_elmt_qtwi->setIcon(0, QET::Icons::Element); m_simple_elmt_qtwi->setIcon(0, QET::Icons::Element);
m_simple_elmt_qtwi->setCheckState(0, Qt::Checked); m_simple_elmt_qtwi->setCheckState(0, Qt::Checked);
m_qtwi_elmts.append(m_simple_elmt_qtwi); m_qtwi_elmts.append(m_simple_elmt_qtwi);
m_master_elmt_qtwi= new QTreeWidgetItem(m_elements_qtwi); m_master_elmt_qtwi= new QTreeWidgetItem(m_elements_qtwi);
m_master_elmt_qtwi->setText(0, tr("Eléments maître")); m_master_elmt_qtwi->setText(0, tr("Eléments maître"));
m_master_elmt_qtwi->setIcon(0, QET::Icons::ElementMaster); m_master_elmt_qtwi->setIcon(0, QET::Icons::ElementMaster);
m_master_elmt_qtwi->setCheckState(0, Qt::Checked); m_master_elmt_qtwi->setCheckState(0, Qt::Checked);
m_qtwi_elmts.append(m_master_elmt_qtwi); m_qtwi_elmts.append(m_master_elmt_qtwi);
m_slave_elmt_qtwi = new QTreeWidgetItem(m_elements_qtwi); m_slave_elmt_qtwi = new QTreeWidgetItem(m_elements_qtwi);
m_slave_elmt_qtwi->setText(0, tr("Eléments esclave")); m_slave_elmt_qtwi->setText(0, tr("Eléments esclave"));
m_slave_elmt_qtwi->setIcon(0, QET::Icons::ElementSlave); m_slave_elmt_qtwi->setIcon(0, QET::Icons::ElementSlave);
m_slave_elmt_qtwi->setCheckState(0, Qt::Checked); m_slave_elmt_qtwi->setCheckState(0, Qt::Checked);
m_qtwi_elmts.append(m_slave_elmt_qtwi); m_qtwi_elmts.append(m_slave_elmt_qtwi);
m_report_elmt_qtwi = new QTreeWidgetItem(m_elements_qtwi); m_report_elmt_qtwi = new QTreeWidgetItem(m_elements_qtwi);
m_report_elmt_qtwi->setText(0, tr("Eléments report de folio")); m_report_elmt_qtwi->setText(0, tr("Eléments report de folio"));
m_report_elmt_qtwi->setIcon(0, QET::Icons::FolioXrefComing); m_report_elmt_qtwi->setIcon(0, QET::Icons::FolioXrefComing);
m_report_elmt_qtwi->setCheckState(0, Qt::Checked); m_report_elmt_qtwi->setCheckState(0, Qt::Checked);
m_qtwi_elmts.append(m_report_elmt_qtwi); m_qtwi_elmts.append(m_report_elmt_qtwi);
m_terminal_elmt_qtwi = new QTreeWidgetItem(m_elements_qtwi); m_terminal_elmt_qtwi = new QTreeWidgetItem(m_elements_qtwi);
m_terminal_elmt_qtwi->setText(0, tr("Eléments bornier")); m_terminal_elmt_qtwi->setText(0, tr("Eléments bornier"));
m_terminal_elmt_qtwi->setIcon(0, QET::Icons::ElementTerminal); m_terminal_elmt_qtwi->setIcon(0, QET::Icons::ElementTerminal);
m_terminal_elmt_qtwi->setCheckState(0, Qt::Checked); m_terminal_elmt_qtwi->setCheckState(0, Qt::Checked);
m_qtwi_elmts.append(m_terminal_elmt_qtwi); m_qtwi_elmts.append(m_terminal_elmt_qtwi);
m_category_qtwi.append(m_qtwi_elmts); m_category_qtwi.append(m_qtwi_elmts);
m_conductor_qtwi = new QTreeWidgetItem(m_root_qtwi); m_conductor_qtwi = new QTreeWidgetItem(m_root_qtwi);
m_conductor_qtwi->setIcon(0, QET::Icons::Conductor); m_conductor_qtwi->setIcon(0, QET::Icons::Conductor);
m_conductor_qtwi->setText(0, tr("Conducteurs")); m_conductor_qtwi->setText(0, tr("Conducteurs"));
m_conductor_qtwi->setCheckState(0, Qt::Checked); m_conductor_qtwi->setCheckState(0, Qt::Checked);
m_category_qtwi.append(m_conductor_qtwi); m_category_qtwi.append(m_conductor_qtwi);
updateNextPreviousButtons(); updateNextPreviousButtons();
} }
@@ -235,10 +235,10 @@ void SearchAndReplaceWidget::fillItemsList()
{ {
disconnect(ui->m_tree_widget, &QTreeWidget::itemChanged, disconnect(ui->m_tree_widget, &QTreeWidget::itemChanged,
this, &SearchAndReplaceWidget::itemChanged); this, &SearchAndReplaceWidget::itemChanged);
qDeleteAll(m_element_hash.keys()); qDeleteAll(m_element_hash.keys());
m_element_hash.clear(); m_element_hash.clear();
QETProject *project_ = m_editor->currentProject(); QETProject *project_ = m_editor->currentProject();
if (!project_) if (!project_)
{ {
@@ -249,21 +249,21 @@ void SearchAndReplaceWidget::fillItemsList()
connect(project_, &QETProject::destroyed, this, connect(project_, &QETProject::destroyed, this,
&SearchAndReplaceWidget::on_m_reload_pb_clicked); &SearchAndReplaceWidget::on_m_reload_pb_clicked);
DiagramContent dc; DiagramContent dc;
for (Diagram *diagram : project_->diagrams()) for (Diagram *diagram : project_->diagrams())
{ {
QString str; QString str;
QSettings settings; QSettings settings;
if (settings.value("genericpanel/folio", true).toBool()) { if (settings.value("genericpanel/folio", true).toBool()) {
str = diagram->border_and_titleblock.finalfolio(); str = diagram->border_and_titleblock.finalfolio();
} else { } else {
str = QString::number(diagram->folioIndex()); str = QString::number(diagram->folioIndex());
} }
str.append(" " + diagram->title()); str.append(" " + diagram->title());
QTreeWidgetItem *qtwi = new QTreeWidgetItem(m_folio_qtwi); QTreeWidgetItem *qtwi = new QTreeWidgetItem(m_folio_qtwi);
qtwi->setText(0, str); qtwi->setText(0, str);
qtwi->setData(0, Qt::UserRole, searchTerms(diagram)); qtwi->setData(0, Qt::UserRole, searchTerms(diagram));
@@ -271,10 +271,10 @@ void SearchAndReplaceWidget::fillItemsList()
m_diagram_hash.insert(qtwi, QPointer<Diagram>(diagram)); m_diagram_hash.insert(qtwi, QPointer<Diagram>(diagram));
dc += DiagramContent(diagram, false); dc += DiagramContent(diagram, false);
} }
for (Element *elmt : dc.m_elements) for (Element *elmt : dc.m_elements)
addElement(elmt); addElement(elmt);
//Sort child of each "element type" tree item. //Sort child of each "element type" tree item.
//we hide, "element type" tree item, if they do not have children //we hide, "element type" tree item, if they do not have children
for(QTreeWidgetItem *qtwi : m_qtwi_elmts) for(QTreeWidgetItem *qtwi : m_qtwi_elmts)
@@ -282,7 +282,7 @@ void SearchAndReplaceWidget::fillItemsList()
qtwi->sortChildren(0, Qt::AscendingOrder); qtwi->sortChildren(0, Qt::AscendingOrder);
qtwi->setHidden(qtwi->childCount() ? false : true); qtwi->setHidden(qtwi->childCount() ? false : true);
} }
for (IndependentTextItem *iti : dc.m_text_fields) for (IndependentTextItem *iti : dc.m_text_fields)
{ {
QTreeWidgetItem *qtwi = new QTreeWidgetItem(m_indi_text_qtwi); QTreeWidgetItem *qtwi = new QTreeWidgetItem(m_indi_text_qtwi);
@@ -302,7 +302,7 @@ void SearchAndReplaceWidget::fillItemsList()
m_conductor_hash.insert(qtwi, QPointer<Conductor>(c)); m_conductor_hash.insert(qtwi, QPointer<Conductor>(c));
} }
m_conductor_qtwi->sortChildren(0, Qt::AscendingOrder); m_conductor_qtwi->sortChildren(0, Qt::AscendingOrder);
updateNextPreviousButtons(); updateNextPreviousButtons();
connect(ui->m_tree_widget, &QTreeWidget::itemChanged, connect(ui->m_tree_widget, &QTreeWidget::itemChanged,
this, &SearchAndReplaceWidget::itemChanged); this, &SearchAndReplaceWidget::itemChanged);
@@ -340,7 +340,7 @@ void SearchAndReplaceWidget::addElement(Element *element)
} }
QTreeWidgetItem *qtwi = new QTreeWidgetItem(parent); QTreeWidgetItem *qtwi = new QTreeWidgetItem(parent);
m_element_hash.insert(qtwi, QPointer<Element>(element)); m_element_hash.insert(qtwi, QPointer<Element>(element));
QString str; QString str;
str += element->elementInformations().value("label").toString(); str += element->elementInformations().value("label").toString();
if(!str.isEmpty()) if(!str.isEmpty())
@@ -365,12 +365,12 @@ void SearchAndReplaceWidget::search()
for (QTreeWidgetItemIterator it(m_root_qtwi) ; *it ; ++it) { for (QTreeWidgetItemIterator it(m_root_qtwi) ; *it ; ++it) {
(*it)->setHidden(false); (*it)->setHidden(false);
} }
for (QTreeWidgetItem *item : m_category_qtwi) { for (QTreeWidgetItem *item : m_category_qtwi) {
item->setExpanded(false); item->setExpanded(false);
} }
m_root_qtwi->setExpanded(true); m_root_qtwi->setExpanded(true);
ui->m_tree_widget->setCurrentItem(m_root_qtwi); ui->m_tree_widget->setCurrentItem(m_root_qtwi);
ui->m_search_le->setPalette(QPalette()); ui->m_search_le->setPalette(QPalette());
} }
@@ -379,9 +379,9 @@ void SearchAndReplaceWidget::search()
for (QTreeWidgetItemIterator it(m_root_qtwi) ; *it ; ++it) { for (QTreeWidgetItemIterator it(m_root_qtwi) ; *it ; ++it) {
(*it)->setHidden(true); (*it)->setHidden(true);
} }
bool match = false; bool match = false;
//Extended search, //Extended search,
//on each string stored in column 0 with role : UserRole //on each string stored in column 0 with role : UserRole
QList<QTreeWidgetItem *> qtwi_list; QList<QTreeWidgetItem *> qtwi_list;
@@ -393,7 +393,7 @@ void SearchAndReplaceWidget::search()
{ {
QStringList list = qtwi->data(0, Qt::UserRole) QStringList list = qtwi->data(0, Qt::UserRole)
.toStringList(); .toStringList();
if(ui->m_mode_cb->currentIndex() == 0) if(ui->m_mode_cb->currentIndex() == 0)
{ {
//Contain string //Contain string
@@ -407,6 +407,13 @@ void SearchAndReplaceWidget::search()
{ {
//entire word //entire word
QRegularExpression rx("\\b" + str + "\\b"); QRegularExpression rx("\\b" + str + "\\b");
if (!rx.isValid())
{
qWarning() <<QObject::tr("this is an error in the code")
<< rx.errorString()
<< rx.patternErrorOffset();
return;
}
if (!ui->m_case_sensitive_cb->isChecked()) { if (!ui->m_case_sensitive_cb->isChecked()) {
rx.setPatternOptions( rx.setPatternOptions(
QRegularExpression::CaseInsensitiveOption); QRegularExpression::CaseInsensitiveOption);
@@ -420,13 +427,13 @@ void SearchAndReplaceWidget::search()
setVisibleAllParents(qtwi); setVisibleAllParents(qtwi);
} }
} }
QPalette background = ui->m_search_le->palette(); QPalette background = ui->m_search_le->palette();
background.setColor(QPalette::Base, match background.setColor(QPalette::Base, match
? QColor("#E0FFF0") ? QColor("#E0FFF0")
: QColor("#FFE0EF")); : QColor("#FFE0EF"));
ui->m_search_le->setPalette(background); ui->m_search_le->setPalette(background);
//Go to the first occurence //Go to the first occurence
ui->m_tree_widget->setCurrentItem(m_root_qtwi); ui->m_tree_widget->setCurrentItem(m_root_qtwi);
on_m_next_pb_clicked(); on_m_next_pb_clicked();
@@ -467,11 +474,11 @@ QTreeWidgetItem *SearchAndReplaceWidget::nextItem(
if (!item) { if (!item) {
qtwi = ui->m_tree_widget->currentItem(); qtwi = ui->m_tree_widget->currentItem();
} }
if (!qtwi) { if (!qtwi) {
qtwi = m_root_qtwi; qtwi = m_root_qtwi;
} }
QTreeWidgetItemIterator it(qtwi, flags); QTreeWidgetItemIterator it(qtwi, flags);
++it; ++it;
@@ -500,13 +507,13 @@ QTreeWidgetItem *SearchAndReplaceWidget::previousItem(
if (!item) { if (!item) {
qtwi = ui->m_tree_widget->currentItem(); qtwi = ui->m_tree_widget->currentItem();
} }
if (!qtwi) { if (!qtwi) {
qtwi = m_root_qtwi; qtwi = m_root_qtwi;
} }
QTreeWidgetItemIterator it(qtwi, flags); QTreeWidgetItemIterator it(qtwi, flags);
--it; --it;
QTreeWidgetItem *previous_ = *it; QTreeWidgetItem *previous_ = *it;
if (previous_) { if (previous_) {
@@ -531,7 +538,7 @@ void SearchAndReplaceWidget::updateNextPreviousButtons()
ui->m_previous_pb->setDisabled(true); ui->m_previous_pb->setDisabled(true);
return; return;
} }
QTreeWidgetItem *next_ = item_; QTreeWidgetItem *next_ = item_;
do do
{ {
@@ -547,7 +554,7 @@ void SearchAndReplaceWidget::updateNextPreviousButtons()
break; break;
} }
} while (m_category_qtwi.contains(next_)); } while (m_category_qtwi.contains(next_));
QTreeWidgetItem *previous_ = item_; QTreeWidgetItem *previous_ = item_;
do do
{ {
@@ -577,10 +584,10 @@ void SearchAndReplaceWidget::itemChanged(QTreeWidgetItem *item, int column)
{ {
Q_UNUSED(column); Q_UNUSED(column);
ui->m_tree_widget->blockSignals(true); ui->m_tree_widget->blockSignals(true);
setChildCheckState(item, item->checkState(0)); setChildCheckState(item, item->checkState(0));
updateParentCheckState(item); updateParentCheckState(item);
ui->m_tree_widget->blockSignals(false); ui->m_tree_widget->blockSignals(false);
} }
@@ -613,14 +620,14 @@ void SearchAndReplaceWidget::updateParentCheckState(QTreeWidgetItem *item,
bool all_parents) bool all_parents)
{ {
QTreeWidgetItem *parent = item->parent(); QTreeWidgetItem *parent = item->parent();
if (!parent) { if (!parent) {
parent = item; parent = item;
} }
int check=0, int check=0,
partially=0; partially=0;
for (int i=0 ; i<parent->childCount() ; ++i) for (int i=0 ; i<parent->childCount() ; ++i)
{ {
switch (parent->child(i)->checkState(0)) { switch (parent->child(i)->checkState(0)) {
@@ -644,7 +651,7 @@ void SearchAndReplaceWidget::updateParentCheckState(QTreeWidgetItem *item,
else { else {
parent->setCheckState(0, Qt::Unchecked); parent->setCheckState(0, Qt::Unchecked);
} }
if (all_parents && item->parent()) { if (all_parents && item->parent()) {
updateParentCheckState(parent, all_parents); updateParentCheckState(parent, all_parents);
} }
@@ -659,7 +666,7 @@ void SearchAndReplaceWidget::activateNextChecked()
//Next button is disabled, so there is not a next item. //Next button is disabled, so there is not a next item.
if (!ui->m_next_pb->isEnabled()) if (!ui->m_next_pb->isEnabled())
return; return;
do { do {
on_m_next_pb_clicked(); on_m_next_pb_clicked();
} while ((ui->m_tree_widget->currentItem()->checkState(0) } while ((ui->m_tree_widget->currentItem()->checkState(0)
@@ -674,7 +681,7 @@ void SearchAndReplaceWidget::activateNextChecked()
QList<Diagram *> SearchAndReplaceWidget::selectedDiagram() const QList<Diagram *> SearchAndReplaceWidget::selectedDiagram() const
{ {
QList <Diagram *> diagram_list; QList <Diagram *> diagram_list;
for (QTreeWidgetItem *qtwi : m_diagram_hash.keys()) for (QTreeWidgetItem *qtwi : m_diagram_hash.keys())
{ {
if (!qtwi->isHidden() && qtwi->checkState(0) == Qt::Checked) if (!qtwi->isHidden() && qtwi->checkState(0) == Qt::Checked)
@@ -685,7 +692,7 @@ QList<Diagram *> SearchAndReplaceWidget::selectedDiagram() const
} }
} }
} }
return diagram_list; return diagram_list;
} }
@@ -696,7 +703,7 @@ QList<Diagram *> SearchAndReplaceWidget::selectedDiagram() const
QList<Element *> SearchAndReplaceWidget::selectedElement() const QList<Element *> SearchAndReplaceWidget::selectedElement() const
{ {
QList <Element *> element_list; QList <Element *> element_list;
for (QTreeWidgetItem *qtwi : m_element_hash.keys()) for (QTreeWidgetItem *qtwi : m_element_hash.keys())
{ {
if (!qtwi->isHidden() && qtwi->checkState(0) == Qt::Checked) if (!qtwi->isHidden() && qtwi->checkState(0) == Qt::Checked)
@@ -707,7 +714,7 @@ QList<Element *> SearchAndReplaceWidget::selectedElement() const
} }
} }
} }
return element_list; return element_list;
} }
@@ -718,7 +725,7 @@ QList<Element *> SearchAndReplaceWidget::selectedElement() const
QList<Conductor *> SearchAndReplaceWidget::selectedConductor() const QList<Conductor *> SearchAndReplaceWidget::selectedConductor() const
{ {
QList <Conductor *> conductor_list; QList <Conductor *> conductor_list;
for (QTreeWidgetItem *qtwi : m_conductor_hash.keys()) for (QTreeWidgetItem *qtwi : m_conductor_hash.keys())
{ {
if (!qtwi->isHidden() && qtwi->checkState(0) == Qt::Checked) if (!qtwi->isHidden() && qtwi->checkState(0) == Qt::Checked)
@@ -729,7 +736,7 @@ QList<Conductor *> SearchAndReplaceWidget::selectedConductor() const
} }
} }
} }
return conductor_list; return conductor_list;
} }
@@ -741,7 +748,7 @@ QList<Conductor *> SearchAndReplaceWidget::selectedConductor() const
QList<IndependentTextItem *> SearchAndReplaceWidget::selectedText() const QList<IndependentTextItem *> SearchAndReplaceWidget::selectedText() const
{ {
QList <IndependentTextItem *> text_list; QList <IndependentTextItem *> text_list;
for(QTreeWidgetItem *qtwi : m_text_hash.keys()) for(QTreeWidgetItem *qtwi : m_text_hash.keys())
{ {
if (!qtwi->isHidden() && qtwi->checkState(0) == Qt::Checked) if (!qtwi->isHidden() && qtwi->checkState(0) == Qt::Checked)
@@ -753,7 +760,7 @@ QList<IndependentTextItem *> SearchAndReplaceWidget::selectedText() const
} }
} }
} }
return text_list; return text_list;
} }
@@ -778,7 +785,7 @@ QStringList SearchAndReplaceWidget::searchTerms(Diagram *diagram)
for (QString key : prop.context.keys()) { for (QString key : prop.context.keys()) {
list.append(prop.context.value(key).toString()); list.append(prop.context.value(key).toString());
} }
return list; return list;
} }
@@ -798,7 +805,7 @@ QStringList SearchAndReplaceWidget::searchTerms(Element *element)
list.append(str); list.append(str);
} }
} }
for (DynamicElementTextItem *deti : element->dynamicTextItems()) for (DynamicElementTextItem *deti : element->dynamicTextItems())
{ {
if (deti->textFrom() if (deti->textFrom()
@@ -811,7 +818,7 @@ QStringList SearchAndReplaceWidget::searchTerms(Element *element)
for (ElementTextItemGroup *group : element->textGroups()) for (ElementTextItemGroup *group : element->textGroups())
{ {
list.append(group->name()); list.append(group->name());
for (DynamicElementTextItem *deti : group->texts()) { for (DynamicElementTextItem *deti : group->texts()) {
if (deti->textFrom() if (deti->textFrom()
== DynamicElementTextItem::UserText == DynamicElementTextItem::UserText
@@ -821,7 +828,7 @@ QStringList SearchAndReplaceWidget::searchTerms(Element *element)
} }
} }
} }
return list; return list;
} }
@@ -834,13 +841,13 @@ QStringList SearchAndReplaceWidget::searchTerms(Conductor *conductor)
{ {
QStringList list; QStringList list;
ConductorProperties properties = conductor->properties(); ConductorProperties properties = conductor->properties();
list.append(properties.text); list.append(properties.text);
list.append(properties.m_function); list.append(properties.m_function);
list.append(properties.m_tension_protocol); list.append(properties.m_tension_protocol);
list.append(properties.m_wire_color); list.append(properties.m_wire_color);
list.append(properties.m_wire_section); list.append(properties.m_wire_section);
return list; return list;
} }
@@ -867,7 +874,7 @@ void SearchAndReplaceWidget::on_m_tree_widget_itemDoubleClicked(
int column) int column)
{ {
Q_UNUSED(column) Q_UNUSED(column)
if (m_diagram_hash.keys().contains(item)) if (m_diagram_hash.keys().contains(item))
{ {
QPointer<Diagram> diagram = m_diagram_hash.value(item); QPointer<Diagram> diagram = m_diagram_hash.value(item);
@@ -911,7 +918,7 @@ void SearchAndReplaceWidget::on_m_reload_pb_clicked()
m_last_selected.data()->setSelected(false); m_last_selected.data()->setSelected(false);
m_last_selected.clear(); m_last_selected.clear();
} }
ui->m_search_le->setFocus(); ui->m_search_le->setFocus();
fillItemsList(); fillItemsList();
m_root_qtwi->setExpanded(true); m_root_qtwi->setExpanded(true);
@@ -922,14 +929,14 @@ void SearchAndReplaceWidget::on_m_tree_widget_currentItemChanged(
QTreeWidgetItem *previous) QTreeWidgetItem *previous)
{ {
Q_UNUSED(previous); Q_UNUSED(previous);
if(m_highlighted_element) { if(m_highlighted_element) {
m_highlighted_element.data()->setHighlighted(false); m_highlighted_element.data()->setHighlighted(false);
} }
if (m_last_selected) { if (m_last_selected) {
m_last_selected.data()->setSelected(false); m_last_selected.data()->setSelected(false);
} }
if (m_element_hash.keys().contains(current)) if (m_element_hash.keys().contains(current))
{ {
QPointer<Element> elmt = m_element_hash.value(current); QPointer<Element> elmt = m_element_hash.value(current);
@@ -942,7 +949,7 @@ void SearchAndReplaceWidget::on_m_tree_widget_currentItemChanged(
else if (m_text_hash.keys().contains(current)) else if (m_text_hash.keys().contains(current))
{ {
QPointer<IndependentTextItem> text = m_text_hash.value(current); QPointer<IndependentTextItem> text = m_text_hash.value(current);
if (text) if (text)
{ {
text.data()->setSelected(true); text.data()->setSelected(true);
m_last_selected = text; m_last_selected = text;
@@ -957,12 +964,12 @@ void SearchAndReplaceWidget::on_m_tree_widget_currentItemChanged(
m_last_selected = cond; m_last_selected = cond;
} }
} }
updateNextPreviousButtons(); updateNextPreviousButtons();
if (!current) { if (!current) {
return; return;
} }
if (current->checkState(0) == Qt::Checked if (current->checkState(0) == Qt::Checked
&& !m_category_qtwi.contains(current)) { && !m_category_qtwi.contains(current)) {
ui->m_replace_pb->setEnabled(true); ui->m_replace_pb->setEnabled(true);
@@ -974,7 +981,7 @@ void SearchAndReplaceWidget::on_m_tree_widget_currentItemChanged(
void SearchAndReplaceWidget::on_m_next_pb_clicked() void SearchAndReplaceWidget::on_m_next_pb_clicked()
{ {
QTreeWidgetItem *item = nullptr; QTreeWidgetItem *item = nullptr;
do do
{ {
item = nextItem(nullptr, QTreeWidgetItemIterator::NotHidden); item = nextItem(nullptr, QTreeWidgetItemIterator::NotHidden);
@@ -984,16 +991,16 @@ void SearchAndReplaceWidget::on_m_next_pb_clicked()
return; return;
} }
} while (m_category_qtwi.contains(item)); } while (m_category_qtwi.contains(item));
ui->m_tree_widget->setCurrentItem(item); ui->m_tree_widget->setCurrentItem(item);
ui->m_tree_widget->scrollToItem(item); ui->m_tree_widget->scrollToItem(item);
on_m_tree_widget_itemDoubleClicked(item, 0); on_m_tree_widget_itemDoubleClicked(item, 0);
} }
void SearchAndReplaceWidget::on_m_previous_pb_clicked() void SearchAndReplaceWidget::on_m_previous_pb_clicked()
{ {
QTreeWidgetItem *item = nullptr; QTreeWidgetItem *item = nullptr;
do do
{ {
item = previousItem(nullptr, item = previousItem(nullptr,
@@ -1014,7 +1021,7 @@ void SearchAndReplaceWidget::on_m_previous_pb_clicked()
return; return;
} }
} while (m_category_qtwi.contains(item)); } while (m_category_qtwi.contains(item));
ui->m_tree_widget->setCurrentItem(item); ui->m_tree_widget->setCurrentItem(item);
ui->m_tree_widget->scrollToItem(item); ui->m_tree_widget->scrollToItem(item);
on_m_tree_widget_itemDoubleClicked(item, 0); on_m_tree_widget_itemDoubleClicked(item, 0);
@@ -1024,7 +1031,7 @@ void SearchAndReplaceWidget::on_m_folio_pb_clicked()
{ {
ReplaceFolioDialog *dialog = new ReplaceFolioDialog(this); ReplaceFolioDialog *dialog = new ReplaceFolioDialog(this);
dialog->setTitleBlockProperties(m_worker.m_titleblock_properties); dialog->setTitleBlockProperties(m_worker.m_titleblock_properties);
int result = dialog->exec(); int result = dialog->exec();
if (result == QDialogButtonBox::AcceptRole) if (result == QDialogButtonBox::AcceptRole)
{ {
@@ -1053,7 +1060,7 @@ void SearchAndReplaceWidget::on_m_folio_pb_clicked()
*/ */
void SearchAndReplaceWidget::on_m_replace_pb_clicked() void SearchAndReplaceWidget::on_m_replace_pb_clicked()
{ {
QTreeWidgetItem *qtwi = ui->m_tree_widget->currentItem(); QTreeWidgetItem *qtwi = ui->m_tree_widget->currentItem();
if(!qtwi) { if(!qtwi) {
return; return;
} }
@@ -1085,7 +1092,7 @@ void SearchAndReplaceWidget::on_m_replace_pb_clicked()
if (t) { if (t) {
m_worker.replaceIndiText(t.data()); m_worker.replaceIndiText(t.data());
} }
} }
else if (ui->m_conductor_pb->text().endsWith(tr(" [édité]")) && else if (ui->m_conductor_pb->text().endsWith(tr(" [édité]")) &&
m_conductor_hash.keys().contains(qtwi)) m_conductor_hash.keys().contains(qtwi))
@@ -1095,7 +1102,7 @@ void SearchAndReplaceWidget::on_m_replace_pb_clicked()
m_worker.replaceConductor(c.data()); m_worker.replaceConductor(c.data());
} }
} }
//Replace advanced //Replace advanced
if (ui->m_advanced_replace_pb->text().endsWith(tr(" [édité]"))) if (ui->m_advanced_replace_pb->text().endsWith(tr(" [édité]")))
{ {
@@ -1103,7 +1110,7 @@ void SearchAndReplaceWidget::on_m_replace_pb_clicked()
QList <Element *>el; QList <Element *>el;
QList <IndependentTextItem *>tl; QList <IndependentTextItem *>tl;
QList <Conductor *>cl; QList <Conductor *>cl;
if (m_diagram_hash.keys().contains(qtwi)) if (m_diagram_hash.keys().contains(qtwi))
{ {
QPointer<Diagram> d = QPointer<Diagram> d =
@@ -1136,11 +1143,11 @@ void SearchAndReplaceWidget::on_m_replace_pb_clicked()
cl.append(c.data()); cl.append(c.data());
} }
} }
m_worker.replaceAdvanced(dl, el, tl, cl); m_worker.replaceAdvanced(dl, el, tl, cl);
} }
} }
activateNextChecked(); activateNextChecked();
ui->m_replace_pb->setEnabled(ui->m_next_pb->isEnabled()); ui->m_replace_pb->setEnabled(ui->m_next_pb->isEnabled());
} }
@@ -1170,8 +1177,8 @@ void SearchAndReplaceWidget::on_m_replace_all_pb_clicked()
selectedElement(), selectedElement(),
selectedText(), selectedText(),
selectedConductor()); selectedConductor());
} }
//Change was made, we reload the panel //Change was made, we reload the panel
//and search again to keep up to date the tree widget //and search again to keep up to date the tree widget
//and the match item of search //and the match item of search
@@ -1186,7 +1193,7 @@ void SearchAndReplaceWidget::on_m_element_pb_clicked()
ReplaceElementDialog *dialog = new ReplaceElementDialog( ReplaceElementDialog *dialog = new ReplaceElementDialog(
m_worker.m_element_context, m_worker.m_element_context,
this); this);
int result = dialog->exec(); int result = dialog->exec();
if (result == QDialogButtonBox::AcceptRole) if (result == QDialogButtonBox::AcceptRole)
{ {
@@ -1215,7 +1222,7 @@ void SearchAndReplaceWidget::on_m_element_pb_clicked()
*/ */
void SearchAndReplaceWidget::on_m_mode_cb_currentIndexChanged(int index) void SearchAndReplaceWidget::on_m_mode_cb_currentIndexChanged(int index)
{ {
Q_UNUSED(index); Q_UNUSED(index);
search(); search();
} }
@@ -1240,7 +1247,7 @@ void SearchAndReplaceWidget::on_m_conductor_pb_clicked()
m_worker.m_conductor_properties, m_worker.m_conductor_properties,
this); this);
int result = dialog->exec(); int result = dialog->exec();
if (result == QDialogButtonBox::AcceptRole) if (result == QDialogButtonBox::AcceptRole)
{ {
QString text = ui->m_conductor_pb->text(); QString text = ui->m_conductor_pb->text();
@@ -1272,7 +1279,7 @@ void SearchAndReplaceWidget::on_m_advanced_replace_pb_clicked()
m_worker.m_advanced_struct, m_worker.m_advanced_struct,
this); this);
int result = dialog->exec(); int result = dialog->exec();
if (result == QDialogButtonBox::AcceptRole) if (result == QDialogButtonBox::AcceptRole)
{ {
QString text = ui->m_advanced_replace_pb->text(); QString text = ui->m_advanced_replace_pb->text();

View File

@@ -574,7 +574,7 @@ void ElementPictureFactory::setPainterStyle(const QDomElement &dom, QPainter &pa
QRegularExpression rx("^(?<name>[a-z-]+):(?<value>[a-z-]+)$"); QRegularExpression rx("^(?<name>[a-z-]+):(?<value>[a-z-]+)$");
if (!rx.isValid()) if (!rx.isValid())
{ {
qWarning() <<"this is an error in the code" qWarning() <<QObject::tr("this is an error in the code")
<< rx.errorString() << rx.errorString()
<< rx.patternErrorOffset(); << rx.patternErrorOffset();
return; return;

View File

@@ -2109,7 +2109,7 @@ int QETApp::projectIdFromString(const QString &url) {
QRegularExpression::CaseInsensitiveOption); QRegularExpression::CaseInsensitiveOption);
if (!embedded.isValid()) if (!embedded.isValid())
{ {
qWarning() <<"this is an error in the code" qWarning() <<QObject::tr("this is an error in the code")
<< embedded.errorString() << embedded.errorString()
<< embedded.patternErrorOffset(); << embedded.patternErrorOffset();
return(-1); return(-1);

View File

@@ -104,7 +104,7 @@ void TitleBlockTemplateLocation::fromString(const QString &loc_str)
QRegularExpression name_from_url("//*(?<name>.*)"); QRegularExpression name_from_url("//*(?<name>.*)");
if (!name_from_url.isValid()) if (!name_from_url.isValid())
{ {
qWarning() <<"this is an error in the code" qWarning() <<QObject::tr("this is an error in the code")
<< name_from_url.errorString() << name_from_url.errorString()
<< name_from_url.patternErrorOffset(); << name_from_url.patternErrorOffset();
return; return;