comparison: pidgin/gtkconv.c
pidgin/gtkconv.c
- changeset 36243
- 2a390d401448
- parent 36133
- b143d7e8e919
- child 36257
- c5445f25f90f
equal
deleted
inserted
replaced
| 36242:dadd62632e4a | 36243:2a390d401448 |
|---|---|
| 917 | 917 |
| 918 if (invite_dialog == NULL) { | 918 if (invite_dialog == NULL) { |
| 919 PidginConvWindow *gtkwin; | 919 PidginConvWindow *gtkwin; |
| 920 GtkWidget *label; | 920 GtkWidget *label; |
| 921 GtkWidget *vbox, *hbox; | 921 GtkWidget *vbox, *hbox; |
| 922 GtkWidget *table; | 922 GtkWidget *grid; |
| 923 GtkWidget *img; | 923 GtkWidget *img; |
| 924 | 924 |
| 925 img = gtk_image_new_from_stock(PIDGIN_STOCK_DIALOG_QUESTION, | 925 img = gtk_image_new_from_stock(PIDGIN_STOCK_DIALOG_QUESTION, |
| 926 gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_HUGE)); | 926 gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_HUGE)); |
| 927 | 927 |
| 967 gtk_widget_set_size_request(label, 350, -1); | 967 gtk_widget_set_size_request(label, 350, -1); |
| 968 gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); | 968 gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); |
| 969 gtk_misc_set_alignment(GTK_MISC(label), 0, 0); | 969 gtk_misc_set_alignment(GTK_MISC(label), 0, 0); |
| 970 gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); | 970 gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); |
| 971 | 971 |
| 972 /* hbox for the table, and to give it some spacing on the left. */ | 972 /* hbox for the grid, and to give it some spacing on the left. */ |
| 973 hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE); | 973 hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE); |
| 974 gtk_container_add(GTK_CONTAINER(vbox), hbox); | 974 gtk_container_add(GTK_CONTAINER(vbox), hbox); |
| 975 | 975 |
| 976 /* Setup the table we're going to use to lay stuff out. */ | 976 /* Setup the grid we're going to use to lay stuff out. */ |
| 977 table = gtk_table_new(2, 2, FALSE); | 977 grid = gtk_grid_table_new(2, 2); |
| 978 gtk_table_set_row_spacings(GTK_TABLE(table), PIDGIN_HIG_BOX_SPACE); | 978 gtk_grid_set_row_spacing(GTK_GRID(grid), PIDGIN_HIG_BOX_SPACE); |
| 979 gtk_table_set_col_spacings(GTK_TABLE(table), PIDGIN_HIG_BOX_SPACE); | 979 gtk_grid_set_column_spacing(GTK_GRID(grid), PIDGIN_HIG_BOX_SPACE); |
| 980 gtk_container_set_border_width(GTK_CONTAINER(table), PIDGIN_HIG_BORDER); | 980 gtk_container_set_border_width(GTK_CONTAINER(grid), PIDGIN_HIG_BORDER); |
| 981 gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0); | 981 gtk_box_pack_start(GTK_BOX(vbox), grid, FALSE, FALSE, 0); |
| 982 | 982 |
| 983 /* Now the Buddy label */ | 983 /* Now the Buddy label */ |
| 984 label = gtk_label_new(NULL); | 984 label = gtk_label_new(NULL); |
| 985 gtk_label_set_markup_with_mnemonic(GTK_LABEL(label), _("_Buddy:")); | 985 gtk_label_set_markup_with_mnemonic(GTK_LABEL(label), _("_Buddy:")); |
| 986 gtk_misc_set_alignment(GTK_MISC(label), 0, 0); | 986 gtk_misc_set_alignment(GTK_MISC(label), 0, 0); |
| 987 gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1); | 987 gtk_grid_attach_defaults(GTK_GRID(grid), label, 0, 0, 1, 1); |
| 988 | 988 |
| 989 /* Now the Buddy drop-down entry field. */ | 989 /* Now the Buddy drop-down entry field. */ |
| 990 info->entry = gtk_entry_new(); | 990 info->entry = gtk_entry_new(); |
| 991 pidgin_setup_screenname_autocomplete(info->entry, NULL, chat_invite_filter, | 991 pidgin_setup_screenname_autocomplete(info->entry, NULL, chat_invite_filter, |
| 992 purple_conversation_get_account(PURPLE_CONVERSATION(chat))); | 992 purple_conversation_get_account(PURPLE_CONVERSATION(chat))); |
| 993 gtk_table_attach_defaults(GTK_TABLE(table), info->entry, 1, 2, 0, 1); | 993 gtk_grid_attach_defaults(GTK_GRID(grid), info->entry, 1, 0, 1, 1); |
| 994 gtk_label_set_mnemonic_widget(GTK_LABEL(label), info->entry); | 994 gtk_label_set_mnemonic_widget(GTK_LABEL(label), info->entry); |
| 995 | 995 |
| 996 /* Now the label for "Message" */ | 996 /* Now the label for "Message" */ |
| 997 label = gtk_label_new(NULL); | 997 label = gtk_label_new(NULL); |
| 998 gtk_label_set_markup_with_mnemonic(GTK_LABEL(label), _("_Message:")); | 998 gtk_label_set_markup_with_mnemonic(GTK_LABEL(label), _("_Message:")); |
| 999 gtk_misc_set_alignment(GTK_MISC(label), 0, 0); | 999 gtk_misc_set_alignment(GTK_MISC(label), 0, 0); |
| 1000 gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 1, 2); | 1000 gtk_grid_attach_defaults(GTK_GRID(grid), label, 0, 1, 1, 1); |
| 1001 | 1001 |
| 1002 | 1002 |
| 1003 /* And finally, the Message entry field. */ | 1003 /* And finally, the Message entry field. */ |
| 1004 info->message = gtk_entry_new(); | 1004 info->message = gtk_entry_new(); |
| 1005 gtk_entry_set_activates_default(GTK_ENTRY(info->message), TRUE); | 1005 gtk_entry_set_activates_default(GTK_ENTRY(info->message), TRUE); |
| 1006 | 1006 |
| 1007 gtk_table_attach_defaults(GTK_TABLE(table), info->message, 1, 2, 1, 2); | 1007 gtk_grid_attach_defaults(GTK_GRID(grid), info->message, 1, 1, 1, 1); |
| 1008 gtk_label_set_mnemonic_widget(GTK_LABEL(label), info->message); | 1008 gtk_label_set_mnemonic_widget(GTK_LABEL(label), info->message); |
| 1009 | 1009 |
| 1010 /* Connect the signals. */ | 1010 /* Connect the signals. */ |
| 1011 g_signal_connect(G_OBJECT(invite_dialog), "response", | 1011 g_signal_connect(G_OBJECT(invite_dialog), "response", |
| 1012 G_CALLBACK(do_invite), info); | 1012 G_CALLBACK(do_invite), info); |
