Patch from Taylor Hayward <thayward@gjpc.com>. Added accelerators to a few

2001-07-17  Christopher James Lahey  <clahey@ximian.com>

	* gui/contact-editor/contact-editor.glade,
	gui/merging/e-card-duplicate-detected.glade,
	gui/merging/e-card-merging-book-commit-duplicate-detected.glade,
	printing/e-contact-print.glade: Patch from Taylor Hayward
	<thayward@gjpc.com>.  Added accelerators to a few dialogs.

svn path=/trunk/; revision=11153

5 files changed, 61 insertions, 57 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index e5c521ea54..985cf01727 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,11 @@
+2001-07-17  Christopher James Lahey  <clahey@ximian.com>
+
+	* gui/contact-editor/contact-editor.glade,
+	gui/merging/e-card-duplicate-detected.glade,
+	gui/merging/e-card-merging-book-commit-duplicate-detected.glade,
+	printing/e-contact-print.glade: Patch from Taylor Hayward
+	<thayward@gjpc.com>.  Added accelerators to a few dialogs.
+
 2001-07-16  Jon Trowbridge  <trow@ximian.com>
 
 	* gui/component/select-names/Evolution-Addressbook-SelectNames.idl:
diff --git a/addressbook/gui/contact-editor/contact-editor.glade b/addressbook/gui/contact-editor/contact-editor.glade
index 76a6539673..a483d57d52 100644
--- a/addressbook/gui/contact-editor/contact-editor.glade
+++ b/addressbook/gui/contact-editor/contact-editor.glade
@@ -272,7 +272,7 @@
 	<can_default>True</can_default>
 	<has_default>True</has_default>
 	<can_focus>True</can_focus>
-	<label>Add</label>
+	<label>_Add</label>
 	<stock_pixmap>GNOME_STOCK_PIXMAP_ADD</stock_pixmap>
       </widget>
 
diff --git a/addressbook/gui/merging/e-card-duplicate-detected.glade b/addressbook/gui/merging/e-card-duplicate-detected.glade
index bc6624e8fd..e370e31379 100644
--- a/addressbook/gui/merging/e-card-duplicate-detected.glade
+++ b/addressbook/gui/merging/e-card-duplicate-detected.glade
@@ -64,7 +64,7 @@
 	<name>button3</name>
 	<can_default>True</can_default>
 	<can_focus>True</can_focus>
-	<label>Add Anyway</label>
+	<label>_Add Anyway</label>
 	<stock_pixmap>GNOME_STOCK_PIXMAP_ADD</stock_pixmap>
       </widget>
 
diff --git a/addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade b/addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade
index 0bc60ba13a..2008fb7757 100644
--- a/addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade
+++ b/addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade
@@ -64,7 +64,7 @@
 	<name>button3</name>
 	<can_default>True</can_default>
 	<can_focus>True</can_focus>
-	<label>Change Anyway</label>
+	<label>_Change Anyway</label>
 	<stock_pixmap>GNOME_STOCK_PIXMAP_ADD</stock_pixmap>
       </widget>
 
diff --git a/addressbook/printing/e-contact-print.glade b/addressbook/printing/e-contact-print.glade
index ff7aa91377..292fc8cc85 100644
--- a/addressbook/printing/e-contact-print.glade
+++ b/addressbook/printing/e-contact-print.glade
@@ -10,17 +10,9 @@
   <language>C</language>
   <gnome_support>False</gnome_support>
   <gettext_support>False</gettext_support>
-  <use_widget_names>False</use_widget_names>
   <output_main_file>False</output_main_file>
   <output_support_files>False</output_support_files>
   <output_build_files>False</output_build_files>
-  <backup_source_files>True</backup_source_files>
-  <main_source_file>interface.c</main_source_file>
-  <main_header_file>interface.h</main_header_file>
-  <handler_source_file>callbacks.c</handler_source_file>
-  <handler_header_file>callbacks.h</handler_header_file>
-  <support_source_file>support.c</support_source_file>
-  <support_header_file>support.h</support_header_file>
 </project>
 
 <widget>
@@ -50,6 +42,48 @@
     </child>
 
     <widget>
+      <class>GtkHButtonBox</class>
+      <child_name>GnomeDialog:action_area</child_name>
+      <name>dialog-action_area1</name>
+      <layout_style>GTK_BUTTONBOX_END</layout_style>
+      <spacing>8</spacing>
+      <child_min_width>85</child_min_width>
+      <child_min_height>27</child_min_height>
+      <child_ipad_x>7</child_ipad_x>
+      <child_ipad_y>0</child_ipad_y>
+      <child>
+	<padding>0</padding>
+	<expand>False</expand>
+	<fill>True</fill>
+	<pack>GTK_PACK_END</pack>
+      </child>
+
+      <widget>
+	<class>GtkButton</class>
+	<name>button1</name>
+	<can_default>True</can_default>
+	<can_focus>True</can_focus>
+	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
+      </widget>
+
+      <widget>
+	<class>GtkButton</class>
+	<name>button2</name>
+	<can_default>True</can_default>
+	<can_focus>True</can_focus>
+	<stock_button>GNOME_STOCK_BUTTON_APPLY</stock_button>
+      </widget>
+
+      <widget>
+	<class>GtkButton</class>
+	<name>button3</name>
+	<can_default>True</can_default>
+	<can_focus>True</can_focus>
+	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
+      </widget>
+    </widget>
+
+    <widget>
       <class>GtkVBox</class>
       <name>vbox-contact-print-style-editor</name>
       <homogeneous>False</homogeneous>
@@ -555,7 +589,8 @@
 		      <class>GtkButton</class>
 		      <name>button6</name>
 		      <can_focus>True</can_focus>
-		      <label>Font...</label>
+		      <label>F_ont...</label>
+		      <relief>GTK_RELIEF_NORMAL</relief>
 		    </widget>
 		  </widget>
 
@@ -586,7 +621,8 @@
 		      <name>button5</name>
 		      <width>90</width>
 		      <can_focus>True</can_focus>
-		      <label>Font...</label>
+		      <label>_Font...</label>
+		      <relief>GTK_RELIEF_NORMAL</relief>
 		    </widget>
 		  </widget>
 
@@ -1585,7 +1621,8 @@
 		<class>GtkButton</class>
 		<name>button11</name>
 		<can_focus>True</can_focus>
-		<label>Font...</label>
+		<label>F_ont...</label>
+		<relief>GTK_RELIEF_NORMAL</relief>
 	      </widget>
 	    </widget>
 
@@ -1877,7 +1914,8 @@
 		<class>GtkButton</class>
 		<name>button10</name>
 		<can_focus>True</can_focus>
-		<label>Font...</label>
+		<label>_Font...</label>
+		<relief>GTK_RELIEF_NORMAL</relief>
 	      </widget>
 	    </widget>
 	  </widget>
@@ -1959,48 +1997,6 @@
 	</widget>
       </widget>
     </widget>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area1</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button1</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button2</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_APPLY</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button3</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
   </widget>
 </widget>