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

More GTK3 adaptations 

svn path=/trunk/; revision=42187
This commit is contained in:
Anders Broman 2012-04-21 21:13:13 +00:00
parent c483317006
commit 8bab40a99e
23 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/gtk/flow_graph.c
View File

@ -594,7 +594,7 @@ flow_graph_dlg_create (void)
gtk_widget_show(node_addr_fr);
/* button row */
hbuttonbox = gtk_hbutton_box_new ();
hbuttonbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
gtk_box_pack_start (GTK_BOX (main_vb), hbuttonbox, FALSE, FALSE, 5);
gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox), GTK_BUTTONBOX_SPREAD);
gtk_box_set_spacing (GTK_BOX (hbuttonbox), 30);

2
ui/gtk/funnel_stat.c
View File

@ -191,7 +191,7 @@ static funnel_text_window_t* new_text_window(const gchar* title) {
hbox = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0, FALSE);
gtk_widget_show(hbox);
tw->button_hbox = gtk_hbutton_box_new();
tw->button_hbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
gtk_button_box_set_layout(GTK_BUTTON_BOX(tw->button_hbox), GTK_BUTTONBOX_START);
gtk_box_pack_start(GTK_BOX(hbox), tw->button_hbox, TRUE, TRUE, 0);

4
ui/gtk/iax2_analysis.c
View File

@ -1530,7 +1530,7 @@ static void create_draw_area(user_data_t* user_data, GtkWidget *box)
/* create the associated scrollbar */
user_data->dlg.dialog_graph.scrollbar_adjustment=(GtkAdjustment *)gtk_adjustment_new(0,0,0,0,0,0);
user_data->dlg.dialog_graph.scrollbar=gtk_hscrollbar_new(user_data->dlg.dialog_graph.scrollbar_adjustment);
user_data->dlg.dialog_graph.scrollbar=gtk_scrollbar_new(GTK_ORIENTATION_HORIZONTAL,user_data->dlg.dialog_graph.scrollbar_adjustment);
gtk_widget_show(user_data->dlg.dialog_graph.scrollbar);
gtk_box_pack_start(GTK_BOX(box), user_data->dlg.dialog_graph.scrollbar, FALSE, FALSE, 0);
g_signal_connect(user_data->dlg.dialog_graph.scrollbar_adjustment, "value_changed", G_CALLBACK(scrollbar_changed), user_data);
@ -3346,7 +3346,7 @@ static void create_iax2_dialog(user_data_t* user_data)
gtk_widget_show_all(notebook);
/* buttons */
box4 = gtk_hbutton_box_new();
box4 = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
gtk_box_pack_start(GTK_BOX(main_vb), box4, FALSE, FALSE, 0);
gtk_container_set_border_width(GTK_CONTAINER(box4), 10);
gtk_button_box_set_layout(GTK_BUTTON_BOX (box4), GTK_BUTTONBOX_EDGE);

2
ui/gtk/io_stat.c
View File

@ -1690,7 +1690,7 @@ create_draw_area(io_stat_t *io, GtkWidget *box)
/* create the associated scrollbar */
io->scrollbar_adjustment=(GtkAdjustment *)gtk_adjustment_new(0,0,0,0,0,0);
io->scrollbar=gtk_hscrollbar_new(io->scrollbar_adjustment);
io->scrollbar=gtk_scrollbar_new(GTK_ORIENTATION_HORIZONTAL, io->scrollbar_adjustment);
gtk_widget_show(io->scrollbar);
gtk_box_pack_start(GTK_BOX(box), io->scrollbar, FALSE, FALSE, 0);
g_signal_connect(io->scrollbar_adjustment, "value-changed", G_CALLBACK(scrollbar_changed), io);

4
ui/gtk/mcast_stream_dlg.c
View File

