# HG changeset patch # User Mark Doliner # Date 1071278183 0 # Node ID 0555e59dfba9519d8fbbd1f67bc826cfb2a1a1f3 # Parent 13334c29799b5e34c805716f2ebef22144b370b2 [gaim-migrate @ 8494] A few more minor updates to the Join Chat dialog. committer: Tailor Script diff -r 13334c29799b -r 0555e59dfba9 ChangeLog --- a/ChangeLog Fri Dec 12 23:42:02 2003 +0000 +++ b/ChangeLog Sat Dec 13 01:16:23 2003 +0000 @@ -1,9 +1,13 @@ Gaim: The Pimpin' Penguin IM Clone that's good for the soul! version 0.75cvs : + * WYSIWYG text input * Yahoo! file transfer (Tim Ringenbach) * Improved i18n support for MSN email notification (Felipe Contreras) * Jabber SASL PLAIN support + * Touch-up various dialogs to follow the Gnome Human Interface + Guidelines more closely (Steven Garrity, Nathan Fredrickson, and + Ka-Hing Cheung) * Chinese (Simplified) translation updated (Funda Wang) * Chinese (Traditional) translation updated (Ambrose C. Li) * Italian translation updated (Claudio Satriano) diff -r 13334c29799b -r 0555e59dfba9 src/buddy_chat.c --- a/src/buddy_chat.c Fri Dec 12 23:42:02 2003 +0000 +++ b/src/buddy_chat.c Sat Dec 13 01:16:23 2003 +0000 @@ -101,10 +101,10 @@ pce = tmp->data; - rowbox = gtk_hbox_new(FALSE, 5); + rowbox = gtk_hbox_new(FALSE, 12); gtk_box_pack_start(GTK_BOX(data->entries_box), rowbox, FALSE, FALSE, 0); - label = gtk_label_new(pce->label); + label = gtk_label_new_with_mnemonic(pce->label); gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); gtk_size_group_add_widget(data->sg, label); gtk_box_pack_start(GTK_BOX(rowbox), label, FALSE, FALSE, 0); @@ -120,6 +120,7 @@ data->entries = g_list_append(data->entries, spin); gtk_widget_set_size_request(spin, 50, -1); gtk_box_pack_end(GTK_BOX(rowbox), spin, FALSE, FALSE, 0); + gtk_label_set_mnemonic_widget(GTK_LABEL(label), GTK_WIDGET(spin)); } else { GtkWidget *entry = gtk_entry_new(); @@ -139,6 +140,7 @@ gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE); gtk_box_pack_end(GTK_BOX(rowbox), entry, TRUE, TRUE, 0); + gtk_label_set_mnemonic_widget(GTK_LABEL(label), GTK_WIDGET(entry)); } g_free(pce); @@ -220,7 +222,7 @@ data->window = gtk_dialog_new_with_buttons(_("Join Chat"), gtkblist->window ? GTK_WINDOW(gtkblist->window) : NULL, 0, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - "Join", GTK_RESPONSE_OK, NULL); + _("_Join"), GTK_RESPONSE_OK, NULL); gtk_dialog_set_default_response(GTK_DIALOG(data->window), GTK_RESPONSE_OK); gtk_container_set_border_width(GTK_CONTAINER(data->window), 6); gtk_window_set_resizable(GTK_WINDOW(data->window), FALSE); @@ -229,12 +231,12 @@ gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), 6); hbox = gtk_hbox_new(FALSE, 12); - gtk_container_add(GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), hbox); - gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); - gtk_misc_set_alignment(GTK_MISC(img), 0, 0); + gtk_container_add(GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), hbox); + gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); + gtk_misc_set_alignment(GTK_MISC(img), 0, 0); vbox = gtk_vbox_new(FALSE, 5); - gtk_container_set_border_width(GTK_CONTAINER(vbox), 5); + gtk_container_set_border_width(GTK_CONTAINER(vbox), 0); gtk_container_add(GTK_CONTAINER(hbox), vbox); label = gtk_label_new(_("Please enter the appropriate information about the chat you would like to join.\n")); @@ -242,13 +244,13 @@ gtk_misc_set_alignment(GTK_MISC(label), 0, 0); gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); - rowbox = gtk_hbox_new(FALSE, 5); + rowbox = gtk_hbox_new(FALSE, 12); gtk_box_pack_start(GTK_BOX(vbox), rowbox, TRUE, TRUE, 0); data->sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); if (numaccounts > 1) { - label = gtk_label_new(_("Join Chat As:")); + label = gtk_label_new_with_mnemonic(_("_Account:")); gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); gtk_box_pack_start(GTK_BOX(rowbox), label, FALSE, FALSE, 0); gtk_size_group_add_widget(data->sg, label); @@ -257,6 +259,7 @@ G_CALLBACK(join_chat_select_account_cb), join_chat_check_account_func, data); gtk_box_pack_start(GTK_BOX(rowbox), data->account_menu, TRUE, TRUE, 0); + gtk_label_set_mnemonic_widget(GTK_LABEL(label), GTK_WIDGET(data->account_menu)); } data->entries_box = gtk_vbox_new(FALSE, 5); diff -r 13334c29799b -r 0555e59dfba9 src/protocols/irc/irc.c --- a/src/protocols/irc/irc.c Fri Dec 12 23:42:02 2003 +0000 +++ b/src/protocols/irc/irc.c Sat Dec 13 01:16:23 2003 +0000 @@ -155,12 +155,12 @@ struct proto_chat_entry *pce; pce = g_new0(struct proto_chat_entry, 1); - pce->label = _("Channel:"); + pce->label = _("_Channel:"); pce->identifier = "channel"; m = g_list_append(m, pce); pce = g_new0(struct proto_chat_entry, 1); - pce->label = _("Password:"); + pce->label = _("_Password:"); pce->identifier = "password"; pce->secret = TRUE; m = g_list_append(m, pce); diff -r 13334c29799b -r 0555e59dfba9 src/protocols/jabber/chat.c --- a/src/protocols/jabber/chat.c Fri Dec 12 23:42:02 2003 +0000 +++ b/src/protocols/jabber/chat.c Sat Dec 13 01:16:23 2003 +0000 @@ -34,26 +34,26 @@ JabberStream *js = gc->proto_data; pce = g_new0(struct proto_chat_entry, 1); - pce->label = _("Room:"); + pce->label = _("_Room:"); pce->identifier = "room"; m = g_list_append(m, pce); /* we're gonna default to a conference server I know is true, until * I can figure out how to disco for a chat server */ pce = g_new0(struct proto_chat_entry, 1); - pce->label = _("Server:"); + pce->label = _("_Server:"); pce->identifier = "server"; pce->def = "conference.jabber.org"; m = g_list_append(m, pce); pce = g_new0(struct proto_chat_entry, 1); - pce->label = _("Handle:"); + pce->label = _("_Handle:"); pce->identifier = "handle"; pce->def = js->user->node; m = g_list_append(m, pce); pce = g_new0(struct proto_chat_entry, 1); - pce->label = _("Password:"); + pce->label = _("_Password:"); pce->identifier = "password"; pce->secret = TRUE; m = g_list_append(m, pce); diff -r 13334c29799b -r 0555e59dfba9 src/protocols/oscar/oscar.c --- a/src/protocols/oscar/oscar.c Fri Dec 12 23:42:02 2003 +0000 +++ b/src/protocols/oscar/oscar.c Sat Dec 13 01:16:23 2003 +0000 @@ -5208,12 +5208,12 @@ struct proto_chat_entry *pce; pce = g_new0(struct proto_chat_entry, 1); - pce->label = _("Join what group:"); + pce->label = _("_Group:"); pce->identifier = "room"; m = g_list_append(m, pce); pce = g_new0(struct proto_chat_entry, 1); - pce->label = _("Exchange:"); + pce->label = _("_Exchange:"); pce->identifier = "exchange"; pce->is_int = TRUE; pce->min = 4; diff -r 13334c29799b -r 0555e59dfba9 src/protocols/toc/toc.c --- a/src/protocols/toc/toc.c Fri Dec 12 23:42:02 2003 +0000 +++ b/src/protocols/toc/toc.c Sat Dec 13 01:16:23 2003 +0000 @@ -1256,12 +1256,12 @@ struct proto_chat_entry *pce; pce = g_new0(struct proto_chat_entry, 1); - pce->label = _("Join what group:"); + pce->label = _("_Group:"); pce->identifier = "room"; m = g_list_append(m, pce); pce = g_new0(struct proto_chat_entry, 1); - pce->label = _("Exchange:"); + pce->label = _("_Exchange:"); pce->identifier = "exchange"; pce->is_int = TRUE; pce->min = 4; diff -r 13334c29799b -r 0555e59dfba9 src/protocols/yahoo/yahoochat.c --- a/src/protocols/yahoo/yahoochat.c Fri Dec 12 23:42:02 2003 +0000 +++ b/src/protocols/yahoo/yahoochat.c Sat Dec 13 01:16:23 2003 +0000 @@ -934,7 +934,7 @@ struct proto_chat_entry *pce; pce = g_new0(struct proto_chat_entry, 1); - pce->label = _("Room:"); + pce->label = _("_Room:"); pce->identifier = "room"; m = g_list_append(m, pce); diff -r 13334c29799b -r 0555e59dfba9 src/protocols/zephyr/zephyr.c --- a/src/protocols/zephyr/zephyr.c Fri Dec 12 23:42:02 2003 +0000 +++ b/src/protocols/zephyr/zephyr.c Sat Dec 13 01:16:23 2003 +0000 @@ -905,17 +905,17 @@ struct proto_chat_entry *pce; pce = g_new0(struct proto_chat_entry, 1); - pce->label = _("Class:"); + pce->label = _("_Class:"); pce->identifier = "class"; m = g_list_append(m, pce); pce = g_new0(struct proto_chat_entry, 1); - pce->label = _("Instance:"); + pce->label = _("_Instance:"); pce->identifier = "instance"; m = g_list_append(m, pce); pce = g_new0(struct proto_chat_entry, 1); - pce->label = _("Recipient:"); + pce->label = _("_Recipient:"); pce->identifier = "recipient"; m = g_list_append(m, pce);