Skip to content

UI concept: Search and filters #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+29 −0
Open

UI concept: Search and filters #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0868361
Add UI concepts for filters and search location
papylhomme Feb 4, 2015
baf15c7
Merge branch 'master' into search_and_filters
papylhomme Feb 4, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions resources.qrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Binary file added resources/images/filter.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
28 changes: 28 additions & 0 deletions src/mainwindow_init.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
#include <QProgressBar>
#include <QSystemTrayIcon>
#include <QToolButton>
#include <QAction>

/*
* Loads various application settings configured in ~/.config/octopi/octopi.conf
Expand Down Expand Up @@ -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);
Expand Down