More context menu updates.

Add "Follow" and "Export Packet Bytes" to the packet detail context
menu. Remove duplicate SCTP menu. Remove redunant action text.

Change-Id: If69815dc774806e267fbd71aa390b0af6f3b0d14
Reviewed-on: https://code.wireshark.org/review/9829
Reviewed-by: Gerald Combs <gerald@wireshark.org>

3 files changed, 23 insertions, 25 deletions

diff --git a/ui/qt/main_window.ui b/ui/qt/main_window.ui
index 8fa7bf8111..d44a0ae4ec 100644
--- a/ui/qt/main_window.ui
+++ b/ui/qt/main_window.ui
@@ -1577,7 +1577,7 @@
     <bool>false</bool>
    </property>
    <property name="text">
-    <string>Follow TCP Stream</string>
+    <string>TCP Stream</string>
    </property>
   </action>
   <action name="actionAnalyzeFollowUDPStream">
@@ -1585,7 +1585,7 @@
     <bool>false</bool>
    </property>
    <property name="text">
-    <string>Follow UDP Stream</string>
+    <string>UDP Stream</string>
    </property>
   </action>
   <action name="actionAnalyzeFollowSSLStream">
@@ -1593,7 +1593,7 @@
     <bool>false</bool>
    </property>
    <property name="text">
-    <string>Follow SSL Stream</string>
+    <string>SSL Stream</string>
    </property>
   </action>
   <action name="actionStatisticsTcpStreamTcptrace">
diff --git a/ui/qt/packet_list.cpp b/ui/qt/packet_list.cpp
index 879242874b..2edcb4543e 100644
--- a/ui/qt/packet_list.cpp
+++ b/ui/qt/packet_list.cpp
@@ -279,22 +279,6 @@ PacketList::PacketList(QWidget *parent) :
     ctx_menu_.addAction(window()->findChild<QAction *>("actionViewEditResolvedName"));
     ctx_menu_.addSeparator();
 
-    main_menu_item = window()->findChild<QMenu *>("menuFollow");
-    submenu = new QMenu(main_menu_item->title());
-    ctx_menu_.addMenu(submenu);
-    submenu->addAction(window()->findChild<QAction *>("actionAnalyzeFollowTCPStream"));
-    submenu->addAction(window()->findChild<QAction *>("actionAnalyzeFollowUDPStream"));
-    submenu->addAction(window()->findChild<QAction *>("actionAnalyzeFollowSSLStream"));
-
-    main_menu_item = window()->findChild<QMenu *>("menuSCTP");
-    submenu = new QMenu(main_menu_item->title());
-    ctx_menu_.addMenu(submenu);
-    submenu->addAction(window()->findChild<QAction *>("actionSCTPAnalyseThisAssociation"));
-    submenu->addAction(window()->findChild<QAction *>("actionSCTPShowAllAssociations"));
-    submenu->addAction(window()->findChild<QAction *>("actionSCTPFilterThisAssociation"));
-
-    ctx_menu_.addSeparator();
-
     main_menu_item = window()->findChild<QMenu *>("menuApplyAsFilter");
     submenu = new QMenu(main_menu_item->title());
     ctx_menu_.addMenu(submenu);
@@ -332,6 +316,14 @@ PacketList::PacketList(QWidget *parent) :
     ctx_menu_.addMenu(submenu);
     submenu->addAction(window()->findChild<QAction *>("actionSCTPAnalyseThisAssociation"));
     submenu->addAction(window()->findChild<QAction *>("actionSCTPShowAllAssociations"));
+    submenu->addAction(window()->findChild<QAction *>("actionSCTPFilterThisAssociation"));
+
+    main_menu_item = window()->findChild<QMenu *>("menuFollow");
+    submenu = new QMenu(main_menu_item->title());
+    ctx_menu_.addMenu(submenu);
+    submenu->addAction(window()->findChild<QAction *>("actionAnalyzeFollowTCPStream"));
+    submenu->addAction(window()->findChild<QAction *>("actionAnalyzeFollowUDPStream"));
+    submenu->addAction(window()->findChild<QAction *>("actionAnalyzeFollowSSLStream"));
 
     ctx_menu_.addSeparator();
 
diff --git a/ui/qt/proto_tree.cpp b/ui/qt/proto_tree.cpp
index e22424d937..1e54bc3f44 100644
--- a/ui/qt/proto_tree.cpp
+++ b/ui/qt/proto_tree.cpp
@@ -216,15 +216,18 @@ ProtoTree::ProtoTree(QWidget *parent) :
 //    "       <menuitem name='Color10' action='/Colorize with Filter/Color 10'/>\n"
 //    "       <menuitem name='NewColoringRule' action='/Colorize with Filter/New Coloring Rule'/>\n"
 //    "     </menu>\n"
-//    "     <menuitem name='FollowTCPStream' action='/Follow TCP Stream'/>\n"
-//    "     <menuitem name='FollowUDPStream' action='/Follow UDP Stream'/>\n"
-//    "     <menuitem name='FollowSSLStream' action='/Follow SSL Stream'/>\n"
+
+        main_menu_item = window()->findChild<QMenu *>("menuFollow");
+        submenu = new QMenu(main_menu_item->title());
+        ctx_menu_.addMenu(submenu);
+        submenu->addAction(window()->findChild<QAction *>("actionAnalyzeFollowTCPStream"));
+        submenu->addAction(window()->findChild<QAction *>("actionAnalyzeFollowUDPStream"));
+        submenu->addAction(window()->findChild<QAction *>("actionAnalyzeFollowSSLStream"));
         ctx_menu_.addSeparator();
 
         main_menu_item = window()->findChild<QMenu *>("menuEditCopy");
         submenu = new QMenu(main_menu_item->title());
         ctx_menu_.addMenu(submenu);
-
         submenu->addAction(window()->findChild<QAction *>("actionCopyAllVisibleItems"));
         submenu->addAction(window()->findChild<QAction *>("actionCopyAllVisibleSelectedTreeItems"));
         submenu->addAction(window()->findChild<QAction *>("actionEditCopyDescription"));
@@ -251,8 +254,11 @@ ProtoTree::ProtoTree(QWidget *parent) :
         submenu->addAction(action);
         copy_actions_ << action;
 
-//    "     <menuitem name='ExportSelectedPacketBytes' action='/ExportSelectedPacketBytes'/>\n"
-//    ctx_menu_.addSeparator();
+        action = window()->findChild<QAction *>("actionFileExportPacketBytes");
+        ctx_menu_.addAction(action);
+
+        ctx_menu_.addSeparator();
+
 //    "     <menuitem name='WikiProtocolPage' action='/WikiProtocolPage'/>\n"
 //    "     <menuitem name='FilterFieldReference' action='/FilterFieldReference'/>\n"
 //    "     <menuitem name='ProtocolHelp' action='/ProtocolHelp'/>\n"