Mercurial > pidgin3 / file comparison

comparison: pidgin/gtkconv.c

pidgin/gtkconv.c

changeset 37990
710f725725a8
parent 37989
018063ec9d2e
child 37992
0185eb26ac7d
equal deleted inserted replaced
37989:018063ec9d2e 37990:710f725725a8
951 951
952 /* Setup the inner hbox and put the dialog's icon in it. */ 952 /* Setup the inner hbox and put the dialog's icon in it. */
953 hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BORDER); 953 hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BORDER);
954 gtk_container_add(GTK_CONTAINER(vbox), hbox); 954 gtk_container_add(GTK_CONTAINER(vbox), hbox);
955 gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); 955 gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
956 gtk_misc_set_alignment(GTK_MISC(img), 0, 0); 956 gtk_widget_set_halign(img, GTK_ALIGN_START);
957 gtk_widget_set_valign(img, GTK_ALIGN_START);
957 958
958 /* Setup the right vbox. */ 959 /* Setup the right vbox. */
959 vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); 960 vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
960 gtk_container_add(GTK_CONTAINER(hbox), vbox); 961 gtk_container_add(GTK_CONTAINER(hbox), vbox);
961 962
963 label = gtk_label_new(_("Please enter the name of the user you wish " 964 label = gtk_label_new(_("Please enter the name of the user you wish "
964 "to invite, along with an optional invite " 965 "to invite, along with an optional invite "
965 "message.")); 966 "message."));
966 gtk_widget_set_size_request(label, 350, -1); 967 gtk_widget_set_size_request(label, 350, -1);
967 gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); 968 gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
968 gtk_misc_set_alignment(GTK_MISC(label), 0, 0); 969 gtk_label_set_alignment(GTK_LABEL(label), 0, 0);
969 gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); 970 gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
970 971
971 /* hbox for the grid, and to give it some spacing on the left. */ 972 /* 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); 973 hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE);
973 gtk_container_add(GTK_CONTAINER(vbox), hbox); 974 gtk_container_add(GTK_CONTAINER(vbox), hbox);
982 /* Now the Buddy label */ 983 /* Now the Buddy label */
983 label = gtk_label_new(NULL); 984 label = gtk_label_new(NULL);
984 gtk_label_set_markup_with_mnemonic(GTK_LABEL(label), _("_Buddy:")); 985 gtk_label_set_markup_with_mnemonic(GTK_LABEL(label), _("_Buddy:"));
985 gtk_widget_set_hexpand(label, TRUE); 986 gtk_widget_set_hexpand(label, TRUE);
986 gtk_widget_set_vexpand(label, TRUE); 987 gtk_widget_set_vexpand(label, TRUE);
987 gtk_misc_set_alignment(GTK_MISC(label), 0, 0); 988 gtk_label_set_alignment(GTK_LABEL(label), 0, 0);
988 gtk_grid_attach(GTK_GRID(grid), label, 0, 0, 1, 1); 989 gtk_grid_attach(GTK_GRID(grid), label, 0, 0, 1, 1);
989 990
990 /* Now the Buddy drop-down entry field. */ 991 /* Now the Buddy drop-down entry field. */
991 info->entry = gtk_entry_new(); 992 info->entry = gtk_entry_new();
992 pidgin_setup_screenname_autocomplete(info->entry, NULL, chat_invite_filter, 993 pidgin_setup_screenname_autocomplete(info->entry, NULL, chat_invite_filter,
999 /* Now the label for "Message" */ 1000 /* Now the label for "Message" */
1000 label = gtk_label_new(NULL); 1001 label = gtk_label_new(NULL);
1001 gtk_label_set_markup_with_mnemonic(GTK_LABEL(label), _("_Message:")); 1002 gtk_label_set_markup_with_mnemonic(GTK_LABEL(label), _("_Message:"));
1002 gtk_widget_set_hexpand(label, TRUE); 1003 gtk_widget_set_hexpand(label, TRUE);
1003 gtk_widget_set_vexpand(label, TRUE); 1004 gtk_widget_set_vexpand(label, TRUE);
1004 gtk_misc_set_alignment(GTK_MISC(label), 0, 0); 1005 gtk_label_set_alignment(GTK_LABEL(label), 0, 0);
1005 gtk_grid_attach(GTK_GRID(grid), label, 0, 1, 1, 1); 1006 gtk_grid_attach(GTK_GRID(grid), label, 0, 1, 1, 1);
1006 1007
1007 /* And finally, the Message entry field. */ 1008 /* And finally, the Message entry field. */
1008 info->message = gtk_entry_new(); 1009 info->message = gtk_entry_new();
1009 gtk_entry_set_activates_default(GTK_ENTRY(info->message), TRUE); 1010 gtk_entry_set_activates_default(GTK_ENTRY(info->message), TRUE);
9084 gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_HUGE)); 9085 gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_HUGE));
9085 /* Setup the inner hbox and put the dialog's icon in it. */ 9086 /* Setup the inner hbox and put the dialog's icon in it. */
9086 hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 12); 9087 hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 12);
9087 gtk_container_add(GTK_CONTAINER(vbox), hbox); 9088 gtk_container_add(GTK_CONTAINER(vbox), hbox);
9088 gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); 9089 gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
9089 gtk_misc_set_alignment(GTK_MISC(img), 0, 0); 9090 gtk_widget_set_halign(img, GTK_ALIGN_START);
9091 gtk_widget_set_valign(img, GTK_ALIGN_START);
9090 9092
9091 /* Setup the right vbox. */ 9093 /* Setup the right vbox. */
9092 vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 12); 9094 vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 12);
9093 gtk_container_add(GTK_CONTAINER(hbox), vbox); 9095 gtk_container_add(GTK_CONTAINER(hbox), vbox);
9094 9096
9095 label = gtk_label_new(_("You have unread messages. Are you sure you want to close the window?")); 9097 label = gtk_label_new(_("You have unread messages. Are you sure you want to close the window?"));
9096 gtk_widget_set_size_request(label, 350, -1); 9098 gtk_widget_set_size_request(label, 350, -1);
9097 gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); 9099 gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
9098 gtk_misc_set_alignment(GTK_MISC(label), 0, 0); 9100 gtk_label_set_alignment(GTK_LABEL(label), 0, 0);
9099 gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); 9101 gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
9100 9102
9101 /* Connect the signals. */ 9103 /* Connect the signals. */
9102 g_signal_connect(G_OBJECT(warn_close_dialog), "response", 9104 g_signal_connect(G_OBJECT(warn_close_dialog), "response",
9103 G_CALLBACK(do_close), gtkwin); 9105 G_CALLBACK(do_close), gtkwin);
10401 10403
10402 gtk_widget_show_all(gtkconv->menu_icon); 10404 gtk_widget_show_all(gtkconv->menu_icon);
10403 10405
10404 gtk_box_pack_start(GTK_BOX(gtkconv->menu_tabby), gtkconv->menu_label, TRUE, TRUE, 0); 10406 gtk_box_pack_start(GTK_BOX(gtkconv->menu_tabby), gtkconv->menu_label, TRUE, TRUE, 0);
10405 gtk_widget_show(gtkconv->menu_label); 10407 gtk_widget_show(gtkconv->menu_label);
10406 gtk_misc_set_alignment(GTK_MISC(gtkconv->menu_label), 0, 0); 10408 gtk_label_set_alignment(GTK_LABEL(gtkconv->menu_label), 0, 0);
10407 10409
10408 gtk_widget_show(gtkconv->menu_tabby); 10410 gtk_widget_show(gtkconv->menu_tabby);
10409 10411
10410 if (PURPLE_IS_IM_CONVERSATION(conv)) 10412 if (PURPLE_IS_IM_CONVERSATION(conv))
10411 pidgin_conv_update_buddy_icon(PURPLE_IM_CONVERSATION(conv)); 10413 pidgin_conv_update_buddy_icon(PURPLE_IM_CONVERSATION(conv));
10463 } 10465 }
10464 10466
10465 gtk_label_set_angle(GTK_LABEL(gtkconv->tab_label), angle); 10467 gtk_label_set_angle(GTK_LABEL(gtkconv->tab_label), angle);
10466 10468
10467 #if 0 10469 #if 0
10468 gtk_misc_set_alignment(GTK_MISC(gtkconv->tab_label), 0.00, 0.5); 10470 gtk_label_set_alignment(GTK_LABEL(gtkconv->tab_label), 0.0, 0.5);
10469 gtk_misc_set_padding(GTK_MISC(gtkconv->tab_label), 4, 0); 10471 gtk_misc_set_padding(GTK_MISC(gtkconv->tab_label), 4, 0);
10470 #endif 10472 #endif
10471 10473
10472 if (angle) 10474 if (angle)
10473 gtkconv->tabby = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BOX_SPACE); 10475 gtkconv->tabby = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BOX_SPACE);

Mercurial Repository: pidgin3

mercurial