From 01bc31cded7290433704e9ef98a90e338c3ea28b Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Mon, 27 Jul 2015 15:28:50 -0700
Subject: Fixup packet list context menu behavior.

Add logic to setMenusForSelectedPacket for setting the enabled states
for the "Apply As" and "Prepare A" actions. Update the PacketList
context menu code to fill in the right filter at the right time.

Exit out of setMenusForSelectedTreeRow if the packet list has focus so
that we don't clobber the enabled states of various actions.

Take the "Apply As" and "Prepare A" context menu titles from their main
window counterparts. Remove actionApply_as_Filter and
actionPrepare_a_Filter.

Remove completed to-do items.

Change-Id: I8f6f538bb7786d8df02a999f3b449dfde640e847
Reviewed-on: https://code.wireshark.org/review/9810
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
---
 ui/qt/main_window.ui | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

(limited to 'ui/qt/main_window.ui')

diff --git a/ui/qt/main_window.ui b/ui/qt/main_window.ui
index 019acb70ec..d1fb5530f9 100644
--- a/ui/qt/main_window.ui
+++ b/ui/qt/main_window.ui
@@ -116,7 +116,7 @@
      <x>0</x>
      <y>0</y>
      <width>960</width>
-     <height>18</height>
+     <height>22</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
@@ -2295,16 +2295,6 @@
     <string>SCTP</string>
    </property>
   </action>
-  <action name="actionApply_as_Filter">
-   <property name="text">
-    <string>Apply as Filter</string>
-   </property>
-  </action>
-  <action name="actionPrepare_a_Filter">
-   <property name="text">
-    <string>Prepare a Filter</string>
-   </property>
-  </action>
   <action name="actionCopy">
    <property name="text">
     <string>Copy</string>
@@ -2600,12 +2590,6 @@
    <extends>QWidget</extends>
    <header>search_frame.h</header>
   </customwidget>
-  <customwidget>
-   <class>AddressEditorFrame</class>
-   <extends>QFrame</extends>
-   <header>address_editor_frame.h</header>
-   <container>1</container>
-  </customwidget>
   <customwidget>
    <class>ColumnEditorFrame</class>
    <extends>QFrame</extends>
@@ -2618,6 +2602,12 @@
    <header>preference_editor_frame.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>AddressEditorFrame</class>
+   <extends>QFrame</extends>
+   <header>address_editor_frame.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <resources>
   <include location="../../image/toolbar.qrc"/>
-- 
cgit v1.2.3