Use gtk_label_new_with_mnemonic() to replace gtk_label_new(). Use

2003-09-05  Yuedong Du  <yuedong.du@sun.com>

        * e-shell-importer.c: (importer_file_page_new),
        (importer_type_page_new), (show_import_wizard): Use
        gtk_label_new_with_mnemonic() to replace gtk_label_new(). Use
        gtk_label_set_mnemonic_widget() to set up label<-> entry
        relationship. Change gtk_button_set_label() to
        gtk_button_set_use_underline() and gtk_button_set_label(). Change
        gtk_radio_button_new_with_label_from_widget() to
        gtk_radio_button_new_with_mnemonic_from_widget(). fix bug #47867

svn path=/trunk/; revision=22502

2 files changed, 21 insertions, 8 deletions

diff --git a/shell/ChangeLog b/shell/ChangeLog
index a20ed886f8..b7f35127ac 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,14 @@
+2003-09-05  Yuedong Du  <yuedong.du@sun.com>
+
+	* e-shell-importer.c: (importer_file_page_new),
+	(importer_type_page_new), (show_import_wizard): Use 
+	gtk_label_new_with_mnemonic() to replace gtk_label_new(). Use
+	gtk_label_set_mnemonic_widget() to set up label<-> entry
+	relationship. Change gtk_button_set_label() to 
+	gtk_button_set_use_underline() and gtk_button_set_label(). Change 
+	gtk_radio_button_new_with_label_from_widget() to 
+	gtk_radio_button_new_with_mnemonic_from_widget(). fix bug #47867
+
 2003-07-24  Yuedong Du  <yuedong.du@sun.com>
 
 	* e-shell-offline-handler.c: (dialog_response_cb): fix crash when user escape the
diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c
index bf7481154c..adbd5efae4 100644
--- a/shell/e-shell-importer.c
+++ b/shell/e-shell-importer.c
@@ -640,7 +640,7 @@ importer_file_page_new (ImportData *data)
 	gtk_container_set_border_width (GTK_CONTAINER (table), 8);
 	gtk_box_pack_start (GTK_BOX (page->vbox), table, TRUE, TRUE, 0);
 
-	label = gtk_label_new (_("Filename:"));
+	label = gtk_label_new_with_mnemonic (_("_Filename:"));
 	gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row + 1, 
 			  GTK_FILL, 0, 0, 0);
 	gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5);
@@ -651,10 +651,11 @@ importer_file_page_new (ImportData *data)
 
 	gtk_table_attach (GTK_TABLE (table), page->filename, 1, 2, 
 			  row, row + 1, GTK_EXPAND | GTK_FILL, 0, 0, 0);
+	gtk_label_set_mnemonic_widget(GTK_LABEL(label), page->filename);
 
 	row++;
 
-	label = gtk_label_new (_("File type:"));
+	label = gtk_label_new_with_mnemonic (_("File _type:"));
 	gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row + 1,
 			  GTK_FILL, 0, 0, 0);
 	gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5);
@@ -664,6 +665,7 @@ importer_file_page_new (ImportData *data)
 	gtk_option_menu_set_menu (GTK_OPTION_MENU (page->filetype), page->menu);
 	gtk_table_attach (GTK_TABLE (table), page->filetype, 1, 2, 
 			  row, row + 1, GTK_EXPAND | GTK_FILL, 0, 0, 0);
+	gtk_label_set_mnemonic_widget(GTK_LABEL(label), page->filetype);
 
 	gtk_widget_show_all (table);
 
@@ -678,12 +680,11 @@ importer_type_page_new (ImportData *data)
 	page = g_new0 (ImportDialogTypePage, 1);
 
 	page->vbox = gtk_vbox_new (FALSE, 5);
-	page->intelligent = gtk_radio_button_new_with_label (NULL, 
-							     _("Import data and settings from older programs"));
+	page->intelligent = gtk_radio_button_new_with_mnemonic (NULL, 
+							     _("Import data and settings from _older programs"));
 	gtk_box_pack_start (GTK_BOX (page->vbox), page->intelligent, FALSE, FALSE, 0);
-
-	page->file = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (page->intelligent),
-								  _("Import a single file"));
+	page->file = gtk_radio_button_new_with_mnemonic_from_widget (GTK_RADIO_BUTTON (page->intelligent),
+								  _("Import a _single file"));
 	gtk_box_pack_start (GTK_BOX (page->vbox), page->file, FALSE, FALSE, 0);
 	gtk_widget_show_all (page->vbox);
 	return page;
@@ -1188,7 +1189,8 @@ show_import_wizard (BonoboUIComponent *component,
 	g_signal_connect (data->druid, "cancel",
 			  G_CALLBACK (import_druid_cancel), data);
 
-	gtk_button_set_label((GtkButton *)((GnomeDruid *)data->druid)->finish, _("Import"));
+	gtk_button_set_use_underline ((GtkButton *)((GnomeDruid *)data->druid)->finish, TRUE);
+	gtk_button_set_label((GtkButton *)((GnomeDruid *)data->druid)->finish, _("_Import"));
 
 	data->start = GNOME_DRUID_PAGE_EDGE (glade_xml_get_widget (data->wizard, "page0"));