From 1c86a794fa25ce1a9bddd7ba5f2dd8d3abb48104 Mon Sep 17 00:00:00 2001
From: Anna Marie Dirks <anna@ximian.com>
Date: Mon, 19 May 2003 15:14:25 +0000
Subject: Changed button order, and added HIG-appropriate spacing/padding.
 Fixes bug

2003-05-19  Anna Marie Dirks  <anna@ximian.com>

	* gui/merging/e-card-merging-book-commit-duplicate-detected.glade:
	Changed button order, and added HIG-appropriate spacing/padding.
	Fixes bug #41232.

svn path=/trunk/; revision=21248
---
 addressbook/ChangeLog                                      |  4 ++++
 .../e-card-merging-book-commit-duplicate-detected.glade    | 14 ++++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'addressbook')

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 215d78c950..53120a4e39 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,5 +1,9 @@
 2003-05-19  Anna Marie Dirks  <anna@ximian.com>
 
+	* gui/merging/e-card-merging-book-commit-duplicate-detected.glade: 
+	Changed button order, and added HIG-appropriate spacing/padding. 
+	Fixes bug #41232.
+
 	* gui/merging/e-card-duplicate-detected.glade: Changed button 
 	order, and added HIG-appropriate spacing/padding. Fixes bug
 	#41229 and #41231.
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 89599a3f7c..f7cfd259e5 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
@@ -4,6 +4,7 @@
 <glade-interface>
 
 <widget class="GtkDialog" id="dialog-duplicate-contact">
+  <property name="border_width">6</property>
   <property name="visible">True</property>
   <property name="title" translatable="yes">Duplicate Contact Detected</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
@@ -17,7 +18,7 @@
     <widget class="GtkVBox" id="dialog-vbox1">
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
-      <property name="spacing">8</property>
+      <property name="spacing">6</property>
 
       <child internal-child="action_area">
 	<widget class="GtkHButtonBox" id="dialog-action_area1">
@@ -29,10 +30,10 @@
 	      <property name="visible">True</property>
 	      <property name="can_default">True</property>
 	      <property name="can_focus">True</property>
-	      <property name="label" translatable="yes">Change Anyway</property>
-	      <property name="use_underline">True</property>
+	      <property name="label">gtk-cancel</property>
+	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">0</property>
+	      <property name="response_id">1</property>
 	    </widget>
 	  </child>
 
@@ -41,10 +42,10 @@
 	      <property name="visible">True</property>
 	      <property name="can_default">True</property>
 	      <property name="can_focus">True</property>
-	      <property name="label">gtk-cancel</property>
+	      <property name="label">gtk-add</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">1</property>
+	      <property name="response_id">0</property>
 	    </widget>
 	  </child>
 	</widget>
@@ -58,6 +59,7 @@
 
       <child>
 	<widget class="GtkTable" id="table1">
+	  <property name="border_width">6</property>
 	  <property name="visible">True</property>
 	  <property name="n_rows">5</property>
 	  <property name="n_columns">2</property>
-- 
cgit