@ -330,7 +330,7 @@ mcast_on_params(GtkButton *button _U_, gpointer data _U_)
gtk_widget_show (table);
/* button row */
hbuttonbox = gtk_hbutton_box_new();
hbuttonbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
gtk_table_attach_defaults(GTK_TABLE(table), hbuttonbox, 0, 2, 5, 6);
ok_bt = gtk_button_new_from_stock(GTK_STOCK_OK);
gtk_container_add (GTK_CONTAINER(hbuttonbox), ok_bt);
@ -680,7 +680,7 @@ mcaststream_dlg_create(void)
gtk_box_pack_start (GTK_BOX (main_vb), label_par, FALSE, FALSE, 0);
/* button row */
hbuttonbox = gtk_hbutton_box_new ();
hbuttonbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
gtk_box_pack_start (GTK_BOX (main_vb), hbuttonbox, FALSE, FALSE, 0);
gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox), GTK_BUTTONBOX_END);
gtk_box_set_spacing (GTK_BOX (hbuttonbox), 0);

2
ui/gtk/packet_win.c
View File

@ -926,7 +926,7 @@ void new_packet_window(GtkWidget *w _U_, gboolean editable _U_)
gtk_widget_show(main_vbox);
/* Panes for the tree and byte view */
pane = gtk_vpaned_new();
pane = gtk_paned_new(GTK_ORIENTATION_VERTICAL);
gtk_container_add(GTK_CONTAINER(main_vbox), pane);
gtk_widget_show(pane);

2
ui/gtk/print_dlg.c
View File

@ -760,7 +760,7 @@ open_print_dialog(const char *title, output_action_e action, print_args_t *args)
gtk_widget_show(hex_cb);
/* seperator */
sep = gtk_hseparator_new();
sep = gtk_separator_new(GTK_ORIENTATION_HORIZONTAL);
gtk_container_add(GTK_CONTAINER(format_vb), sep);
gtk_widget_show(sep);

2
ui/gtk/profile_dlg.c
View File

@ -891,7 +891,7 @@ profile_dialog_new(void)
gtk_widget_show(props_vb);
/* row: Profile name entry */
middle_hb = gtk_hbox_new(FALSE, 3);
middle_hb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE);
gtk_container_add(GTK_CONTAINER(props_vb), middle_hb);
gtk_widget_show(middle_hb);

4
ui/gtk/proto_dlg.c
View File

@ -156,7 +156,7 @@ build_heur_dissectors_treeview(void)
gtk_widget_show(label);
gtk_box_pack_start(GTK_BOX(proto_vb), label, FALSE, FALSE, 5);
bbox = gtk_hbutton_box_new();
bbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
gtk_box_set_spacing(GTK_BOX(bbox), 5);
gtk_box_pack_start(GTK_BOX(proto_vb), bbox, FALSE, FALSE, 0);
@ -288,7 +288,7 @@ build_protocols_treeview(void)
gtk_widget_show(label);
gtk_box_pack_start(GTK_BOX(proto_vb), label, FALSE, FALSE, 5);
bbox = gtk_hbutton_box_new();
bbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
gtk_box_set_spacing(GTK_BOX(bbox), 5);
gtk_box_pack_start(GTK_BOX(proto_vb), bbox, FALSE, FALSE, 0);

4
ui/gtk/rtp_analysis.c
View File

@ -1568,7 +1568,7 @@ static void create_draw_area(user_data_t* user_data, GtkWidget *box)
/* create the associated scrollbar */
user_data->dlg.dialog_graph.scrollbar_adjustment=(GtkAdjustment *)gtk_adjustment_new(0,0,0,0,0,0);
user_data->dlg.dialog_graph.scrollbar=gtk_hscrollbar_new(user_data->dlg.dialog_graph.scrollbar_adjustment);
user_data->dlg.dialog_graph.scrollbar=gtk_scrollbar_new(GTK_ORIENTATION_HORIZONTAL, user_data->dlg.dialog_graph.scrollbar_adjustment);
gtk_widget_show(user_data->dlg.dialog_graph.scrollbar);
gtk_box_pack_start(GTK_BOX(box), user_data->dlg.dialog_graph.scrollbar, FALSE, FALSE, 0);
g_signal_connect(user_data->dlg.dialog_graph.scrollbar_adjustment, "value_changed", G_CALLBACK(scrollbar_changed), user_data);
@ -3505,7 +3505,7 @@ static void create_rtp_dialog(user_data_t* user_data)
gtk_widget_show_all(notebook);
/* buttons */
box4 = gtk_hbutton_box_new();
box4 = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
gtk_box_pack_start(GTK_BOX(main_vb), box4, FALSE, FALSE, 0);
gtk_container_set_border_width(GTK_CONTAINER(box4), 10);
gtk_button_box_set_layout(GTK_BUTTON_BOX (box4), GTK_BUTTONBOX_EDGE);

