GUI changes

Play nice with themes, especially dark ones. Most likely the light icons
will look crappy with a light theme, but theming support is another
thing entirely. Right now I'm using a dark theme, so this is it...

1 files changed, 14 insertions, 11 deletions

diff --git a/collectionwidget.cpp b/collectionwidget.cpp
index 127c6a6..b0eb29b 100644
--- a/collectionwidget.cpp
+++ b/collectionwidget.cpp
@@ -1,13 +1,15 @@
 #include <QStandardItem>
 #include <QSortFilterProxyModel>
 #include <QLineEdit>
-#include <QGroupBox>
+//#include <QGroupBox>
+#include <QLabel>
 #include <QToolBar>
 #include <QHBoxLayout>
 #include <QVBoxLayout>
 
 #include "collectionwidget.h"
 #include "collectionwidgetproxy.h"
+#include "helper.h"
 
 CollectionWidget::CollectionWidget(QWidget *parent) : QWidget(parent){
     mCustomActions = new QActionGroup(this);
@@ -19,25 +21,26 @@ CollectionWidget::CollectionWidget(QWidget *parent) : QWidget(parent){
     mView->setSortingEnabled(true);
     mView->setAlternatingRowColors(true);
     mView->setSelectionMode(QAbstractItemView::ExtendedSelection);
-    QGroupBox *filterGB = new QGroupBox(tr("Filter"));
-    QHBoxLayout *filterGBL = new QHBoxLayout;
+    QLabel *filterL = new QLabel(tr("&Filter:"));
+    QHBoxLayout *filterLayout = new QHBoxLayout;
     mFilter  = new QLineEdit;
-    filterGBL->addWidget(mFilter);
-    QToolBar *filterTB = new QToolBar;
-    QAction *clearFilter = new QAction(QIcon(":/clean_tampon.png"), tr("Clear filter"), this);
+    filterL->setBuddy(mFilter);
+    QAction *clearFilter = new QAction(Helper::iconFromQChar(QChar(0x2694), 28), tr("Clear filter"), this);
     connect(clearFilter, &QAction::triggered, [this, proxy] { mFilter->clear(); proxy->setFilterRegExp("");} );
-    filterTB->addAction(clearFilter);
-    QAction *activateFilter = new QAction(QIcon(":/stomp.png"), tr("Filter!"), this);
+    QAction *activateFilter = new QAction(Helper::iconFromQChar(QChar(0x2245), 28), tr("Filter!"), this);
     connect(activateFilter, &QAction::triggered, [this, proxy] {
         proxy->setFilterRegExp(mFilter->text());
         expandFirst(proxy);
     } );
     connect(mFilter, &QLineEdit::returnPressed, activateFilter, &QAction::trigger);
+    QToolBar *filterTB = new QToolBar;
     filterTB->addAction(activateFilter);
-    filterGBL->addWidget(filterTB);
-    filterGB->setLayout(filterGBL);
+    filterTB->addAction(clearFilter);
+    filterLayout->addWidget(filterL);
+    filterLayout->addWidget(mFilter);
+    filterLayout->addWidget(filterTB);
     QVBoxLayout *mainLayout = new QVBoxLayout;
-    mainLayout->addWidget(filterGB);
+    mainLayout->addLayout(filterLayout);
     mainLayout->addWidget(mView);
     setLayout(mainLayout);
 }