diff options
author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2014-08-08 12:59:42 +0200 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2015-05-29 21:25:09 +0000 |
commit | 3827c81473f382ce72a0b0aab6ff0da1140692aa (patch) | |
tree | 885b4b614211c62ff7b9c918462ac3e2277245d3 /ui/qt/proto_tree.cpp | |
parent | 486a530451d54c740f7efee2aad481529cb83108 (diff) |
Qt: Add Conversation Filter sub menu
Apply conversation filters using the new color_dissector_filters.[ch]
from g1f03180.
Change-Id: I2e535bb3d5b95fd26226422daf9f83c452a95e3c
Reviewed-on: https://code.wireshark.org/review/3558
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/qt/proto_tree.cpp')
-rw-r--r-- | ui/qt/proto_tree.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/ui/qt/proto_tree.cpp b/ui/qt/proto_tree.cpp index ac2dac3a52..2d1b404587 100644 --- a/ui/qt/proto_tree.cpp +++ b/ui/qt/proto_tree.cpp @@ -195,6 +195,10 @@ ProtoTree::ProtoTree(QWidget *parent) : submenu->addAction(window()->findChild<QAction *>("actionAnalyzePAFAndNotSelected")); submenu->addAction(window()->findChild<QAction *>("actionAnalyzePAFOrNotSelected")); + QMenu *main_conv_menu = window()->findChild<QMenu *>("menuConversationFilter"); + conv_menu_.setTitle(main_conv_menu->title()); + ctx_menu_.addMenu(&conv_menu_); + // action = window()->findChild<QAction *>("actionColorize_with_Filter"); // submenu = new QMenu(); // action->setMenu(submenu); @@ -276,6 +280,12 @@ void ProtoTree::contextMenuEvent(QContextMenuEvent *event) { if (ctx_menu_.isEmpty()) return; // We're in a PacketDialog + QMenu *main_conv_menu = window()->findChild<QMenu *>("menuConversationFilter"); + conv_menu_.clear(); + foreach (QAction *action, main_conv_menu->actions()) { + conv_menu_.addAction(action); + } + decode_as_->setData(qVariantFromValue(true)); ctx_menu_.exec(event->globalPos()); decode_as_->setData(QVariant()); |