From 50e30e3c70b8c3b9fa3543ab0b863e30713f1432 Mon Sep 17 00:00:00 2001 From: Anders Broman Date: Thu, 12 May 2011 10:56:26 +0000 Subject: Make the use of UIManager a configure option. NOTE Only for Windows. Additional moves to UIManager. svn path=/trunk/; revision=37072 --- gtk/ansi_a_stat.c | 19 +++++++++++---- gtk/gsm_a_stat.c | 65 +++++++++++++++++++++++++++++++++++++--------------- gtk/gui_stat_menu.h | 10 +++++++- gtk/main_statusbar.c | 6 ++++- gtk/menus.c | 19 +++++++++++++++ gtk/menus.h | 4 +--- 6 files changed, 95 insertions(+), 28 deletions(-) (limited to 'gtk') diff --git a/gtk/ansi_a_stat.c b/gtk/ansi_a_stat.c index bb4d7a82ac..14a0b0452e 100644 --- a/gtk/ansi_a_stat.c +++ b/gtk/ansi_a_stat.c @@ -325,11 +325,15 @@ ansi_a_stat_gtk_win_create( window_present(dlg_p->win); } - +#ifdef MAIN_MENU_USE_UIMANAGER +void +ansi_a_stat_gtk_bsmap_cb(GtkAction *action _U_, gpointer user_data _U_) +#else static void ansi_a_stat_gtk_bsmap_cb( GtkWidget *w _U_, gpointer d _U_) +#endif { /* * if the window is already open, bring it to front @@ -352,11 +356,15 @@ ansi_a_stat_gtk_bsmap_init( ansi_a_stat_gtk_bsmap_cb(NULL, NULL); } - +#ifdef MAIN_MENU_USE_UIMANAGER +void +ansi_a_stat_gtk_dtap_cb(GtkAction *action _U_, gpointer user_data _U_) +#else static void ansi_a_stat_gtk_dtap_cb( GtkWidget *w _U_, gpointer d _U_) +#endif { /* @@ -404,11 +412,14 @@ register_tap_listener_gtkansi_a_stat(void) exit(1); } +#ifdef MAIN_MENU_USE_UIMANAGER +#else register_stat_menu_item("_ANSI/A-Interface BSMAP", REGISTER_STAT_GROUP_TELEPHONY, ansi_a_stat_gtk_bsmap_cb, NULL, NULL ,NULL); - register_stat_cmd_arg("ansi_a,bsmap", ansi_a_stat_gtk_bsmap_init,NULL); - register_stat_menu_item("_ANSI/A-Interface DTAP", REGISTER_STAT_GROUP_TELEPHONY, ansi_a_stat_gtk_dtap_cb, NULL, NULL ,NULL); +#endif + register_stat_cmd_arg("ansi_a,bsmap", ansi_a_stat_gtk_bsmap_init,NULL); + register_stat_cmd_arg("ansi_a,dtap", ansi_a_stat_gtk_dtap_init, NULL); } diff --git a/gtk/gsm_a_stat.c b/gtk/gsm_a_stat.c index 61bbdfdffc..f3335c0f57 100644 --- a/gtk/gsm_a_stat.c +++ b/gtk/gsm_a_stat.c @@ -435,11 +435,14 @@ gsm_a_stat_gtk_win_create( window_present(dlg_p->win); } - +#ifdef MAIN_MENU_USE_UIMANAGER +void gsm_a_stat_gtk_bssmap_cb(GtkAction *action _U_, gpointer user_data _U_) +#else static void gsm_a_stat_gtk_bssmap_cb( GtkWidget *w _U_, gpointer d _U_) +#endif { /* int i;*/ @@ -490,10 +493,15 @@ gsm_a_stat_gtk_dtap_cb( gsm_a_stat_draw(&gsm_a_stat); } +#ifdef MAIN_MENU_USE_UIMANAGER +void +gsm_a_stat_gtk_dtap_mm_cb(GtkAction *action _U_, gpointer user_data _U_) +#else static void gsm_a_stat_gtk_dtap_mm_cb( GtkWidget *w _U_, gpointer d _U_) +#endif { gsm_a_stat_gtk_dtap_cb(w, d, &dlg_dtap_mm, "GSM A-I/F DTAP Mobility Management Statistics", @@ -507,10 +515,15 @@ gsm_a_stat_gtk_dtap_mm_init(const char *optarg _U_, gsm_a_stat_gtk_dtap_mm_cb(NULL, NULL); } +#ifdef MAIN_MENU_USE_UIMANAGER +void +gsm_a_stat_gtk_dtap_rr_cb(GtkAction *action _U_, gpointer user_data _U_) +#else static void gsm_a_stat_gtk_dtap_rr_cb( GtkWidget *w _U_, gpointer d _U_) +#endif { gsm_a_stat_gtk_dtap_cb(w, d, &dlg_dtap_rr, "GSM A-I/F DTAP Radio Resource Management Statistics", @@ -524,10 +537,15 @@ gsm_a_stat_gtk_dtap_rr_init(const char *optarg _U_, gsm_a_stat_gtk_dtap_rr_cb(NULL, NULL); } +#ifdef MAIN_MENU_USE_UIMANAGER +void +gsm_a_stat_gtk_dtap_cc_cb(GtkAction *action _U_, gpointer user_data _U_) +#else static void gsm_a_stat_gtk_dtap_cc_cb( GtkWidget *w _U_, gpointer d _U_) +#endif { gsm_a_stat_gtk_dtap_cb(w, d, &dlg_dtap_cc, "GSM A-I/F DTAP Call Control Statistics", @@ -541,10 +559,15 @@ gsm_a_stat_gtk_dtap_cc_init(const char *optarg _U_, gsm_a_stat_gtk_dtap_cc_cb(NULL, NULL); } +#ifdef MAIN_MENU_USE_UIMANAGER +void +gsm_a_stat_gtk_dtap_gmm_cb(GtkAction *action _U_, gpointer user_data _U_) +#else static void gsm_a_stat_gtk_dtap_gmm_cb( GtkWidget *w _U_, gpointer d _U_) +#else { gsm_a_stat_gtk_dtap_cb(w, d, &dlg_dtap_gmm, "GSM A-I/F DTAP GPRS Mobility Management Statistics", @@ -678,43 +701,47 @@ register_tap_listener_gtkgsm_a_stat(void) exit(1); } +#ifdef MAIN_MENU_USE_UIMANAGER +#else register_stat_menu_item("_GSM/A-Interface BSSMAP", REGISTER_STAT_GROUP_TELEPHONY, gsm_a_stat_gtk_bssmap_cb, NULL, NULL, NULL); - register_stat_cmd_arg("gsm_a,bssmap", gsm_a_stat_gtk_bssmap_init,NULL); - register_stat_menu_item("_GSM/A-Interface DTAP/Mobility Management", REGISTER_STAT_GROUP_TELEPHONY, gsm_a_stat_gtk_dtap_mm_cb, NULL, NULL, NULL); - register_stat_cmd_arg("gsm_a,dtap_mm", gsm_a_stat_gtk_dtap_mm_init,NULL); - register_stat_menu_item("_GSM/A-Interface DTAP/Radio Resource Management", REGISTER_STAT_GROUP_TELEPHONY, gsm_a_stat_gtk_dtap_rr_cb, NULL, NULL, NULL); - register_stat_cmd_arg("gsm_a,dtap_rr", gsm_a_stat_gtk_dtap_rr_init,NULL); - register_stat_menu_item("_GSM/A-Interface DTAP/Call Control", REGISTER_STAT_GROUP_TELEPHONY, gsm_a_stat_gtk_dtap_cc_cb, NULL, NULL, NULL); - register_stat_cmd_arg("gsm_a,dtap_cc", gsm_a_stat_gtk_dtap_cc_init,NULL); - register_stat_menu_item("_GSM/A-Interface DTAP/GPRS Mobility Management", REGISTER_STAT_GROUP_TELEPHONY, gsm_a_stat_gtk_dtap_gmm_cb, NULL, NULL, NULL); - register_stat_cmd_arg("gsm_a,dtap_gmm", gsm_a_stat_gtk_dtap_gmm_init,NULL); - register_stat_menu_item("_GSM/A-Interface DTAP/Short Message Service", REGISTER_STAT_GROUP_TELEPHONY, gsm_a_stat_gtk_dtap_sms_cb, NULL, NULL, NULL); - register_stat_cmd_arg("gsm_a,dtap_sms", gsm_a_stat_gtk_dtap_sms_init,NULL); - register_stat_menu_item("_GSM/A-Interface DTAP/GPRS Session Management", REGISTER_STAT_GROUP_TELEPHONY, gsm_a_stat_gtk_dtap_sm_cb, NULL, NULL, NULL); - register_stat_cmd_arg("gsm_a,dtap_sm", gsm_a_stat_gtk_dtap_sm_init,NULL); - register_stat_menu_item("_GSM/A-Interface DTAP/Supplementary Services", REGISTER_STAT_GROUP_TELEPHONY, gsm_a_stat_gtk_dtap_ss_cb, NULL, NULL, NULL); - register_stat_cmd_arg("gsm_a,dtap_ss", gsm_a_stat_gtk_dtap_ss_init,NULL); - register_stat_menu_item("_GSM/A-Interface DTAP/Special Conformance Testing Functions", REGISTER_STAT_GROUP_TELEPHONY, gsm_a_stat_gtk_dtap_tp_cb, NULL, NULL, NULL); - register_stat_cmd_arg("gsm_a,dtap_tp", gsm_a_stat_gtk_dtap_tp_init,NULL); - register_stat_menu_item("_GSM/A-Interface SACCH", REGISTER_STAT_GROUP_TELEPHONY, gsm_a_stat_gtk_sacch_rr_cb, NULL, NULL, NULL); +#endif + + register_stat_cmd_arg("gsm_a,bssmap", gsm_a_stat_gtk_bssmap_init,NULL); + + register_stat_cmd_arg("gsm_a,dtap_mm", gsm_a_stat_gtk_dtap_mm_init,NULL); + + register_stat_cmd_arg("gsm_a,dtap_rr", gsm_a_stat_gtk_dtap_rr_init,NULL); + + register_stat_cmd_arg("gsm_a,dtap_cc", gsm_a_stat_gtk_dtap_cc_init,NULL); + + register_stat_cmd_arg("gsm_a,dtap_gmm", gsm_a_stat_gtk_dtap_gmm_init,NULL); + + register_stat_cmd_arg("gsm_a,dtap_sms", gsm_a_stat_gtk_dtap_sms_init,NULL); + + register_stat_cmd_arg("gsm_a,dtap_sm", gsm_a_stat_gtk_dtap_sm_init,NULL); + + register_stat_cmd_arg("gsm_a,dtap_ss", gsm_a_stat_gtk_dtap_ss_init,NULL); + + register_stat_cmd_arg("gsm_a,dtap_tp", gsm_a_stat_gtk_dtap_tp_init,NULL); + register_stat_cmd_arg("gsm_a,sacch", gsm_a_stat_gtk_sacch_rr_init,NULL); } diff --git a/gtk/gui_stat_menu.h b/gtk/gui_stat_menu.h index 8744e63829..421194444b 100644 --- a/gtk/gui_stat_menu.h +++ b/gtk/gui_stat_menu.h @@ -96,7 +96,6 @@ extern void register_stat_menu_item( * * @param callback_data data for callback function */ -/*#define MAIN_MENU_USE_UIMANAGER 1 */ #ifdef MAIN_MENU_USE_UIMANAGER void eth_endpoints_cb(GtkAction *action, gpointer user_data); void fc_endpoints_cb(GtkAction *action, gpointer user_data); @@ -138,6 +137,15 @@ void gui_iostat_cb(GtkAction *action, gpointer user_data); void voip_calls_launch(GtkAction *action, gpointer user_data); +void ansi_a_stat_gtk_bsmap_cb(GtkAction *action, gpointer user_data); +void ansi_a_stat_gtk_dtap_cb(GtkAction *action, gpointer user_data); + +void gsm_a_stat_gtk_bssmap_cb(GtkAction *action, gpointer user_data); +void gsm_a_stat_gtk_dtap_mm_cb(GtkAction *action, gpointer user_data); +void gsm_a_stat_gtk_dtap_rr_cb(GtkAction *action, gpointer user_data); +void gsm_a_stat_gtk_dtap_cc_cb(GtkAction *action, gpointer user_data); +void gsm_a_stat_gtk_dtap_gmm_cb(GtkAction *action, gpointer user_data); + extern void register_stat_menu_item_stock( register_stat_group_t group, const char *gui_path, diff --git a/gtk/main_statusbar.c b/gtk/main_statusbar.c index 2914546f52..dd26b6b0ad 100644 --- a/gtk/main_statusbar.c +++ b/gtk/main_statusbar.c @@ -499,7 +499,11 @@ packets_bar_update(void) } } } else { - packets_str = g_strdup(" No Packets"); + gulong computed_elapsed = cf_get_computed_elapsed(); + packets_str = g_strdup_printf(" No Packets, Startup time: Load time: %lu:%02lu.%03lu", + computed_elapsed/60000, + computed_elapsed%60000/1000, + computed_elapsed%1000); } gtk_statusbar_push(GTK_STATUSBAR(packets_bar), packets_ctx, packets_str); } diff --git a/gtk/menus.c b/gtk/menus.c index 790a32058c..fd88bcb692 100644 --- a/gtk/menus.c +++ b/gtk/menus.c @@ -1255,6 +1255,16 @@ static const char *ui_desc_menubar = " \n" " \n" " \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" " \n" " \n" " \n" @@ -1628,6 +1638,15 @@ static const GtkActionEntry main_menu_bar_entries[] = { { "/Statistics/Endpoints", WIRESHARK_STOCK_ENDPOINTS, "Endpoints", NULL, NULL, G_CALLBACK(init_hostlist_notebook_cb) }, { "/Statistics/IOGraphs", WIRESHARK_STOCK_GRAPHS, "_IO Graph", NULL, NULL, G_CALLBACK(gui_iostat_cb) }, + { "/Telephony/ANSI", NULL, "ANSI", NULL, NULL, NULL }, + { "/Telephony/ANSI/BSMAP", NULL, "A-Interface BSMAP", NULL, NULL, G_CALLBACK(ansi_a_stat_gtk_bsmap_cb) }, + { "/Telephony/ANSI/DTAP", NULL, "A-Interface DTAP", NULL, NULL, G_CALLBACK(ansi_a_stat_gtk_dtap_cb) }, + + { "/Telephony/GSM", NULL, "GSM", NULL, NULL, NULL }, + { "/Telephony/GSM/BSSMAP", NULL, "_GSM/A-Interface BSSMAP", NULL, NULL, G_CALLBACK(gsm_a_stat_gtk_bssmap_cb) }, + { "/Telephony/GSM/DTAP", NULL, "_GSM/A-Interface DTAP", NULL, NULL, + { "/Telephony/GSM/DTAP/CallControl", NULL, "Call Control", NULL, NULL, G_CALLBACK(gsm_a_stat_gtk_dtap_cc_cb) }, + { "/Telephony/IAX2", NULL, "IA_X2", NULL, NULL, NULL }, { "/Telephony/IAX2/StreamAnalysis", NULL, "Stream Analysis...", NULL, NULL, G_CALLBACK(iax2_analysis_cb) }, { "/Telephony/VoIPCalls", WIRESHARK_STOCK_TELEPHONE, "_VoIP Calls", NULL, NULL, G_CALLBACK(voip_calls_launch) }, diff --git a/gtk/menus.h b/gtk/menus.h index 306b3262cd..c8630db77e 100644 --- a/gtk/menus.h +++ b/gtk/menus.h @@ -29,9 +29,7 @@ extern "C" { #endif /* __cplusplus */ -/*#define MAIN_MENU_USE_UIMANAGER 1 */ - - /* Add a new recent capture filename to the "Recent Files" submenu +/* Add a new recent capture filename to the "Recent Files" submenu (duplicates will be ignored) */ extern void add_menu_recent_capture_file(gchar *cf_name); -- cgit v1.2.3