diff --git a/editor/partline.cpp b/editor/partline.cpp
index 9dfc94755..938722c02 100644
--- a/editor/partline.cpp
+++ b/editor/partline.cpp
@@ -251,4 +251,3 @@ QRectF PartLine::boundingRect() const {
bool PartLine::isUseless() const {
return(sceneP1() == sceneP2());
}
-
diff --git a/elementspanelwidget.cpp b/elementspanelwidget.cpp
index a88930682..a77253898 100644
--- a/elementspanelwidget.cpp
+++ b/elementspanelwidget.cpp
@@ -34,13 +34,15 @@ ElementsPanelWidget::ElementsPanelWidget(QWidget *parent) : QWidget(parent) {
new_element = new QAction(QIcon(":/ico/new.png"), tr("Nouvel \351l\351ment"), this);
edit_element = new QAction(QIcon(":/ico/edit.png"), tr("\311diter l'\351l\351ment"), this);
delete_element = new QAction(QIcon(":/ico/delete.png"), tr("Supprimer l'\351l\351ment"), this);
+ erase_textfield = new QAction(QIcon(":/ico/erase.png"), tr("Effacer le filtre"), this);
// initialise le champ de texte pour filtrer avec une disposition horizontale
QLabel *filter_label = new QLabel(tr("Filtrer : "), this);
filter_textfield = new QLineEdit(this);
- QHBoxLayout *hlayout = new QHBoxLayout();
- hlayout -> addWidget(filter_label);
- hlayout -> addWidget(filter_textfield);
+ filter_toolbar = new QToolBar("filter");
+ filter_toolbar -> addAction(erase_textfield);
+ filter_toolbar -> addWidget(filter_label);
+ filter_toolbar -> addWidget(filter_textfield);
context_menu = new QMenu(this);
@@ -52,7 +54,9 @@ ElementsPanelWidget::ElementsPanelWidget(QWidget *parent) : QWidget(parent) {
connect(edit_element, SIGNAL(triggered()), elements_panel, SLOT(editElement()));
connect(delete_element, SIGNAL(triggered()), elements_panel, SLOT(deleteElement()));
- connect(filter_textfield, SIGNAL(textEdited(const QString &)), elements_panel, SLOT(filter(const QString &)));
+ connect(erase_textfield, SIGNAL(triggered()), filter_textfield, SLOT(clear()));
+ connect(erase_textfield, SIGNAL(triggered()), filter_textfield, SLOT(setFocus()));
+ connect(filter_textfield, SIGNAL(textEdited(const QString &)), elements_panel, SLOT(filter(const QString &)));
connect(elements_panel, SIGNAL(currentItemChanged(QTreeWidgetItem *, QTreeWidgetItem *)), this, SLOT(updateButtons()));
connect(elements_panel, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(handleContextMenu(const QPoint &)));
@@ -75,7 +79,7 @@ ElementsPanelWidget::ElementsPanelWidget(QWidget *parent) : QWidget(parent) {
vlayout -> setMargin(0);
vlayout -> setSpacing(0);
vlayout -> addWidget(toolbar);
- vlayout -> addLayout(hlayout);
+ vlayout -> addWidget(filter_toolbar);
vlayout -> addWidget(elements_panel);
vlayout -> setStretchFactor(elements_panel, 75000);
setLayout(vlayout);
diff --git a/elementspanelwidget.h b/elementspanelwidget.h
index 74801f597..0913aa7bf 100644
--- a/elementspanelwidget.h
+++ b/elementspanelwidget.h
@@ -38,11 +38,12 @@ class ElementsPanelWidget : public QWidget {
// attributs
private:
ElementsPanel *elements_panel;
- QToolBar *toolbar;
+ QToolBar *toolbar, *filter_toolbar;
QAction *reload;
QAction *new_category, *edit_category, *delete_category;
QAction *new_element, *edit_element, *delete_element;
QMenu *context_menu;
+ QAction *erase_textfield;
QLineEdit *filter_textfield;
// methodes
diff --git a/ico/erase.png b/ico/erase.png
new file mode 100755
index 000000000..90ad31279
Binary files /dev/null and b/ico/erase.png differ
diff --git a/lang/qet_en.qm b/lang/qet_en.qm
index cc11db4f5..15186f649 100644
Binary files a/lang/qet_en.qm and b/lang/qet_en.qm differ
diff --git a/lang/qet_en.ts b/lang/qet_en.ts
index 627f79e66..45f75b209 100644
--- a/lang/qet_en.ts
+++ b/lang/qet_en.ts
@@ -616,20 +616,25 @@ Changes will be permanent.
Delete element
-
+
Gestionnaire de catégories
Categories manager
-
+
Vous pouvez utiliser ce gestionnaire pour ajouter, supprimer ou modifier les catégories.
Use this manager to add, delete or modify categories.
-
+
Filtrer :
Filter:
+
+
+ Effacer le filtre
+ Erase filter
+
EllipseEditor
diff --git a/qelectrotech.qrc b/qelectrotech.qrc
index 58311f78c..eb9aeb576 100644
--- a/qelectrotech.qrc
+++ b/qelectrotech.qrc
@@ -26,6 +26,7 @@
ico/edit.png
ico/ellipse.png
ico/entrer_fs.png
+ ico/erase.png
ico/exit.png
ico/export.png
ico/fileclose.png