From c1554d1c3fe64968dd143f877bddae10cdcee423 Mon Sep 17 00:00:00 2001
From: AL <26797547+Al12rs@users.noreply.github.com>
Date: Wed, 26 Feb 2020 19:22:15 +0100
Subject: Added checkbox icons for filterlist state

---
 src/filterlist.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'src/filterlist.cpp')

diff --git a/src/filterlist.cpp b/src/filterlist.cpp
index 144c5689..59f2e0be 100644
--- a/src/filterlist.cpp
+++ b/src/filterlist.cpp
@@ -29,6 +29,8 @@ public:
     setData(0, Qt::ToolTipRole, name);
     setData(0, TypeRole, type);
     setData(0, IDRole, id);
+    setData(0, Qt::DecorationRole, QIcon(":/MO/gui/unchecked-checkbox"));
+    setData(0, Qt::TextAlignmentRole, Qt::AlignCenter);
   }
 
   CriteriaType type() const
@@ -84,11 +86,13 @@ private:
   void updateState()
   {
     QString s;
+    QIcon i;
 
     switch (m_state)
     {
       case Inactive:
       {
+        i = QIcon(":/MO/gui/unchecked-checkbox");
         break;
       }
 
@@ -96,17 +100,19 @@ private:
       {
         // U+2713 CHECK MARK
         s = QString::fromUtf8("\xe2\x9c\x93");
+        i = QIcon(":/MO/gui/checked-checkbox");
         break;
       }
 
       case Inverted:
       {
         s = tr("Not");
+        i = QIcon(":/MO/gui/indeterminate-checkbox");
         break;
       }
     }
-
-    setText(0, s);
+    //setText(0, s);
+    setData(0, Qt::DecorationRole, i);
   }
 };
 
@@ -199,8 +205,7 @@ FilterList::FilterList(Ui::MainWindow* ui, CategoryFactory& factory)
     [&]{ onOptionsChanged(); });
 
   ui->filters->header()->setMinimumSectionSize(0);
-  ui->filters->header()->setSectionResizeMode(0, QHeaderView::ResizeToContents);
-  ui->filters->header()->resizeSection(0, 30);
+  ui->filters->header()->resizeSection(0, 23);
   ui->categoriesSplitter->setCollapsible(0, false);
   ui->categoriesSplitter->setCollapsible(1, false);
 
-- 
cgit v1.3.1


From c2e2be8ff7953c59cbf51024e3ff0249ad83387c Mon Sep 17 00:00:00 2001
From: AL <26797547+Al12rs@users.noreply.github.com>
Date: Wed, 26 Feb 2020 19:34:33 +0100
Subject: Cleanup previous filterList code

---
 src/filterlist.cpp | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'src/filterlist.cpp')

diff --git a/src/filterlist.cpp b/src/filterlist.cpp
index 59f2e0be..57bc740a 100644
--- a/src/filterlist.cpp
+++ b/src/filterlist.cpp
@@ -30,7 +30,6 @@ public:
     setData(0, TypeRole, type);
     setData(0, IDRole, id);
     setData(0, Qt::DecorationRole, QIcon(":/MO/gui/unchecked-checkbox"));
-    setData(0, Qt::TextAlignmentRole, Qt::AlignCenter);
   }
 
   CriteriaType type() const
@@ -85,7 +84,6 @@ private:
 
   void updateState()
   {
-    QString s;
     QIcon i;
 
     switch (m_state)
@@ -98,20 +96,16 @@ private:
 
       case Active:
       {
-        // U+2713 CHECK MARK
-        s = QString::fromUtf8("\xe2\x9c\x93");
         i = QIcon(":/MO/gui/checked-checkbox");
         break;
       }
 
       case Inverted:
       {
-        s = tr("Not");
         i = QIcon(":/MO/gui/indeterminate-checkbox");
         break;
       }
     }
-    //setText(0, s);
     setData(0, Qt::DecorationRole, i);
   }
 };
@@ -234,8 +228,6 @@ QTreeWidgetItem* FilterList::addCriteriaItem(
   // no way to espand nodes in the filter view since clicking changes state.
   ui->filters->addTopLevelItem(item);
 
-  item->setTextAlignment(0, Qt::AlignCenter);
-
   return item;
 }
 
-- 
cgit v1.3.1