Skip to content

Added basic skeleton of the UI for the filters #13

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
virajparimi wants to merge 13 commits into
base: gsoc
Choose a base branch
from
Open

Added basic skeleton of the UI for the filters #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
7bcb35c
Resolved few merge conflicts
virajparimi Jul 7, 2018
1f97e3c
Removed Ravel.pro.user
virajparimi Jun 12, 2018
aa3d5c8
Resolving merge conflicts while rebasing v2
virajparimi Jul 7, 2018
63e6cce
Resolving merge conflicts while rebasing v3
virajparimi Jul 7, 2018
1580e73
Finished first iteration of adding filter for normal string input
virajparimi Jun 21, 2018
c7142e5
Added filter removal functionality for basic string filters
virajparimi Jun 21, 2018
da07341
Fixed filter removal bug and added time based filter functionality
virajparimi Jun 21, 2018
e20ddec
Added regex based filter and made sure to remove suggestions if input…
virajparimi Jun 23, 2018
7c27af7
Minor bug fixes and changes to UI
virajparimi Jun 29, 2018
a7449ef
Added UI improvement
virajparimi Jul 6, 2018
5692d05
Fixed duration filter bug
virajparimi Jul 7, 2018
647224b
Added time units change functionality for duration filter
virajparimi Jul 7, 2018
c59c117
Fixed building issue after rebasing
virajparimi Jul 7, 2018
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
8 changes: 8 additions & 0 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ qt5_wrap_ui(ui_mainwindow.h mainwindow.ui)
qt5_wrap_ui(ui_metricrangedialog.h metricrangedialog.ui)
qt5_wrap_ui(ui_visoptionsdialog.h visoptionsdialog.ui)
qt5_wrap_ui(ui_taskpropertywindow.h taskpropertywindow.ui)
qt5_wrap_ui(ui_filterdialog.h filterdialog.ui)
qt5_wrap_ui(ui_addfunctionsdialog.h addfunctionsdialog.ui)

# Sources and UI Files
set(Ravel_SOURCES
Expand Down Expand Up @@ -73,6 +75,8 @@ set(Ravel_SOURCES
primaryentitygroup.cpp
metrics.cpp
taskpropertywindow.cpp
filterdialog.cpp
addfunctionsdialog.cpp
${ADDED_SOURCES}
)

Expand Down Expand Up @@ -114,6 +118,8 @@ set(Ravel_HEADERS
primaryentitygroup.h
metrics.h
taskpropertywindow.h
filterdialog.h
addfunctionsdialog.h
${ADDED_HEADERS}
)

Expand All @@ -122,6 +128,8 @@ set(Ravel_UIC
ui_visoptionsdialog.h
ui_metricrangedialog.h
ui_taskpropertywindow.h
ui_filterdialog.h
ui_addfunctionsdialog.h
)

# Build Target
Expand Down
12 changes: 9 additions & 3 deletions src/Ravel.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,9 @@ SOURCES += main.cpp \
primaryentitygroup.cpp \
entitygroup.cpp \
importfunctor.cpp \
taskpropertywindow.cpp
taskpropertywindow.cpp \
filterdialog.cpp \
addfunctionsdialog.cpp

HEADERS += \
trace.h \
Expand Down Expand Up @@ -99,13 +101,17 @@ HEADERS += \
entitygroup.h \
ravelutils.h \
importfunctor.h \
taskpropertywindow.h
taskpropertywindow.h \
filterdialog.h \
addfunctionsdialog.h

FORMS += \
mainwindow.ui \
visoptionsdialog.ui \
metricrangedialog.ui \
taskpropertywindow.ui
taskpropertywindow.ui \
filterdialog.ui \
addfunctionsdialog.ui

HOME = $$system(echo $HOME)

Expand Down
Loading