[evolution-patches] addressbook patch for #41140, #41130, #41137



This patch HIGifies the various dialogs in ldap_config.glade. This fixes
bugs #41130, #41140, #41137. 

thank you, 
Anna



-- 
Anna Marie Dirks <anna ximian com>
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/ChangeLog,v
retrieving revision 1.1412
diff -u -u -w -r1.1412 ChangeLog
--- ChangeLog	16 May 2003 18:10:47 -0000	1.1412
+++ ChangeLog	16 May 2003 19:17:06 -0000
@@ -1,3 +1,18 @@
+2003-05-16  Anna Marie Dirks  <anna ximian com>
+
+	* gui/component/ldap-config.glade: HIG-ified the various dialogs
+	(including the settings pages, the config druid, and the edit dialog) 
+	in this glade file. This fixes bugs #41140, #41137, #41130
+
+	* 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.
+
+
 2003-05-15  Chris Toshok  <toshok ximian com>
 
 	* gui/component/addressbook.c (book_open_cb): backing out a tiny
Index: gui/component/ldap-config.glade
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/component/ldap-config.glade,v
retrieving revision 1.14
diff -u -u -w -r1.14 ldap-config.glade
--- gui/component/ldap-config.glade	30 Apr 2003 04:07:15 -0000	1.14
+++ gui/component/ldap-config.glade	16 May 2003 19:17:07 -0000
@@ -14,12 +14,14 @@
 
   <child>
     <widget class="GtkVBox" id="vbox37">
+      <property name="border_width">6</property>
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
+      <property name="spacing">6</property>
 
       <child>
 	<widget class="GtkNotebook" id="account-editor-notebook">
+	  <property name="border_width">6</property>
 	  <property name="visible">True</property>
 	  <property name="can_focus">True</property>
 	  <property name="show_tabs">True</property>
@@ -33,7 +35,7 @@
 	      <property name="border_width">6</property>
 	      <property name="visible">True</property>
 	      <property name="homogeneous">False</property>
-	      <property name="spacing">3</property>
+	      <property name="spacing">6</property>
 
 	      <child>
 		<widget class="GtkHBox" id="hbox100">
@@ -233,7 +235,7 @@
 	    <widget class="GtkHButtonBox" id="hbuttonbox20">
 	      <property name="visible">True</property>
 	      <property name="layout_style">GTK_BUTTONBOX_END</property>
-	      <property name="spacing">0</property>
+	      <property name="spacing">6</property>
 
 	      <child>
 		<widget class="GtkButton" id="account-editor-cancel-button">
@@ -285,7 +287,7 @@
 
   <child>
     <widget class="GnomeDruid" id="account-druid">
-      <property name="border_width">4</property>
+      <property name="border_width">6</property>
       <property name="visible">True</property>
       <property name="show_help">False</property>
 
@@ -297,9 +299,7 @@
 	  <property name="text" translatable="yes">This assistant will help you to access online directory services
 using LDAP (Lightweight Directory Access Protocol) servers. 
 
-Adding a new LDAP server requires some specialized information
-about the server. Please contact your system administrator if you 
-need help finding this information.</property>
+Adding a new LDAP server requires some specialized information about the server. Please contact your system administrator if you need help finding this information.</property>
 	</widget>
       </child>
 
@@ -317,10 +317,10 @@
 
 	      <child>
 		<widget class="GtkVBox" id="account-druid-general-vbox">
-		  <property name="border_width">3</property>
+		  <property name="border_width">6</property>
 		  <property name="visible">True</property>
 		  <property name="homogeneous">False</property>
-		  <property name="spacing">3</property>
+		  <property name="spacing">6</property>
 
 		  <child>
 		    <widget class="GtkLabel" id="label158">
@@ -380,10 +380,10 @@
 
 	      <child>
 		<widget class="GtkVBox" id="account-druid-connecting-vbox">
-		  <property name="border_width">3</property>
+		  <property name="border_width">6</property>
 		  <property name="visible">True</property>
 		  <property name="homogeneous">False</property>
-		  <property name="spacing">3</property>
+		  <property name="spacing">6</property>
 
 		  <child>
 		    <widget class="GtkLabel" id="label174">
@@ -444,10 +444,10 @@
 
 	      <child>
 		<widget class="GtkVBox" id="account-druid-searching-vbox">
-		  <property name="border_width">3</property>
+		  <property name="border_width">6</property>
 		  <property name="visible">True</property>
 		  <property name="homogeneous">False</property>
-		  <property name="spacing">3</property>
+		  <property name="spacing">6</property>
 
 		  <child>
 		    <widget class="GtkLabel" id="label254">
@@ -508,10 +508,10 @@
 
 	      <child>
 		<widget class="GtkVBox" id="vbox21">
-		  <property name="border_width">3</property>
+		  <property name="border_width">6</property>
 		  <property name="visible">True</property>
 		  <property name="homogeneous">False</property>
-		  <property name="spacing">3</property>
+		  <property name="spacing">6</property>
 
 		  <child>
 		    <widget class="GtkLabel" id="label198">
@@ -747,7 +747,7 @@
     <widget class="GtkVBox" id="addressbook-sources-vbox">
       <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="hbuttonbox27">
@@ -800,9 +800,10 @@
 
       <child>
 	<widget class="GtkHBox" id="addressbook-sources">
+	  <property name="border_width">6</property>
 	  <property name="visible">True</property>
 	  <property name="homogeneous">False</property>
-	  <property name="spacing">0</property>
+	  <property name="spacing">6</property>
 
 	  <child>
 	    <widget class="Custom" id="sourcesTable">
@@ -851,7 +852,7 @@
 		<widget class="GtkVButtonBox" id="vbuttonbox18">
 		  <property name="visible">True</property>
 		  <property name="layout_style">GTK_BUTTONBOX_START</property>
