From 95f1c55f09068b2259ddad2b042fd329478a6111 Mon Sep 17 00:00:00 2001
From: Arno <arno@disconnect.de>
Date: Sat, 24 Nov 2018 05:19:58 +0100
Subject: Harmonize filter bars

MovieWidget and PictureWidget both have filter bars on top of the left
tree, but the buttons were different. Change it to enhance user
experience :)
---
 mappingtreewidget.cpp | 23 +++++++++++++----------
 mappingtreewidget.h   |  3 ---
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/mappingtreewidget.cpp b/mappingtreewidget.cpp
index f22c6dd..c4872bc 100644
--- a/mappingtreewidget.cpp
+++ b/mappingtreewidget.cpp
@@ -22,6 +22,7 @@
 #include <QMenu>
 #include <QSqlError>
 #include <QApplication>
+#include <QToolBar>
 
 #include "mappingtreewidget.h"
 #include "mappingtreemodel.h"
@@ -30,6 +31,7 @@
 #include "mappinginputdialog.h"
 #include "mappingdata.h"
 #include "smglobals.h"
+#include "helper.h"
 
 MappingTreeWidget::MappingTreeWidget(QWidget *parent) : QWidget(parent){
     //setup model
@@ -84,20 +86,21 @@ MappingTreeWidget::MappingTreeWidget(QWidget *parent) : QWidget(parent){
     // filter + refresh
     mFilter = new QLineEdit;
     connect(mFilter, &QLineEdit::returnPressed, this, &MappingTreeWidget::filter);
-    mDoFilter = new QPushButton(tr("Filter"));
-    connect(mDoFilter, &QPushButton::clicked, this, &MappingTreeWidget::filter);
-    mClearFilter = new QPushButton(tr("Clear"));
-    connect(mClearFilter, &QPushButton::clicked, this, &MappingTreeWidget::clearFilter);
-    mRefresh = new QPushButton;
-    mRefresh->setIcon(QIcon(":/refresh.png"));
-    connect(mRefresh, &QPushButton::clicked, mModel, &MappingTreeModel::populate);
+    QToolBar *filterTB = new QToolBar;
+    QAction *doFilterA = new QAction(Helper::icon(Qt::transparent, qApp->palette().color(QPalette::Text), QChar(0x2245), true, false), tr("Filter"), this);
+    connect(doFilterA, &QAction::triggered, this, &MappingTreeWidget::filter);
+    filterTB->addAction(doFilterA);
+    QAction *clearFilterA = new QAction(Helper::icon(Qt::transparent, qApp->palette().color(QPalette::Text), QChar(0x2694), true, false), tr("Clear"), this);
+    connect(clearFilterA, &QAction::triggered, this, &MappingTreeWidget::clearFilter);
+    filterTB->addAction(clearFilterA);
+    QAction *refreshA = new QAction(QIcon(":/refresh.png"), tr("Refresh"), this);
+    connect(refreshA, &QAction::triggered, mModel, &MappingTreeModel::populate);
+    filterTB->addAction(refreshA);
     QLabel *filterLabel = new QLabel(tr("Filter"));
     QHBoxLayout *filterLayout = new QHBoxLayout;
     filterLayout->addWidget(filterLabel);
     filterLayout->addWidget(mFilter);
-    filterLayout->addWidget(mDoFilter);
-    filterLayout->addWidget(mClearFilter);
-    filterLayout->addWidget(mRefresh);
+    filterLayout->addWidget(filterTB);
 
     //setup actions
     mAddChildA = new QAction(tr("Add child..."), this);
diff --git a/mappingtreewidget.h b/mappingtreewidget.h
index 7a7bfd0..b6bbd57 100644
--- a/mappingtreewidget.h
+++ b/mappingtreewidget.h
@@ -62,11 +62,8 @@ class MappingTreeWidget : public QWidget {
         QStringListModel *mTypesModel;
         QComboBox *mTypeBox;
         QLineEdit *mFilter;
-        QPushButton *mDoFilter;
-        QPushButton *mClearFilter;
         QPushButton *mAddType;
         QPushButton *mDeleteType;
-        QPushButton *mRefresh;
         QAction *mAddChildA;
         QAction *mAddActorA;
         QAction *mDeleteChildA;
-- 
cgit v1.2.3-70-g09d2