URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=c2b713c0935de91f07faf0674dbb024391531a90
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark
Commits:
c2b713c by Gerald Combs (gerald@xxxxxxxxxxxxx):
Qt: Add the capture and display filter dialog.
Use a single overloaded dialog, similar to the GTK+ UI.
Change-Id: If85db14a7101770f115bef725f5145e0010c518d
Reviewed-on: https://code.wireshark.org/review/8776
Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
Actions performed:
from 198ef94 Don't include cfile.h.
adds c2b713c Qt: Add the capture and display filter dialog.
Summary of changes:
ui/filters.h | 6 +-
ui/gtk/filter_dlg.c | 2 +-
ui/qt/CMakeLists.txt | 4 +
ui/qt/Makefile.am | 2 +
ui/qt/Makefile.common | 4 +
ui/qt/Wireshark.pro | 3 +
ui/qt/capture_filter_edit.cpp | 78 +++---
ui/qt/capture_filter_edit.h | 3 +-
ui/qt/capture_filter_syntax_worker.cpp | 5 +-
ui/qt/coloring_rules_dialog.cpp | 1 -
ui/qt/coloring_rules_dialog.h | 2 +-
ui/qt/coloring_rules_dialog.ui | 3 +
ui/qt/display_filter_expression_dialog.cpp | 1 +
ui/qt/filter_dialog.cpp | 280 ++++++++++++++++++++
ui/qt/{coloring_rules_dialog.h => filter_dialog.h} | 92 +++----
ui/qt/{profile_dialog.ui => filter_dialog.ui} | 44 +--
ui/qt/main_window.h | 2 +
ui/qt/main_window.ui | 6 -
ui/qt/main_window_slots.cpp | 23 ++
19 files changed, 448 insertions(+), 113 deletions(-)
create mode 100644 ui/qt/filter_dialog.cpp
copy ui/qt/{coloring_rules_dialog.h => filter_dialog.h} (50%)
copy ui/qt/{profile_dialog.ui => filter_dialog.ui} (85%)