6
ui/gtk/rtp_player.c
View File

@ -1829,7 +1829,7 @@ add_channel_to_window(gchar *key _U_ , rtp_channel_info_t *rci, guint *counter _
/* Create the Separator if it is not the last one */
(*counter)++;
if (*counter < g_hash_table_size(rtp_channels_hash)) {
rci->separator = gtk_hseparator_new();
rci->separator = gtk_separator_new(GTK_ORIENTATION_HORIZONTAL);
gtk_box_pack_start(GTK_BOX (channels_vb), rci->separator, FALSE, FALSE, 5);
}
@ -2379,7 +2379,7 @@ rtp_player_dlg_create(void)
gtk_widget_set_tooltip_text (cb_use_rtp_timestamp, "Use RTP Timestamp instead of the arriving packet time. This will not reproduce the RTP stream as the user heard it, but is useful when the RTP is being tunneled and the original packet timing is missing");
/* button row */
hbuttonbox = gtk_hbutton_box_new ();
hbuttonbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
gtk_box_pack_start (GTK_BOX (h_jitter_buttons_box), hbuttonbox, TRUE, TRUE, 0);
gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox), GTK_BUTTONBOX_SPREAD);
gtk_box_set_spacing (GTK_BOX (hbuttonbox), 10);
@ -2418,7 +2418,7 @@ rtp_player_dlg_create(void)
g_signal_connect(rtp_player_dlg_w, "destroy", G_CALLBACK(rtp_player_on_destroy), NULL);
/* button row */
/* ?? hbuttonbox = gtk_hbutton_box_new ();*/
/* ?? hbuttonbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);*/
/* Filter/status hbox */
stat_hbox = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 1, FALSE);

2
ui/gtk/rtp_stream_dlg.c
View File

@ -997,7 +997,7 @@ rtpstream_dlg_create (void)
gtk_box_pack_start (GTK_BOX (main_vb), label_rev, FALSE, FALSE, 0);
/* button row */
hbuttonbox = gtk_hbutton_box_new ();
hbuttonbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
gtk_box_pack_start (GTK_BOX (main_vb), hbuttonbox, FALSE, FALSE, 0);
gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox), GTK_BUTTONBOX_END);
gtk_box_set_spacing (GTK_BOX (hbuttonbox), 0);

6
ui/gtk/sctp_assoc_analyse.c
View File

@ -569,7 +569,7 @@ static void create_analyse_window(struct sctp_analyse* u_data)
gtk_box_pack_start(GTK_BOX(page1), u_data->analyse_nb->bytes_ep2, TRUE, TRUE, 0);
gtk_misc_set_alignment (GTK_MISC(u_data->analyse_nb->bytes_ep2),0,0);
hbox = gtk_hbutton_box_new();
hbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
gtk_box_pack_start(GTK_BOX(page1), hbox, FALSE, FALSE, 0);
gtk_container_set_border_width(GTK_CONTAINER(hbox), 10);
gtk_button_box_set_layout(GTK_BUTTON_BOX (hbox), GTK_BUTTONBOX_SPREAD);
@ -669,7 +669,7 @@ static void create_analyse_window(struct sctp_analyse* u_data)
gtk_widget_show(vbox_r);
h_button_box=gtk_hbutton_box_new();
h_button_box=gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
gtk_box_pack_start(GTK_BOX(page2), h_button_box, FALSE, FALSE, 0);
gtk_container_set_border_width(GTK_CONTAINER(h_button_box), 10);
gtk_button_box_set_layout(GTK_BUTTON_BOX (h_button_box), GTK_BUTTONBOX_SPREAD);
@ -773,7 +773,7 @@ static void create_analyse_window(struct sctp_analyse* u_data)
gtk_widget_show(vbox_r);
h_button_box=gtk_hbutton_box_new();
h_button_box=gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
gtk_box_pack_start(GTK_BOX(page3), h_button_box, FALSE, FALSE, 0);
gtk_container_set_border_width(GTK_CONTAINER(h_button_box), 10);
gtk_button_box_set_layout(GTK_BUTTON_BOX (h_button_box), GTK_BUTTONBOX_SPREAD);

