From 0868361fe1282a5aa3c904aa6581672e65bf5c10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Lhomme?= <papylhomme@gmail.com>
Date: Wed, 4 Feb 2015 13:43:21 +0000
Subject: [PATCH] Add UI concepts for filters and search location

---
 resources.qrc               |   1 +
 resources/images/filter.png | Bin 0 -> 2303 bytes
 src/mainwindow_init.cpp     |  28 ++++++++++++++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 100644 resources/images/filter.png

diff --git a/resources.qrc b/resources.qrc
index 5008f182..513fbe98 100644
--- a/resources.qrc
+++ b/resources.qrc
@@ -23,6 +23,7 @@
         <file>resources/images/folder.png</file>
         <file>resources/images/binary.png</file>
         <file>resources/images/outdated.png</file>
+        <file>resources/images/filter.png</file>
         <file>resources/images/unrequired.png</file>
         <file>resources/images/commit.png</file>
         <file>resources/images/refresh.png</file>
diff --git a/resources/images/filter.png b/resources/images/filter.png
new file mode 100644
index 0000000000000000000000000000000000000000..6d03b095b38addcd2a2f3c0aae100176c8adcce8
GIT binary patch
literal 2303
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
Z{Xbf&0US)_t-k;O002ovPDHLkV1mnhB}@PS

literal 0
HcmV?d00001

diff --git a/src/mainwindow_init.cpp b/src/mainwindow_init.cpp
index b7fff070..df3e497d 100644
--- a/src/mainwindow_init.cpp
+++ b/src/mainwindow_init.cpp
@@ -46,6 +46,7 @@
 #include <QProgressBar>
 #include <QSystemTrayIcon>
 #include <QToolButton>
+#include <QAction>
 
 /*
  * Loads various application settings configured in ~/.config/octopi/octopi.conf
@@ -284,6 +285,33 @@ void MainWindow::initToolBar()
   }
 
   m_leFilterPackage->setMinimumHeight(24);
+
+  QMenu * menu = new QMenu();
+  menu -> addAction("All");
+  menu -> addAction(QIcon(":/resources/images/installed.png"), "Installed");
+  menu -> addAction(QIcon(":/resources/images/unrequired.png"), "Unrequired");
+  menu -> addAction(QIcon(":/resources/images/foreign_green.png"), "Alien Installed");
+  menu -> addAction(QIcon(":/resources/images/noninstalled.png"), "Non installed");
+  menu -> addAction(QIcon(":/resources/images/outdated.png"), "Outdated");
+  menu -> addAction(QIcon(":/resources/images/foreign_red.png"), "Alien Outdated");
+  menu -> addAction(QIcon(":/resources/images/newer.png"), "More recent");
+
+  foreach(QAction * action, menu -> actions())
+    action -> setCheckable(true);
+
+  QToolButton * filterButton = new QToolButton();
+  filterButton -> setIcon(QIcon(":/resources/images/filter.png"));
+  filterButton -> setMenu(menu);
+  filterButton -> setPopupMode(QToolButton::InstantPopup);
+  ui->mainToolBar->addWidget(filterButton);
+
+
+  QComboBox * searchLocation = new QComboBox();
+  searchLocation -> addItem("Pacman");
+  searchLocation -> addItem("AUR");
+  searchLocation -> addItem("Both");
+  ui->mainToolBar->addWidget(searchLocation);
+
   ui->mainToolBar->addWidget(m_leFilterPackage);
 
   QWidget * hSpacer = new QWidget(this);