This patch (related with string) had been committed into Gtkhtml CVS Head

[Mengjie Yu <Meng-Jie Yu Sun COM>]

hi,

This patch is against module gtkhtml and had been committed into CVS.

Please see the enclosure.


yours,
Mengjie

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gtkhtml/components/html-editor/ChangeLog,v
retrieving revision 1.488
diff -u -p -r1.488 ChangeLog
--- ChangeLog	26 Jan 2005 10:19:55 -0000	1.488
+++ ChangeLog	27 Jan 2005 07:26:31 -0000
@@ -1,3 +1,16 @@
+2005-01-27  Mengjie Yu  <meng-jie yu sun com>
+
+	* body.c: (body_properties):add atk name to some widget.
+	* gi-color-combo.c: (color_combo_construct):add atk name to the
+	color preview button.
+	* gi-combo-box.c: (gal_combo_box_init):add atk name to the popup
+	botton.
+	* link.c: (link_widget):set atk names to the entries.
+	* replace.c: (gtk_html_replace_dialog_new):add mnemonic to the
+	entry.
+	* search.c: (gtk_html_search_dialog_new):add atk desciption to
+	the search dialog.
+
 2005-01-26  Radek Doulik  <rodo ximian com>
 
 	* GNOME_GtkHTML_Editor-emacs.xml.in: removed forgotten insert
Index: body.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/components/html-editor/body.c,v
retrieving revision 1.49
diff -u -p -r1.49 body.c
--- body.c	20 Jan 2005 10:20:23 -0000	1.49
+++ body.c	27 Jan 2005 07:26:35 -0000
@@ -240,6 +240,7 @@ body_properties (GtkHTMLControlData *cd,
 	gtk_table_set_row_spacings (GTK_TABLE (t1), 6);
 
 	data->option_template = gtk_option_menu_new ();
+	atk_object_set_name (gtk_widget_get_accessible (data->option_template), _("Template"));
 	fill_templates (data);
 	hbox = gtk_hbox_new (FALSE, 1);
 	gtk_box_pack_start (GTK_BOX (hbox), data->option_template, FALSE, FALSE, 0);
@@ -293,6 +294,8 @@ body_properties (GtkHTMLControlData *cd,
 				     ip->url + off);
 	}
 
+
+	atk_object_set_name (gtk_widget_get_accessible (gnome_file_entry_gnome_entry (GNOME_FILE_ENTRY (data->pixmap_entry))), _("Background Image File Path"));
 
 	hbox = gtk_hbox_new (FALSE, 6);
 	gtk_box_pack_start (GTK_BOX (hbox), gtk_label_new_with_mnemonic (_("_Source:")), FALSE, FALSE, 0);
Index: gi-color-combo.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/components/html-editor/gi-color-combo.c,v
retrieving revision 1.3
diff -u -p -r1.3 gi-color-combo.c
--- gi-color-combo.c	20 Jan 2005 10:20:23 -0000	1.3
+++ gi-color-combo.c	27 Jan 2005 07:26:36 -0000
@@ -35,6 +35,7 @@
 #include <libgnomecanvas/gnome-canvas.h>
 #include <libgnomecanvas/gnome-canvas-pixbuf.h>
 #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
+#include <glib/gi18n.h>
 #include "htmlmarshal.h"
 #include "gi-colors.h"
 #include "gi-color-combo.h"
