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

Search and replace widget : folio are now displayed in the search field

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5548 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2018-10-05 07:49:07 +00:00
parent 912901ff6d
commit 0b1382490f
2 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,6 +25,8 @@
#include "independenttextitem.h" #include "independenttextitem.h"
#include "conductor.h" #include "conductor.h"
#include <QSettings>
/** /**
* @brief SearchAndReplaceWidget::SearchAndReplaceWidget * @brief SearchAndReplaceWidget::SearchAndReplaceWidget
* Constructor * Constructor
@@ -87,6 +89,9 @@ void SearchAndReplaceWidget::clear()
{ {
disconnect(ui->m_tree_widget, &QTreeWidget::itemChanged, this, &SearchAndReplaceWidget::itemChanged); disconnect(ui->m_tree_widget, &QTreeWidget::itemChanged, this, &SearchAndReplaceWidget::itemChanged);
qDeleteAll(m_diagram_hash.keys());
m_diagram_hash.clear();
qDeleteAll(m_element_hash.keys()); qDeleteAll(m_element_hash.keys());
m_element_hash.clear(); m_element_hash.clear();
@@ -224,7 +229,23 @@ void SearchAndReplaceWidget::fillItemsList()
DiagramContent dc; DiagramContent dc;
for (Diagram *diagram : project_->diagrams()) { for (Diagram *diagram : project_->diagrams())
{
QString str;
QSettings settings;
if (settings.value("genericpanel/folio", true).toBool()) {
str = diagram->border_and_titleblock.finalfolio();
} else {
str = QString::number(diagram->folioIndex());
}
str.append(" " + diagram->title());
QTreeWidgetItem *qtwi = new QTreeWidgetItem(m_folio_qtwi);
qtwi->setText(0, str);
qtwi->setCheckState(0, Qt::Checked);
m_diagram_hash.insert(qtwi, QPointer<Diagram>(diagram));
dc += DiagramContent(diagram, false); dc += DiagramContent(diagram, false);
} }
@@ -565,7 +586,14 @@ void SearchAndReplaceWidget::on_m_tree_widget_itemDoubleClicked(QTreeWidgetItem
{ {
Q_UNUSED(column); Q_UNUSED(column);
if (m_element_hash.keys().contains(item)) if (m_diagram_hash.keys().contains(item))
{
QPointer<Diagram> diagram = m_diagram_hash.value(item);
if(diagram) {
diagram.data()->showMe();
}
}
else if (m_element_hash.keys().contains(item))
{ {
QPointer<Element> elmt = m_element_hash.value(item); QPointer<Element> elmt = m_element_hash.value(item);
if (elmt) { if (elmt) {

1
sources/SearchAndReplace/ui/searchandreplacewidget.h
View File

@@ -87,6 +87,7 @@ class SearchAndReplaceWidget : public QWidget
QHash<QTreeWidgetItem *, QPointer <Conductor>> m_conductor_hash; QHash<QTreeWidgetItem *, QPointer <Conductor>> m_conductor_hash;
QPointer<Element> m_highlighted_element; QPointer<Element> m_highlighted_element;
QPointer<QGraphicsObject> m_last_selected; QPointer<QGraphicsObject> m_last_selected;
QHash<QTreeWidgetItem *, QPointer <Diagram>> m_diagram_hash;
}; };
#endif // SEARCHANDREPLACEWIDGET_H #endif // SEARCHANDREPLACEWIDGET_H