diff options
| author | Luis Ontanon <luis.ontanon@gmail.com> | 2006-09-27 17:12:42 +0000 |
|---|---|---|
| committer | Luis Ontanon <luis.ontanon@gmail.com> | 2006-09-27 17:12:42 +0000 |
| commit | 2e7726b3ffd6ec3d87742219ad944645ebc24edb (patch) | |
| tree | 21aaca41aab6c93abea5ea9532f92244ddf88bbe /gtk | |
| parent | e21c2fe5b5fcab0ab732cb7962afa6720eb50306 (diff) | |
* rename REGISTER_STAT_GROUP_E -> register_stat_group_t
* Add a "Tools" menu
* allow wslua's register_menu to register menu items into more menus
svn path=/trunk/; revision=19338
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/funnel_stat.c | 2 | ||||
| -rw-r--r-- | gtk/gui_stat_menu.h | 2 | ||||
| -rw-r--r-- | gtk/menu.c | 13 | ||||
| -rw-r--r-- | gtk/tap_dfilter_dlg.c | 2 |
4 files changed, 14 insertions, 5 deletions
diff --git a/gtk/funnel_stat.c b/gtk/funnel_stat.c index 77d13d711c..506a549cd9 100644 --- a/gtk/funnel_stat.c +++ b/gtk/funnel_stat.c @@ -544,7 +544,7 @@ static void our_menu_callback(void* unused _U_, gpointer data) { } static void register_menu_cb(const char *name, - REGISTER_STAT_GROUP_E group, + register_stat_group_t group, void (*callback)(gpointer), gpointer callback_data, gboolean retap) { diff --git a/gtk/gui_stat_menu.h b/gtk/gui_stat_menu.h index 595ed1348e..40124c1d49 100644 --- a/gtk/gui_stat_menu.h +++ b/gtk/gui_stat_menu.h @@ -63,7 +63,7 @@ extern "C" { */ extern void register_stat_menu_item( const char *name, - REGISTER_STAT_GROUP_E group, + register_stat_group_t group, GtkItemFactoryCallback callback, gboolean (*selected_packet_enabled)(frame_data *, epan_dissect_t *), gboolean (*selected_tree_row_enabled)(field_info *), diff --git a/gtk/menu.c b/gtk/menu.c index fe9e5b2473..3a82105906 100644 --- a/gtk/menu.c +++ b/gtk/menu.c @@ -598,7 +598,8 @@ static GtkItemFactoryEntry menu_items[] = init_conversation_notebook_cb, 0, WIRESHARK_STOCK_CONVERSATIONS), ITEM_FACTORY_STOCK_ENTRY("/Statistics/Endpoints", NULL, init_hostlist_notebook_cb, 0, WIRESHARK_STOCK_ENDPOINTS), - ITEM_FACTORY_ENTRY("/_Help", NULL, NULL, 0, "<Branch>", NULL), + ITEM_FACTORY_ENTRY("/_Tools", NULL, NULL, 0, "<Branch>", NULL), + ITEM_FACTORY_ENTRY("/_Help", NULL, NULL, 0, "<Branch>", NULL), ITEM_FACTORY_STOCK_ENTRY("/Help/_Contents", "F1", topic_menu_cb, HELP_CONTENT, GTK_STOCK_HELP), ITEM_FACTORY_ENTRY("/Help/_Supported Protocols", NULL, supported_cb, 0, NULL, NULL), #if (GLIB_MAJOR_VERSION >= 2) @@ -914,7 +915,7 @@ static GList * tap_menu_item_add( void register_stat_menu_item( const char *name, - REGISTER_STAT_GROUP_E group, + register_stat_group_t group, GtkItemFactoryCallback callback, gboolean (*selected_packet_enabled)(frame_data *, epan_dissect_t *), gboolean (*selected_tree_row_enabled)(field_info *), @@ -942,6 +943,7 @@ register_stat_menu_item( case(REGISTER_STAT_GROUP_TELEPHONY): toolspath = "/Statistics/"; break; case(REGISTER_STAT_GROUP_NONE): toolspath = "/Statistics/"; break; case(REGISTER_ANALYZE_GROUP_NONE): toolspath = "/Analyze/"; break; + case(REGISTER_TOOLS_GROUP_NONE): toolspath = "/Tools/"; break; default: g_assert(0); toolspath = NULL; @@ -1067,6 +1069,8 @@ static guint merge_tap_menus_layered(GList *node, gint group) { break; case(REGISTER_ANALYZE_GROUP_NONE): break; + case(REGISTER_TOOLS_GROUP_NONE): + break; default: g_assert_not_reached(); } @@ -1139,6 +1143,11 @@ void merge_all_tap_menus(GList *node) { entry->path = "/Analyze/"; /*gtk_item_factory_create_item(main_menu_factory, entry, NULL, 2);*/ } + if (merge_tap_menus_layered(node, REGISTER_TOOLS_GROUP_NONE)) { + /*gtk_item_factory_create_item(main_menu_factory, entry, NULL, 2);*/ + } + + } diff --git a/gtk/tap_dfilter_dlg.c b/gtk/tap_dfilter_dlg.c index c94ff0a0ae..b6e32505a6 100644 --- a/gtk/tap_dfilter_dlg.c +++ b/gtk/tap_dfilter_dlg.c @@ -71,7 +71,7 @@ tap_dfilter_dlg_cb(GtkWidget *w, gpointer data); */ void register_dfilter_stat(tap_dfilter_dlg *info, const char *name, - REGISTER_STAT_GROUP_E group) + register_stat_group_t group) { char *full_name; |