@@ -183,6 +184,7 @@ gi_color_combo_construct (GiColorCombo *
 	 * Our button with the canvas preview
 	 */
 	cc->preview_button = gtk_button_new ();
+	atk_object_set_name (gtk_widget_get_accessible (cc->preview_button), _("color preview"));
 	gtk_button_set_relief (GTK_BUTTON (cc->preview_button), GTK_RELIEF_NONE);
 
 	cc->preview_canvas = GNOME_CANVAS (gnome_canvas_new ());
Index: gi-combo-box.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/components/html-editor/gi-combo-box.c,v
retrieving revision 1.4
diff -u -p -r1.4 gi-combo-box.c
--- gi-combo-box.c	21 Jan 2005 06:20:41 -0000	1.4
+++ gi-combo-box.c	27 Jan 2005 07:26:48 -0000
@@ -39,6 +39,7 @@
 #include <gtk/gtktearoffmenuitem.h>
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdkcursor.h>
+#include <glib/gi18n.h>
 #include "gi-combo-box.h"
 #include "gi-utils.h"
 #include "htmlmarshal.h"
@@ -398,7 +399,6 @@ gi_combo_box_init (GiComboBox *combo_box
 {
 	GtkWidget *arrow;
 	GdkCursor *cursor;
-
 	combo_box->priv = g_new0 (GiComboBoxPrivate, 1);
 
 	/*
@@ -414,6 +414,10 @@ gi_combo_box_init (GiComboBox *combo_box
 	g_signal_connect (combo_box->priv->arrow_button, "toggled",
 			  G_CALLBACK (gtk_combo_toggle_pressed), combo_box);
 	gtk_widget_show_all (combo_box->priv->arrow_button);
+	
+	/* set the a11y name */
+	atk_object_set_name (gtk_widget_get_accessible (combo_box->priv->arrow_button), _("Popup"));
+
 
 	/*
 	 * prelight the display widget when mousing over the arrow.
Index: link.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/components/html-editor/link.c,v
retrieving revision 1.36
diff -u -p -r1.36 link.c
--- link.c	19 Nov 2004 10:19:52 -0000	1.36
+++ link.c	27 Jan 2005 07:26:50 -0000
@@ -191,9 +191,11 @@ link_widget (GtkHTMLEditLinkProperties *
 
 	d->entry_url = glade_xml_get_widget (xml, "entry_url");
 	g_signal_connect (d->entry_url, "changed", G_CALLBACK (url_changed), d);
+	atk_object_set_name (gtk_widget_get_accessible (d->entry_url), _("URL:"));
 
 	d->entry_description = glade_xml_get_widget (xml, "entry_description");
 	g_signal_connect (d->entry_description, "changed", G_CALLBACK (description_changed), d);
+	atk_object_set_name (gtk_widget_get_accessible (d->entry_description), _("Description:"));
 
 	d->label_description = glade_xml_get_widget (xml, "label_description");
 
Index: replace.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/components/html-editor/replace.c,v
retrieving revision 1.23
diff -u -p -r1.23 replace.c
--- replace.c	6 Dec 2004 13:09:50 -0000	1.23
+++ replace.c	27 Jan 2005 07:26:52 -0000
@@ -179,10 +179,12 @@ gtk_html_replace_dialog_new (GtkHTML *ht
 		gtk_entry_set_text (GTK_ENTRY (dialog->entry_replace), cd->replace_text_replace);
 
 	gtk_table_set_col_spacings (GTK_TABLE (table), 3);
-	label = gtk_label_new (_("Replace:"));
+	label = gtk_label_new_with_mnemonic (_("R_eplace:"));
+	gtk_label_set_mnemonic_widget (label,dialog-> entry_search);
 	gtk_misc_set_alignment (GTK_MISC (label), .0, .5);
 	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
-	label = gtk_label_new (_("With:"));
+	label = gtk_label_new_with_mnemonic (_("_With:"));
+	gtk_label_set_mnemonic_widget (label, dialog->entry_replace);
 	gtk_misc_set_alignment (GTK_MISC (label), .0, .5);
 	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
 
Index: search.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/components/html-editor/search.c,v
retrieving revision 1.29
diff -u -p -r1.29 search.c
--- search.c	19 Nov 2004 10:19:52 -0000	1.29
+++ search.c	27 Jan 2005 07:26:55 -0000
@@ -103,7 +103,6 @@ gtk_html_search_dialog_new (GtkHTML *htm
 {
 	GtkHTMLSearchDialog *dialog = g_new (GtkHTMLSearchDialog, 1);
 	GtkWidget *hbox, *vbox;
-
 	/* we use CANCEL response for close, because we want Esc to close the dialog - see gtkdialog.c */
 	dialog->dialog         = GTK_DIALOG (gtk_dialog_new_with_buttons (_("Find"), NULL, 0,
 									  GTK_STOCK_CLOSE, GTK_RESPONSE_CANCEL,
@@ -115,6 +114,8 @@ gtk_html_search_dialog_new (GtkHTML *htm
 	dialog->regular_exp    = gtk_check_button_new_with_mnemonic (_("_Regular Expression"));
 	dialog->html           = html;
 	dialog->cd             = cd;
+
+	atk_object_set_description (gtk_widget_get_accessible (dialog->entry), _("Input the words you want to search here"));
 
 	hbox = gtk_hbox_new (FALSE, 6);