Mercurial > pidgin

changeset 7853:340df1652af1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 8507] HIG changes from me, Ka-Hing and Nathan F. committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Sat, 13 Dec 2003 19:31:54 +0000
parents fdbac6662b04
children 1e8322fc19b5
files src/buddy_chat.c src/dialogs.c src/gtkblist.c src/gtkconv.c src/protocols/oscar/oscar.c
diffstat 5 files changed, 25 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/src/buddy_chat.c	Sat Dec 13 19:04:51 2003 +0000
+++ b/src/buddy_chat.c	Sat Dec 13 19:31:54 2003 +0000
@@ -220,7 +220,7 @@
 	img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION, GTK_ICON_SIZE_DIALOG);
 	data = g_new0(GaimGtkJoinChatData, 1);
 
-	data->window = gtk_dialog_new_with_buttons(_("Join Chat"), gtkblist->window ? GTK_WINDOW(gtkblist->window) : NULL, 0,
+	data->window = gtk_dialog_new_with_buttons(_("Join a Chat"), gtkblist->window ? GTK_WINDOW(gtkblist->window) : NULL, 0,
 											   GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 											   _("_Join"), GTK_RESPONSE_OK, NULL);
 	gtk_dialog_set_default_response(GTK_DIALOG(data->window), GTK_RESPONSE_OK);
--- a/src/dialogs.c	Sat Dec 13 19:04:51 2003 +0000
+++ b/src/dialogs.c	Sat Dec 13 19:31:54 2003 +0000
@@ -539,7 +539,7 @@
 
 	info->gc = gaim_connections_get_all()->data;
 
-	window = gtk_dialog_new_with_buttons(_("New Message"), gtkblist ? GTK_WINDOW(gtkblist->window) : NULL, 0,
+	window = gtk_dialog_new_with_buttons(_("New Instant Message"), gtkblist ? GTK_WINDOW(gtkblist->window) : NULL, 0,
 					       GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
 	gtk_dialog_set_default_response (GTK_DIALOG(window), GTK_RESPONSE_OK);
 	gtk_container_set_border_width (GTK_CONTAINER(window), 6);
@@ -755,7 +755,7 @@
 		a->c = c;
 		a->window = gtk_dialog_new_with_buttons(_("Insert Link"),
 				GTK_WINDOW(gtkwin->window), 0, GTK_STOCK_CANCEL,
-				GTK_RESPONSE_CANCEL, _("Insert"), GTK_RESPONSE_OK, NULL);
+				GTK_RESPONSE_CANCEL, _("_Insert"), GTK_RESPONSE_OK, NULL);
 		gtk_dialog_set_default_response(GTK_DIALOG(a->window), GTK_RESPONSE_OK);
 		g_signal_connect(G_OBJECT(a->window), "response",
 						 G_CALLBACK(do_insert_link), a);
@@ -768,6 +768,7 @@
 		gtk_container_set_border_width(
 			GTK_CONTAINER(GTK_DIALOG(a->window)->vbox), 6);
 		gtk_window_set_role(GTK_WINDOW(a->window), "insert_link");
+		gtk_dialog_set_response_sensitive(GTK_DIALOG(a->window), GTK_RESPONSE_OK, FALSE);
 
 		hbox = gtk_hbox_new(FALSE, 12);
 		gtk_container_add(GTK_CONTAINER(GTK_DIALOG(a->window)->vbox), hbox);
@@ -784,31 +785,32 @@
 		gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
 		gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
 
-		hbox = gtk_hbox_new(FALSE, 6);
-		gtk_container_add(GTK_CONTAINER(vbox), hbox);
-
-		table = gtk_table_new(4, 2, FALSE);
-		gtk_table_set_row_spacings(GTK_TABLE(table), 5);
-		gtk_table_set_col_spacings(GTK_TABLE(table), 5);
+		table = gtk_table_new(2, 2, FALSE);
+		gtk_table_set_row_spacings(GTK_TABLE(table), 6);
+		gtk_table_set_col_spacings(GTK_TABLE(table), 6);
 		gtk_container_set_border_width(GTK_CONTAINER(table), 0);
 		gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0);
 
-		label = gtk_label_new(_("URL"));
+		label = gtk_label_new_with_mnemonic(_("_URL:"));
 		gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
 		gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1);
 
 		a->url = gtk_entry_new();
 		gtk_table_attach_defaults(GTK_TABLE(table), a->url, 1, 2, 0, 1);
+		gtk_label_set_mnemonic_widget(GTK_LABEL(label), GTK_WIDGET(a->url));
 		gtk_widget_grab_focus(a->url);
 
 		gtk_entry_set_activates_default (GTK_ENTRY(a->url), TRUE);
+		g_signal_connect(G_OBJECT(a->url), "changed",
+				G_CALLBACK(gaim_gtk_set_sensitive_if_input), a->window);
 
-		label = gtk_label_new(_("Description"));
+		label = gtk_label_new_with_mnemonic(_("_Description:"));
 		gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
 		gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 1, 2);
 
 		a->text = gtk_entry_new();
 		gtk_table_attach_defaults(GTK_TABLE(table), a->text, 1, 2, 1, 2);
