Mercurial > pidgin.yaz

comparison src/gtkconv.c @ 11243:a511b77a368b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 13408] sf patch #1246384, from shiyee "This patch globally defines spacings and boreders according to the Gnome Human Interfaces Guidelines, and uses those defines where appropriate. No visual changes are made, but the the intention is that the defines should help promote uniformness." committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Fri, 12 Aug 2005 23:53:28 +0000
parents 8b3d1b2c2c43
children 5c15a709835f
comparison
equal deleted inserted replaced
11242:01c06e7ae1f6 11243:a511b77a368b
872 GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, 872 GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
873 GAIM_STOCK_INVITE, GTK_RESPONSE_OK, NULL); 873 GAIM_STOCK_INVITE, GTK_RESPONSE_OK, NULL);
874 874
875 gtk_dialog_set_default_response(GTK_DIALOG(invite_dialog), 875 gtk_dialog_set_default_response(GTK_DIALOG(invite_dialog),
876 GTK_RESPONSE_OK); 876 GTK_RESPONSE_OK);
877 gtk_container_set_border_width(GTK_CONTAINER(invite_dialog), 6); 877 gtk_container_set_border_width(GTK_CONTAINER(invite_dialog), GAIM_HIG_BOX_SPACE);
878 gtk_window_set_resizable(GTK_WINDOW(invite_dialog), FALSE); 878 gtk_window_set_resizable(GTK_WINDOW(invite_dialog), FALSE);
879 gtk_dialog_set_has_separator(GTK_DIALOG(invite_dialog), FALSE); 879 gtk_dialog_set_has_separator(GTK_DIALOG(invite_dialog), FALSE);
880 880
881 info->window = GTK_WIDGET(invite_dialog); 881 info->window = GTK_WIDGET(invite_dialog);
882 882
883 /* Setup the outside spacing. */ 883 /* Setup the outside spacing. */
884 vbox = GTK_DIALOG(invite_dialog)->vbox; 884 vbox = GTK_DIALOG(invite_dialog)->vbox;
885 885
886 gtk_box_set_spacing(GTK_BOX(vbox), 12); 886 gtk_box_set_spacing(GTK_BOX(vbox), GAIM_HIG_BORDER);
887 gtk_container_set_border_width(GTK_CONTAINER(vbox), 6); 887 gtk_container_set_border_width(GTK_CONTAINER(vbox), GAIM_HIG_BOX_SPACE);
888 888
889 /* Setup the inner hbox and put the dialog's icon in it. */ 889 /* Setup the inner hbox and put the dialog's icon in it. */
890 hbox = gtk_hbox_new(FALSE, 12); 890 hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
891 gtk_container_add(GTK_CONTAINER(vbox), hbox); 891 gtk_container_add(GTK_CONTAINER(vbox), hbox);
892 gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); 892 gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
893 gtk_misc_set_alignment(GTK_MISC(img), 0, 0); 893 gtk_misc_set_alignment(GTK_MISC(img), 0, 0);
894 894
895 /* Setup the right vbox. */ 895 /* Setup the right vbox. */
904 gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); 904 gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
905 gtk_misc_set_alignment(GTK_MISC(label), 0, 0); 905 gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
906 gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); 906 gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
907 907
908 /* hbox for the table, and to give it some spacing on the left. */ 908 /* hbox for the table, and to give it some spacing on the left. */
909 hbox = gtk_hbox_new(FALSE, 6); 909 hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE);
910 gtk_container_add(GTK_CONTAINER(vbox), hbox); 910 gtk_container_add(GTK_CONTAINER(vbox), hbox);
911 911
912 /* Setup the table we're going to use to lay stuff out. */ 912 /* Setup the table we're going to use to lay stuff out. */
913 table = gtk_table_new(2, 2, FALSE); 913 table = gtk_table_new(2, 2, FALSE);
914 gtk_table_set_row_spacings(GTK_TABLE(table), 6); 914 gtk_table_set_row_spacings(GTK_TABLE(table), GAIM_HIG_BOX_SPACE);
915 gtk_table_set_col_spacings(GTK_TABLE(table), 6); 915 gtk_table_set_col_spacings(GTK_TABLE(table), GAIM_HIG_BOX_SPACE);
916 gtk_container_set_border_width(GTK_CONTAINER(table), 12); 916 gtk_container_set_border_width(GTK_CONTAINER(table), GAIM_HIG_BORDER);
917 gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0); 917 gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0);
918 918
919 /* Now the Buddy label */ 919 /* Now the Buddy label */
920 label = gtk_label_new(NULL); 920 label = gtk_label_new(NULL);
921 gtk_label_set_markup_with_mnemonic(GTK_LABEL(label), _("_Buddy:")); 921 gtk_label_set_markup_with_mnemonic(GTK_LABEL(label), _("_Buddy:"));
1133 gtk_dialog_set_default_response(GTK_DIALOG(gtkconv->dialogs.search), 1133 gtk_dialog_set_default_response(GTK_DIALOG(gtkconv->dialogs.search),
1134 GTK_RESPONSE_OK); 1134 GTK_RESPONSE_OK);
1135 g_signal_connect(G_OBJECT(gtkconv->dialogs.search), "response", 1135 g_signal_connect(G_OBJECT(gtkconv->dialogs.search), "response",
1136 G_CALLBACK(do_search_cb), s); 1136 G_CALLBACK(do_search_cb), s);
1137 1137
1138 gtk_container_set_border_width(GTK_CONTAINER(gtkconv->dialogs.search), 6); 1138 gtk_container_set_border_width(GTK_CONTAINER(gtkconv->dialogs.search), GAIM_HIG_BOX_SPACE);
1139 gtk_window_set_resizable(GTK_WINDOW(gtkconv->dialogs.search), FALSE); 1139 gtk_window_set_resizable(GTK_WINDOW(gtkconv->dialogs.search), FALSE);
1140 gtk_dialog_set_has_separator(GTK_DIALOG(gtkconv->dialogs.search), FALSE); 1140 gtk_dialog_set_has_separator(GTK_DIALOG(gtkconv->dialogs.search), FALSE);
1141 gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(gtkconv->dialogs.search)->vbox), 12); 1141 gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(gtkconv->dialogs.search)->vbox), GAIM_HIG_BORDER);
1142 gtk_container_set_border_width( 1142 gtk_container_set_border_width(
1143 GTK_CONTAINER(GTK_DIALOG(gtkconv->dialogs.search)->vbox), 6); 1143 GTK_CONTAINER(GTK_DIALOG(gtkconv->dialogs.search)->vbox), GAIM_HIG_BOX_SPACE);
1144 1144
1145 hbox = gtk_hbox_new(FALSE, 12); 1145 hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
1146 gtk_container_add(GTK_CONTAINER(GTK_DIALOG(gtkconv->dialogs.search)->vbox), 1146 gtk_container_add(GTK_CONTAINER(GTK_DIALOG(gtkconv->dialogs.search)->vbox),
1147 hbox); 1147 hbox);
1148 gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); 1148 gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
1149 1149
1150 gtk_misc_set_alignment(GTK_MISC(img), 0, 0); 1150 gtk_misc_set_alignment(GTK_MISC(img), 0, 0);
3906 /* Setup the outer pane. */ 3906 /* Setup the outer pane. */
3907 vpaned = gtk_vpaned_new(); 3907 vpaned = gtk_vpaned_new();
3908 gtk_widget_show(vpaned); 3908 gtk_widget_show(vpaned);
3909 3909
3910 /* Setup the top part of the pane. */ 3910 /* Setup the top part of the pane. */
3911 vbox = gtk_vbox_new(FALSE, 6); 3911 vbox = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE);
3912 gtk_paned_pack1(GTK_PANED(vpaned), vbox, TRUE, TRUE); 3912 gtk_paned_pack1(GTK_PANED(vpaned), vbox, TRUE, TRUE);
3913 gtk_widget_show(vbox); 3913 gtk_widget_show(vbox);
3914 3914
3915 if (gc != NULL) 3915 if (gc != NULL)
3916 prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl); 3916 prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl);
3917 3917
3918 if (prpl_info->options & OPT_PROTO_CHAT_TOPIC) 3918 if (prpl_info->options & OPT_PROTO_CHAT_TOPIC)
3919 { 3919 {
3920 hbox = gtk_hbox_new(FALSE, 6); 3920 hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE);
3921 gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); 3921 gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
3922 gtk_widget_show(hbox); 3922 gtk_widget_show(hbox);
3923 3923
3924 label = gtk_label_new(_("Topic:")); 3924 label = gtk_label_new(_("Topic:"));
3925 gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); 3925 gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
3962 G_CALLBACK(refocus_entry_cb), gtkconv); 3962 G_CALLBACK(refocus_entry_cb), gtkconv);
3963 g_signal_connect(G_OBJECT(gtkconv->imhtml), "key_release_event", 3963 g_signal_connect(G_OBJECT(gtkconv->imhtml), "key_release_event",
3964 G_CALLBACK(refocus_entry_cb), gtkconv); 3964 G_CALLBACK(refocus_entry_cb), gtkconv);
3965 3965
3966 /* Build the right pane. */ 3966 /* Build the right pane. */
3967 lbox = gtk_vbox_new(FALSE, 6); 3967 lbox = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE);
3968 gtk_paned_pack2(GTK_PANED(hpaned), lbox, FALSE, TRUE); 3968 gtk_paned_pack2(GTK_PANED(hpaned), lbox, FALSE, TRUE);
3969 gtk_widget_show(lbox); 3969 gtk_widget_show(lbox);
3970 3970
3971 /* Setup the label telling how many people are in the room. */ 3971 /* Setup the label telling how many people are in the room. */
3972 gtkchat->count = gtk_label_new(_("0 people in room")); 3972 gtkchat->count = gtk_label_new(_("0 people in room"));
4019 gtkchat->list = list; 4019 gtkchat->list = list;
4020 4020
4021 gtk_container_add(GTK_CONTAINER(sw), list); 4021 gtk_container_add(GTK_CONTAINER(sw), list);
4022 4022
4023 /* Setup the user list toolbar. */ 4023 /* Setup the user list toolbar. */
4024 bbox = gtk_hbox_new(TRUE, 6); 4024 bbox = gtk_hbox_new(TRUE, GAIM_HIG_BOX_SPACE);
4025 gtk_box_pack_start(GTK_BOX(lbox), bbox, FALSE, FALSE, 0); 4025 gtk_box_pack_start(GTK_BOX(lbox), bbox, FALSE, FALSE, 0);
4026 gtk_widget_show(bbox); 4026 gtk_widget_show(bbox);
4027 4027
4028 /* IM */ 4028 /* IM */
4029 button = gaim_pixbuf_button_from_stock(NULL, GAIM_STOCK_IM, 4029 button = gaim_pixbuf_button_from_stock(NULL, GAIM_STOCK_IM,
4061 G_CALLBACK(info_cb), gtkconv); 4061 G_CALLBACK(info_cb), gtkconv);
4062 4062
4063 gtk_widget_show(button); 4063 gtk_widget_show(button);
4064 4064
4065 /* Setup the bottom half of the conversation window */ 4065 /* Setup the bottom half of the conversation window */
4066 vbox = gtk_vbox_new(FALSE, 6); 4066 vbox = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE);
4067 gtk_paned_pack2(GTK_PANED(vpaned), vbox, FALSE, TRUE); 4067 gtk_paned_pack2(GTK_PANED(vpaned), vbox, FALSE, TRUE);
4068 gtk_widget_show(vbox); 4068 gtk_widget_show(vbox);
4069 4069
4070 gtkconv->lower_hbox = gtk_hbox_new(FALSE, 6); 4070 gtkconv->lower_hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE);
4071 gtk_box_pack_start(GTK_BOX(vbox), gtkconv->lower_hbox, TRUE, TRUE, 0); 4071 gtk_box_pack_start(GTK_BOX(vbox), gtkconv->lower_hbox, TRUE, TRUE, 0);
4072 gtk_widget_show(gtkconv->lower_hbox); 4072 gtk_widget_show(gtkconv->lower_hbox);
4073 4073
4074 vbox = gtk_vbox_new(FALSE, 6); 4074 vbox = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE);
4075 gtk_box_pack_end(GTK_BOX(gtkconv->lower_hbox), vbox, TRUE, TRUE, 0); 4075 gtk_box_pack_end(GTK_BOX(gtkconv->lower_hbox), vbox, TRUE, TRUE, 0);
4076 gtk_widget_show(vbox); 4076 gtk_widget_show(vbox);
4077 4077
4078 /* Setup the toolbar, entry widget and all signals */ 4078 /* Setup the toolbar, entry widget and all signals */
4079 frame = gaim_gtk_create_imhtml(TRUE, &gtkconv->entry, &gtkconv->toolbar); 4079 frame = gaim_gtk_create_imhtml(TRUE, &gtkconv->entry, &gtkconv->toolbar);
4124 /* Setup the outer pane */ 4124 /* Setup the outer pane */
4125 paned = gtk_vpaned_new(); 4125 paned = gtk_vpaned_new();
4126 gtk_widget_show(paned); 4126 gtk_widget_show(paned);
4127 4127
4128 /* Setup the top part of the pane */ 4128 /* Setup the top part of the pane */
4129 vbox = gtk_vbox_new(FALSE, 6); 4129 vbox = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE);
4130 gtk_paned_pack1(GTK_PANED(paned), vbox, TRUE, TRUE); 4130 gtk_paned_pack1(GTK_PANED(paned), vbox, TRUE, TRUE);
4131 gtk_widget_show(vbox); 4131 gtk_widget_show(vbox);
4132 4132
4133 /* Setup the gtkimhtml widget */ 4133 /* Setup the gtkimhtml widget */
4134 frame = gaim_gtk_create_imhtml(FALSE, &gtkconv->imhtml, NULL); 4134 frame = gaim_gtk_create_imhtml(FALSE, &gtkconv->imhtml, NULL);
4149 G_CALLBACK(refocus_entry_cb), gtkconv); 4149 G_CALLBACK(refocus_entry_cb), gtkconv);
4150 g_signal_connect(G_OBJECT(gtkconv->imhtml), "key_release_event", 4150 g_signal_connect(G_OBJECT(gtkconv->imhtml), "key_release_event",
4151 G_CALLBACK(refocus_entry_cb), gtkconv); 4151 G_CALLBACK(refocus_entry_cb), gtkconv);
4152 4152
4153 /* Setup the bottom half of the conversation window */ 4153 /* Setup the bottom half of the conversation window */
4154 vbox2 = gtk_vbox_new(FALSE, 6); 4154 vbox2 = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE);
4155 gtk_paned_pack2(GTK_PANED(paned), vbox2, FALSE, TRUE); 4155 gtk_paned_pack2(GTK_PANED(paned), vbox2, FALSE, TRUE);
4156 gtk_widget_show(vbox2); 4156 gtk_widget_show(vbox2);
4157 4157
4158 gtkconv->lower_hbox = gtk_hbox_new(FALSE, 6); 4158 gtkconv->lower_hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE);
4159 gtk_box_pack_start(GTK_BOX(vbox2), gtkconv->lower_hbox, TRUE, TRUE, 0); 4159 gtk_box_pack_start(GTK_BOX(vbox2), gtkconv->lower_hbox, TRUE, TRUE, 0);
4160 gtk_widget_show(gtkconv->lower_hbox); 4160 gtk_widget_show(gtkconv->lower_hbox);
4161 4161
4162 vbox2 = gtk_vbox_new(FALSE, 6); 4162 vbox2 = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE);
4163 gtk_box_pack_end(GTK_BOX(gtkconv->lower_hbox), vbox2, TRUE, TRUE, 0); 4163 gtk_box_pack_end(GTK_BOX(gtkconv->lower_hbox), vbox2, TRUE, TRUE, 0);
4164 gtk_widget_show(vbox2); 4164 gtk_widget_show(vbox2);
4165 4165
4166 /* Setup the toolbar, entry widget and all signals */ 4166 /* Setup the toolbar, entry widget and all signals */
4167 frame = gaim_gtk_create_imhtml(TRUE, &gtkconv->entry, &gtkconv->toolbar); 4167 frame = gaim_gtk_create_imhtml(TRUE, &gtkconv->entry, &gtkconv->toolbar);
4530 G_CALLBACK(conv_dnd_recv), gtkconv); 4530 G_CALLBACK(conv_dnd_recv), gtkconv);
4531 g_signal_connect(G_OBJECT(gtkconv->entry), "drag_data_received", 4531 g_signal_connect(G_OBJECT(gtkconv->entry), "drag_data_received",
4532 G_CALLBACK(conv_dnd_recv), gtkconv); 4532 G_CALLBACK(conv_dnd_recv), gtkconv);
4533 4533
4534 /* Setup the container for the tab. */ 4534 /* Setup the container for the tab. */
4535 gtkconv->tab_cont = tab_cont = gtk_vbox_new(FALSE, 6); 4535 gtkconv->tab_cont = tab_cont = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE);
4536 g_object_set_data(G_OBJECT(tab_cont), "GaimGtkConversation", gtkconv); 4536 g_object_set_data(G_OBJECT(tab_cont), "GaimGtkConversation", gtkconv);
4537 gtk_container_set_border_width(GTK_CONTAINER(tab_cont), 6); 4537 gtk_container_set_border_width(GTK_CONTAINER(tab_cont), GAIM_HIG_BOX_SPACE);
4538 gtk_container_add(GTK_CONTAINER(tab_cont), pane); 4538 gtk_container_add(GTK_CONTAINER(tab_cont), pane);
4539 gtk_widget_show(pane); 4539 gtk_widget_show(pane);
4540 4540
4541 new_ui = TRUE; 4541 new_ui = TRUE;
4542 4542
4553 g_signal_connect_swapped(G_OBJECT(pane), "focus", 4553 g_signal_connect_swapped(G_OBJECT(pane), "focus",
4554 G_CALLBACK(gtk_widget_grab_focus), 4554 G_CALLBACK(gtk_widget_grab_focus),
4555 gtkconv->entry); 4555 gtkconv->entry);
4556 } 4556 }
4557 4557
4558 gtkconv->tabby = tabby = gtk_hbox_new(FALSE, 6); 4558 gtkconv->tabby = tabby = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE);
4559 gtkconv->menu_tabby = menu_tabby = gtk_hbox_new(FALSE, 6); 4559 gtkconv->menu_tabby = menu_tabby = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE);
4560 4560
4561 /* Close button. */ 4561 /* Close button. */
4562 gtkconv->close = gtk_button_new(); 4562 gtkconv->close = gtk_button_new();
4563 gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &close_button_width, &close_button_height); 4563 gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &close_button_width, &close_button_height);
4564 if (gtk_check_version(2, 4, 2) == NULL) 4564 if (gtk_check_version(2, 4, 2) == NULL)