2
ui/gtk/sctp_byte_graph_dlg.c
View File

@ -1263,7 +1263,7 @@ static void init_sctp_graph_window(struct sctp_udata *u_data)
sctp_graph_set_title(u_data);
hbox = gtk_hbutton_box_new();
hbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
gtk_container_set_border_width(GTK_CONTAINER(hbox), 10);
gtk_button_box_set_layout(GTK_BUTTON_BOX (hbox), GTK_BUTTONBOX_SPREAD);

4
ui/gtk/sctp_chunk_stat_dlg.c
View File

@ -625,7 +625,7 @@ gtk_sctpstat_dlg(struct sctp_udata *u_data, unsigned int direction)
gtk_widget_show(u_data->io->window);
hbuttonbox2 = gtk_hbutton_box_new();
hbuttonbox2 = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
gtk_box_pack_start(GTK_BOX(vbox1), hbuttonbox2, FALSE, FALSE, 0);
gtk_container_set_border_width(GTK_CONTAINER(hbuttonbox2), 10);
gtk_button_box_set_layout(GTK_BUTTON_BOX (hbuttonbox2), GTK_BUTTONBOX_SPREAD);
@ -747,7 +747,7 @@ sctp_chunk_dlg(struct sctp_udata *u_data)
gtk_misc_set_alignment(GTK_MISC(label), 0.0f, 0.5f);
gtk_table_attach_defaults(GTK_TABLE(table), label, 3, 4, row, row+1);
h_button_box=gtk_hbutton_box_new();
h_button_box=gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
gtk_box_pack_start(GTK_BOX(main_vb), h_button_box, FALSE, FALSE, 0);
gtk_container_set_border_width(GTK_CONTAINER(h_button_box), 10);
gtk_button_box_set_layout(GTK_BUTTON_BOX (h_button_box), GTK_BUTTONBOX_SPREAD);

2
ui/gtk/sctp_error_dlg.c
View File

@ -248,7 +248,7 @@ gtk_sctperror_dlg(void)
gtk_widget_show(sctp_error_dlg_w);
hbuttonbox2 = gtk_hbutton_box_new ();
hbuttonbox2 = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
gtk_widget_show (hbuttonbox2);
gtk_box_pack_start (GTK_BOX (vbox1), hbuttonbox2, FALSE, FALSE, 0);
gtk_box_set_spacing (GTK_BOX (hbuttonbox2), 5);

2
ui/gtk/sctp_graph_dlg.c
View File

@ -1681,7 +1681,7 @@ init_sctp_graph_window(struct sctp_udata *u_data)
sctp_graph_set_title(u_data);
hbox = gtk_hbutton_box_new();
hbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
gtk_container_set_border_width(GTK_CONTAINER(hbox), 10);
gtk_button_box_set_layout(GTK_BUTTON_BOX (hbox), GTK_BUTTONBOX_SPREAD);

2
ui/gtk/sctp_stat_dlg.c
View File

@ -583,7 +583,7 @@ gtk_sctpstat_dlg(void)
gtk_widget_show(sctp_stat_dlg_w);
hbuttonbox2 = gtk_hbutton_box_new();
hbuttonbox2 = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
gtk_box_pack_start(GTK_BOX(vbox1), hbuttonbox2, FALSE, FALSE, 0);
gtk_container_set_border_width(GTK_CONTAINER(hbuttonbox2), 10);
gtk_button_box_set_layout(GTK_BUTTON_BOX (hbuttonbox2), GTK_BUTTONBOX_SPREAD);

2
ui/gtk/sip_stat.c
View File

@ -665,7 +665,7 @@ gtk_sipstat_init(const char *optarg, void *userdata _U_)
/* Separator between requests and responses */
separator = gtk_hseparator_new();
separator = gtk_separator_new(GTK_ORIENTATION_HORIZONTAL);
gtk_container_add(GTK_CONTAINER(main_vb), separator);
/* Request table and frame */

