/* menu.c
* Menu routines
*
- * $Id: menu.c,v 1.177 2004/03/13 17:50:23 ulfl Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
#include "menu.h"
#include "tap_menu.h"
#include <epan/packet.h>
-#include <epan/resolv.h>
-#include "prefs.h"
+#include <epan/addr_resolv.h>
+#include <epan/prefs.h>
+#include <epan/tap.h>
+#include <epan/timestamp.h>
+#include <epan/ipproto.h>
+
+#include "about_dlg.h"
#include "capture_dlg.h"
#include "color_dlg.h"
-#include "filter_prefs.h"
+#include "filter_dlg.h"
+#include "dlg_utils.h"
#include "file_dlg.h"
#include "find_dlg.h"
#include "goto_dlg.h"
#include "toolbar.h"
#include "gtkglobals.h"
#include "register.h"
-#include "../tap.h"
#include "../menu.h"
-#include "../ipproto.h"
#include "packet_list.h"
#include "ethclist.h"
#include "recent.h"
#include "../ui_util.h"
#include "proto_draw.h"
+#include "conversations_table.h"
+#include "hostlist_table.h"
#include "simple_dialog.h"
GtkWidget *popup_menu_object;
-extern void savehex_cb(GtkWidget * w, gpointer data _U_);
-
static void
clear_menu_recent_capture_file_cmd_cb(GtkWidget *w, gpointer unused _U_);
typedef struct _menu_item {
- char *name;
+ char *name;
gint group;
- gboolean enabled;
+ gboolean enabled;
GtkItemFactoryCallback callback;
gpointer callback_data;
- gboolean (*selected_packet_enabled)(frame_data *, epan_dissect_t *);
- gboolean (*selected_tree_row_enabled)(field_info *);
- GList *children;
+ gboolean (*selected_packet_enabled)(frame_data *, epan_dissect_t *);
+ gboolean (*selected_tree_row_enabled)(field_info *);
+ GList *children;
} menu_item_t;
static GList *tap_menu_tree_root = NULL;
Item 6: extra data needed for ImageItem and StockItem (gtk2)
*/
+/* As a general GUI guideline, we try to follow the Gnome Human Interface Guidelines, which can be found at:
+ http://developer.gnome.org/projects/gup/hig/1.0/index.html
+
+Please note: there are some differences between the Gnome HIG menu suggestions and our implementation:
+
+File/Open Recent: the Gnome HIG suggests putting the list of recently used files as elements into the File menuitem.
+ As this is ok for only a few items, this will become unhandy for 10 or even more list entries.
+ For this reason, we use a submenu for this.
+
+File/Close: the Gnome HIG suggests putting this item just above the Quit item.
+ This results in unintuitive behaviour as both Close and Quit items are very near together.
+ By putting the Close item near the open item(s), it better suggests that it will close the
+ currently opened/captured file only.
+*/
+
+
/* main menu */
static GtkItemFactoryEntry menu_items[] =
{
ITEM_FACTORY_STOCK_ENTRY("/File/_Open...", "<control>O", file_open_cmd_cb,
0, GTK_STOCK_OPEN),
ITEM_FACTORY_ENTRY("/File/Open _Recent", NULL, NULL, 0, "<Branch>", NULL),
+ ITEM_FACTORY_ENTRY("/File/_Merge...", NULL, file_merge_cmd_cb, 0, NULL, NULL),
ITEM_FACTORY_STOCK_ENTRY("/File/_Close", "<control>W", file_close_cmd_cb,
0, GTK_STOCK_CLOSE),
ITEM_FACTORY_ENTRY("/File/<separator>", NULL, NULL, 0, "<Separator>", NULL),
0, GTK_STOCK_SAVE_AS),
ITEM_FACTORY_ENTRY("/File/<separator>", NULL, NULL, 0, "<Separator>", NULL),
ITEM_FACTORY_ENTRY("/File/_Export", NULL, NULL, 0, "<Branch>", NULL),
- ITEM_FACTORY_ENTRY("/File/_Export/_Selected Packet Bytes...", "<control>H", savehex_cb,
+ ITEM_FACTORY_ENTRY("/File/Export/as \"Plain _Text\" file...", NULL, export_text_cmd_cb,
+ 0, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/File/Export/as \"_PostScript\" file...", NULL, export_ps_cmd_cb,
+ 0, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/File/Export/as XML - \"P_SML\" (packet summary) file...", NULL, export_psml_cmd_cb,
+ 0, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/File/Export/as XML - \"P_DML\" (packet details) file...", NULL, export_pdml_cmd_cb,
+ 0, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/File/Export/<separator>", NULL, NULL, 0, "<Separator>", NULL),
+ ITEM_FACTORY_ENTRY("/File/Export/Selected Packet _Bytes...", "<control>H", savehex_cb,
0, NULL, NULL),
ITEM_FACTORY_ENTRY("/File/<separator>", NULL, NULL, 0, "<Separator>", NULL),
ITEM_FACTORY_STOCK_ENTRY("/File/_Print...", "<control>P", file_print_cmd_cb,
find_previous_cb, 0, GTK_STOCK_GO_BACK),
ITEM_FACTORY_ENTRY("/Edit/<separator>", NULL, NULL, 0, "<Separator>", NULL),
ITEM_FACTORY_ENTRY("/Edit/_Time Reference", NULL, NULL, 0, "<Branch>", NULL),
- ITEM_FACTORY_ENTRY("/Edit/Time Reference/Set Time Reference (toggle)", "<control>T", reftime_frame_cb, 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Edit/Time Reference/Find Next", NULL, reftime_frame_cb, 1, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Edit/Time Reference/Find Previous", NULL, reftime_frame_cb, 2, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Edit/Time Reference/Set Time Reference (toggle)", "<control>T", reftime_frame_cb, REFTIME_TOGGLE, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Edit/Time Reference/Find Next", NULL, reftime_frame_cb, REFTIME_FIND_NEXT, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Edit/Time Reference/Find Previous", NULL, reftime_frame_cb, REFTIME_FIND_PREV, NULL, NULL),
ITEM_FACTORY_ENTRY("/Edit/_Mark Packet", "<control>M", mark_frame_cb,
0, NULL, NULL),
ITEM_FACTORY_ENTRY("/Edit/Mark _All Packets", NULL, mark_all_frames_cb,
ITEM_FACTORY_STOCK_ENTRY("/Edit/_Preferences...", "<shift><control>P", prefs_cb,
0, GTK_STOCK_PREFERENCES),
ITEM_FACTORY_ENTRY("/_View", NULL, NULL, 0, "<Branch>", NULL),
- ITEM_FACTORY_ENTRY("/View/_Show", NULL, NULL, 0, "<Branch>", NULL),
- ITEM_FACTORY_ENTRY("/View/Show/Main Toolbar", NULL, main_toolbar_show_cb, 0, "<CheckItem>", NULL),
- ITEM_FACTORY_ENTRY("/View/Show/Filter Toolbar", NULL, filter_toolbar_show_cb, 0, "<CheckItem>", NULL),
- ITEM_FACTORY_ENTRY("/View/Show/<separator>", NULL, NULL, 0, "<Separator>", NULL),
- ITEM_FACTORY_ENTRY("/View/Show/Packet List", NULL, packet_list_show_cb, 0, "<CheckItem>", NULL),
- ITEM_FACTORY_ENTRY("/View/Show/Packet Details", NULL, tree_view_show_cb, 0, "<CheckItem>", NULL),
- ITEM_FACTORY_ENTRY("/View/Show/Packet Bytes", NULL, byte_view_show_cb, 0, "<CheckItem>", NULL),
- ITEM_FACTORY_ENTRY("/View/Show/<separator>", NULL, NULL, 0, "<Separator>", NULL),
- ITEM_FACTORY_ENTRY("/View/Show/Status Bar", NULL, statusbar_show_cb, 0, "<CheckItem>", NULL),
+ ITEM_FACTORY_ENTRY("/View/_Main Toolbar", NULL, main_toolbar_show_cb, 0, "<CheckItem>", NULL),
+ ITEM_FACTORY_ENTRY("/View/_Filter Toolbar", NULL, filter_toolbar_show_cb, 0, "<CheckItem>", NULL),
+ ITEM_FACTORY_ENTRY("/View/_Statusbar", NULL, statusbar_show_cb, 0, "<CheckItem>", NULL),
+ ITEM_FACTORY_ENTRY("/View/<separator>", NULL, NULL, 0, "<Separator>", NULL),
+ ITEM_FACTORY_ENTRY("/View/Packet _List", NULL, packet_list_show_cb, 0, "<CheckItem>", NULL),
+ ITEM_FACTORY_ENTRY("/View/Packet _Details", NULL, tree_view_show_cb, 0, "<CheckItem>", NULL),
+ ITEM_FACTORY_ENTRY("/View/Packet _Bytes", NULL, byte_view_show_cb, 0, "<CheckItem>", NULL),
+ ITEM_FACTORY_ENTRY("/View/<separator>", NULL, NULL, 0, "<Separator>", NULL),
ITEM_FACTORY_ENTRY("/View/_Time Display Format", NULL, NULL, 0, "<Branch>", NULL),
ITEM_FACTORY_ENTRY("/View/Time Display Format/Time of Day", NULL, timestamp_absolute_cb,
0, "<RadioItem>", NULL),
0, "/View/Time Display Format/Time of Day", NULL),
ITEM_FACTORY_ENTRY("/View/Time Display Format/Seconds Since Previous Packet", NULL, timestamp_delta_cb,
0, "/View/Time Display Format/Time of Day", NULL),
- ITEM_FACTORY_ENTRY("/View/_Name Resolution", NULL, NULL, 0, "<Branch>", NULL),
+ ITEM_FACTORY_ENTRY("/View/Name Resol_ution", NULL, NULL, 0, "<Branch>", NULL),
+ ITEM_FACTORY_ENTRY("/View/Name Resolution/_Resolve Name", NULL, resolve_name_cb, 0, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/View/Name Resolution/<separator>", NULL, NULL, 0, "<Separator>", NULL),
ITEM_FACTORY_ENTRY("/View/Name Resolution/Enable for _MAC Layer", NULL, name_resolution_mac_cb, 0, "<CheckItem>", NULL),
ITEM_FACTORY_ENTRY("/View/Name Resolution/Enable for _Network Layer", NULL, name_resolution_network_cb, 0, "<CheckItem>", NULL),
ITEM_FACTORY_ENTRY("/View/Name Resolution/Enable for _Transport Layer", NULL, name_resolution_transport_cb, 0, "<CheckItem>", NULL),
#ifdef HAVE_LIBPCAP
- ITEM_FACTORY_ENTRY("/View/Auto Scroll in _Live Capture", NULL, auto_scroll_live_cb, 0, "<CheckItem>", NULL),
+ ITEM_FACTORY_ENTRY("/View/Auto Scroll in Li_ve Capture", NULL, auto_scroll_live_cb, 0, "<CheckItem>", NULL),
#endif
ITEM_FACTORY_ENTRY("/View/<separator>", NULL, NULL, 0, "<Separator>", NULL),
- ITEM_FACTORY_STOCK_ENTRY("/View/Zoom In", "<control>plus", view_zoom_in_cb,
+ ITEM_FACTORY_STOCK_ENTRY("/View/_Zoom In", "<control>plus", view_zoom_in_cb,
0, GTK_STOCK_ZOOM_IN),
- ITEM_FACTORY_STOCK_ENTRY("/View/Zoom Out", "<control>minus", view_zoom_out_cb,
+ ITEM_FACTORY_STOCK_ENTRY("/View/Zoom _Out", "<control>minus", view_zoom_out_cb,
0, GTK_STOCK_ZOOM_OUT),
- ITEM_FACTORY_STOCK_ENTRY("/View/Normal Size", "<control>equal", view_zoom_100_cb,
+ ITEM_FACTORY_STOCK_ENTRY("/View/_Normal Size", "<control>equal", view_zoom_100_cb,
0, GTK_STOCK_ZOOM_100),
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/_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/<separator>", NULL, NULL, 0, "<Separator>", NULL),
ITEM_FACTORY_STOCK_ENTRY("/View/_Coloring Rules...", NULL, color_display_cb,
0, GTK_STOCK_SELECT_COLOR),
capture_prep_cb, 0, ETHEREAL_STOCK_CAPTURE_START),
ITEM_FACTORY_STOCK_ENTRY("/Capture/S_top", "<control>E", capture_stop_cb,
0, GTK_STOCK_STOP),
+ ITEM_FACTORY_ENTRY("/Capture/_Interfaces...", NULL,
+ capture_if_cb, 0, NULL, NULL),
ITEM_FACTORY_STOCK_ENTRY("/Capture/_Capture Filters...", NULL, cfilter_dialog_cb,
0, ETHEREAL_STOCK_CAPTURE_FILTER),
#endif /* HAVE_LIBPCAP */
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,
- match_selected_cb_replace_ptree, 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Analyze/Match/_Not Selected", NULL,
- match_selected_cb_not_ptree, 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Analyze/Match/_And Selected", NULL,
- match_selected_cb_and_ptree, 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Analyze/Match/_Or Selected", NULL,
- match_selected_cb_or_ptree, 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Analyze/Match/A_nd Not Selected", NULL,
- match_selected_cb_and_ptree_not, 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Analyze/Match/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,
- prepare_selected_cb_replace_ptree, 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Analyze/Prepare/_Not Selected", NULL,
- prepare_selected_cb_not_ptree, 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Analyze/Prepare/_And Selected", NULL,
- prepare_selected_cb_and_ptree, 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Analyze/Prepare/_Or Selected", NULL,
- prepare_selected_cb_or_ptree, 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Analyze/Prepare/A_nd Not Selected", NULL,
- prepare_selected_cb_and_ptree_not, 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Analyze/Prepare/O_r Not Selected", NULL,
- prepare_selected_cb_or_ptree_not, 0, NULL, 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_ptree_cb,
+ MATCH_SELECTED_REPLACE|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Analyze/Apply as Filter/_Not Selected", NULL, match_selected_ptree_cb,
+ MATCH_SELECTED_NOT|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Analyze/Apply as Filter/... _and Selected", NULL, match_selected_ptree_cb,
+ MATCH_SELECTED_AND|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Analyze/Apply as Filter/... _or Selected", NULL, match_selected_ptree_cb,
+ MATCH_SELECTED_OR|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Analyze/Apply as Filter/... a_nd not Selected", NULL, match_selected_ptree_cb,
+ MATCH_SELECTED_AND_NOT|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Analyze/Apply as Filter/... o_r not Selected", NULL, match_selected_ptree_cb,
+ MATCH_SELECTED_OR_NOT|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Analyze/_Prepare a Filter", NULL, NULL, 0, "<Branch>", NULL),
+ ITEM_FACTORY_ENTRY("/Analyze/Prepare a Filter/_Selected", NULL, match_selected_ptree_cb,
+ MATCH_SELECTED_REPLACE, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Analyze/Prepare a Filter/_Not Selected", NULL, match_selected_ptree_cb,
+ MATCH_SELECTED_NOT, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Analyze/Prepare a Filter/... _and Selected", NULL, match_selected_ptree_cb,
+ MATCH_SELECTED_AND, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Analyze/Prepare a Filter/... _or Selected", NULL, match_selected_ptree_cb,
+ MATCH_SELECTED_OR, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Analyze/Prepare a Filter/... a_nd not Selected", NULL, match_selected_ptree_cb,
+ MATCH_SELECTED_AND_NOT, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Analyze/Prepare a Filter/... o_r not Selected", NULL, match_selected_ptree_cb,
+ MATCH_SELECTED_OR_NOT, 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),
ITEM_FACTORY_ENTRY("/Analyze/Decode _As...", NULL, decode_as_cb,
ITEM_FACTORY_ENTRY("/Statistics/_Summary", NULL, summary_open_cb, 0, NULL, NULL),
ITEM_FACTORY_ENTRY("/Statistics/_Protocol Hierarchy", NULL,
proto_hier_stats_cb, 0, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Statistics/Conversations", NULL,
+ init_conversation_notebook_cb, 0, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Statistics/Endpoints", NULL,
+ init_hostlist_notebook_cb, 0, NULL, NULL),
ITEM_FACTORY_ENTRY("/_Help", NULL, NULL, 0, "<Branch>", NULL),
ITEM_FACTORY_STOCK_ENTRY("/Help/_Contents", "F1", help_cb, 0, GTK_STOCK_HELP),
ITEM_FACTORY_ENTRY("/Help/_Supported Protocols", NULL, supported_cb, 0, NULL, NULL),
+#if (GLIB_MAJOR_VERSION >= 2)
+#ifdef ETHEREAL_EUG_DIR
+ ITEM_FACTORY_ENTRY("/Help/User's Guide", NULL, url_page_menu_cb, HELP_CONTENT, NULL, NULL),
+#endif
+ ITEM_FACTORY_ENTRY("/Help/Manual Pages", NULL, NULL, 0, "<Branch>", NULL),
+ ITEM_FACTORY_ENTRY("/Help/Manual Pages/Ethereal", NULL, url_page_menu_cb, LOCALPAGE_MAN_ETHEREAL, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Help/Manual Pages/Ethereal Filter", NULL, url_page_menu_cb, LOCALPAGE_MAN_ETHEREAL_FILTER, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Help/Manual Pages/<separator>", NULL, NULL, 0, "<Separator>", NULL),
+ ITEM_FACTORY_ENTRY("/Help/Manual Pages/Tethereal", NULL, url_page_menu_cb, LOCALPAGE_MAN_TETHEREAL, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Help/Manual Pages/Mergecap", NULL, url_page_menu_cb, LOCALPAGE_MAN_MERGECAP, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Help/Manual Pages/Editcap", NULL, url_page_menu_cb, LOCALPAGE_MAN_EDITCAP, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Help/Manual Pages/Text2pcap", NULL, url_page_menu_cb, LOCALPAGE_MAN_TEXT2PCAP, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Help/Ethereal Online", NULL, NULL, 0, "<Branch>", NULL),
+ ITEM_FACTORY_STOCK_ENTRY("/Help/Ethereal Online/Home Page", NULL, url_page_menu_cb, ONLINEPAGE_HOME, GTK_STOCK_HOME),
+ ITEM_FACTORY_ENTRY("/Help/Ethereal Online/Wiki", NULL, url_page_menu_cb, ONLINEPAGE_WIKI, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Help/Ethereal Online/User's Guide", NULL, url_page_menu_cb, ONLINEPAGE_USERGUIDE, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Help/Ethereal Online/FAQ's", NULL, url_page_menu_cb, ONLINEPAGE_FAQ, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Help/Ethereal Online/Downloads", NULL, url_page_menu_cb, ONLINEPAGE_DOWNLOAD, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Help/Ethereal Online/Example Files", NULL, url_page_menu_cb, ONLINEPAGE_SAMPLE_FILES, NULL, NULL),
+#endif
ITEM_FACTORY_ENTRY("/Help/<separator>", NULL, NULL, 0, "<Separator>", NULL),
-#ifdef HAVE_PLUGINS
- ITEM_FACTORY_ENTRY("/Help/About _Plugins", NULL, tools_plugins_cmd_cb,
- 0, NULL, NULL),
-#endif /* HAVE_PLUGINS */
- ITEM_FACTORY_ENTRY("/Help/_About Ethereal", NULL, about_ethereal,
+ ITEM_FACTORY_ENTRY("/Help/_About Ethereal", NULL, about_ethereal_cb,
0, NULL, NULL)
};
ITEM_FACTORY_ENTRY("/<separator>", NULL, NULL, 0, "<Separator>", NULL),
ITEM_FACTORY_ENTRY("/Mark Packet", NULL, mark_frame_cb, 0, NULL, NULL),
ITEM_FACTORY_ENTRY("/Time Reference", NULL, NULL, 0, "<Branch>", NULL),
- 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,
- match_selected_cb_replace_plist, 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Match/_Not Selected", NULL,
- match_selected_cb_not_plist, 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Match/_And Selected", NULL,
- match_selected_cb_and_plist, 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Match/_Or Selected", NULL, match_selected_cb_or_plist,
- 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Match/A_nd Not Selected", NULL,
- match_selected_cb_and_plist_not, 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Match/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,
- prepare_selected_cb_replace_plist, 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Prepare/_Not Selected", NULL,
- prepare_selected_cb_not_plist, 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Prepare/_And Selected", NULL,
- prepare_selected_cb_and_plist, 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Prepare/_Or Selected", NULL,
- prepare_selected_cb_or_plist, 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Prepare/A_nd Not Selected", NULL,
- prepare_selected_cb_and_plist_not, 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Prepare/O_r Not Selected", NULL,
- prepare_selected_cb_or_plist_not, 0, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Time Reference/Set Time Reference (toggle)", NULL, reftime_frame_cb, REFTIME_TOGGLE, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Time Reference/Find Next", NULL, reftime_frame_cb, REFTIME_FIND_NEXT, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Time Reference/Find Previous", NULL, reftime_frame_cb, REFTIME_FIND_PREV, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Apply as Filter", NULL, NULL, 0, "<Branch>", NULL),
+ ITEM_FACTORY_ENTRY("/Apply as Filter/_Selected", NULL, match_selected_plist_cb,
+ MATCH_SELECTED_REPLACE|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Apply as Filter/_Not Selected", NULL, match_selected_plist_cb,
+ MATCH_SELECTED_NOT|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Apply as Filter/... _and Selected", NULL, match_selected_plist_cb,
+ MATCH_SELECTED_AND|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Apply as Filter/... _or Selected", NULL, match_selected_plist_cb,
+ MATCH_SELECTED_OR|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Apply as Filter/... a_nd not Selected", NULL, match_selected_plist_cb,
+ MATCH_SELECTED_AND_NOT|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Apply as Filter/... o_r not Selected", NULL, match_selected_plist_cb,
+ MATCH_SELECTED_OR_NOT|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
+
+ ITEM_FACTORY_ENTRY("/Prepare a Filter", NULL, NULL, 0, "<Branch>", NULL),
+ ITEM_FACTORY_ENTRY("/Prepare a Filter/_Selected", NULL, match_selected_plist_cb,
+ MATCH_SELECTED_REPLACE, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Prepare a Filter/_Not Selected", NULL, match_selected_plist_cb,
+ MATCH_SELECTED_NOT, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Prepare a Filter/... _and Selected", NULL, match_selected_plist_cb,
+ MATCH_SELECTED_AND, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Prepare a Filter/... _or Selected", NULL, match_selected_plist_cb,
+ MATCH_SELECTED_OR, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Prepare a Filter/... a_nd not Selected", NULL, match_selected_plist_cb,
+ MATCH_SELECTED_AND_NOT, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Prepare a Filter/... o_r not Selected", NULL, match_selected_plist_cb,
+ MATCH_SELECTED_OR_NOT, NULL, NULL),
+
ITEM_FACTORY_ENTRY("/<separator>", NULL, NULL, 0, "<Separator>", NULL),
ITEM_FACTORY_ENTRY("/Coloring Rules...", NULL, color_display_cb,
0, NULL, NULL),
ITEM_FACTORY_ENTRY("/_Go to Corresponding Packet", NULL, goto_framenum_cb, 0, NULL, NULL),
ITEM_FACTORY_ENTRY("/_Export Selected Packet Bytes...", NULL, savehex_cb,
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,
- match_selected_cb_replace_ptree, 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Match/_Not Selected", NULL,
- match_selected_cb_not_ptree, 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Match/_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("/Protocol Preferences...", NULL, properties_cb,
0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Match/A_nd Not Selected", NULL,
- match_selected_cb_and_ptree_not, 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Match/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,
- prepare_selected_cb_replace_ptree, 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Prepare/_Not Selected", NULL,
- prepare_selected_cb_not_ptree, 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Prepare/_And Selected", NULL,
- prepare_selected_cb_and_ptree, 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Prepare/_Or Selected", NULL,
- prepare_selected_cb_or_ptree, 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Prepare/A_nd Not Selected", NULL,
- prepare_selected_cb_and_ptree_not, 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Prepare/O_r Not Selected", NULL,
- prepare_selected_cb_or_ptree_not, 0, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Apply as Filter", NULL, NULL, 0, "<Branch>", NULL),
+ ITEM_FACTORY_ENTRY("/Apply as Filter/_Selected", NULL, match_selected_ptree_cb,
+ MATCH_SELECTED_REPLACE|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Apply as Filter/_Not Selected", NULL, match_selected_ptree_cb,
+ MATCH_SELECTED_NOT|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Apply as Filter/... _and Selected", NULL, match_selected_ptree_cb,
+ MATCH_SELECTED_AND|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Apply as Filter/... _or Selected", NULL, match_selected_ptree_cb,
+ MATCH_SELECTED_OR|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Apply as Filter/... a_nd not Selected", NULL, match_selected_ptree_cb,
+ MATCH_SELECTED_AND_NOT|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Apply as Filter/... o_r not Selected", NULL, match_selected_ptree_cb,
+ MATCH_SELECTED_OR_NOT|MATCH_SELECTED_APPLY_NOW, NULL, NULL),
+
+ ITEM_FACTORY_ENTRY("/Prepare a Filter", NULL, NULL, 0, "<Branch>", NULL),
+ ITEM_FACTORY_ENTRY("/Prepare a Filter/_Selected", NULL, match_selected_ptree_cb,
+ MATCH_SELECTED_REPLACE, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Prepare a Filter/_Not Selected", NULL, match_selected_ptree_cb,
+ MATCH_SELECTED_NOT, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Prepare a Filter/... _and Selected", NULL, match_selected_ptree_cb,
+ MATCH_SELECTED_AND, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Prepare a Filter/... _or Selected", NULL, match_selected_ptree_cb,
+ MATCH_SELECTED_OR, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Prepare a Filter/... a_nd not Selected", NULL, match_selected_ptree_cb,
+ MATCH_SELECTED_AND_NOT, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Prepare a Filter/... o_r not Selected", NULL, match_selected_ptree_cb,
+ MATCH_SELECTED_OR_NOT, NULL, NULL),
ITEM_FACTORY_ENTRY("/<separator>", NULL, NULL, 0, "<Separator>", NULL),
ITEM_FACTORY_ENTRY("/Collapse All", NULL, collapse_all_cb, 0, NULL, NULL),
- ITEM_FACTORY_ENTRY("/Expand All", NULL, expand_all_cb, 0, NULL, NULL)
+ ITEM_FACTORY_ENTRY("/Expand All", NULL, expand_all_cb, 0, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Expand Tree", NULL, expand_tree_cb, 0, NULL, NULL)
};
static GtkItemFactoryEntry hexdump_menu_items[] =
ITEM_FACTORY_ENTRY("/Display Filters...", NULL, dfilter_dialog_cb,
0, NULL, NULL),
ITEM_FACTORY_ENTRY("/Export Selected Packet Bytes...", NULL, savehex_cb,
+ 0, NULL, NULL),
+ ITEM_FACTORY_ENTRY("/Copy Packet Bytes into Clipboard", NULL, copy_hex_cb,
0, NULL, NULL)
};
GList *curnode)
{
menu_item_t *curr;
- menu_item_t *child;
+ menu_item_t *child;
- child = g_malloc(sizeof (menu_item_t));
+ child = g_malloc(sizeof (menu_item_t));
child->group = group;
- child->name = name;
+ child->name = name;
child->callback = callback;
- child->selected_packet_enabled = selected_packet_enabled;
- child->selected_tree_row_enabled = selected_tree_row_enabled;
+ child->selected_packet_enabled = selected_packet_enabled;
+ child->selected_tree_row_enabled = selected_tree_row_enabled;
child->callback_data = callback_data;
- child->enabled = FALSE;
+ child->enabled = FALSE;
child->children = NULL;
/* insert the new child node into the parent */
void
register_tap_menu_item(
char *name,
- gint group,
+ REGISTER_TAP_GROUP_E group,
GtkItemFactoryCallback callback,
gboolean (*selected_packet_enabled)(frame_data *, epan_dissect_t *),
gboolean (*selected_tree_row_enabled)(field_info *),
gpointer callback_data)
{
- /*static const char toolspath[] = "/Statistics/";*/
- char *toolspath;
- char *p;
- char *menupath;
- size_t menupathlen;
- menu_item_t *child;
+ /*static const char toolspath[] = "/Statistics/";*/
+ char *toolspath;
+ char *p;
+ char *menupath;
+ size_t menupathlen;
+ menu_item_t *child;
GList *curnode;
GList *childnode;
/*
* The menu path must be relative.
*/
- g_assert(*name != '/');
+ g_assert(*name != '/');
switch(group) {
case(REGISTER_TAP_GROUP_GENERIC): toolspath = "/Statistics/"; break;
gpointer dialog;
- if((cfile.state != FILE_CLOSED) && !cfile.user_saved) {
+ if((cfile.state != FILE_CLOSED) && !cfile.user_saved && prefs.gui_ask_unsaved) {
/* user didn't saved his current file, ask him */
dialog = simple_dialog(ESD_TYPE_CONFIRMATION, ESD_BTNS_YES_NO_CANCEL,
PRIMARY_TEXT_START "Save capture file before opening a new one?" PRIMARY_TEXT_END "\n\n"
normalized_cf_name = g_strdup(cf_name);
-#ifdef WIN32
- /* replace all slashes by backslashes */
- g_strdelimit(normalized_cf_name, "/", '\\');
+#ifdef _WIN32
+ /* replace all slashes by backslashes */
+ g_strdelimit(normalized_cf_name, "/", '\\');
#endif
/* get the submenu container item */
* already in the list or
* this element is above maximum count (too old), remove it */
if (!widget_cf_name ||
-#ifdef WIN32
- /* do a case insensitive compare on win32 */
+#ifdef _WIN32
+ /* do a case insensitive compare on win32 */
#if GLIB_MAJOR_VERSION < 2
- g_strncasecmp(widget_cf_name, normalized_cf_name, 1000) == 0 ||
+ g_strncasecmp(widget_cf_name, normalized_cf_name, 1000) == 0 ||
#else
- g_ascii_strncasecmp(widget_cf_name, normalized_cf_name, 1000) == 0 ||
+ g_ascii_strncasecmp(widget_cf_name, normalized_cf_name, 1000) == 0 ||
#endif
-#else /* WIN32 */
- /* do a case sensitive compare on unix */
+#else /* _WIN32 */
+ /* do a case sensitive compare on unix */
strncmp(widget_cf_name, normalized_cf_name, 1000) == 0 ||
#endif
cnt >= prefs.gui_recent_files_count_max) {
#if GTK_MAJOR_VERSION < 2
menu_item = gtk_menu_item_new_with_label("<Clear File List>");
#else
- menu_item = gtk_image_menu_item_new_from_stock
- (GTK_STOCK_CLEAR, NULL);
+ menu_item = gtk_image_menu_item_new_from_stock(GTK_STOCK_CLEAR, NULL);
#endif
gtk_menu_append (GTK_MENU(submenu_recent_files), menu_item);
SIGNAL_CONNECT_OBJECT(GTK_OBJECT(menu_item), "activate",
/* write all capture filenames of the menu to the user's recent file */
void
menu_recent_file_write_all(FILE *rf) {
- GtkWidget *submenu_recent_files;
+ GtkWidget *submenu_recent_files;
GList *children;
- GList *child;
- gchar *cf_name;
+ GList *child;
+ gchar *cf_name;
- submenu_recent_files = gtk_item_factory_get_widget(main_menu_factory, MENU_RECENT_FILES_PATH);
+ submenu_recent_files = gtk_item_factory_get_widget(main_menu_factory, MENU_RECENT_FILES_PATH);
/* we have to iterate backwards through the children's list,
* so we get the latest item last in the file.
children = gtk_container_children(GTK_CONTAINER(submenu_recent_files));
child = g_list_last(children);
while(child != NULL) {
- /* get capture filename from the menu item label */
- cf_name = OBJECT_GET_DATA(child->data, MENU_RECENT_FILES_KEY);
- if (cf_name) {
- fprintf (rf, RECENT_KEY_CAPTURE_FILE ": %s\n", cf_name);
- }
+ /* get capture filename from the menu item label */
+ cf_name = OBJECT_GET_DATA(child->data, MENU_RECENT_FILES_KEY);
+ if (cf_name) {
+ fprintf (rf, RECENT_KEY_CAPTURE_FILE ": %s\n", cf_name);
+ }
child = g_list_previous(child);
}
- g_list_free(children);
+ g_list_free(children);
}
/* save current setting in recent */
recent.main_toolbar_show = GTK_CHECK_MENU_ITEM(w)->active;
- main_widgets_rearrange();
+ main_widgets_show_or_hide();
}
/* save current setting in recent */
recent.filter_toolbar_show = GTK_CHECK_MENU_ITEM(w)->active;
- main_widgets_rearrange();
+ main_widgets_show_or_hide();
}
/* save current setting in recent */
recent.packet_list_show = GTK_CHECK_MENU_ITEM(w)->active;
- main_widgets_rearrange();
+ main_widgets_show_or_hide();
}
/* save current setting in recent */
recent.tree_view_show = GTK_CHECK_MENU_ITEM(w)->active;
- main_widgets_rearrange();
+ main_widgets_show_or_hide();
}
/* save current setting in recent */
recent.byte_view_show = GTK_CHECK_MENU_ITEM(w)->active;
- main_widgets_rearrange();
+ main_widgets_show_or_hide();
}
/* save current setting in recent */
recent.statusbar_show = GTK_CHECK_MENU_ITEM(w)->active;
- main_widgets_rearrange();
+ main_widgets_show_or_hide();
}
timestamp_absolute_cb(GtkWidget *w _U_, gpointer d _U_)
{
if (recent.gui_time_format != TS_ABSOLUTE) {
- timestamp_type = TS_ABSOLUTE;
- recent.gui_time_format = timestamp_type;
+ set_timestamp_setting(TS_ABSOLUTE);
+ recent.gui_time_format = TS_ABSOLUTE;
change_time_formats(&cfile);
}
}
timestamp_absolute_date_cb(GtkWidget *w _U_, gpointer d _U_)
{
if (recent.gui_time_format != TS_ABSOLUTE_WITH_DATE) {
- timestamp_type = TS_ABSOLUTE_WITH_DATE;
- recent.gui_time_format = timestamp_type;
+ set_timestamp_setting(TS_ABSOLUTE_WITH_DATE);
+ recent.gui_time_format = TS_ABSOLUTE_WITH_DATE;
change_time_formats(&cfile);
}
}
timestamp_relative_cb(GtkWidget *w _U_, gpointer d _U_)
{
if (recent.gui_time_format != TS_RELATIVE) {
- timestamp_type = TS_RELATIVE;
- recent.gui_time_format = timestamp_type;
+ set_timestamp_setting(TS_RELATIVE);
+ recent.gui_time_format = TS_RELATIVE;
change_time_formats(&cfile);
}
}
timestamp_delta_cb(GtkWidget *w _U_, gpointer d _U_)
{
if (recent.gui_time_format != TS_DELTA) {
- timestamp_type = TS_DELTA;
- recent.gui_time_format = timestamp_type;
+ set_timestamp_setting(TS_DELTA);
+ recent.gui_time_format = TS_DELTA;
change_time_formats(&cfile);
}
}
+void
+menu_name_resolution_changed(void)
+{
+ GtkWidget *menu = NULL;
+
+ menu = gtk_item_factory_get_widget(main_menu_factory, "/View/Name Resolution/Enable for MAC Layer");
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu), g_resolv_flags & RESOLV_MAC);
+
+ menu = gtk_item_factory_get_widget(main_menu_factory, "/View/Name Resolution/Enable for Network Layer");
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu), g_resolv_flags & RESOLV_NETWORK);
+
+ menu = gtk_item_factory_get_widget(main_menu_factory, "/View/Name Resolution/Enable for Transport Layer");
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu), g_resolv_flags & RESOLV_TRANSPORT);
+}
+
static void
name_resolution_mac_cb(GtkWidget *w _U_, gpointer d _U_)
{
menu_recent_read_finished(void) {
GtkWidget *menu = NULL;
- menu = gtk_item_factory_get_widget(main_menu_factory, "/View/Show/Main Toolbar");
+ menu = gtk_item_factory_get_widget(main_menu_factory, "/View/Main Toolbar");
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu), recent.main_toolbar_show);
- menu = gtk_item_factory_get_widget(main_menu_factory, "/View/Show/Filter Toolbar");
+ menu = gtk_item_factory_get_widget(main_menu_factory, "/View/Filter Toolbar");
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu), recent.filter_toolbar_show);
- menu = gtk_item_factory_get_widget(main_menu_factory, "/View/Show/Packet List");
+ menu = gtk_item_factory_get_widget(main_menu_factory, "/View/Statusbar");
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu), recent.statusbar_show);
+
+ menu = gtk_item_factory_get_widget(main_menu_factory, "/View/Packet List");
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu), recent.packet_list_show);
- menu = gtk_item_factory_get_widget(main_menu_factory, "/View/Show/Packet Details");
+ menu = gtk_item_factory_get_widget(main_menu_factory, "/View/Packet Details");
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu), recent.tree_view_show);
- menu = gtk_item_factory_get_widget(main_menu_factory, "/View/Show/Packet Bytes");
+ menu = gtk_item_factory_get_widget(main_menu_factory, "/View/Packet Bytes");
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu), recent.byte_view_show);
- menu = gtk_item_factory_get_widget(main_menu_factory, "/View/Show/Status Bar");
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu), recent.statusbar_show);
-
- menu = gtk_item_factory_get_widget(main_menu_factory, "/View/Name Resolution/Enable for MAC Layer");
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu), g_resolv_flags & RESOLV_MAC);
-
- menu = gtk_item_factory_get_widget(main_menu_factory, "/View/Name Resolution/Enable for Network Layer");
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu), g_resolv_flags & RESOLV_NETWORK);
-
- menu = gtk_item_factory_get_widget(main_menu_factory, "/View/Name Resolution/Enable for Transport Layer");
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu), g_resolv_flags & RESOLV_TRANSPORT);
+ menu_name_resolution_changed();
#ifdef HAVE_LIBPCAP
menu = gtk_item_factory_get_widget(main_menu_factory, "/View/Auto Scroll in Live Capture");
main_widgets_rearrange();
/* don't change the time format, if we had a command line value */
- if (timestamp_type != TS_NOT_SET) {
- recent.gui_time_format = timestamp_type;
+ if (get_timestamp_setting() != TS_NOT_SET) {
+ recent.gui_time_format = get_timestamp_setting();
}
switch(recent.gui_time_format) {
byte_view_select(widget, (GdkEventButton *) event);
}
- if(event->type == GDK_BUTTON_PRESS) {
+ /* context menu handler (but the byte view notebook pages have their own handler) */
+ if(event->type == GDK_BUTTON_PRESS && widget != byte_nb_ptr) {
event_button = (GdkEventButton *) event;
/* To qoute the "Gdk Event Structures" doc:
{
set_menu_sensitivity(main_menu_factory, "/File/Open...", have_capture_file);
set_menu_sensitivity(main_menu_factory, "/File/Open Recent", have_capture_file);
+ set_menu_sensitivity(main_menu_factory, "/File/Merge...", have_capture_file);
set_menu_sensitivity(main_menu_factory, "/File/Close", have_capture_file);
set_menu_sensitivity(main_menu_factory, "/File/Save As...",
have_capture_file);
capture_in_progress);
#endif /* HAVE_LIBPCAP */
set_toolbar_for_capture_in_progress(capture_in_progress);
+
+ set_capture_if_dialog_for_capture_in_progress(capture_in_progress);
}
/* Enable or disable menu items based on whether you have some captured
{
gboolean is_enabled;
GList *child;
- menu_item_t *node_data = node->data;
+ menu_item_t *node_data = node->data;
/*
* Is this a leaf node or an interior node?
have_captured_packets);
set_menu_sensitivity(main_menu_factory, "/View/Normal Size",
have_captured_packets);
- set_menu_sensitivity(main_menu_factory, "/View/Coloring Rules...",
- have_captured_packets);
set_menu_sensitivity(packet_list_menu_factory, "/Coloring Rules...",
have_captured_packets);
set_menu_sensitivity(main_menu_factory, "/Go/Go to Packet...",
{
gboolean is_enabled;
GList *child;
- menu_item_t *node_data = node->data;
+ menu_item_t *node_data = node->data;
/*
* Is this a leaf node or an interior node?
cf->current_frame != NULL && decode_as_ok());
set_menu_sensitivity(NULL, "/Decode As...",
cf->current_frame != NULL && decode_as_ok());
+ set_menu_sensitivity(main_menu_factory, "/View/Name Resolution/Resolve Name",
+ cf->current_frame != NULL && (g_resolv_flags & RESOLV_ALL_ADDRS) != RESOLV_ALL_ADDRS);
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,
{
gboolean is_enabled;
GList *child;
- menu_item_t *node_data = node->data;
+ menu_item_t *node_data = node->data;
/*
* Is this a leaf node or an interior node?
"/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...",
+ 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(tree_view_menu_factory, "/Expand Tree", cf->finfo_selected->tree_type != -1);
} else {
set_menu_sensitivity(main_menu_factory,
"/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(tree_view_menu_factory, "/Protocol Properties...",
+ 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 Preferences...",
FALSE);
+ set_menu_sensitivity(main_menu_factory, "/View/Expand Tree", FALSE);
+ set_menu_sensitivity(tree_view_menu_factory, "/Expand Tree", FALSE);
}
walk_menu_tree_for_selected_tree_row(tap_menu_tree_root, cf->finfo_selected);
git.samba.org / obnox / wireshark / wip.git / blobdiff