From 380de0b4c3ff1ef746632f11c50b4284a142bd20 Mon Sep 17 00:00:00 2001 From: Claveau Joshua Date: Tue, 17 Nov 2020 22:25:01 +0100 Subject: [PATCH] Search and replace widget : minor improvement Fix 1 : when widget is reloaded the categories is not checked, but the child items is. Now all category is checked when reloaded. Fix 2 : the folio number displayed in the widget is wrong (start at 0 instead of 1) --- .../SearchAndReplace/ui/searchandreplacewidget.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/sources/SearchAndReplace/ui/searchandreplacewidget.cpp b/sources/SearchAndReplace/ui/searchandreplacewidget.cpp index 93d96ef77..3b3391751 100644 --- a/sources/SearchAndReplace/ui/searchandreplacewidget.cpp +++ b/sources/SearchAndReplace/ui/searchandreplacewidget.cpp @@ -250,6 +250,16 @@ void SearchAndReplaceWidget::fillItemsList() connect(project_, &QETProject::destroyed, this, &SearchAndReplaceWidget::on_m_reload_pb_clicked); + m_root_qtwi ->setCheckState(0, Qt::Checked); + m_folio_qtwi ->setCheckState(0, Qt::Checked); + m_elements_qtwi ->setCheckState(0, Qt::Checked); + m_simple_elmt_qtwi ->setCheckState(0, Qt::Checked); + m_report_elmt_qtwi ->setCheckState(0, Qt::Checked); + m_master_elmt_qtwi ->setCheckState(0, Qt::Checked); + m_slave_elmt_qtwi ->setCheckState(0, Qt::Checked); + m_terminal_elmt_qtwi->setCheckState(0, Qt::Checked); + m_indi_text_qtwi ->setCheckState(0, Qt::Checked); + m_conductor_qtwi ->setCheckState(0, Qt::Checked); DiagramContent dc; for (Diagram *diagram : project_->diagrams()) @@ -260,7 +270,7 @@ void SearchAndReplaceWidget::fillItemsList() if (settings.value("genericpanel/folio", true).toBool()) { str = diagram->border_and_titleblock.finalfolio(); } else { - str = QString::number(diagram->folioIndex()); + str = QString::number(diagram->folioIndex()+1); } str.append(" " + diagram->title()); @@ -292,6 +302,7 @@ void SearchAndReplaceWidget::fillItemsList() qtwi->setData(0, Qt::UserRole, iti->toPlainText()); m_text_hash.insert(qtwi, QPointer(iti)); } + m_indi_text_qtwi->sortChildren(0, Qt::AscendingOrder); for (Conductor *c : dc.m_potential_conductors)