rename context menu items:

Match -> Apply as Filter
Prepare -> Prepare a Filter
and prepended a ... at appropriate submenu items

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@10814 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/gtk/hostlist_table.c b/gtk/hostlist_table.c
index 7779d49500b11ee14375212b0a5537168a84cb51..1a864415ecbc29ed4be5badd9a504fca483d555d 100644 (file)
--- a/gtk/hostlist_table.c
+++ b/gtk/hostlist_table.c
@@ -2,7 +2,7 @@
  * modified from endpoint_talkers_table.c   2003 Ronnie Sahlberg
  * Helper routines common to all host list taps.
  *
- * $Id: hostlist_table.c,v 1.10 2004/05/03 22:15:21 ulfl Exp $
+ * $Id: hostlist_table.c,v 1.11 2004/05/07 12:15:23 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -363,10 +363,23 @@ static gint
 hostlist_show_popup_menu_cb(void *widg _U_, GdkEvent *event, hostlist_table *et)
 {
        GdkEventButton *bevent = (GdkEventButton *)event;
+    gint row;
+    gint column;
 
+    /* To qoute the "Gdk Event Structures" doc:
+     * "Normally button 1 is the left mouse button, 2 is the middle button, and 3 is the right button" */
        if(event->type==GDK_BUTTON_PRESS && bevent->button==3){
-               gtk_menu_popup(GTK_MENU(et->menu), NULL, NULL, NULL, NULL, 
-                       bevent->button, bevent->time);
+        /* if this is a right click on one of our columns, select it and popup the context menu */
+        if(gtk_clist_get_selection_info(et->table,
+                                          (gint) (((GdkEventButton *)event)->x),
+                                          (gint) (((GdkEventButton *)event)->y),
+                                             &row, &column)) {
+            gtk_clist_unselect_all(et->table);
+            gtk_clist_select_row(et->table, row, -1);
+
+                   gtk_menu_popup(GTK_MENU(et->menu), NULL, NULL, NULL, NULL, 
+                           bevent->button, bevent->time);
+        }
        }
 
        return FALSE;
@@ -375,33 +388,33 @@ hostlist_show_popup_menu_cb(void *widg _U_, GdkEvent *event, hostlist_table *et)
 static GtkItemFactoryEntry hostlist_list_menu_items[] =
 {
        /* Match */
-       ITEM_FACTORY_ENTRY("/Match Display Filter", NULL, NULL, 0, "<Branch>", NULL),
-       ITEM_FACTORY_ENTRY("/Match Display Filter/Selected", NULL, 
+       ITEM_FACTORY_ENTRY("/Apply as Filter", NULL, NULL, 0, "<Branch>", NULL),
+       ITEM_FACTORY_ENTRY("/Apply as Filter/Selected", NULL, 
                hostlist_select_filter_cb, 0*256+0, NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Match Display Filter/Not Selected", NULL, 
+       ITEM_FACTORY_ENTRY("/Apply as Filter/Not Selected", NULL, 
                hostlist_select_filter_cb, 0*256+1, NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Match Display Filter/And Selected", NULL, 
+       ITEM_FACTORY_ENTRY("/Apply as Filter/... and Selected", NULL, 
                hostlist_select_filter_cb, 0*256+2, NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Match Display Filter/Or Selected", NULL, 
+       ITEM_FACTORY_ENTRY("/Apply as Filter/... or Selected", NULL, 
                hostlist_select_filter_cb, 0*256+3, NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Match Display Filter/And Not Selected", NULL, 
+       ITEM_FACTORY_ENTRY("/Apply as Filter/... and not Selected", NULL, 
                hostlist_select_filter_cb, 0*256+4, NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Match Display Filter/Or Not Selected", NULL, 
+       ITEM_FACTORY_ENTRY("/Apply as Filter/... or not Selected", NULL, 
                hostlist_select_filter_cb, 0*256+5, NULL, NULL),
 
        /* Prepare */
-       ITEM_FACTORY_ENTRY("/Prepare Display Filter", NULL, NULL, 0, "<Branch>", NULL),
-       ITEM_FACTORY_ENTRY("/Prepare Display Filter/Selected", NULL, 
+       ITEM_FACTORY_ENTRY("/Prepare a Filter", NULL, NULL, 0, "<Branch>", NULL),
+       ITEM_FACTORY_ENTRY("/Prepare a Filter/Selected", NULL, 
                hostlist_select_filter_cb, 1*256+0, NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare Display Filter/Not Selected", NULL, 
+       ITEM_FACTORY_ENTRY("/Prepare a Filter/Not Selected", NULL, 
                hostlist_select_filter_cb, 1*256+1, NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare Display Filter/And Selected", NULL, 
+       ITEM_FACTORY_ENTRY("/Prepare a Filter/... and Selected", NULL, 
                hostlist_select_filter_cb, 1*256+2, NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare Display Filter/Or Selected", NULL, 
+       ITEM_FACTORY_ENTRY("/Prepare a Filter/... or Selected", NULL, 
                hostlist_select_filter_cb, 1*256+3, NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare Display Filter/And Not Selected", NULL, 
+       ITEM_FACTORY_ENTRY("/Prepare a Filter/... and not Selected", NULL, 
                hostlist_select_filter_cb, 1*256+4, NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare Display Filter/Or Not Selected", NULL, 
+       ITEM_FACTORY_ENTRY("/Prepare a Filter/... or not Selected", NULL, 
                hostlist_select_filter_cb, 1*256+5, NULL, NULL),
 
        /* Find Frame */

diff --git a/gtk/main.c b/gtk/main.c
index dd08726be605abd83feb5437e24d681ba89cec38..a5682666cc6e286d1671f870796a291b9a392c87 100644 (file)
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -1,6 +1,6 @@
 /* main.c
  *
- * $Id: main.c,v 1.432 2004/05/05 08:49:24 guy Exp $
+ * $Id: main.c,v 1.433 2004/05/07 12:15:24 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -3939,29 +3939,29 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs)
                          filter_te);
     set_menu_object_data("/Analyze/Follow TCP Stream", E_DFILTER_TE_KEY,
                          filter_te);
-    set_menu_object_data("/Analyze/Match/Selected", E_DFILTER_TE_KEY,
+    set_menu_object_data("/Analyze/Apply as Filter/Selected", E_DFILTER_TE_KEY,
                          filter_te);
-    set_menu_object_data("/Analyze/Match/Not Selected", E_DFILTER_TE_KEY,
+    set_menu_object_data("/Analyze/Apply as Filter/Not Selected", E_DFILTER_TE_KEY,
                          filter_te);
-    set_menu_object_data("/Analyze/Match/And Selected", E_DFILTER_TE_KEY,
+    set_menu_object_data("/Analyze/Apply as Filter/... and Selected", E_DFILTER_TE_KEY,
                          filter_te);
-    set_menu_object_data("/Analyze/Match/Or Selected", E_DFILTER_TE_KEY,
+    set_menu_object_data("/Analyze/Apply as Filter/... or Selected", E_DFILTER_TE_KEY,
                          filter_te);
-    set_menu_object_data("/Analyze/Match/And Not Selected", E_DFILTER_TE_KEY,
+    set_menu_object_data("/Analyze/Apply as Filter/... and not Selected", E_DFILTER_TE_KEY,
                          filter_te);
-    set_menu_object_data("/Analyze/Match/Or Not Selected", E_DFILTER_TE_KEY,
+    set_menu_object_data("/Analyze/Apply as Filter/... or not Selected", E_DFILTER_TE_KEY,
                          filter_te);
-    set_menu_object_data("/Analyze/Prepare/Selected", E_DFILTER_TE_KEY,
+    set_menu_object_data("/Analyze/Prepare a Filter/Selected", E_DFILTER_TE_KEY,
                          filter_te);
-    set_menu_object_data("/Analyze/Prepare/Not Selected", E_DFILTER_TE_KEY,
+    set_menu_object_data("/Analyze/Prepare a Filter/Not Selected", E_DFILTER_TE_KEY,
                          filter_te);
-    set_menu_object_data("/Analyze/Prepare/And Selected", E_DFILTER_TE_KEY,
+    set_menu_object_data("/Analyze/Prepare a Filter/... and Selected", E_DFILTER_TE_KEY,
                          filter_te);
-    set_menu_object_data("/Analyze/Prepare/Or Selected", E_DFILTER_TE_KEY,
+    set_menu_object_data("/Analyze/Prepare a Filter/... or Selected", E_DFILTER_TE_KEY,
                          filter_te);
-    set_menu_object_data("/Analyze/Prepare/And Not Selected", E_DFILTER_TE_KEY,
+    set_menu_object_data("/Analyze/Prepare a Filter/... and not Selected", E_DFILTER_TE_KEY,
                          filter_te);
-    set_menu_object_data("/Analyze/Prepare/Or Not Selected", E_DFILTER_TE_KEY,
+    set_menu_object_data("/Analyze/Prepare a Filter/... or not Selected", E_DFILTER_TE_KEY,
                          filter_te);
     set_toolbar_object_data(E_DFILTER_TE_KEY, filter_te);
     OBJECT_SET_DATA(popup_menu_object, E_DFILTER_TE_KEY, filter_te);

diff --git a/gtk/menu.c b/gtk/menu.c
index a89c7ae73f4cd37b1f2704459579376ba84e8bcf..aab64acbd001e06881942106f7e42d55ff7d4ba6 100644 (file)
--- a/gtk/menu.c
+++ b/gtk/menu.c
@@ -1,7 +1,7 @@
 /* menu.c
  * Menu routines
  *
- * $Id: menu.c,v 1.191 2004/05/04 21:08:03 guy Exp $
+ * $Id: menu.c,v 1.192 2004/05/07 12:15:24 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -275,31 +275,31 @@ static GtkItemFactoryEntry menu_items[] =
     ITEM_FACTORY_ENTRY("/_Analyze", NULL, NULL, 0, "<Branch>", NULL),
     ITEM_FACTORY_STOCK_ENTRY("/Analyze/_Display Filters...", NULL, dfilter_dialog_cb,
                        0, ETHEREAL_STOCK_DISPLAY_FILTER),
-    ITEM_FACTORY_ENTRY("/Analyze/_Match", NULL, NULL, 0, "<Branch>", NULL),
-    ITEM_FACTORY_ENTRY("/Analyze/Match/_Selected", NULL,
+    ITEM_FACTORY_ENTRY("/Analyze/Appl_y as Filter", NULL, NULL, 0, "<Branch>", NULL),
+    ITEM_FACTORY_ENTRY("/Analyze/Apply as Filter/_Selected", NULL,
                        match_selected_cb_replace_ptree, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Analyze/Match/_Not Selected", NULL,
+    ITEM_FACTORY_ENTRY("/Analyze/Apply as Filter/_Not Selected", NULL,
                        match_selected_cb_not_ptree, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Analyze/Match/_And Selected", NULL,
+    ITEM_FACTORY_ENTRY("/Analyze/Apply as Filter/... _and Selected", NULL,
                        match_selected_cb_and_ptree, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Analyze/Match/_Or Selected", NULL,
+    ITEM_FACTORY_ENTRY("/Analyze/Apply as Filter/... _or Selected", NULL,
                        match_selected_cb_or_ptree, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Analyze/Match/A_nd Not Selected", NULL,
+    ITEM_FACTORY_ENTRY("/Analyze/Apply as Filter/... a_nd not Selected", NULL,
                        match_selected_cb_and_ptree_not, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Analyze/Match/O_r Not Selected", NULL,
+    ITEM_FACTORY_ENTRY("/Analyze/Apply as Filter/... o_r not Selected", NULL,
                        match_selected_cb_or_ptree_not, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Analyze/_Prepare", NULL, NULL, 0, "<Branch>", NULL),
-    ITEM_FACTORY_ENTRY("/Analyze/Prepare/_Selected", NULL,
+    ITEM_FACTORY_ENTRY("/Analyze/_Prepare a Filter", NULL, NULL, 0, "<Branch>", NULL),
+    ITEM_FACTORY_ENTRY("/Analyze/Prepare a Filter/_Selected", NULL,
                        prepare_selected_cb_replace_ptree, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Analyze/Prepare/_Not Selected", NULL,
+    ITEM_FACTORY_ENTRY("/Analyze/Prepare a Filter/_Not Selected", NULL,
                        prepare_selected_cb_not_ptree, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Analyze/Prepare/_And Selected", NULL,
+    ITEM_FACTORY_ENTRY("/Analyze/Prepare a Filter/... _and Selected", NULL,
                        prepare_selected_cb_and_ptree, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Analyze/Prepare/_Or Selected", NULL,
+    ITEM_FACTORY_ENTRY("/Analyze/Prepare a Filter/... _or Selected", NULL,
                        prepare_selected_cb_or_ptree, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Analyze/Prepare/A_nd Not Selected", NULL,
+    ITEM_FACTORY_ENTRY("/Analyze/Prepare a Filter/... a_nd not Selected", NULL,
                        prepare_selected_cb_and_ptree_not, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Analyze/Prepare/O_r Not Selected", NULL,
+    ITEM_FACTORY_ENTRY("/Analyze/Prepare a Filter/... o_r not Selected", NULL,
                        prepare_selected_cb_or_ptree_not, 0, NULL, NULL),
     ITEM_FACTORY_ENTRY("/Analyze/<separator>", NULL, NULL, 0, "<Separator>", NULL),
     ITEM_FACTORY_ENTRY("/Analyze/_Enabled Protocols...", "<shift><control>R", proto_cb, 0, NULL, NULL),
@@ -348,31 +348,31 @@ static GtkItemFactoryEntry packet_list_menu_items[] =
     ITEM_FACTORY_ENTRY("/Time Reference/Set Time Reference (toggle)", NULL, reftime_frame_cb, 0, NULL, NULL),
     ITEM_FACTORY_ENTRY("/Time Reference/Find Next", NULL, reftime_frame_cb, 1, NULL, NULL),
     ITEM_FACTORY_ENTRY("/Time Reference/Find Previous", NULL, reftime_frame_cb, 2, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Match", NULL, NULL, 0, "<Branch>", NULL),
-    ITEM_FACTORY_ENTRY("/Match/_Selected", NULL,
+    ITEM_FACTORY_ENTRY("/Apply as Filter", NULL, NULL, 0, "<Branch>", NULL),
+    ITEM_FACTORY_ENTRY("/Apply as Filter/_Selected", NULL,
                        match_selected_cb_replace_plist, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Match/_Not Selected", NULL,
+    ITEM_FACTORY_ENTRY("/Apply as Filter/_Not Selected", NULL,
                        match_selected_cb_not_plist, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Match/_And Selected", NULL,
+    ITEM_FACTORY_ENTRY("/Apply as Filter/... _and Selected", NULL,
                        match_selected_cb_and_plist, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Match/_Or Selected", NULL, match_selected_cb_or_plist,
+    ITEM_FACTORY_ENTRY("/Apply as Filter/... _or Selected", NULL, match_selected_cb_or_plist,
                        0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Match/A_nd Not Selected", NULL,
+    ITEM_FACTORY_ENTRY("/Apply as Filter/... a_nd not Selected", NULL,
                        match_selected_cb_and_plist_not, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Match/O_r Not Selected", NULL,
+    ITEM_FACTORY_ENTRY("/Apply as Filter/... o_r not Selected", NULL,
                        match_selected_cb_or_plist_not, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Prepare", NULL, NULL, 0, "<Branch>", NULL),
-    ITEM_FACTORY_ENTRY("/Prepare/_Selected", NULL,
+    ITEM_FACTORY_ENTRY("/Prepare a Filter", NULL, NULL, 0, "<Branch>", NULL),
+    ITEM_FACTORY_ENTRY("/Prepare a Filter/_Selected", NULL,
                        prepare_selected_cb_replace_plist, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Prepare/_Not Selected", NULL,
+    ITEM_FACTORY_ENTRY("/Prepare a Filter/_Not Selected", NULL,
                        prepare_selected_cb_not_plist, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Prepare/_And Selected", NULL,
+    ITEM_FACTORY_ENTRY("/Prepare a Filter/... _and Selected", NULL,
                        prepare_selected_cb_and_plist, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Prepare/_Or Selected", NULL,
+    ITEM_FACTORY_ENTRY("/Prepare a Filter/... _or Selected", NULL,
                        prepare_selected_cb_or_plist, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Prepare/A_nd Not Selected", NULL,
+    ITEM_FACTORY_ENTRY("/Prepare a Filter/... a_nd not Selected", NULL,
                        prepare_selected_cb_and_plist_not, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Prepare/O_r Not Selected", NULL,
+    ITEM_FACTORY_ENTRY("/Prepare a Filter/... o_r not Selected", NULL,
                        prepare_selected_cb_or_plist_not, 0, NULL, NULL),
     ITEM_FACTORY_ENTRY("/<separator>", NULL, NULL, 0, "<Separator>", NULL),
     ITEM_FACTORY_ENTRY("/Coloring Rules...", NULL, color_display_cb,
@@ -396,31 +396,31 @@ static GtkItemFactoryEntry tree_view_menu_items[] =
                        0, NULL, NULL),
     ITEM_FACTORY_ENTRY("/Protocol Properties...", NULL, properties_cb,
                        0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Match", NULL, NULL, 0, "<Branch>", NULL),
-    ITEM_FACTORY_ENTRY("/Match/_Selected", NULL,
+    ITEM_FACTORY_ENTRY("/Apply as Filter", NULL, NULL, 0, "<Branch>", NULL),
+    ITEM_FACTORY_ENTRY("/Apply as Filter/_Selected", NULL,
                        match_selected_cb_replace_ptree, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Match/_Not Selected", NULL,
+    ITEM_FACTORY_ENTRY("/Apply as Filter/_Not Selected", NULL,
                        match_selected_cb_not_ptree, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Match/_And Selected", NULL,
+    ITEM_FACTORY_ENTRY("/Apply as Filter/... _and Selected", NULL,
                        match_selected_cb_and_ptree, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Match/_Or Selected", NULL, match_selected_cb_or_ptree,
+    ITEM_FACTORY_ENTRY("/Apply as Filter/... _or Selected", NULL, match_selected_cb_or_ptree,
                        0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Match/A_nd Not Selected", NULL,
+    ITEM_FACTORY_ENTRY("/Apply as Filter/... a_nd not Selected", NULL,
                        match_selected_cb_and_ptree_not, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Match/O_r Not Selected", NULL,
+    ITEM_FACTORY_ENTRY("/Apply as Filter/... o_r not Selected", NULL,
                        match_selected_cb_or_ptree_not, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Prepare", NULL, NULL, 0, "<Branch>", NULL),
-    ITEM_FACTORY_ENTRY("/Prepare/_Selected", NULL,
+    ITEM_FACTORY_ENTRY("/Prepare a Filter", NULL, NULL, 0, "<Branch>", NULL),
+    ITEM_FACTORY_ENTRY("/Prepare a Filter/_Selected", NULL,
                        prepare_selected_cb_replace_ptree, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Prepare/_Not Selected", NULL,
+    ITEM_FACTORY_ENTRY("/Prepare a Filter/_Not Selected", NULL,
                        prepare_selected_cb_not_ptree, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Prepare/_And Selected", NULL,
+    ITEM_FACTORY_ENTRY("/Prepare a Filter/... _and Selected", NULL,
                        prepare_selected_cb_and_ptree, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Prepare/_Or Selected", NULL,
+    ITEM_FACTORY_ENTRY("/Prepare a Filter/... _or Selected", NULL,
                        prepare_selected_cb_or_ptree, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Prepare/A_nd Not Selected", NULL,
+    ITEM_FACTORY_ENTRY("/Prepare a Filter/... a_nd not Selected", NULL,
                        prepare_selected_cb_and_ptree_not, 0, NULL, NULL),
-    ITEM_FACTORY_ENTRY("/Prepare/O_r Not Selected", NULL,
+    ITEM_FACTORY_ENTRY("/Prepare a Filter/... o_r not Selected", NULL,
                        prepare_selected_cb_or_ptree_not, 0, NULL, NULL),
     ITEM_FACTORY_ENTRY("/<separator>", NULL, NULL, 0, "<Separator>", NULL),
     ITEM_FACTORY_ENTRY("/Collapse All", NULL, collapse_all_cb, 0, NULL, NULL),
@@ -1671,9 +1671,9 @@ set_menus_for_selected_packet(capture_file *cf)
       cf->current_frame != NULL && decode_as_ok());
   set_menu_sensitivity(tree_view_menu_factory, "/Resolve Name",
       cf->current_frame != NULL && (g_resolv_flags & RESOLV_ALL_ADDRS) != RESOLV_ALL_ADDRS);
-  set_menu_sensitivity(packet_list_menu_factory, "/Match",
+  set_menu_sensitivity(packet_list_menu_factory, "/Apply as Filter",
       cf->current_frame != NULL);
-  set_menu_sensitivity(packet_list_menu_factory, "/Prepare",
+  set_menu_sensitivity(packet_list_menu_factory, "/Prepare a Filter",
       cf->current_frame != NULL);
 
   walk_menu_tree_for_selected_packet(tap_menu_tree_root, cf->current_frame,
@@ -1762,13 +1762,13 @@ set_menus_for_selected_tree_row(capture_file *cf)
          "/Go/Go to Corresponding Packet", hfinfo->type == FT_FRAMENUM);
        set_menu_sensitivity(tree_view_menu_factory,
          "/Go to Corresponding Packet", hfinfo->type == FT_FRAMENUM);
-       set_menu_sensitivity(main_menu_factory, "/Analyze/Match",
+       set_menu_sensitivity(main_menu_factory, "/Analyze/Apply as Filter",
          proto_can_match_selected(cf->finfo_selected, cf->edt));
-       set_menu_sensitivity(tree_view_menu_factory, "/Match",
+       set_menu_sensitivity(tree_view_menu_factory, "/Apply as Filter",
          proto_can_match_selected(cf->finfo_selected, cf->edt));
-       set_menu_sensitivity(main_menu_factory, "/Analyze/Prepare",
+       set_menu_sensitivity(main_menu_factory, "/Analyze/Prepare a Filter",
          proto_can_match_selected(cf->finfo_selected, cf->edt));
-       set_menu_sensitivity(tree_view_menu_factory, "/Prepare",
+       set_menu_sensitivity(tree_view_menu_factory, "/Prepare a Filter",
          proto_can_match_selected(cf->finfo_selected, cf->edt));
        set_menu_sensitivity(tree_view_menu_factory, "/Protocol Properties...",
          properties);
@@ -1779,10 +1779,10 @@ set_menus_for_selected_tree_row(capture_file *cf)
            "/Go/Go to Corresponding Packet", FALSE);
        set_menu_sensitivity(tree_view_menu_factory,
            "/Go to Corresponding Packet", FALSE);
-       set_menu_sensitivity(main_menu_factory, "/Analyze/Match", FALSE);
-       set_menu_sensitivity(tree_view_menu_factory, "/Match", FALSE);
-       set_menu_sensitivity(main_menu_factory, "/Analyze/Prepare", FALSE);
-       set_menu_sensitivity(tree_view_menu_factory, "/Prepare", FALSE);
+       set_menu_sensitivity(main_menu_factory, "/Analyze/Apply as Filter", FALSE);
+       set_menu_sensitivity(tree_view_menu_factory, "/Apply as Filter", FALSE);
+       set_menu_sensitivity(main_menu_factory, "/Analyze/Prepare a Filter", FALSE);
+       set_menu_sensitivity(tree_view_menu_factory, "/Prepare a Filter", FALSE);
        set_menu_sensitivity(tree_view_menu_factory, "/Protocol Properties...",
          FALSE);
        set_menu_sensitivity(main_menu_factory, "/View/Expand Tree", FALSE);

diff --git a/gtk/service_response_time_table.c b/gtk/service_response_time_table.c
index 3092096252c46f3ed89aacd41dd0842a29a97448..06d6a5b5bd42338f5e75f6ed5bbd303c4df2a645 100644 (file)
--- a/gtk/service_response_time_table.c
+++ b/gtk/service_response_time_table.c
@@ -3,7 +3,7 @@
  * Helper routines common to all service response time statistics
  * tap.
  *
- * $Id: service_response_time_table.c,v 1.17 2004/04/07 04:31:32 sahlberg Exp $
+ * $Id: service_response_time_table.c,v 1.18 2004/05/07 12:15:24 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -253,33 +253,33 @@ srt_show_popup_menu_cb(void *widg _U_, GdkEvent *event, srt_stat_table *rst)
 static GtkItemFactoryEntry srt_list_menu_items[] =
 {
        /* Match */
-       ITEM_FACTORY_ENTRY("/Match Display Filter", NULL, NULL, 0, "<Branch>", NULL),
-       ITEM_FACTORY_ENTRY("/Match Display Filter/Selected", NULL,
+       ITEM_FACTORY_ENTRY("/Apply as Filter", NULL, NULL, 0, "<Branch>", NULL),
+       ITEM_FACTORY_ENTRY("/Apply as Filter/Selected", NULL,
                srt_select_filter_cb, 0*256+0, NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Match Display Filter/Not Selected", NULL,
+       ITEM_FACTORY_ENTRY("/Apply as Filter/... not Selected", NULL,
                srt_select_filter_cb, 0*256+1, NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Match Display Filter/And Selected", NULL,
+       ITEM_FACTORY_ENTRY("/Apply as Filter/.. and Selected", NULL,
                srt_select_filter_cb, 0*256+2, NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Match Display Filter/Or Selected", NULL,
+       ITEM_FACTORY_ENTRY("/Apply as Filter/... or Selected", NULL,
                srt_select_filter_cb, 0*256+3, NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Match Display Filter/And Not Selected", NULL,
+       ITEM_FACTORY_ENTRY("/Apply as Filter/... and not Selected", NULL,
                srt_select_filter_cb, 0*256+4, NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Match Display Filter/Or Not Selected", NULL,
+       ITEM_FACTORY_ENTRY("/Apply as Filter/... or not Selected", NULL,
                srt_select_filter_cb, 0*256+5, NULL, NULL),
 
        /* Prepare */
-       ITEM_FACTORY_ENTRY("/Prepare Display Filter", NULL, NULL, 0, "<Branch>", NULL),
-       ITEM_FACTORY_ENTRY("/Prepare Display Filter/Selected", NULL,
+       ITEM_FACTORY_ENTRY("/Prepare a Filter", NULL, NULL, 0, "<Branch>", NULL),
+       ITEM_FACTORY_ENTRY("/Prepare a Filter/Selected", NULL,
                srt_select_filter_cb, 1*256+0, NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare Display Filter/Not Selected", NULL,
+       ITEM_FACTORY_ENTRY("/Prepare a Filter/Not Selected", NULL,
                srt_select_filter_cb, 1*256+1, NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare Display Filter/And Selected", NULL,
+       ITEM_FACTORY_ENTRY("/Prepare a Filter/... and Selected", NULL,
                srt_select_filter_cb, 1*256+2, NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare Display Filter/Or Selected", NULL,
+       ITEM_FACTORY_ENTRY("/Prepare a Filter/... or Selected", NULL,
                srt_select_filter_cb, 1*256+3, NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare Display Filter/And Not Selected", NULL,
+       ITEM_FACTORY_ENTRY("/Prepare a Filter/... and not Selected", NULL,
                srt_select_filter_cb, 1*256+4, NULL, NULL),
-       ITEM_FACTORY_ENTRY("/Prepare Display Filter/Or Not Selected", NULL,
+       ITEM_FACTORY_ENTRY("/Prepare a Filter/... or not Selected", NULL,
                srt_select_filter_cb, 1*256+5, NULL, NULL),
 
        /* Find Frame */