From cec010c1e7ffb411fa82efcb3645f558498f29bb Mon Sep 17 00:00:00 2001 From: xavierqet Date: Sun, 20 Jan 2008 18:50:10 +0000 Subject: [PATCH] Ajout d'un bouton pour effacer le filtre dans le panel d'elements git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@283 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- editor/partline.cpp | 1 - elementspanelwidget.cpp | 14 +++++++++----- elementspanelwidget.h | 3 ++- ico/erase.png | Bin 0 -> 3120 bytes lang/qet_en.qm | Bin 53858 -> 53947 bytes lang/qet_en.ts | 11 ++++++++--- qelectrotech.qrc | 1 + 7 files changed, 20 insertions(+), 10 deletions(-) create mode 100755 ico/erase.png 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 0000000000000000000000000000000000000000..90ad312794b2299b3e718de51a08baf939f9234f GIT binary patch literal 3120 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 KMNUMnLSTZIEVy9+ literal 0 HcmV?d00001 diff --git a/lang/qet_en.qm b/lang/qet_en.qm index cc11db4f573a0f4cf42c772b207de31cf8df025e..15186f649623ca48f9cb2be9a826efbd7b017d92 100644 GIT binary patch delta 266 zcmaE~gn9Q;<_RKyjq9DgInX9k9S zQ~6tLN`dr4{*J;~3=I2Y_`CnA0_i>cvm8W$^jA~<4QuNd7!H{5Z`d#oNN4k(>1qJd z^Z7q@7Xayp{C}nF7#I#J^8W|ZxtT!Dp~(V*Vw(gX?=+EMaAhcBNMtBxNM%r9NMp!k s$YCe}vWqwvfPf8%1zpq95|dMl6mn7((lT>Oic%*}$dKLq_*6YR0RJ#q&;S4c delta 204 zcmdnJl=;yT<_RK<7dDD&3e>wky2`+?^DDpaUn>TNU9J3KTmAv*Q~cq9B@7I^C-CR( zcV=MN!^WR?i3Lbcg3{;t%jPjLFzn^wFS{!Qq#gOI70v1qJde*B-h3xM7mze-M38CKE^$ZvG_jb0?$2aHrWd{HvI!WmO 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