osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

add the (optional) possibility to register a stock icon for a stats menu entry 

svn path=/trunk/; revision=25005
This commit is contained in:
Ulf Lamping 2008-04-13 23:55:32 +00:00
parent 50f4da953e
commit 5f96c98776
3 changed files with 63 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gtk/gui_stat_menu.h
View File

@ -69,6 +69,21 @@ extern void register_stat_menu_item(
gboolean (*selected_tree_row_enabled)(field_info *, gpointer callback_data),
gpointer callback_data);
/**
* Same as register_stat_menu_item() but with optional stock item.
*
* @param stock_id the stock_id (icon) to show, or NULL
*
*/
extern void register_stat_menu_item_stock(
const char *name,
register_stat_group_t group,
const gchar *stock_id,
GtkItemFactoryCallback callback,
gboolean (*selected_packet_enabled)(frame_data *, epan_dissect_t *, gpointer callback_data),
gboolean (*selected_tree_row_enabled)(field_info *, gpointer callback_data),
gpointer callback_data);
#ifdef __cplusplus
}
#endif /* __cplusplus */

3
gtk/io_stat.c
View File

@ -2149,6 +2149,7 @@ register_tap_listener_gtk_iostat(void)
{
register_stat_cmd_arg("io,stat", gtk_iostat_init,NULL);
register_stat_menu_item("_IO Graphs", REGISTER_STAT_GROUP_GENERIC,
register_stat_menu_item_stock("_IO Graphs",
REGISTER_STAT_GROUP_GENERIC, WIRESHARK_STOCK_GRAPHS,
gtk_iostat_cb, NULL, NULL, NULL);
}

65
gtk/main_menu.c
View File

@ -92,6 +92,7 @@
typedef struct _menu_item {
char *name;
gint group;
const char *stock_id;
gboolean enabled;
GtkItemFactoryCallback callback;
gpointer callback_data;
@ -1188,6 +1189,7 @@ static gint tap_menu_item_add_compare(gconstpointer a, gconstpointer b)
static GList * tap_menu_item_add(
char *name,
gint group,
const char *stock_id,
GtkItemFactoryCallback callback,
gboolean (*selected_packet_enabled)(frame_data *, epan_dissect_t *, gpointer callback_data),
gboolean (*selected_tree_row_enabled)(field_info *, gpointer callback_data),
@ -1199,8 +1201,9 @@ static GList * tap_menu_item_add(
child = g_malloc(sizeof (menu_item_t));
child->group = group;
child->name = name;
child->group = group;
child->stock_id = stock_id;
child->callback = callback;
child->selected_packet_enabled = selected_packet_enabled;
child->selected_tree_row_enabled = selected_tree_row_enabled;
@ -1239,9 +1242,10 @@ static GList * tap_menu_item_add(
* is selected and, if one is, on the tree row) and FALSE if not.
*/
void
register_stat_menu_item(
register_stat_menu_item_stock(
const char *name,
register_stat_group_t group,
const char *stock_id,
GtkItemFactoryCallback callback,
gboolean (*selected_packet_enabled)(frame_data *, epan_dissect_t *, gpointer callback_data),
gboolean (*selected_tree_row_enabled)(field_info *, gpointer callback_data),
@ -1321,7 +1325,7 @@ register_stat_menu_item(
* add it to the Tools menu tree.
*/
childnode = tap_menu_item_add(
menupath, group, NULL, NULL ,NULL, NULL, curnode);
menupath, group, "", NULL, NULL ,NULL, NULL, curnode);
} else {
/*
* Yes. We don't need this "menupath" any longer.
@ -1349,12 +1353,31 @@ register_stat_menu_item(
* the main menu.
*/
tap_menu_item_add(
menupath, group, callback,
menupath, group, stock_id, callback,
selected_packet_enabled, selected_tree_row_enabled,
callback_data, curnode);
}
void
register_stat_menu_item(
const char *name,
register_stat_group_t group,
GtkItemFactoryCallback callback,
gboolean (*selected_packet_enabled)(frame_data *, epan_dissect_t *, gpointer callback_data),
gboolean (*selected_tree_row_enabled)(field_info *, gpointer callback_data),
gpointer callback_data)
{
register_stat_menu_item_stock(
name,
group,
NULL,
callback,
selected_packet_enabled,
selected_tree_row_enabled,
callback_data);
}
static guint merge_tap_menus_layered(GList *node, gint group) {
GtkItemFactoryEntry *entry;
GList *child;
@ -1409,6 +1432,10 @@ static guint merge_tap_menus_layered(GList *node, gint group) {
default:
g_assert_not_reached();
}
if(node_data->stock_id!= NULL) {
entry->item_type = "<StockItem>";
entry->extra_data = node_data->stock_id;
}
gtk_item_factory_create_item(main_menu_factory, entry, node_data->callback_data, /* callback_type */ 2);
set_menu_sensitivity(main_menu_factory, node_data->name, FALSE); /* no capture file yet */
added++;
@ -1447,45 +1474,45 @@ static guint merge_tap_menus_layered(GList *node, gint group) {
void merge_all_tap_menus(GList *node) {
GtkItemFactoryEntry *entry;
GtkItemFactoryEntry *sep_entry;
entry = g_malloc0(sizeof (GtkItemFactoryEntry));
entry->item_type = "<Separator>";
entry->path = "/Statistics/";
sep_entry = g_malloc0(sizeof (GtkItemFactoryEntry));
sep_entry->item_type = "<Separator>";
sep_entry->path = "/Statistics/";
/*
* merge only the menu items of the specific group,
* and then append a seperator
*/
if (merge_tap_menus_layered(node, REGISTER_STAT_GROUP_GENERIC)) {
gtk_item_factory_create_item(main_menu_factory, entry, NULL, 2);
gtk_item_factory_create_item(main_menu_factory, sep_entry, NULL, 2);
}
if (merge_tap_menus_layered(node, REGISTER_STAT_GROUP_CONVERSATION_LIST)) {
/*gtk_item_factory_create_item(main_menu_factory, entry, NULL, 2);*/
/*gtk_item_factory_create_item(main_menu_factory, sep_entry, NULL, 2);*/
}
if (merge_tap_menus_layered(node, REGISTER_STAT_GROUP_ENDPOINT_LIST)) {
/*gtk_item_factory_create_item(main_menu_factory, entry, NULL, 2);*/
/*gtk_item_factory_create_item(main_menu_factory, sep_entry, NULL, 2);*/
}
if (merge_tap_menus_layered(node, REGISTER_STAT_GROUP_RESPONSE_TIME)) {
gtk_item_factory_create_item(main_menu_factory, entry, NULL, 2);
gtk_item_factory_create_item(main_menu_factory, sep_entry, NULL, 2);
}
if (merge_tap_menus_layered(node, REGISTER_STAT_GROUP_TELEPHONY)) {
gtk_item_factory_create_item(main_menu_factory, entry, NULL, 2);
gtk_item_factory_create_item(main_menu_factory, sep_entry, NULL, 2);
}
if (merge_tap_menus_layered(node, REGISTER_STAT_GROUP_NONE)) {
/*gtk_item_factory_create_item(main_menu_factory, entry, NULL, 2);*/
/*gtk_item_factory_create_item(main_menu_factory, sep_entry, NULL, 2);*/
}
if (merge_tap_menus_layered(node, REGISTER_ANALYZE_GROUP_NONE)) {
entry->path = "/Analyze/";
/*gtk_item_factory_create_item(main_menu_factory, entry, NULL, 2);*/
sep_entry->path = "/Analyze/";
/*gtk_item_factory_create_item(main_menu_factory, sep_entry, NULL, 2);*/
}
if (merge_tap_menus_layered(node, REGISTER_ANALYZE_GROUP_CONVERSATION_FILTER)) {
entry->path = "/Analyze/Conversation Filter/";
/*gtk_item_factory_create_item(main_menu_factory, entry, NULL, 2);*/
sep_entry->path = "/Analyze/Conversation Filter/";
/*gtk_item_factory_create_item(main_menu_factory, sep_entry, NULL, 2);*/
}
#ifdef HAVE_LUA_5_1
if (merge_tap_menus_layered(node, REGISTER_TOOLS_GROUP_NONE)) {
/*gtk_item_factory_create_item(main_menu_factory, entry, NULL, 2);*/
/*gtk_item_factory_create_item(main_menu_factory, sep_entry, NULL, 2);*/
}
#endif
}