-		  <property name="spacing">0</property>
+		  <property name="spacing">6</property>
 
 		  <child>
 		    <widget class="GtkButton" id="addSource">
@@ -976,17 +977,17 @@
       <property name="border_width">6</property>
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
-      <property name="spacing">3</property>
+      <property name="spacing">6</property>
 
       <child>
 	<widget class="GtkTable" id="table36">
-	  <property name="border_width">3</property>
+	  <property name="border_width">6</property>
 	  <property name="visible">True</property>
 	  <property name="n_rows">3</property>
 	  <property name="n_columns">2</property>
 	  <property name="homogeneous">False</property>
-	  <property name="row_spacing">3</property>
-	  <property name="column_spacing">3</property>
+	  <property name="row_spacing">6</property>
+	  <property name="column_spacing">6</property>
 
 	  <child>
 	    <widget class="GtkLabel" id="label534">
@@ -997,7 +998,7 @@
 	      <property name="justify">GTK_JUSTIFY_CENTER</property>
 	      <property name="wrap">False</property>
 	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
+	      <property name="xalign">1</property>
 	      <property name="yalign">0.5</property>
 	      <property name="xpad">0</property>
 	      <property name="ypad">0</property>
@@ -1022,7 +1023,7 @@
 	      <property name="justify">GTK_JUSTIFY_CENTER</property>
 	      <property name="wrap">False</property>
 	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
+	      <property name="xalign">1</property>
 	      <property name="yalign">0.5</property>
 	      <property name="xpad">0</property>
 	      <property name="ypad">0</property>
@@ -1127,13 +1128,13 @@
 	      <child>
 		<widget class="GtkLabel" id="label553">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Email Address:</property>
+		  <property name="label" translatable="yes">Email address:</property>
 		  <property name="use_underline">False</property>
 		  <property name="use_markup">False</property>
 		  <property name="justify">GTK_JUSTIFY_CENTER</property>
 		  <property name="wrap">False</property>
 		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
+		  <property name="xalign">1</property>
 		  <property name="yalign">0.5</property>
 		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
@@ -1539,19 +1540,20 @@
 
   <child>
     <widget class="GtkVBox" id="connecting-tab">
+      <property name="border_width">6</property>
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
+      <property name="spacing">6</property>
 
       <child>
 	<widget class="GtkTable" id="table14">
-	  <property name="border_width">3</property>
+	  <property name="border_width">6</property>
 	  <property name="visible">True</property>
 	  <property name="n_rows">2</property>
 	  <property name="n_columns">2</property>
 	  <property name="homogeneous">False</property>
-	  <property name="row_spacing">3</property>
-	  <property name="column_spacing">3</property>
+	  <property name="row_spacing">6</property>
+	  <property name="column_spacing">6</property>
 
 	  <child>
 	    <widget class="GtkLabel" id="label175">
@@ -1562,7 +1564,7 @@
 	      <property name="justify">GTK_JUSTIFY_CENTER</property>
 	      <property name="wrap">False</property>
 	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
+	      <property name="xalign">1</property>
 	      <property name="yalign">0.5</property>
 	      <property name="xpad">0</property>
 	      <property name="ypad">0</property>
@@ -1724,7 +1726,7 @@
 	      <property name="justify">GTK_JUSTIFY_CENTER</property>
 	      <property name="wrap">False</property>
 	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
+	      <property name="xalign">1</property>
 	      <property name="yalign">0.5</property>
 	      <property name="xpad">0</property>
 	      <property name="ypad">0</property>
@@ -1997,17 +1999,17 @@
       <property name="border_width">6</property>
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
-      <property name="spacing">3</property>
+      <property name="spacing">6</property>
 
       <child>
 	<widget class="GtkTable" id="table30">
-	  <property name="border_width">3</property>
+	  <property name="border_width">6</property>
 	  <property name="visible">True</property>
 	  <property name="n_rows">4</property>
 	  <property name="n_columns">2</property>
 	  <property name="homogeneous">False</property>
-	  <property name="row_spacing">3</property>
-	  <property name="column_spacing">3</property>
+	  <property name="row_spacing">6</property>
+	  <property name="column_spacing">6</property>
 
 	  <child>
 	    <widget class="GtkLabel" id="label455">
@@ -2018,7 +2020,7 @@
 	      <property name="justify">GTK_JUSTIFY_LEFT</property>
 	      <property name="wrap">False</property>
 	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
+	      <property name="xalign">1</property>
 	      <property name="yalign">0.5</property>
 	      <property name="xpad">0</property>
 	      <property name="ypad">0</property>
@@ -2042,7 +2044,7 @@
 	      <property name="justify">GTK_JUSTIFY_LEFT</property>
 	      <property name="wrap">False</property>
 	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
+	      <property name="xalign">1</property>
 	      <property name="yalign">0.5</property>
 	      <property name="xpad">0</property>
 	      <property name="ypad">0</property>
@@ -2165,7 +2167,7 @@
 	      <property name="justify">GTK_JUSTIFY_LEFT</property>
 	      <property name="wrap">False</property>
 	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
+	      <property name="xalign">1</property>
 	      <property name="yalign">1</property>
 	      <property name="xpad">0</property>
 	      <property name="ypad">0</property>
@@ -2317,7 +2319,7 @@
 	      <property name="justify">GTK_JUSTIFY_LEFT</property>
 	      <property name="wrap">False</property>
 	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
+	      <property name="xalign">1</property>
 	      <property name="yalign">0.5</property>
 	      <property name="xpad">0</property>
 	      <property name="ypad">0</property>
@@ -2602,7 +2604,7 @@
     <widget class="GtkVBox" id="dialog-vbox5">
       <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_area5">


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]