diff options
author | Ulf Lamping <ulf.lamping@web.de> | 2007-02-12 05:08:33 +0000 |
---|---|---|
committer | Ulf Lamping <ulf.lamping@web.de> | 2007-02-12 05:08:33 +0000 |
commit | ca590fafbe8d8769d3cd1c4b6ecd881bb0a1f399 (patch) | |
tree | 5fc29d1d5e99e263547cde7854c8a1f765869463 /gtk | |
parent | d7cf1e1fddf56272bfc61bff69b1cf04afbd1e3e (diff) |
ooops, and here comes the actual context menu code change from Douglas Pratley ... already mentioned in SVN 20787
svn path=/trunk/; revision=20790
Diffstat (limited to 'gtk')
-rw-r--r-- | gtk/menu.c | 55 |
1 files changed, 26 insertions, 29 deletions
diff --git a/gtk/menu.c b/gtk/menu.c index 1c9dcf0593..63168058fb 100644 --- a/gtk/menu.c +++ b/gtk/menu.c @@ -712,16 +712,23 @@ static GtkItemFactoryEntry packet_list_menu_items[] = ITEM_FACTORY_ENTRY("/Copy", NULL, NULL, 0, "<Branch>", NULL), ITEM_FACTORY_ENTRY("/Copy/Summary (Text)", NULL, packet_list_copy_summary_cb, CS_TEXT, NULL, NULL), ITEM_FACTORY_ENTRY("/Copy/Summary (CSV)", NULL, packet_list_copy_summary_cb, CS_CSV, NULL, NULL), - ITEM_FACTORY_ENTRY("/Copy/Hex and Text", NULL, copy_hex_cb, CD_ALLINFO, NULL, NULL), - ITEM_FACTORY_ENTRY("/Copy/Text Only", NULL, copy_hex_cb, CD_TEXTONLY, NULL, NULL), - ITEM_FACTORY_ENTRY("/Copy/Hex Columns", NULL, copy_hex_cb, CD_HEXCOLUMNS, NULL, NULL), - ITEM_FACTORY_ENTRY("/Copy/Hex Stream", NULL, copy_hex_cb, CD_HEX, NULL, NULL), + ITEM_FACTORY_ENTRY("/Copy/<separator>", NULL, NULL, 0, "<Separator>", NULL), + ITEM_FACTORY_ENTRY("/Copy/Bytes (Offset Hex Text)", NULL, copy_hex_cb, CD_ALLINFO, NULL, NULL), + ITEM_FACTORY_ENTRY("/Copy/Bytes (Offset Hex)", NULL, copy_hex_cb, CD_HEXCOLUMNS, NULL, NULL), + ITEM_FACTORY_ENTRY("/Copy/Bytes (Printable Text Only)", NULL, copy_hex_cb, CD_TEXTONLY, NULL, NULL), + ITEM_FACTORY_ENTRY("/Copy/<separator>", NULL, NULL, 0, "<Separator>", NULL), + ITEM_FACTORY_ENTRY("/Copy/Bytes (Hex Stream)", NULL, copy_hex_cb, CD_HEX, NULL, NULL), #if GTK_MAJOR_VERSION >= 2 - ITEM_FACTORY_ENTRY("/Copy/Binary Stream", NULL, copy_hex_cb, CD_BINARY, NULL, NULL), + ITEM_FACTORY_ENTRY("/Copy/Bytes (Binary Stream)", NULL, copy_hex_cb, CD_BINARY, NULL, NULL), #endif ITEM_FACTORY_ENTRY("/<separator>", NULL, NULL, 0, "<Separator>", NULL), + ITEM_FACTORY_ENTRY("/Export Selected Packet Bytes...", NULL, savehex_cb, + 0, NULL, NULL), + + ITEM_FACTORY_ENTRY("/<separator>", NULL, NULL, 0, "<Separator>", NULL), + ITEM_FACTORY_STOCK_ENTRY("/Decode As...", NULL, decode_as_cb, 0, WIRESHARK_STOCK_DECODE_AS), ITEM_FACTORY_STOCK_ENTRY("/Print...", NULL, file_print_selected_cmd_cb, 0, GTK_STOCK_PRINT), ITEM_FACTORY_ENTRY("/Show Packet in New Window", NULL, new_window_cb, @@ -737,15 +744,22 @@ static GtkItemFactoryEntry tree_view_menu_items[] = ITEM_FACTORY_ENTRY("/<separator>", NULL, NULL, 0, "<Separator>", NULL), - ITEM_FACTORY_ENTRY("/Copy", NULL, copy_selected_plist_cb, 0, NULL, NULL), - ITEM_FACTORY_ENTRY("/Copy Selected Bytes As", NULL, NULL, 0, "<Branch>", NULL), - ITEM_FACTORY_ENTRY("/Copy Selected Bytes As/Hex and Text", NULL, copy_hex_cb, CD_ALLINFO | CD_FLAGS_SELECTEDONLY, NULL, NULL), - ITEM_FACTORY_ENTRY("/Copy Selected Bytes As/Text Only", NULL, copy_hex_cb, CD_TEXTONLY | CD_FLAGS_SELECTEDONLY, NULL, NULL), - ITEM_FACTORY_ENTRY("/Copy Selected Bytes As/Hex Columns", NULL, copy_hex_cb, CD_HEXCOLUMNS | CD_FLAGS_SELECTEDONLY, NULL, NULL), - ITEM_FACTORY_ENTRY("/Copy Selected Bytes As/Hex Stream", NULL, copy_hex_cb, CD_HEX | CD_FLAGS_SELECTEDONLY, NULL, NULL), + ITEM_FACTORY_ENTRY("/Copy", NULL, NULL, 0, "<Branch>", NULL), + ITEM_FACTORY_ENTRY("/Copy/Description", NULL, copy_selected_plist_cb, 0, NULL, NULL), + ITEM_FACTORY_ENTRY("/Copy/Bytes (Offset Hex Text)", NULL, copy_hex_cb, CD_ALLINFO | CD_FLAGS_SELECTEDONLY, NULL, NULL), + ITEM_FACTORY_ENTRY("/Copy/Bytes (Offset Hex)", NULL, copy_hex_cb, CD_HEXCOLUMNS | CD_FLAGS_SELECTEDONLY, NULL, NULL), + ITEM_FACTORY_ENTRY("/Copy/Bytes (Printable Text Only)", NULL, copy_hex_cb, CD_TEXTONLY | CD_FLAGS_SELECTEDONLY, NULL, NULL), + ITEM_FACTORY_ENTRY("/Copy/<separator>", NULL, NULL, 0, "<Separator>", NULL), + ITEM_FACTORY_ENTRY("/Copy/Bytes (Hex Stream)", NULL, copy_hex_cb, CD_HEX | CD_FLAGS_SELECTEDONLY, NULL, NULL), #if GTK_MAJOR_VERSION >= 2 - ITEM_FACTORY_ENTRY("/Copy Selected Bytes As/Binary Stream", NULL, copy_hex_cb, CD_BINARY | CD_FLAGS_SELECTEDONLY, NULL, NULL), + ITEM_FACTORY_ENTRY("/Copy/Bytes (Binary Stream)", NULL, copy_hex_cb, CD_BINARY | CD_FLAGS_SELECTEDONLY, NULL, NULL), #endif + + ITEM_FACTORY_ENTRY("/<separator>", NULL, NULL, 0, "<Separator>", NULL), + + ITEM_FACTORY_ENTRY("/Export Selected Packet Bytes...", NULL, savehex_cb, + 0, NULL, NULL), + ITEM_FACTORY_ENTRY("/<separator>", NULL, NULL, 0, "<Separator>", NULL), ITEM_FACTORY_ENTRY("/Apply as Filter", NULL, NULL, 0, "<Branch>", NULL), @@ -795,17 +809,6 @@ static GtkItemFactoryEntry tree_view_menu_items[] = ITEM_FACTORY_ENTRY("/_Go to Corresponding Packet", NULL, goto_framenum_cb, 0, NULL, NULL), }; -static GtkItemFactoryEntry hexdump_menu_items[] = -{ - ITEM_FACTORY_ENTRY("/Copy", NULL, NULL, 0, "<Branch>", NULL), - ITEM_FACTORY_ENTRY("/Copy/All Information", NULL, copy_hex_cb, - CD_ALLINFO, NULL, NULL), - ITEM_FACTORY_ENTRY("/Copy/Text Only", NULL, copy_hex_cb, - CD_TEXTONLY, NULL, NULL), - ITEM_FACTORY_ENTRY("/Export Selected Packet Bytes...", NULL, savehex_cb, - 0, NULL, NULL), -}; - static int initialize = TRUE; static GtkItemFactory *main_menu_factory = NULL; @@ -854,11 +857,9 @@ menus_init(void) { popup_menu_list = g_slist_append((GSList *)popup_menu_list, tree_view_menu_factory); hexdump_menu_factory = gtk_item_factory_new(GTK_TYPE_MENU, "<main>", NULL); - gtk_item_factory_create_items_ac(hexdump_menu_factory, sizeof(hexdump_menu_items)/sizeof(hexdump_menu_items[0]), hexdump_menu_items, popup_menu_object, 2); OBJECT_SET_DATA(popup_menu_object, PM_HEXDUMP_KEY, hexdump_menu_factory->widget); popup_menu_list = g_slist_append((GSList *)popup_menu_list, hexdump_menu_factory); - /* main */ main_menu_factory = gtk_item_factory_new(GTK_TYPE_MENU_BAR, "<main>", grp); gtk_item_factory_create_items_ac(main_menu_factory, nmenu_items, menu_items, NULL, 2); @@ -2467,10 +2468,6 @@ set_menus_for_selected_tree_row(capture_file *cf) set_menu_sensitivity(main_menu_factory, "/File/Export/Selected Packet Bytes...", cf->finfo_selected != NULL); - set_menu_sensitivity(hexdump_menu_factory, "/Copy", - cf->finfo_selected != NULL); - set_menu_sensitivity(hexdump_menu_factory, "/Export Selected Packet Bytes...", - cf->finfo_selected != NULL); if (cf->finfo_selected != NULL) { header_field_info *hfinfo = cf->finfo_selected->hfinfo; |