URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=c8cad99515eeac25faf6ea84795ce6b5fa4afebb
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark
Commits:
c8cad99 by Gerald Combs (gerald@xxxxxxxxxxxxx):
Qt: Add the Coloring Rules dialog.
Merge in the old ColorDialog which was a placeholder for
color_filter_add_cb.
Change-Id: I48d188509f480b8514122b4011ac9d8790fcca10
Reviewed-on: https://code.wireshark.org/review/6996
Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
Actions performed:
from b3f3dd8 Qt: Fix preference change behavior.
adds c8cad99 Qt: Add the Coloring Rules dialog.
Summary of changes:
color_filters.c | 14 +-
color_filters.h | 13 +-
ui/qt/CMakeLists.txt | 7 +-
ui/qt/Makefile.am | 2 +
ui/qt/Makefile.common | 6 +-
ui/qt/Wireshark.pro | 5 +-
ui/qt/color_dialog.cpp | 65 ---
ui/qt/color_dialog.h | 52 ---
ui/qt/color_utils.cpp | 10 +
ui/qt/color_utils.h | 1 +
ui/qt/coloring_rules_dialog.cpp | 440 ++++++++++++++++++++
ui/qt/coloring_rules_dialog.h | 108 +++++
...{profile_dialog.ui => coloring_rules_dialog.ui} | 115 +++--
ui/qt/io_graph_dialog.ui | 6 +-
ui/qt/main_window.h | 1 +
ui/qt/main_window.ui | 21 +-
ui/qt/main_window_slots.cpp | 8 +
ui/qt/packet_list.cpp | 6 +
ui/qt/packet_list.h | 1 +
19 files changed, 691 insertions(+), 190 deletions(-)
delete mode 100644 ui/qt/color_dialog.cpp
delete mode 100644 ui/qt/color_dialog.h
create mode 100644 ui/qt/coloring_rules_dialog.cpp
create mode 100644 ui/qt/coloring_rules_dialog.h
copy ui/qt/{profile_dialog.ui => coloring_rules_dialog.ui} (59%)