Wireshark-commits: [Wireshark-commits] master-2.0 731e900: Qt: Make conversation menu items static.
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=731e900e3aea6cdb8feb9927d4ddac82a9c4bd67
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark
Commits:
731e900 by Gerald Combs (gerald@xxxxxxxxxxxxx):
Qt: Make conversation menu items static.
Add a ConversationAction and ColorizeAction classes which respectively
handle conversation filtering and colorization.
Move conversation menu initialization to initConversationMenus and call
it once at startup. This keeps us from leaking quite a bit of memory
each time we select a packet or proto tree item.
Conflicts:
ui/qt/main_window_slots.cpp
Bug: 12044
Change-Id: I32e8cedaba08a419d5da6a7a9db31c910909f450
Reviewed-on: https://code.wireshark.org/review/14516
Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
(cherry picked from commit 6931f581f90d272474b47d4a4606bb93183f449a)
Reviewed-on: https://code.wireshark.org/review/14673
Actions performed:
from 14c27ad Treat Gammu DCT3 trace files as having magic numbers.
adds 731e900 Qt: Make conversation menu items static.
Summary of changes:
epan/dissector_filters.h | 4 +-
ui/qt/CMakeLists.txt | 2 +
ui/qt/Makefile.common | 2 +
ui/qt/Wireshark.pro | 2 +
ui/qt/capture_file.cpp | 10 ++
ui/qt/capture_file.h | 8 ++
...s_dialog.h => conversation_colorize_action.cpp} | 76 +++++------
ui/qt/conversation_colorize_action.h | 90 +++++++++++++
ui/qt/main_window.cpp | 69 ++++++++++
ui/qt/main_window.h | 3 +
ui/qt/main_window_slots.cpp | 137 ++++++--------------
ui/qt/proto_tree.cpp | 1 -
ui/qt/qt_ui_utils.cpp | 9 +-
ui/qt/qt_ui_utils.h | 9 ++
14 files changed, 277 insertions(+), 145 deletions(-)
copy ui/qt/{sctp_all_assocs_dialog.h => conversation_colorize_action.cpp} (50%)
create mode 100644 ui/qt/conversation_colorize_action.h
