Re: [evolution-patches] UI patch for addressbook bug #41144

[Chris Toshok <toshok ximian com>]

On Fri, 2003-04-25 at 09:55, Anna Marie Dirks wrote:
> This patch looks good... but thanks to Jakub, we can make it look even
> better. 

ohh, yay.

The stock-edit icons aren't being installed at the moment, so I'm also
including a diff to art/Makefile.am to get them installed.

Chris

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/ChangeLog,v
retrieving revision 1.1389
diff -u -w -r1.1389 ChangeLog
--- ChangeLog	23 Apr 2003 20:34:35 -0000	1.1389
+++ ChangeLog	25 Apr 2003 20:36:57 -0000
@@ -1,3 +1,12 @@
+2003-04-24  Chris Toshok  <toshok ximian com>
+
+	[ fixes bug #41144 ]
+	
+	* gui/component/ldap-config.glade: use stock buttons for the
+	Add/Delete buttons.  Switch from "Delete" to "Remove", though, as
+	"Remove" fits much better with the one for "Add".  Also, add our
+	stock-edit-24.png icon for "Edit".
+
 2003-04-23  Chris Toshok  <toshok ximian com>
 
 	[ fixes bug #37351 ]
Index: gui/component/ldap-config.glade
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/component/ldap-config.glade,v
retrieving revision 1.13
diff -u -w -r1.13 ldap-config.glade
--- gui/component/ldap-config.glade	8 Apr 2003 15:31:53 -0000	1.13
+++ gui/component/ldap-config.glade	25 Apr 2003 20:36:57 -0000
@@ -858,8 +858,8 @@
 		      <property name="visible">True</property>
 		      <property name="can_default">True</property>
 		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">_Add</property>
-		      <property name="use_underline">True</property>
+		      <property name="label">gtk-add</property>
+		      <property name="use_stock">True</property>
 		      <property name="relief">GTK_RELIEF_NORMAL</property>
 		    </widget>
 		  </child>
@@ -869,9 +869,62 @@
 		      <property name="visible">True</property>
 		      <property name="can_default">True</property>
 		      <property name="can_focus">True</property>
+		      <property name="relief">GTK_RELIEF_NORMAL</property>
+
+		      <child>
+			<widget class="GtkAlignment" id="alignment64">
+			  <property name="visible">True</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xscale">0</property>
+			  <property name="yscale">0</property>
+
+			  <child>
+			    <widget class="GtkHBox" id="hbox121">
+			      <property name="visible">True</property>
+			      <property name="homogeneous">False</property>
+			      <property name="spacing">2</property>
+
+			      <child>
+				<widget class="Custom" id="custom1">
+				  <property name="visible">True</property>
+				  <property name="creation_function">e_create_image_widget</property>
+				  <property name="string1">stock-edit-24.png</property>
+				  <property name="int1">0</property>
+				  <property name="int2">0</property>
+				  <property name="last_modification_time">Fri, 25 Apr 2003 20:27:48 GMT</property>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkLabel" id="label554">
+				  <property name="visible">True</property>
 		      <property name="label" translatable="yes">_Edit</property>
 		      <property name="use_underline">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
+				  <property name="use_markup">False</property>
+				  <property name="justify">GTK_JUSTIFY_LEFT</property>
+				  <property name="wrap">False</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">0.5</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">0</property>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
+			    </widget>
+			  </child>
+			</widget>
+		      </child>
 		    </widget>
 		  </child>
 
@@ -880,8 +933,8 @@
 		      <property name="visible">True</property>
 		      <property name="can_default">True</property>
 		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">De_lete</property>
-		      <property name="use_underline">True</property>
+		      <property name="label">gtk-remove</property>
+		      <property name="use_stock">True</property>
 		      <property name="relief">GTK_RELIEF_NORMAL</property>
 		    </widget>
 		  </child>

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/art/ChangeLog,v
retrieving revision 1.142
diff -u -r1.142 ChangeLog
--- ChangeLog	3 Mar 2003 17:15:27 -0000	1.142
+++ ChangeLog	25 Apr 2003 20:36:12 -0000
@@ -1,3 +1,7 @@
+2003-04-25  Chris Toshok  <toshok ximian com>
+
+	* Makefile.am (images_DATA): add stock-edit-{16,24}.png
+
 2003-03-03  Ettore Perazzoli  <ettore ximian com>
 
 	* about-box.png: New artwork from Jakub.
Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/art/Makefile.am,v
retrieving revision 1.102
diff -u -r1.102 Makefile.am
--- Makefile.am	6 Feb 2003 15:36:57 -0000	1.102
+++ Makefile.am	25 Apr 2003 20:36:12 -0000
@@ -149,6 +149,8 @@
 	settings-16.png			\
 	show_all_messages.xpm		\
 	splash.png			\
+	stock-edit-16.png		\
+	stock-edit-24.png		\
 	summary-settings.png		\
 	summary_preferences-16.png	\
 	talking-heads.png		\