6
ui/gtk/tcp_graph.c
View File

@ -1055,7 +1055,7 @@ static GtkWidget *control_panel_create_zoom_group (struct graph *g)
gtk_box_pack_start (GTK_BOX (zoom_inout_box), zoom_in, FALSE, FALSE, 10);
gtk_box_pack_start (GTK_BOX (zoom_inout_box), zoom_out, FALSE, FALSE, 0);
zoom_separator1 = gtk_hseparator_new ();
zoom_separator1 = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
zoom_h_entry = gtk_entry_new ();
gtk_entry_set_text (GTK_ENTRY (zoom_h_entry), "1.000");
@ -1080,7 +1080,7 @@ static GtkWidget *control_panel_create_zoom_group (struct graph *g)
gtk_table_attach (GTK_TABLE (zoom_table), zoom_v_entry, 1, 2, 1, 2,
GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND, 5, 0);
zoom_separator2 = gtk_hseparator_new ();
zoom_separator2 = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
zoom_h_adj = (GtkAdjustment * )gtk_adjustment_new ((gfloat)1.2, 1.0, 5, (gfloat)0.1, 1, 0);
zoom_h_step = gtk_spin_button_new (zoom_h_adj, 0, 1);
@ -1537,7 +1537,7 @@ static GtkWidget *control_panel_create_graph_type_group (struct graph *g)
break;
}
graph_init = gtk_check_button_new_with_label ("Init on change");
graph_sep = gtk_hseparator_new ();
graph_sep = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
graph_box = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE);
gtk_box_pack_start (GTK_BOX (graph_box), graph_rtt, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (graph_box), graph_tput, TRUE, TRUE, 0);

6
ui/gtk/uat_gui.c
View File

@ -985,13 +985,13 @@ static GtkWidget* uat_window(void* u) {
rep->bbox = dlg_button_row_new(GTK_STOCK_OK, GTK_STOCK_APPLY, GTK_STOCK_CANCEL, NULL);
}
move_hbox = gtk_vbutton_box_new();
move_hbox = gtk_button_box_new(GTK_ORIENTATION_VERTICAL);
gtk_box_pack_start(GTK_BOX(vbox), move_hbox, TRUE, FALSE, 0);
edit_hbox = gtk_vbutton_box_new();
edit_hbox = gtk_button_box_new(GTK_ORIENTATION_VERTICAL);
gtk_box_pack_start(GTK_BOX(vbox), edit_hbox, TRUE, FALSE, 0);
refresh_hbox = gtk_vbutton_box_new();
refresh_hbox = gtk_button_box_new(GTK_ORIENTATION_VERTICAL);
gtk_box_pack_end(GTK_BOX(vbox), refresh_hbox, TRUE, FALSE, 0);

2
ui/gtk/voip_calls_dlg.c
View File

@ -706,7 +706,7 @@ voip_calls_dlg_create(void)
gtk_box_pack_start(GTK_BOX(main_vb), status_label, FALSE, FALSE, 8);
/* button row */
hbuttonbox = gtk_hbutton_box_new();
hbuttonbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
gtk_box_pack_start(GTK_BOX(main_vb), hbuttonbox, FALSE, FALSE, 0);
gtk_button_box_set_layout(GTK_BUTTON_BOX (hbuttonbox), GTK_BUTTONBOX_SPREAD);
gtk_box_set_spacing(GTK_BOX(hbuttonbox), 30);

2
ui/gtk/wlan_stat_dlg.c
View File

@ -1762,7 +1762,7 @@ wlanstat_dlg_create (void)
gtk_container_add(GTK_CONTAINER(wlanstat_dlg_w), vbox);
gtk_container_set_border_width (GTK_CONTAINER(vbox), 6);
wlanstat_pane = gtk_vpaned_new();
wlanstat_pane = gtk_paned_new(GTK_ORIENTATION_VERTICAL);
gtk_box_pack_start (GTK_BOX (vbox), wlanstat_pane, TRUE, TRUE, 0);
gtk_paned_set_position(GTK_PANED(wlanstat_pane), recent.gui_geometry_wlan_stats_pane);
gtk_widget_show(wlanstat_pane);