diff options
author | Bill Meier <wmeier@newsguy.com> | 2013-01-02 22:59:34 +0000 |
---|---|---|
committer | Bill Meier <wmeier@newsguy.com> | 2013-01-02 22:59:34 +0000 |
commit | 85d59a5509f5f22968d3cd9a5e7f6500cdfcb63f (patch) | |
tree | d9860e20aea3f2a94eca3b1f84b4a1e9f433006c | |
parent | 844ee8059a77c97c95439ffdf0fd4be5a464fe1f (diff) |
Fix a minor window handling difference between GTK2 & GTK3:
Use gtk_box_pack_start() instead of gtk_container_add() in several places.
svn path=/trunk/; revision=46906
-rw-r--r-- | ui/gtk/mtp3_summary.c | 407 |
1 files changed, 204 insertions, 203 deletions
diff --git a/ui/gtk/mtp3_summary.c b/ui/gtk/mtp3_summary.c index 33c06661b3..c069d2af84 100644 --- a/ui/gtk/mtp3_summary.c +++ b/ui/gtk/mtp3_summary.c @@ -53,9 +53,9 @@ typedef struct _my_columns_t { - guint32 value; - const gchar *strptr; - GtkJustification just; + guint32 value; + const gchar *strptr; + GtkJustification just; } my_columns_t; enum @@ -70,26 +70,26 @@ enum }; /* Create list */ -static -GtkWidget* create_list(void) +static GtkWidget * +create_list(void) { - GtkListStore *list_store; - GtkWidget *list; + GtkListStore *list_store; + GtkWidget *list; GtkTreeViewColumn *column; - GtkCellRenderer *renderer; - GtkTreeSortable *sortable; - GtkTreeView *list_view; - GtkTreeSelection *selection; - - /* Create the store */ - list_store = gtk_list_store_new(N_COLUMN, /* Total number of columns XXX*/ - G_TYPE_STRING, /* SI */ - G_TYPE_INT, /* Num MSUs */ - G_TYPE_STRING, /* MSUs/sec */ - G_TYPE_INT, /* Num Bytes */ - G_TYPE_STRING, /* Bytes/MSU */ - G_TYPE_STRING); /* Bytes/sec */ + GtkCellRenderer *renderer; + GtkTreeSortable *sortable; + GtkTreeView *list_view; + GtkTreeSelection *selection; + + /* Create the store */ + list_store = gtk_list_store_new(N_COLUMN, /* Total number of columns XXX*/ + G_TYPE_STRING, /* SI */ + G_TYPE_INT, /* Num MSUs */ + G_TYPE_STRING, /* MSUs/sec */ + G_TYPE_INT, /* Num Bytes */ + G_TYPE_STRING, /* Bytes/MSU */ + G_TYPE_STRING); /* Bytes/sec */ /* Create a view */ list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (list_store)); @@ -114,8 +114,8 @@ GtkWidget* create_list(void) /* 1:st column */ renderer = gtk_cell_renderer_text_new (); column = gtk_tree_view_column_new_with_attributes ("SI", renderer, - "text", SI_COLUMN, - NULL); + "text", SI_COLUMN, + NULL); gtk_tree_view_column_set_sort_column_id(column, SI_COLUMN); gtk_tree_view_column_set_resizable(column, TRUE); @@ -128,8 +128,8 @@ GtkWidget* create_list(void) /* 2:nd column... */ renderer = gtk_cell_renderer_text_new (); column = gtk_tree_view_column_new_with_attributes ("Num MSUs", renderer, - "text", NUM_MSUS_COLUMN, - NULL); + "text", NUM_MSUS_COLUMN, + NULL); gtk_tree_view_column_set_sort_column_id(column, NUM_MSUS_COLUMN); gtk_tree_view_column_set_resizable(column, TRUE); gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); @@ -139,8 +139,8 @@ GtkWidget* create_list(void) /* 3:d column... */ renderer = gtk_cell_renderer_text_new (); column = gtk_tree_view_column_new_with_attributes ("MSUs/sec", renderer, - "text", NUM_MSUS_SEC_COLUMN, - NULL); + "text", NUM_MSUS_SEC_COLUMN, + NULL); gtk_tree_view_column_set_sort_column_id(column, NUM_MSUS_SEC_COLUMN); gtk_tree_view_column_set_resizable(column, TRUE); gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); @@ -150,8 +150,8 @@ GtkWidget* create_list(void) /* 4:d column... */ renderer = gtk_cell_renderer_text_new (); column = gtk_tree_view_column_new_with_attributes ("Num Bytes", renderer, - "text", NUM_BYTES_COLUMN, - NULL); + "text", NUM_BYTES_COLUMN, + NULL); gtk_tree_view_column_set_sort_column_id(column, NUM_BYTES_COLUMN); gtk_tree_view_column_set_resizable(column, TRUE); gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); @@ -161,8 +161,8 @@ GtkWidget* create_list(void) /* 5:th column... */ renderer = gtk_cell_renderer_text_new (); column = gtk_tree_view_column_new_with_attributes ("Bytes/MSU", renderer, - "text", NUM_BYTES_MSU_COLUMN, - NULL); + "text", NUM_BYTES_MSU_COLUMN, + NULL); gtk_tree_view_column_set_sort_column_id(column, NUM_BYTES_MSU_COLUMN); @@ -174,8 +174,8 @@ GtkWidget* create_list(void) /* 6:th column... */ renderer = gtk_cell_renderer_text_new (); column = gtk_tree_view_column_new_with_attributes ("Bytes/sec", renderer, - "text", NUM_BYTES_SEC_COLUMN, - NULL); + "text", NUM_BYTES_SEC_COLUMN, + NULL); gtk_tree_view_column_set_sort_column_id(column, NUM_BYTES_SEC_COLUMN); gtk_tree_view_column_set_resizable(column, TRUE); @@ -198,28 +198,28 @@ GtkWidget* create_list(void) static void add_string_to_box(gchar *str, GtkWidget *box) { - GtkWidget *lb; - lb = gtk_label_new(str); - gtk_misc_set_alignment(GTK_MISC(lb), 0.0f, 0.5f); - gtk_box_pack_start(GTK_BOX(box), lb,FALSE,FALSE, 0); - gtk_widget_show(lb); + GtkWidget *lb; + lb = gtk_label_new(str); + gtk_misc_set_alignment(GTK_MISC(lb), 0.0f, 0.5f); + gtk_box_pack_start(GTK_BOX(box), lb,FALSE,FALSE, 0); + gtk_widget_show(lb); } static void mtp3_sum_draw( - GtkWidget *table, - double seconds, - int *tot_num_msus_p, - double *tot_num_bytes_p) + GtkWidget *table, + double seconds, + int *tot_num_msus_p, + double *tot_num_bytes_p) { - char *entries[N_COLUMN]; - int i, j; - int num_msus; - int num_bytes; + char *entries[N_COLUMN]; + int i, j; + int num_msus; + int num_bytes; GtkListStore *list_store; - GtkTreeIter iter; + GtkTreeIter iter; *tot_num_msus_p = 0; *tot_num_bytes_p = 0; @@ -248,13 +248,13 @@ mtp3_sum_draw( entries[5] = (seconds) ? g_strdup_printf("%.2f", (double)num_bytes/seconds) : g_strdup("N/A"); gtk_list_store_insert_with_values( list_store , &iter, G_MAXINT, - SI_COLUMN, mtp3_service_indicator_code_short_vals[i].strptr, - NUM_MSUS_COLUMN, num_msus, - NUM_MSUS_SEC_COLUMN, entries[2], - NUM_BYTES_COLUMN, num_bytes, - NUM_BYTES_MSU_COLUMN, entries[4], - NUM_BYTES_SEC_COLUMN, entries[5], - -1); + SI_COLUMN, mtp3_service_indicator_code_short_vals[i].strptr, + NUM_MSUS_COLUMN, num_msus, + NUM_MSUS_SEC_COLUMN, entries[2], + NUM_BYTES_COLUMN, num_bytes, + NUM_BYTES_MSU_COLUMN, entries[4], + NUM_BYTES_SEC_COLUMN, entries[5], + -1); g_free(entries[2]); g_free(entries[4]); @@ -263,179 +263,180 @@ mtp3_sum_draw( } -void mtp3_sum_gtk_sum_cb(GtkAction *action _U_, gpointer user_data _U_) +void +mtp3_sum_gtk_sum_cb(GtkAction *action _U_, gpointer user_data _U_) { - summary_tally summary; - GtkWidget *sum_open_w, - *main_vb, *file_fr, *data_fr, *file_box, - *data_box, *bbox, *close_bt, - *tot_fr, *tot_box, - *table, *table_fr; - - gchar string_buff[SUM_STR_MAX]; - const char * file_type; - double seconds; - int tot_num_msus; - double tot_num_bytes; - - if (cfile.state == FILE_CLOSED) { - return; - } - - /* initialize the tally */ - summary_fill_in(&cfile, &summary); - - /* initial computations */ - seconds = summary.stop_time - summary.start_time; - - sum_open_w = dlg_window_new("MTP3 Statistics: Summary"); /* transient_for top_level */ - gtk_window_set_destroy_with_parent (GTK_WINDOW(sum_open_w), TRUE); - - /* Container for each row of widgets */ - main_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); - gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5); - gtk_container_add(GTK_CONTAINER(sum_open_w), main_vb); - gtk_widget_show(main_vb); - - /* File frame */ - file_fr = gtk_frame_new("File"); - gtk_container_add(GTK_CONTAINER(main_vb), file_fr); - gtk_widget_show(file_fr); - - file_box = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); - gtk_container_add(GTK_CONTAINER(file_fr), file_box); - gtk_widget_show(file_box); - - /* filename */ - g_snprintf(string_buff, SUM_STR_MAX, "Name: %s", ((summary.filename) ? summary.filename : "None")); - add_string_to_box(string_buff, file_box); - - /* length */ - g_snprintf(string_buff, SUM_STR_MAX, "Length: %" G_GINT64_MODIFIER "d", summary.file_length); - add_string_to_box(string_buff, file_box); - - /* format */ - file_type = wtap_file_type_string(summary.file_type); - g_snprintf(string_buff, SUM_STR_MAX, "Format: %s", (file_type ? file_type : "N/A")); - add_string_to_box(string_buff, file_box); - - if (summary.has_snap) { - /* snapshot length */ - g_snprintf(string_buff, SUM_STR_MAX, "Snapshot length: %u", summary.snap); - add_string_to_box(string_buff, file_box); - } - - /* Data frame */ - data_fr = gtk_frame_new("Data"); - gtk_container_add(GTK_CONTAINER(main_vb), data_fr); - gtk_widget_show(data_fr); - - data_box = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); - gtk_container_add(GTK_CONTAINER(data_fr), data_box); - gtk_widget_show(data_box); - - /* - * We must have no un-time-stamped packets (i.e., the number of - * time-stamped packets must be the same as the number of packets), - * and at least two time-stamped packets, in order for the elapsed - * time to be valid. - */ - if (summary.packet_count_ts == summary.packet_count && - summary.packet_count_ts >= 2) { - /* seconds */ - g_snprintf(string_buff, SUM_STR_MAX, "Elapsed time: %.3f seconds", summary.elapsed_time); - add_string_to_box(string_buff, data_box); + summary_tally summary; + GtkWidget *sum_open_w; + GtkWidget *main_vb, *file_fr, *data_fr, *file_box; + GtkWidget *data_box, *bbox, *close_bt; + GtkWidget *tot_fr, *tot_box; + GtkWidget *table, *table_fr; + + gchar string_buff[SUM_STR_MAX]; + const char *file_type; + double seconds; + int tot_num_msus; + double tot_num_bytes; + + if (cfile.state == FILE_CLOSED) { + return; + } - g_snprintf(string_buff, SUM_STR_MAX, "Between first and last packet: %.3f seconds", seconds); - add_string_to_box(string_buff, data_box); - } + /* initialize the tally */ + summary_fill_in(&cfile, &summary); + + /* initial computations */ + seconds = summary.stop_time - summary.start_time; - /* Packet count */ - g_snprintf(string_buff, SUM_STR_MAX, "Packet count: %i", summary.packet_count); - add_string_to_box(string_buff, data_box); + sum_open_w = dlg_window_new("MTP3 Statistics: Summary"); /* transient_for top_level */ + gtk_window_set_destroy_with_parent (GTK_WINDOW(sum_open_w), TRUE); - /* MTP3 SPECIFIC */ - table_fr = gtk_frame_new("Service Indicator (SI) Totals"); - gtk_container_add(GTK_CONTAINER(main_vb), table_fr); - gtk_widget_show(table_fr); + /* Container for each row of widgets */ + main_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); + gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5); + gtk_container_add(GTK_CONTAINER(sum_open_w), main_vb); + gtk_widget_show(main_vb); - table = create_list(); + /* File frame */ + file_fr = gtk_frame_new("File"); + gtk_box_pack_start(GTK_BOX(main_vb), file_fr, TRUE, TRUE, 0); + gtk_widget_show(file_fr); - gtk_container_add(GTK_CONTAINER(table_fr), table); - gtk_widget_show(table); + file_box = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); + gtk_container_add(GTK_CONTAINER(file_fr), file_box); + gtk_widget_show(file_box); + /* filename */ + g_snprintf(string_buff, SUM_STR_MAX, "Name: %s", ((summary.filename) ? summary.filename : "None")); + add_string_to_box(string_buff, file_box); + + /* length */ + g_snprintf(string_buff, SUM_STR_MAX, "Length: %" G_GINT64_MODIFIER "d", summary.file_length); + add_string_to_box(string_buff, file_box); - mtp3_sum_draw(table, seconds, &tot_num_msus, &tot_num_bytes); + /* format */ + file_type = wtap_file_type_string(summary.file_type); + g_snprintf(string_buff, SUM_STR_MAX, "Format: %s", (file_type ? file_type : "N/A")); + add_string_to_box(string_buff, file_box); - /* Totals frame */ - tot_fr = gtk_frame_new("Totals"); - gtk_container_add(GTK_CONTAINER(main_vb), tot_fr); - gtk_widget_show(tot_fr); + if (summary.has_snap) { + /* snapshot length */ + g_snprintf(string_buff, SUM_STR_MAX, "Snapshot length: %u", summary.snap); + add_string_to_box(string_buff, file_box); + } - tot_box = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); - gtk_container_add(GTK_CONTAINER(tot_fr), tot_box); - gtk_widget_show(tot_box); + /* Data frame */ + data_fr = gtk_frame_new("Data"); + gtk_box_pack_start(GTK_BOX(main_vb), data_fr, TRUE, TRUE, 0); + gtk_widget_show(data_fr); - g_snprintf(string_buff, SUM_STR_MAX, "Total MSUs: %u", tot_num_msus); - add_string_to_box(string_buff, tot_box); + data_box = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); + gtk_container_add(GTK_CONTAINER(data_fr), data_box); + gtk_widget_show(data_box); - /* - * We must have no un-time-stamped packets (i.e., the number of - * time-stamped packets must be the same as the number of packets), - * and at least two time-stamped packets, in order for the elapsed - * time to be valid. - */ - if (summary.packet_count_ts == summary.packet_count && - summary.packet_count_ts >= 2) { - if (seconds) { - g_snprintf(string_buff, SUM_STR_MAX, "MSUs/second: %.2f", tot_num_msus/seconds); + /* + * We must have no un-time-stamped packets (i.e., the number of + * time-stamped packets must be the same as the number of packets), + * and at least two time-stamped packets, in order for the elapsed + * time to be valid. + */ + if (summary.packet_count_ts == summary.packet_count && + summary.packet_count_ts >= 2) { + /* seconds */ + g_snprintf(string_buff, SUM_STR_MAX, "Elapsed time: %.3f seconds", summary.elapsed_time); + add_string_to_box(string_buff, data_box); + + g_snprintf(string_buff, SUM_STR_MAX, "Between first and last packet: %.3f seconds", seconds); + add_string_to_box(string_buff, data_box); } - else { - g_snprintf(string_buff, SUM_STR_MAX, "MSUs/second: N/A"); + + /* Packet count */ + g_snprintf(string_buff, SUM_STR_MAX, "Packet count: %i", summary.packet_count); + add_string_to_box(string_buff, data_box); + + /* MTP3 SPECIFIC */ + table_fr = gtk_frame_new("Service Indicator (SI) Totals"); + gtk_box_pack_start(GTK_BOX(main_vb), table_fr, TRUE, TRUE, 0); + gtk_widget_show(table_fr); + + table = create_list(); + + gtk_container_add(GTK_CONTAINER(table_fr), table); + gtk_widget_show(table); + + + mtp3_sum_draw(table, seconds, &tot_num_msus, &tot_num_bytes); + + /* Totals frame */ + tot_fr = gtk_frame_new("Totals"); + gtk_box_pack_start(GTK_BOX(main_vb), tot_fr, TRUE, TRUE, 0); + gtk_widget_show(tot_fr); + + tot_box = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE); + gtk_container_add(GTK_CONTAINER(tot_fr), tot_box); + gtk_widget_show(tot_box); + + g_snprintf(string_buff, SUM_STR_MAX, "Total MSUs: %u", tot_num_msus); + add_string_to_box(string_buff, tot_box); + + /* + * We must have no un-time-stamped packets (i.e., the number of + * time-stamped packets must be the same as the number of packets), + * and at least two time-stamped packets, in order for the elapsed + * time to be valid. + */ + if (summary.packet_count_ts == summary.packet_count && + summary.packet_count_ts >= 2) { + if (seconds) { + g_snprintf(string_buff, SUM_STR_MAX, "MSUs/second: %.2f", tot_num_msus/seconds); + } + else { + g_snprintf(string_buff, SUM_STR_MAX, "MSUs/second: N/A"); + } + add_string_to_box(string_buff, tot_box); } + + g_snprintf(string_buff, SUM_STR_MAX, "Total Bytes: %.0f", tot_num_bytes); add_string_to_box(string_buff, tot_box); - } - - g_snprintf(string_buff, SUM_STR_MAX, "Total Bytes: %.0f", tot_num_bytes); - add_string_to_box(string_buff, tot_box); - - if (tot_num_msus) { - g_snprintf(string_buff, SUM_STR_MAX, "Average Bytes/MSU: %.2f", tot_num_bytes/tot_num_msus); - } - else { - g_snprintf(string_buff, SUM_STR_MAX, "Average Bytes/MSU: N/A"); - } - add_string_to_box(string_buff, tot_box); - - /* - * We must have no un-time-stamped packets (i.e., the number of - * time-stamped packets must be the same as the number of packets), - * and at least two time-stamped packets, in order for the elapsed - * time to be valid. - */ - if (summary.packet_count_ts == summary.packet_count && - summary.packet_count_ts >= 2) { - if (seconds) { - g_snprintf(string_buff, SUM_STR_MAX, "Bytes/second: %.2f", tot_num_bytes/seconds); + + if (tot_num_msus) { + g_snprintf(string_buff, SUM_STR_MAX, "Average Bytes/MSU: %.2f", tot_num_bytes/tot_num_msus); } else { - g_snprintf(string_buff, SUM_STR_MAX, "Bytes/second: N/A"); + g_snprintf(string_buff, SUM_STR_MAX, "Average Bytes/MSU: N/A"); } add_string_to_box(string_buff, tot_box); - } - /* Button row. */ - bbox = dlg_button_row_new(GTK_STOCK_CLOSE, NULL); - gtk_container_add(GTK_CONTAINER(main_vb), bbox); - gtk_widget_show(bbox); + /* + * We must have no un-time-stamped packets (i.e., the number of + * time-stamped packets must be the same as the number of packets), + * and at least two time-stamped packets, in order for the elapsed + * time to be valid. + */ + if (summary.packet_count_ts == summary.packet_count && + summary.packet_count_ts >= 2) { + if (seconds) { + g_snprintf(string_buff, SUM_STR_MAX, "Bytes/second: %.2f", tot_num_bytes/seconds); + } + else { + g_snprintf(string_buff, SUM_STR_MAX, "Bytes/second: N/A"); + } + add_string_to_box(string_buff, tot_box); + } + + /* Button row. */ + bbox = dlg_button_row_new(GTK_STOCK_CLOSE, NULL); + gtk_box_pack_start(GTK_BOX(main_vb), bbox, FALSE, FALSE, 0); + gtk_widget_show(bbox); - close_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE); - window_set_cancel_button(sum_open_w, close_bt, window_cancel_button_cb); + close_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE); + window_set_cancel_button(sum_open_w, close_bt, window_cancel_button_cb); - g_signal_connect(sum_open_w, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); + g_signal_connect(sum_open_w, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); - gtk_widget_show_all(sum_open_w); - window_present(sum_open_w); + gtk_widget_show_all(sum_open_w); + window_present(sum_open_w); } |