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

More GUIManager stuff. 

svn path=/trunk/; revision=37175
This commit is contained in:
Anders Broman 2011-05-16 06:28:33 +00:00
parent 448fdb60b3
commit 0cb247defc
5 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk/gui_stat_menu.h
View File

@ -158,6 +158,10 @@ void gsm_map_stat_gtk_sum_cb(GtkAction *action, gpointer user_data);
void tcp_graph_cb (GtkAction *action, gpointer user_data);
gboolean tcp_graph_selected_packet_enabled(frame_data *current_frame, epan_dissect_t *edt, gpointer callback_data _U_);
void gtk_rpcprogs_cb(GtkWidget *w, gpointer data);
void mcaststream_launch(GtkAction *action, gpointer user_data);
void wlanstat_launch(GtkAction *action, gpointer user_data);
extern void register_stat_menu_item_stock(
register_stat_group_t group,
const char *gui_path,

8
gtk/mcast_stream_dlg.c
View File

@ -773,8 +773,13 @@ mcaststream_dlg_show(GList *list)
/****************************************************************************/
/* entry point when called via the GTK menu */
#ifdef MAIN_MENU_USE_UIMANAGER
void
mcaststream_launch(GtkAction *action _U_, gpointer user_data _U_)
#else
static void
mcaststream_launch(GtkWidget *w _U_, gpointer data _U_)
#endif
{
/* Register the tap listener */
register_tap_listener_mcast_stream();
@ -792,6 +797,9 @@ mcaststream_launch(GtkWidget *w _U_, gpointer data _U_)
void
register_tap_listener_mcast_stream_dlg(void)
{
#ifdef MAIN_MENU_USE_UIMANAGER
#else
register_stat_menu_item("UDP Multicast Streams", REGISTER_STAT_GROUP_UNSORTED,
mcaststream_launch, NULL, NULL, NULL);
#endif
}

17
gtk/menus.c
View File

@ -1264,6 +1264,9 @@ static const char *ui_desc_menubar =
" <menuitem name='RTT-Graph' action='/Analyze/StatisticsMenu/TCPStreamGraphMenu/RTT-Graph'/>\n"
" <menuitem name='Window-Scaling-Graph' action='/Analyze/StatisticsMenu/TCPStreamGraphMenu/Window-Scaling-Graph'/>\n"
" </menu>\n"
" <menuitem name='ONC-RPC-Programs' action='/Analyze/StatisticsMenu/ONC-RPC-Programs'/>\n"
" <menuitem name='UDPMulticastStreams' action='/Analyze/StatisticsMenu/UDPMulticastStreams'/>\n"
" <menuitem name='WLANTraffic' action='/Analyze/StatisticsMenu/WLANTraffic'/>\n"
" </menu>\n"
" <menu name= 'TelephonyMenu' action='/Telephony'>\n"
" <menu name= 'ANSI' action='/Telephony/ANSI'>\n"
@ -1656,11 +1659,15 @@ static const GtkActionEntry main_menu_bar_entries[] = {
{ "/Analyze/StatisticsMenu/FlowGraph", WIRESHARK_STOCK_FLOW_GRAPH, "Flo_w Graph...", NULL, NULL, G_CALLBACK(flow_graph_launch) },
{ "/Analyze/StatisticsMenu/HTTP", NULL, "HTTP", NULL, NULL, NULL },
{ "/Analyze/StatisticsMenu/TCPStreamGraphMenu", NULL, "TCP StreamGraph", NULL, NULL, NULL },
{ "/Analyze/StatisticsMenu/TCPStreamGraphMenu/Time-Sequence-Graph-Stevens", NULL, "Time-Sequence Graph (Stevens)", NULL, NULL, G_CALLBACK(tcp_graph_cb) },
{ "/Analyze/StatisticsMenu/TCPStreamGraphMenu/Time-Sequence-Graph-tcptrace", NULL, "Time-Sequence Graph (tcptrace)", NULL, NULL, G_CALLBACK(tcp_graph_cb) },
{ "/Analyze/StatisticsMenu/TCPStreamGraphMenu/Throughput-Graph", NULL, "Throughput Graph", NULL, NULL, G_CALLBACK(tcp_graph_cb) },
{ "/Analyze/StatisticsMenu/TCPStreamGraphMenu/RTT-Graph", NULL, "Round Trip Time Graph", NULL, NULL, G_CALLBACK(tcp_graph_cb) },
{ "/Analyze/StatisticsMenu/TCPStreamGraphMenu/Window-Scaling-Graph", NULL, "Window Scaling Graph", NULL, NULL, G_CALLBACK(tcp_graph_cb) },
{ "/Analyze/StatisticsMenu/TCPStreamGraphMenu/Time-Sequence-Graph-Stevens", NULL, "Time-Sequence Graph (Stevens)", NULL, NULL, G_CALLBACK(tcp_graph_cb) },
{ "/Analyze/StatisticsMenu/TCPStreamGraphMenu/Time-Sequence-Graph-tcptrace", NULL, "Time-Sequence Graph (tcptrace)", NULL, NULL, G_CALLBACK(tcp_graph_cb) },
{ "/Analyze/StatisticsMenu/TCPStreamGraphMenu/Throughput-Graph", NULL, "Throughput Graph", NULL, NULL, G_CALLBACK(tcp_graph_cb) },
{ "/Analyze/StatisticsMenu/TCPStreamGraphMenu/RTT-Graph", NULL, "Round Trip Time Graph", NULL, NULL, G_CALLBACK(tcp_graph_cb) },
{ "/Analyze/StatisticsMenu/TCPStreamGraphMenu/Window-Scaling-Graph", NULL, "Window Scaling Graph", NULL, NULL, G_CALLBACK(tcp_graph_cb) },
{ "/Analyze/StatisticsMenu/ONC-RPC-Programs", NULL, "ONC-RPC Programs", NULL, NULL, G_CALLBACK(gtk_rpcprogs_cb) },
{ "/Analyze/StatisticsMenu/UDPMulticastStreams", NULL, "UDP Multicast Streams", NULL, NULL, G_CALLBACK(mcaststream_launch) },
{ "/Analyze/StatisticsMenu/WLANTraffic", NULL, "WLAN Traffic", NULL, NULL, G_CALLBACK(wlanstat_launch) },
{ "/Statistics/Summary", GTK_STOCK_PROPERTIES, "_Summary", NULL, NULL, G_CALLBACK(summary_open_cb) },
{ "/Statistics/ProtocolHierarchy", NULL, "_Protocol Hierarchy", NULL, NULL, G_CALLBACK(proto_hier_stats_cb) },

8
gtk/rpc_progs.c
View File

@ -409,8 +409,13 @@ gtk_rpcprogs_init(const char *optarg _U_, void* userdata _U_)
gdk_window_raise(win->window);
}
#ifdef MAIN_MENU_USE_UIMANAGER
void
gtk_rpcprogs_cb(GtkWidget *w _U_, gpointer data _U_)
#else
static void
gtk_rpcprogs_cb(GtkWidget *w _U_, gpointer d _U_)
#endif
{
gtk_rpcprogs_init("",NULL);
}
@ -420,6 +425,9 @@ register_tap_listener_gtkrpcprogs(void)
{
register_stat_cmd_arg("rpc,programs", gtk_rpcprogs_init,NULL);
#ifdef MAIN_MENU_USE_UIMANAGER
#else
register_stat_menu_item("ONC-RPC Programs", REGISTER_STAT_GROUP_UNSORTED,
gtk_rpcprogs_cb, NULL, NULL, NULL);
#endif
}

8
gtk/wlan_stat_dlg.c
View File

@ -1958,8 +1958,13 @@ wlanstat_dlg_create (void)
gdk_window_raise(wlanstat_dlg_w->window);
}
#ifdef MAIN_MENU_USE_UIMANAGER
void
wlanstat_launch (GtkAction *action _U_, gpointer user_data _U_)
#else
static void
wlanstat_launch (GtkWidget *w _U_, gpointer data _U_)
#endif
{
if (wlanstat_dlg_w) {
reactivate_window(wlanstat_dlg_w);
@ -1975,6 +1980,9 @@ register_tap_listener_wlanstat (void)
SET_ADDRESS(&broadcast, AT_ETHER, 6, src);
#ifdef MAIN_MENU_USE_UIMANAGER
#else
register_stat_menu_item ("WLAN Traffic", REGISTER_STAT_GROUP_UNSORTED,
wlanstat_launch, NULL, NULL, NULL);
#endif
}