+		gtk_label_set_mnemonic_widget(GTK_LABEL(label), GTK_WIDGET(a->text));
 		gtk_entry_set_activates_default (GTK_ENTRY(a->text), TRUE);
 
 		g_signal_connect(G_OBJECT(a->window), "destroy",
--- a/src/gtkblist.c	Sat Dec 13 19:04:51 2003 +0000
+++ b/src/gtkblist.c	Sat Dec 13 19:31:54 2003 +0000
@@ -1684,9 +1684,9 @@
 	{ "/Buddies/sep1", NULL, NULL, 0, "<Separator>" },
 	{ N_("/Buddies/Show _Offline Buddies"), NULL, gaim_gtk_blist_edit_mode_cb, 1, "<CheckItem>"},
 	{ N_("/Buddies/Show _Empty Groups"), NULL, gaim_gtk_blist_show_empty_groups_cb, 1, "<CheckItem>"},
-	{ N_("/Buddies/_Add a Buddy..."), "<CTL>B", gaim_gtk_blist_add_buddy_cb, 0, "<StockItem>", GTK_STOCK_ADD },
-	{ N_("/Buddies/Add a C_hat..."), NULL, gaim_gtk_blist_add_chat_cb, 0, "<StockItem>", GTK_STOCK_ADD },
-	{ N_("/Buddies/Add a _Group..."), NULL, gaim_blist_request_add_group, 0, NULL},
+	{ N_("/Buddies/_Add Buddy..."), "<CTL>B", gaim_gtk_blist_add_buddy_cb, 0, "<StockItem>", GTK_STOCK_ADD },
+	{ N_("/Buddies/Add C_hat..."), NULL, gaim_gtk_blist_add_chat_cb, 0, "<StockItem>", GTK_STOCK_ADD },
+	{ N_("/Buddies/Add _Group..."), NULL, gaim_blist_request_add_group, 0, "<StockItem>", GTK_STOCK_ADD },
 	{ "/Buddies/sep2", NULL, NULL, 0, "<Separator>" },
 	{ N_("/Buddies/_Signoff"), "<CTL>D", gaim_connections_disconnect_all, 0, "<StockItem>", GAIM_STOCK_SIGN_OFF },
 	{ N_("/Buddies/_Quit"), "<CTL>Q", gaim_core_quit, 0, "<StockItem>", GTK_STOCK_QUIT },
@@ -3659,7 +3659,7 @@
 void
 gaim_gtk_blist_request_add_group(void)
 {
-	gaim_request_input(NULL, _("Add Group"), _("Add a new group"),
+	gaim_request_input(NULL, _("Add Group"), NULL,
 					   _("Please enter the name of the group to be added."),
 					   NULL, FALSE, FALSE,
 					   _("Add"), G_CALLBACK(add_group_cb),
--- a/src/gtkconv.c	Sat Dec 13 19:04:51 2003 +0000
+++ b/src/gtkconv.c	Sat Dec 13 19:31:54 2003 +0000
@@ -307,7 +307,7 @@
 	gtkconv = GAIM_GTK_CONVERSATION(conv);
 
 	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtkconv->toolbar.image))) {
-		window = gtk_file_selection_new(_("Gaim - Insert Image"));
+		window = gtk_file_selection_new(_("Insert Image"));
 		g_snprintf(buf, sizeof(buf), "%s" G_DIR_SEPARATOR_S, gaim_home_dir());
 		gtk_file_selection_set_filename(GTK_FILE_SELECTION(window), buf);
 
@@ -2900,7 +2900,7 @@
 
 	{ "/Conversation/sep2", NULL, NULL, 0, "<Separator>" },
 
-	{ N_("/Conversation/Insert _URL..."), NULL, menu_insert_link_cb, 0,
+	{ N_("/Conversation/Insert Lin_k..."), NULL, menu_insert_link_cb, 0,
 	  "<StockItem>", GAIM_STOCK_LINK },
 	{ N_("/Conversation/Insert _Image..."), NULL, menu_insert_image_cb, 0,
 	  "<StockItem>", GAIM_STOCK_IMAGE },
--- a/src/protocols/oscar/oscar.c	Sat Dec 13 19:04:51 2003 +0000
+++ b/src/protocols/oscar/oscar.c	Sat Dec 13 19:31:54 2003 +0000
@@ -6496,21 +6496,21 @@
 	GList *m = NULL;
 
 	pam = g_new0(struct proto_actions_menu, 1);
-	pam->label = _("Set User Info");
+	pam->label = _("Set User Info...");
 	pam->callback = oscar_show_set_info;
 	pam->gc = gc;
 	m = g_list_append(m, pam);
 
 #if 0
 	pam = g_new0(struct proto_actions_menu, 1);
-	pam->label = _("Set Available Message");
+	pam->label = _("Set Available Message...");
 	pam->callback = oscar_show_setavailmsg;
 	pam->gc = gc;
 	m = g_list_append(m, pam);
 #endif
 
 	pam = g_new0(struct proto_actions_menu, 1);
-	pam->label = _("Change Password");
+	pam->label = _("Change Password...");
 	pam->callback = oscar_change_pass;
 	pam->gc = gc;
 	m = g_list_append(m, pam);
@@ -6536,7 +6536,7 @@
 		m = g_list_append(m, NULL);
 
 		pam = g_new0(struct proto_actions_menu, 1);
-		pam->label = _("Format Screenname");
+		pam->label = _("Format Screenname...");
 		pam->callback = oscar_show_format_screenname;
 		pam->gc = gc;
 		m = g_list_append(m, pam);
@@ -6554,7 +6554,7 @@
 		m = g_list_append(m, pam);
 
 		pam = g_new0(struct proto_actions_menu, 1);
-		pam->label = _("Change Current Registered Address");
+		pam->label = _("Change Current Registered Address...");
 		pam->callback = oscar_show_change_email;
 		pam->gc = gc;
 		m = g_list_append(m, pam);
@@ -6571,7 +6571,7 @@
 	m = g_list_append(m, NULL);
 
 	pam = g_new0(struct proto_actions_menu, 1);
-	pam->label = _("Search for Buddy by Email");
+	pam->label = _("Search for Buddy by Email...");
 	pam->callback = oscar_show_find_email;
 	pam->gc = gc;
 	m = g_list_append(m, pam);