Mercurial > pidgin.yaz

comparison pidgin/gtkblist.c @ 17688:486daeb90aa9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add mnemonics to labels in Add Buddy and Add Chat dialogs, and put Account entry at the top of the Add Buddy dialog to match Add Chat
author Stu Tomlinson <stu@nosnilmot.com>
date Mon, 04 Jun 2007 01:30:13 +0000
parents 0e4a789cd027
children fa5c24086481
comparison
equal deleted inserted replaced
17677:8223df108932 17688:486daeb90aa9
5404 gtk_table_set_row_spacings(GTK_TABLE(table), 5); 5404 gtk_table_set_row_spacings(GTK_TABLE(table), 5);
5405 gtk_table_set_col_spacings(GTK_TABLE(table), 5); 5405 gtk_table_set_col_spacings(GTK_TABLE(table), 5);
5406 gtk_container_set_border_width(GTK_CONTAINER(table), 0); 5406 gtk_container_set_border_width(GTK_CONTAINER(table), 0);
5407 gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0); 5407 gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0);
5408 5408
5409 label = gtk_label_new(_("Screen name:")); 5409 /* Set up stuff for the account box */
5410 label = gtk_label_new_with_mnemonic(_("_Account:"));
5410 gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); 5411 gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
5411 gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1); 5412 gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1);
5412 5413
5414 data->account_box = pidgin_account_option_menu_new(account, FALSE,
5415 G_CALLBACK(add_buddy_select_account_cb), NULL, data);
5416
5417 gtk_table_attach_defaults(GTK_TABLE(table), data->account_box, 1, 2, 0, 1);
5418 gtk_label_set_mnemonic_widget(GTK_LABEL(label), data->account_box);
5419 pidgin_set_accessible_label (data->account_box, label);
5420 /* End of account box */
5421
5422 label = gtk_label_new_with_mnemonic(_("_Screen name:"));
5423 gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
5424 gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 1, 2);
5425
5413 data->entry = gtk_entry_new(); 5426 data->entry = gtk_entry_new();
5414 gtk_table_attach_defaults(GTK_TABLE(table), data->entry, 1, 2, 0, 1); 5427 gtk_table_attach_defaults(GTK_TABLE(table), data->entry, 1, 2, 1, 2);
5415 gtk_widget_grab_focus(data->entry); 5428 gtk_widget_grab_focus(data->entry);
5416 5429
5417 if (username != NULL) 5430 if (username != NULL)
5418 gtk_entry_set_text(GTK_ENTRY(data->entry), username); 5431 gtk_entry_set_text(GTK_ENTRY(data->entry), username);
5419 else 5432 else
5420 gtk_dialog_set_response_sensitive(GTK_DIALOG(data->window), 5433 gtk_dialog_set_response_sensitive(GTK_DIALOG(data->window),
5421 GTK_RESPONSE_OK, FALSE); 5434 GTK_RESPONSE_OK, FALSE);
5422 5435
5423 gtk_entry_set_activates_default (GTK_ENTRY(data->entry), TRUE); 5436 gtk_entry_set_activates_default (GTK_ENTRY(data->entry), TRUE);
5437 gtk_label_set_mnemonic_widget(GTK_LABEL(label), data->entry);
5424 pidgin_set_accessible_label (data->entry, label); 5438 pidgin_set_accessible_label (data->entry, label);
5425 5439
5426 g_signal_connect(G_OBJECT(data->entry), "changed", 5440 g_signal_connect(G_OBJECT(data->entry), "changed",
5427 G_CALLBACK(pidgin_set_sensitive_if_input), 5441 G_CALLBACK(pidgin_set_sensitive_if_input),
5428 data->window); 5442 data->window);
5429 5443
5430 label = gtk_label_new(_("Alias:")); 5444 label = gtk_label_new_with_mnemonic(_("A_lias:"));
5431 gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); 5445 gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
5432 gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 1, 2); 5446 gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 2, 3);
5433 5447
5434 data->entry_for_alias = gtk_entry_new(); 5448 data->entry_for_alias = gtk_entry_new();
5435 gtk_table_attach_defaults(GTK_TABLE(table), 5449 gtk_table_attach_defaults(GTK_TABLE(table),
5436 data->entry_for_alias, 1, 2, 1, 2); 5450 data->entry_for_alias, 1, 2, 2, 3);
5437 5451
5438 if (alias != NULL) 5452 if (alias != NULL)
5439 gtk_entry_set_text(GTK_ENTRY(data->entry_for_alias), alias); 5453 gtk_entry_set_text(GTK_ENTRY(data->entry_for_alias), alias);
5440 5454
5441 if (username != NULL) 5455 if (username != NULL)
5442 gtk_widget_grab_focus(GTK_WIDGET(data->entry_for_alias)); 5456 gtk_widget_grab_focus(GTK_WIDGET(data->entry_for_alias));
5443 5457
5444 gtk_entry_set_activates_default (GTK_ENTRY(data->entry_for_alias), TRUE); 5458 gtk_entry_set_activates_default (GTK_ENTRY(data->entry_for_alias), TRUE);
5459 gtk_label_set_mnemonic_widget(GTK_LABEL(label), data->entry_for_alias);
5445 pidgin_set_accessible_label (data->entry_for_alias, label); 5460 pidgin_set_accessible_label (data->entry_for_alias, label);
5446 5461
5447 label = gtk_label_new(_("Group:")); 5462 label = gtk_label_new_with_mnemonic(_("_Group:"));
5448 gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); 5463 gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
5449 gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 2, 3); 5464 gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 3, 4);
5450 5465
5451 data->combo = gtk_combo_new(); 5466 data->combo = gtk_combo_new();
5452 gtk_combo_set_popdown_strings(GTK_COMBO(data->combo), groups_tree()); 5467 gtk_combo_set_popdown_strings(GTK_COMBO(data->combo), groups_tree());
5453 gtk_table_attach_defaults(GTK_TABLE(table), data->combo, 1, 2, 2, 3); 5468 gtk_table_attach_defaults(GTK_TABLE(table), data->combo, 1, 2, 3, 4);
5469 gtk_label_set_mnemonic_widget(GTK_LABEL(label), GTK_COMBO(data->combo)->entry);
5454 pidgin_set_accessible_label (data->combo, label); 5470 pidgin_set_accessible_label (data->combo, label);
5455
5456 /* Set up stuff for the account box */
5457 label = gtk_label_new(_("Account:"));
5458 gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
5459 gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 3, 4);
5460
5461 data->account_box = pidgin_account_option_menu_new(account, FALSE,
5462 G_CALLBACK(add_buddy_select_account_cb), NULL, data);
5463
5464 gtk_table_attach_defaults(GTK_TABLE(table), data->account_box, 1, 2, 3, 4);
5465 pidgin_set_accessible_label (data->account_box, label);
5466 /* End of account box */
5467 5471
5468 g_signal_connect(G_OBJECT(data->window), "response", 5472 g_signal_connect(G_OBJECT(data->window), "response",
5469 G_CALLBACK(add_buddy_cb), data); 5473 G_CALLBACK(add_buddy_cb), data);
5470 5474
5471 gtk_widget_show_all(data->window); 5475 gtk_widget_show_all(data->window);
5768 gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); 5772 gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
5769 5773
5770 rowbox = gtk_hbox_new(FALSE, 5); 5774 rowbox = gtk_hbox_new(FALSE, 5);
5771 gtk_box_pack_start(GTK_BOX(vbox), rowbox, FALSE, FALSE, 0); 5775 gtk_box_pack_start(GTK_BOX(vbox), rowbox, FALSE, FALSE, 0);
5772 5776
5773 label = gtk_label_new(_("Account:")); 5777 label = gtk_label_new_with_mnemonic(_("_Account:"));
5774 gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); 5778 gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
5775 gtk_size_group_add_widget(data->sg, label); 5779 gtk_size_group_add_widget(data->sg, label);
5776 gtk_box_pack_start(GTK_BOX(rowbox), label, FALSE, FALSE, 0); 5780 gtk_box_pack_start(GTK_BOX(rowbox), label, FALSE, FALSE, 0);
5777 5781
5778 data->account_menu = pidgin_account_option_menu_new(account, FALSE, 5782 data->account_menu = pidgin_account_option_menu_new(account, FALSE,
5779 G_CALLBACK(addchat_select_account_cb), 5783 G_CALLBACK(addchat_select_account_cb),
5780 chat_account_filter_func, data); 5784 chat_account_filter_func, data);
5781 gtk_box_pack_start(GTK_BOX(rowbox), data->account_menu, TRUE, TRUE, 0); 5785 gtk_box_pack_start(GTK_BOX(rowbox), data->account_menu, TRUE, TRUE, 0);
5786 gtk_label_set_mnemonic_widget(GTK_LABEL(label), data->account_menu);
5782 pidgin_set_accessible_label (data->account_menu, label); 5787 pidgin_set_accessible_label (data->account_menu, label);
5783 5788
5784 data->entries_box = gtk_vbox_new(FALSE, 5); 5789 data->entries_box = gtk_vbox_new(FALSE, 5);
5785 gtk_container_set_border_width(GTK_CONTAINER(data->entries_box), 0); 5790 gtk_container_set_border_width(GTK_CONTAINER(data->entries_box), 0);
5786 gtk_box_pack_start(GTK_BOX(vbox), data->entries_box, TRUE, TRUE, 0); 5791 gtk_box_pack_start(GTK_BOX(vbox), data->entries_box, TRUE, TRUE, 0);
5788 rebuild_addchat_entries(data); 5793 rebuild_addchat_entries(data);
5789 5794
5790 rowbox = gtk_hbox_new(FALSE, 5); 5795 rowbox = gtk_hbox_new(FALSE, 5);
5791 gtk_box_pack_start(GTK_BOX(vbox), rowbox, FALSE, FALSE, 0); 5796 gtk_box_pack_start(GTK_BOX(vbox), rowbox, FALSE, FALSE, 0);
5792 5797
5793 label = gtk_label_new(_("Alias:")); 5798 label = gtk_label_new_with_mnemonic(_("A_lias:"));
5794 gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); 5799 gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
5795 gtk_size_group_add_widget(data->sg, label); 5800 gtk_size_group_add_widget(data->sg, label);
5796 gtk_box_pack_start(GTK_BOX(rowbox), label, FALSE, FALSE, 0); 5801 gtk_box_pack_start(GTK_BOX(rowbox), label, FALSE, FALSE, 0);
5797 5802
5798 data->alias_entry = gtk_entry_new(); 5803 data->alias_entry = gtk_entry_new();
5799 if (alias != NULL) 5804 if (alias != NULL)
5800 gtk_entry_set_text(GTK_ENTRY(data->alias_entry), alias); 5805 gtk_entry_set_text(GTK_ENTRY(data->alias_entry), alias);
5801 gtk_box_pack_end(GTK_BOX(rowbox), data->alias_entry, TRUE, TRUE, 0); 5806 gtk_box_pack_end(GTK_BOX(rowbox), data->alias_entry, TRUE, TRUE, 0);
5802 gtk_entry_set_activates_default(GTK_ENTRY(data->alias_entry), TRUE); 5807 gtk_entry_set_activates_default(GTK_ENTRY(data->alias_entry), TRUE);
5808 gtk_label_set_mnemonic_widget(GTK_LABEL(label), data->alias_entry);
5803 pidgin_set_accessible_label (data->alias_entry, label); 5809 pidgin_set_accessible_label (data->alias_entry, label);
5804 if (name != NULL) 5810 if (name != NULL)
5805 gtk_widget_grab_focus(data->alias_entry); 5811 gtk_widget_grab_focus(data->alias_entry);
5806 5812
5807 rowbox = gtk_hbox_new(FALSE, 5); 5813 rowbox = gtk_hbox_new(FALSE, 5);
5808 gtk_box_pack_start(GTK_BOX(vbox), rowbox, FALSE, FALSE, 0); 5814 gtk_box_pack_start(GTK_BOX(vbox), rowbox, FALSE, FALSE, 0);
5809 5815
5810 label = gtk_label_new(_("Group:")); 5816 label = gtk_label_new_with_mnemonic(_("_Group:"));
5811 gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); 5817 gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
5812 gtk_size_group_add_widget(data->sg, label); 5818 gtk_size_group_add_widget(data->sg, label);
5813 gtk_box_pack_start(GTK_BOX(rowbox), label, FALSE, FALSE, 0); 5819 gtk_box_pack_start(GTK_BOX(rowbox), label, FALSE, FALSE, 0);
5814 5820
5815 data->group_combo = gtk_combo_new(); 5821 data->group_combo = gtk_combo_new();
5819 if (group) 5825 if (group)
5820 { 5826 {
5821 gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(data->group_combo)->entry), 5827 gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(data->group_combo)->entry),
5822 group->name); 5828 group->name);
5823 } 5829 }
5830 gtk_label_set_mnemonic_widget(GTK_LABEL(label), GTK_COMBO(data->group_combo)->entry);
5824 pidgin_set_accessible_label (data->group_combo, label); 5831 pidgin_set_accessible_label (data->group_combo, label);
5825 5832
5826 g_signal_connect(G_OBJECT(data->window), "response", 5833 g_signal_connect(G_OBJECT(data->window), "response",
5827 G_CALLBACK(add_chat_resp_cb), data); 5834 G_CALLBACK(add_chat_resp_cb), data);
5828 5835