summaryrefslogtreecommitdiff
path: root/ui/qt/proto_tree.cpp
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2013-10-14 16:54:41 +0000
committerGerald Combs <gerald@wireshark.org>2013-10-14 16:54:41 +0000
commit13c1c9daf7bbc5f976a39fac412319d77e22ae51 (patch)
tree34266295b2bbbf56a89074afd06378d7594dbc50 /ui/qt/proto_tree.cpp
parent1eb36c1119072f6af5b4f720c26ec64409be45c5 (diff)
downloadwireshark-13c1c9daf7bbc5f976a39fac412319d77e22ae51.tar.gz
PacketList and ProtoTree need access to MainWindow at initialization
time in order to fill in their respective context menus. R52386 broke that. Fix it and add comments about handling reparenting. Fixes bug 9265. svn path=/trunk/; revision=52600
Diffstat (limited to 'ui/qt/proto_tree.cpp')
-rw-r--r--ui/qt/proto_tree.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/ui/qt/proto_tree.cpp b/ui/qt/proto_tree.cpp
index 1db31165df..f47f41c2a5 100644
--- a/ui/qt/proto_tree.cpp
+++ b/ui/qt/proto_tree.cpp
@@ -164,6 +164,8 @@ ProtoTree::ProtoTree(QWidget *parent) :
setAccessibleName(tr("Packet details"));
setUniformRowHeights(true);
+ // XXX We might want to reimplement setParent() and fill in the context
+ // menu there.
ctx_menu_.addAction(window()->findChild<QAction *>("actionViewExpandSubtrees"));
ctx_menu_.addAction(window()->findChild<QAction *>("actionViewExpandAll"));
ctx_menu_.addAction(window()->findChild<QAction *>("actionViewCollapseAll"));