diff options
| author | ulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7> | 2005-05-18 19:30:18 +0000 |
|---|---|---|
| committer | ulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7> | 2005-05-18 19:30:18 +0000 |
| commit | 2906229c9963b8dc9b1dab0aa6e2f0547497a9da (patch) | |
| tree | cec6c8b1c2a3a0ec535a713ed0d4b51d21337b86 /gtk/menu.c | |
| parent | d60c62df3fdb59f0c9d9495b84c5d4f150534f1b (diff) | |
insensitive context menu "Expand Subtrees" if no protocol field is currently selected, sort and name the tree related menu items like the context menu ones
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@14395 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'gtk/menu.c')
| -rw-r--r-- | gtk/menu.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/gtk/menu.c b/gtk/menu.c index db9fcf1281..c140a65e17 100644 --- a/gtk/menu.c +++ b/gtk/menu.c @@ -274,11 +274,11 @@ static GtkItemFactoryEntry menu_items[] = ITEM_FACTORY_STOCK_ENTRY("/View/Resize All Columns", NULL, packet_list_resize_columns_cb, 0, ETHEREAL_STOCK_RESIZE_COLUMNS), ITEM_FACTORY_ENTRY("/View/<separator>", NULL, NULL, 0, "<Separator>", NULL), - ITEM_FACTORY_ENTRY("/View/Collapse _All", NULL, collapse_all_cb, - 0, NULL, NULL), + ITEM_FACTORY_ENTRY("/View/E_xpand Subtrees", NULL, expand_tree_cb, 0, NULL, NULL), ITEM_FACTORY_ENTRY("/View/_Expand All", NULL, expand_all_cb, 0, NULL, NULL), - ITEM_FACTORY_ENTRY("/View/Expand Tree", NULL, expand_tree_cb, 0, NULL, NULL), + ITEM_FACTORY_ENTRY("/View/Collapse _All", NULL, collapse_all_cb, + 0, NULL, NULL), ITEM_FACTORY_ENTRY("/View/<separator>", NULL, NULL, 0, "<Separator>", NULL), ITEM_FACTORY_STOCK_ENTRY("/View/_Coloring Rules...", NULL, color_display_cb, 0, GTK_STOCK_SELECT_COLOR), @@ -1946,7 +1946,8 @@ set_menus_for_selected_tree_row(capture_file *cf) proto_can_match_selected(cf->finfo_selected, cf->edt)); set_menu_sensitivity(tree_view_menu_factory, "/Protocol Preferences...", properties); - set_menu_sensitivity(main_menu_factory, "/View/Expand Tree", cf->finfo_selected->tree_type != -1); + set_menu_sensitivity(main_menu_factory, "/View/Expand Subtrees", cf->finfo_selected->tree_type != -1); + set_menu_sensitivity(tree_view_menu_factory, "/Expand Subtrees", cf->finfo_selected->tree_type != -1); set_menu_sensitivity(tree_view_menu_factory, "/Wiki Protocol Page", TRUE); set_menu_sensitivity(tree_view_menu_factory, "/Filter Field Reference", @@ -1962,7 +1963,8 @@ set_menus_for_selected_tree_row(capture_file *cf) set_menu_sensitivity(tree_view_menu_factory, "/Prepare a Filter", FALSE); set_menu_sensitivity(tree_view_menu_factory, "/Protocol Preferences...", FALSE); - set_menu_sensitivity(main_menu_factory, "/View/Expand Tree", FALSE); + set_menu_sensitivity(main_menu_factory, "/View/Expand Subtrees", FALSE); + set_menu_sensitivity(tree_view_menu_factory, "/Expand Subtrees", FALSE); set_menu_sensitivity(tree_view_menu_factory, "/Wiki Protocol Page", FALSE); set_menu_sensitivity(tree_view_menu_factory, "/Filter Field Reference", |