comparison: pidgin/gtkconv.c
pidgin/gtkconv.c
- changeset 37989
- 018063ec9d2e
- parent 37901
- 41e45e18f3b2
- child 37990
- 710f725725a8
equal
deleted
inserted
replaced
| 37978:266009ac8af6 | 37989:018063ec9d2e |
|---|---|
| 971 /* hbox for the grid, and to give it some spacing on the left. */ | 971 /* hbox for the grid, and to give it some spacing on the left. */ |
| 972 hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE); | 972 hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE); |
| 973 gtk_container_add(GTK_CONTAINER(vbox), hbox); | 973 gtk_container_add(GTK_CONTAINER(vbox), hbox); |
| 974 | 974 |
| 975 /* Setup the grid we're going to use to lay stuff out. */ | 975 /* Setup the grid we're going to use to lay stuff out. */ |
| 976 grid = gtk_grid_table_new(2, 2); | 976 grid = gtk_grid_new(); |
| 977 gtk_grid_set_row_spacing(GTK_GRID(grid), PIDGIN_HIG_BOX_SPACE); | 977 gtk_grid_set_row_spacing(GTK_GRID(grid), PIDGIN_HIG_BOX_SPACE); |
| 978 gtk_grid_set_column_spacing(GTK_GRID(grid), PIDGIN_HIG_BOX_SPACE); | 978 gtk_grid_set_column_spacing(GTK_GRID(grid), PIDGIN_HIG_BOX_SPACE); |
| 979 gtk_container_set_border_width(GTK_CONTAINER(grid), PIDGIN_HIG_BORDER); | 979 gtk_container_set_border_width(GTK_CONTAINER(grid), PIDGIN_HIG_BORDER); |
| 980 gtk_box_pack_start(GTK_BOX(vbox), grid, FALSE, FALSE, 0); | 980 gtk_box_pack_start(GTK_BOX(vbox), grid, FALSE, FALSE, 0); |
| 981 | 981 |
| 982 /* Now the Buddy label */ | 982 /* Now the Buddy label */ |
| 983 label = gtk_label_new(NULL); | 983 label = gtk_label_new(NULL); |
| 984 gtk_label_set_markup_with_mnemonic(GTK_LABEL(label), _("_Buddy:")); | 984 gtk_label_set_markup_with_mnemonic(GTK_LABEL(label), _("_Buddy:")); |
| 985 gtk_widget_set_hexpand(label, TRUE); | |
| 986 gtk_widget_set_vexpand(label, TRUE); | |
| 985 gtk_misc_set_alignment(GTK_MISC(label), 0, 0); | 987 gtk_misc_set_alignment(GTK_MISC(label), 0, 0); |
| 986 gtk_grid_attach_defaults(GTK_GRID(grid), label, 0, 0, 1, 1); | 988 gtk_grid_attach(GTK_GRID(grid), label, 0, 0, 1, 1); |
| 987 | 989 |
| 988 /* Now the Buddy drop-down entry field. */ | 990 /* Now the Buddy drop-down entry field. */ |
| 989 info->entry = gtk_entry_new(); | 991 info->entry = gtk_entry_new(); |
| 990 pidgin_setup_screenname_autocomplete(info->entry, NULL, chat_invite_filter, | 992 pidgin_setup_screenname_autocomplete(info->entry, NULL, chat_invite_filter, |
| 991 purple_conversation_get_account(PURPLE_CONVERSATION(chat))); | 993 purple_conversation_get_account(PURPLE_CONVERSATION(chat))); |
| 992 gtk_grid_attach_defaults(GTK_GRID(grid), info->entry, 1, 0, 1, 1); | 994 gtk_widget_set_hexpand(info->entry, TRUE); |
| 995 gtk_widget_set_vexpand(info->entry, TRUE); | |
| 996 gtk_grid_attach(GTK_GRID(grid), info->entry, 1, 0, 1, 1); | |
| 993 gtk_label_set_mnemonic_widget(GTK_LABEL(label), info->entry); | 997 gtk_label_set_mnemonic_widget(GTK_LABEL(label), info->entry); |
| 994 | 998 |
| 995 /* Now the label for "Message" */ | 999 /* Now the label for "Message" */ |
| 996 label = gtk_label_new(NULL); | 1000 label = gtk_label_new(NULL); |
| 997 gtk_label_set_markup_with_mnemonic(GTK_LABEL(label), _("_Message:")); | 1001 gtk_label_set_markup_with_mnemonic(GTK_LABEL(label), _("_Message:")); |
| 1002 gtk_widget_set_hexpand(label, TRUE); | |
| 1003 gtk_widget_set_vexpand(label, TRUE); | |
| 998 gtk_misc_set_alignment(GTK_MISC(label), 0, 0); | 1004 gtk_misc_set_alignment(GTK_MISC(label), 0, 0); |
| 999 gtk_grid_attach_defaults(GTK_GRID(grid), label, 0, 1, 1, 1); | 1005 gtk_grid_attach(GTK_GRID(grid), label, 0, 1, 1, 1); |
| 1000 | |
| 1001 | 1006 |
| 1002 /* And finally, the Message entry field. */ | 1007 /* And finally, the Message entry field. */ |
| 1003 info->message = gtk_entry_new(); | 1008 info->message = gtk_entry_new(); |
| 1004 gtk_entry_set_activates_default(GTK_ENTRY(info->message), TRUE); | 1009 gtk_entry_set_activates_default(GTK_ENTRY(info->message), TRUE); |
| 1005 | 1010 gtk_widget_set_hexpand(info->message, TRUE); |
| 1006 gtk_grid_attach_defaults(GTK_GRID(grid), info->message, 1, 1, 1, 1); | 1011 gtk_widget_set_vexpand(info->message, TRUE); |
| 1012 gtk_grid_attach(GTK_GRID(grid), info->message, 1, 1, 1, 1); | |
| 1007 gtk_label_set_mnemonic_widget(GTK_LABEL(label), info->message); | 1013 gtk_label_set_mnemonic_widget(GTK_LABEL(label), info->message); |
| 1008 | 1014 |
| 1009 /* Connect the signals. */ | 1015 /* Connect the signals. */ |
| 1010 g_signal_connect(G_OBJECT(invite_dialog), "response", | 1016 g_signal_connect(G_OBJECT(invite_dialog), "response", |
| 1011 G_CALLBACK(do_invite), info); | 1017 G_CALLBACK(do_invite), info); |
