GNOME.org
 

[evolution-patches] Fix for 57963

Hi,

I have updated
http://lists.ximian.com/archives/public/evolution-patches/2004-April/004998.html
to HEAD.

Does this look ok?

Thanks,
Jon

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/ui/ChangeLog,v
retrieving revision 1.393
diff -p -u -r1.393 ChangeLog
--- ChangeLog	19 May 2004 03:46:28 -0000	1.393
+++ ChangeLog	19 May 2004 15:19:30 -0000
@@ -1,3 +1,19 @@
+2004-05-19  William Jon McCann  <mccann jhu edu>
+
+	* evolution-message-composer.xml: 
+	* evolution-composer-entries.xml: 
+	* evolution-contact-list-editor.xml: 
+	* evolution-contact-editor.xml: 
+	* evolution.xml: 
+	* evolution-mail-message.xml: 
+	* evolution-mail-list.xml: 
+	* evolution-mail-global.xml: 
+	* evolution-addressbook.xml: use stock icons where possible.
+	Calendar and tasks already use stock icons.
+
+	* evolution-tasks.xml: swap positions of delete and print icons
+	to be consistent with the other components.
+
 2004-05-19  Not Zed  <NotZed Ximian com>
 
 	* evolution.xml: Added View->Window menu.
Index: evolution-addressbook.xml
===================================================================
RCS file: /cvs/gnome/evolution/ui/evolution-addressbook.xml,v
retrieving revision 1.63
diff -p -u -r1.63 evolution-addressbook.xml
--- evolution-addressbook.xml	18 May 2004 18:54:08 -0000	1.63
+++ evolution-addressbook.xml	19 May 2004 15:19:30 -0000
@@ -2,16 +2,17 @@
   <commands>
     <cmd name="ContactDelete"
 	 _tip="Delete selected contacts"
+	 pixtype="stock" pixname="gtk-delete"
 	 accel="*Control*d"/>
 
     <cmd name="ContactsPrint"
 	 _tip="Print selected contacts"
-	 pixtype="stock" pixname="Print"
+	 pixtype="stock" pixname="gtk-print"
 	 accel="*Control*p"/>
 
     <cmd name="ContactsPrintPreview"
 	 _tip="Previews the contacts to be printed"
-	 pixtype="stock" pixname="Print"/>
+	 pixtype="stock" pixname="gtk-print-preview"/>
 
     <cmd name="ContactsView"
 	 _tip="View the current contact"
@@ -19,17 +20,20 @@
 
     <cmd name="ContactStop"
 	 _tip="Stop Loading"
-	 pixtype="stock" pixname="Stop"/>
+	 pixtype="stock" pixname="gtk-stop"/>
 
     <cmd name="ContactsCut" _label="Cut" _tip="Cut the selection"
+	 pixtype="stock" pixname="gtk-cut"
 	 accel="*Control*x"/>
 
     <cmd name="ContactsCopy" _label="Copy"
 	 _tip="Copy the selection"
+	 pixtype="stock" pixname="gtk-copy"
 	 accel="*Control*c"/>
 
     <cmd name="ContactsPaste" _label="Paste"
 	 _tip="Paste the clipboard"
+	 pixtype="stock" pixname="gtk-paste"
 	 accel="*Control*v"/>
 
     <cmd name="ContactsSelectAll" _label="Select All"
@@ -38,6 +42,7 @@
 
     <cmd name="ContactsSaveAsVCard" _label="Save as VCard..."
 	 _tip="Save selected contacts as a VCard."
+	 pixtype="stock" pixname="gtk-save-as"
 	 accel="*Control**Alt*s"/>
 
     <cmd name="ContactsSendContactToOther" _label="Forward Contact"
@@ -66,17 +71,14 @@
 	<menuitem name="ContactsView"
 		  verb="" _label="_Open"/>
 	<menuitem name="ContactsSaveAsVCard"
-		  verb="" _label="_Save as VCard..."
-		  pixtype="pixbuf"/>
+		  verb="" _label="_Save as VCard..."/>
       </placeholder>
 
       <placeholder name="Print">
 	<menuitem name="ContactsPrintPreview" verb=""
-		  _label="Print Pre_view"
-		  pixtype="pixbuf"/>
+		  _label="Print Pre_view"/>
 	<menuitem name="ContactsPrint" verb=""
-		  _label="_Print..."
-		  pixtype="pixbuf"/>
+		  _label="_Print..."/>
       </placeholder>
 
     </submenu>
@@ -93,19 +95,15 @@
 
 	<separator f="" name="eadbk2"/>
 
-	<menuitem name="ContactsCut" verb="" _label="C_ut"
-		  pixtype="pixbuf"/>
+	<menuitem name="ContactsCut" verb="" _label="C_ut"/>
 	
-	<menuitem name="ContactsCopy" verb="" _label="_Copy"
-		  pixtype="pixbuf"/>
+	<menuitem name="ContactsCopy" verb="" _label="_Copy"/>
 	
-	<menuitem name="ContactsPaste" verb="" _label="_Paste"
-		  pixtype="pixbuf"/>
+	<menuitem name="ContactsPaste" verb="" _label="_Paste"/>
 
 	<separator f="" name="eadbk6"/>
 
-	<menuitem name="ContactDelete" verb=""
-		  _label="_Delete" pixtype="pixbuf"/>
+	<menuitem name="ContactDelete" verb="" _label="_Delete"/>
       </submenu>
 
     </placeholder>
@@ -131,10 +129,10 @@
 
   <dockitem name="Toolbar">
     <toolitem name="ContactsPrint" verb=""
-	      _label="Print" pixtype="pixbuf"/>
+	      _label="Print"/>
 
     <toolitem name="ContactDelete" verb=""
-	      _label="Delete" pixtype="pixbuf"/>
+	      _label="Delete"/>
 
     <toolitem name="ContactStop" verb=""
 	      _label="Stop"/>
Index: evolution-composer-entries.xml
===================================================================
RCS file: /cvs/gnome/evolution/ui/evolution-composer-entries.xml,v
retrieving revision 1.1
diff -p -u -r1.1 evolution-composer-entries.xml
--- evolution-composer-entries.xml	7 Apr 2003 23:19:19 -0000	1.1
+++ evolution-composer-entries.xml	19 May 2004 15:19:30 -0000
@@ -3,15 +3,15 @@
 
     <cmd name="EditCut"
      _tip="Cut selected text to the clipboard"
-     accel="*Control*x" pixtype="pixbuf"/>
+     accel="*Control*x" pixtype="stock" pixname="gtk-cut"/>
 
     <cmd name="EditCopy"
      _tip="Copy selected text to the clipboard"
-     accel="*Control*c" pixtype="pixbuf"/>
+     accel="*Control*c" pixtype="stock" pixname="gtk-copy"/>
 
     <cmd name="EditPaste"
      _tip="Paste text from the clipboard"
-     accel="*Control*v" pixtype="pixbuf"/>
+     accel="*Control*v" pixtype="stock" pixname="gtk-paste"/>
 
     <cmd name="EditSelectAll"
      _tip="Select all text"
Index: evolution-contact-editor.xml
===================================================================
RCS file: /cvs/gnome/evolution/ui/evolution-contact-editor.xml,v
retrieving revision 1.25
diff -p -u -r1.25 evolution-contact-editor.xml
--- evolution-contact-editor.xml	6 Jan 2004 17:50:20 -0000	1.25
+++ evolution-contact-editor.xml	19 May 2004 15:19:30 -0000
@@ -1,18 +1,18 @@
 <Root>
         <commands>
-		<cmd name="ContactEditorSave" pixtype="pixbuf" accel="*Control*s"/>
-		<cmd name="ContactEditorSaveAs" pixtype="pixbuf" accel="*Control**Shift*s"/>
+		<cmd name="ContactEditorSave" pixtype="stock" pixname="gtk-save" accel="*Control*s"/>
+		<cmd name="ContactEditorSaveAs" pixtype="stock" pixname="gtk-save-as" accel="*Control**Shift*s"/>
 
 		<cmd name="ContactEditorSendAs"/>
 
 		<cmd name="ContactEditorSendTo"/>
 
-		<cmd name="ContactEditorDelete" pixtype="pixbuf"
+		<cmd name="ContactEditorDelete" pixtype="stock" pixname="gtk-delete"
 		 _tip="Delete this item" accel="*Control*d"/>
 
 		<cmd name="ContactEditorPrint"
 		 _tip="Print this item"
-		 pixtype="pixbuf" accel="*Control*p"/>
+		 pixtype="stock" pixname="gtk-print" accel="*Control*p"/>
 
 <!-- Envelope printing is disabled for Evolution 1.0.
 		<cmd name="ContactEditorPrintEnvelope"
@@ -20,7 +20,7 @@
 -->
 
 		<cmd name="ContactEditorClose"
-		 pixtype="stock" pixname="Close" accel="*Control*w"/>
+		 pixtype="stock" pixname="gtk-close" accel="*Control*w"/>
 
 		<cmd name="ContactEditorSaveClose"
 		 _tip="Save the contact and close the dialog box"
@@ -81,12 +81,12 @@
 		<separator f="" name="econtactedit1"/>
 
 		<toolitem name="ContactEditorPrint" verb=""
-		_label="Print" priority="1" pixtype="pixbuf"/>
+		_label="Print" priority="1"/>
 
 		<separator f="" name="econtactedit2"/>
 
 		<toolitem name="ContactEditorDelete" verb=""
-		_label="Delete" pixtype="pixbuf" priority="1"/>
+		_label="Delete" priority="1"/>
 
 		<toolitem name="ContactEditorClose" verb=""
 		_label="Close" priority="1"/>	
Index: evolution-contact-list-editor.xml
===================================================================
RCS file: /cvs/gnome/evolution/ui/evolution-contact-list-editor.xml,v
retrieving revision 1.12
diff -p -u -r1.12 evolution-contact-list-editor.xml
--- evolution-contact-list-editor.xml	6 Jan 2004 17:50:20 -0000	1.12
+++ evolution-contact-list-editor.xml	19 May 2004 15:19:30 -0000
@@ -1,17 +1,17 @@
 <Root>
         <commands>
-		<cmd name="ContactListEditorSave" pixtype="pixbuf" accel="*Control*s"/>
-		<cmd name="ContactListEditorSaveAs" pixtype="pixbuf" accel="*Control**Shift*s"/>
+		<cmd name="ContactListEditorSave" pixtype="stock" pixname="gtk-save" accel="*Control*s"/>
+		<cmd name="ContactListEditorSaveAs" pixtype="stock" pixname="gtk-save-as" accel="*Control**Shift*s"/>
 
 		<cmd name="ContactListEditorSendAs"/>
 		<cmd name="ContactListEditorSendTo"/>
 
 		<cmd name="ContactListEditorDelete"
 		 _tip="Delete this list"
-		 pixtype="pixbuf" accel="*Control*d"/>
+		 pixtype="stock" pixname="gtk-delete" accel="*Control*d"/>
 
 		<cmd name="ContactListEditorClose"
-		 pixtype="stock" pixname="Close" accel="*Control*w"/>
+		 pixtype="stock" pixname="gtk-close" accel="*Control*w"/>
 
 		<cmd name="ContactListEditorSaveClose"
 		 _tip="Save the list and close the dialog box"
@@ -29,7 +29,7 @@
 
 			<separator/>
 
-		        <menuitem name="ContactListEditorDelete" verb="" _label="_Delete..." pixtype="pixbuf"/>
+		        <menuitem name="ContactListEditorDelete" verb="" _label="_Delete..."/>
 
 			<separator/>
 
Index: evolution-mail-global.xml
===================================================================
RCS file: /cvs/gnome/evolution/ui/evolution-mail-global.xml,v
retrieving revision 1.26
diff -p -u -r1.26 evolution-mail-global.xml
--- evolution-mail-global.xml	26 Jan 2004 22:35:19 -0000	1.26
+++ evolution-mail-global.xml	19 May 2004 15:19:30 -0000
@@ -14,7 +14,7 @@
 
     <cmd name="MailStop"
      _tip="Cancel the current mail operation"
-     pixtype="stock" pixname="Stop"/>
+     pixtype="stock" pixname="gtk-stop"/>
 
     <cmd name="ToolsFilters"
      _tip="Create or edit rules for filtering new mail"/>
Index: evolution-mail-list.xml
===================================================================
RCS file: /cvs/gnome/evolution/ui/evolution-mail-list.xml,v
retrieving revision 1.18
diff -p -u -r1.18 evolution-mail-list.xml
--- evolution-mail-list.xml	23 Jan 2004 20:24:16 -0000	1.18
+++ evolution-mail-list.xml	19 May 2004 15:19:30 -0000
@@ -4,15 +4,15 @@
 
     <cmd name="EditCut"
      _tip="Cut selected message(s) to the clipboard"
-     accel="*Control*x" pixtype="pixbuf"/>
+     accel="*Control*x" pixtype="stock" pixname="gtk-cut"/>
 
     <cmd name="EditCopy"
      _tip="Copy selected message(s) to the clipboard"
-     accel="*Control*c" pixtype="pixbuf"/>
+     accel="*Control*c" pixtype="stock" pixname="gtk-copy"/>
 
     <cmd name="EditPaste"
      _tip="Paste message(s) from the clipboard"
-     accel="*Control*v" pixtype="pixbuf"/>
+     accel="*Control*v" pixtype="stock" pixname="gtk-paste"/>
 
     <cmd name="EditInvertSelection"
      _tip="Select all and only the messages that are not currently selected"
@@ -28,7 +28,7 @@
 
     <cmd name="ChangeFolderProperties"
      _tip="Change the properties of this folder"
-     pixtype="pixbuf"/>
+     pixtype="stock" pixname="gtk-properties"/>
 
     <cmd name="FolderExpunge"
      _tip="Permanently remove all deleted messages from this folder"
Index: evolution-mail-message.xml
===================================================================
RCS file: /cvs/gnome/evolution/ui/evolution-mail-message.xml,v
retrieving revision 1.64
diff -p -u -r1.64 evolution-mail-message.xml
--- evolution-mail-message.xml	14 May 2004 18:47:03 -0000	1.64
+++ evolution-mail-message.xml	19 May 2004 15:19:30 -0000
@@ -22,7 +22,8 @@
      accel="*Control*v" pixtype="stock" pixname="gtk-paste"/>
 
     <cmd name="MailNext"
-     _tip="Display the next message"/>
+     _tip="Display the next message"
+     pixtype="stock" pixname="gtk-go-forward"/>
 
     <cmd name="MailNextFlagged"
      _tip="Display the next important message"/>
@@ -35,7 +36,8 @@
      _tip="Display the next unread thread"/>
 
     <cmd name="MailPrevious"
-     _tip="Display the previous message"/>
+     _tip="Display the previous message"
+     pixtype="stock" pixname="gtk-go-back"/>
 
     <cmd name="MailPreviousFlagged"
      _tip="Display the previous important message"/>
@@ -146,17 +148,17 @@
     <cmd name="MessageSaveAs"
      _tip="Save the message as a text file"
      accel="*Control**Alt*s"
-     pixtype="pixbuf"/>
+     pixtype="stock" pixname="gtk-save-as"/>
 
     <cmd name="MessageSearch"
      _tip="Search for text in the body of the displayed message"
      accel="*Control*s"
-     pixtype="pixbuf"/>
+     pixtype="stock" pixname="gtk-find"/>
 
     <cmd name="MessageUndelete"
      _tip="Un-delete the selected messages"
      accel="*Control*u"
-     pixtype="pixbuf"/>
+     pixtype="stock" pixname="gtk-undelete"/>
 
     <cmd name="PrintMessage"
      _tip="Print this message"
@@ -424,12 +426,10 @@
 
     <placeholder name="MailNextButtons">
       <toolitem name="MailPrevious" verb=""
-       _label="Previous"
-       pixtype="pixbuf"/>
+       _label="Previous"/>
 
       <toolitem name="MailNext" verb=""
-       _label="Next"
-       pixtype="pixbuf"/>
+       _label="Next"/>
     </placeholder>
   </dockitem>
 
Index: evolution-message-composer.xml
===================================================================
RCS file: /cvs/gnome/evolution/ui/evolution-message-composer.xml,v
retrieving revision 1.42
diff -p -u -r1.42 evolution-message-composer.xml
--- evolution-message-composer.xml	12 Jan 2004 22:23:33 -0000	1.42
+++ evolution-message-composer.xml	19 May 2004 15:19:30 -0000
@@ -2,18 +2,18 @@
 	<commands>
 
 	        <cmd name="FileOpen" _label="Open" hidden="1"
-		_tip="Open a file" pixtype="stock" pixname="Open" accel="*Control*o"/>
+		_tip="Open a file" pixtype="stock" pixname="gtk-open" accel="*Control*o"/>
 		
 	        <cmd name="FileSave" _label="Save"
-		_tip="Save the current file" pixtype="pixbuf"
+		_tip="Save the current file" pixtype="stock" pixname="gtk-save"
 		accel="*Ctrl*s"/>
 		
 	        <cmd name="FileSaveAs" _label="Save As"
 	        _tip="Save the current file with a different name"
-		pixtype="pixbuf"/>
+		pixtype="stock" pixname="gtk-save-as"/>
 		
 	        <cmd name="FileClose" _label="Close"
-		_tip="Close the current file" pixtype="stock" pixname="Close"
+		_tip="Close the current file" pixtype="stock" pixname="gtk-close"
 		accel="*Ctrl*w"/>
 		
 		<cmd name="FileSaveInFolder" _label="Save in folder..."
@@ -28,6 +28,7 @@
 		pixtype="pixbuf"/>
 		
 		<cmd name="DeleteAll" _label="_Delete all"
+		pixtype="stock" pixname="gtk-delete"
 		_tip="Delete all but signature"/>
 
 		<cmd name="FormatHtml" _label="HT_ML" _tip="Send the mail in HTML format"
Index: evolution-subscribe.xml
===================================================================
RCS file: /cvs/gnome/evolution/ui/evolution-subscribe.xml,v
retrieving revision 1.10
diff -p -u -r1.10 evolution-subscribe.xml
--- evolution-subscribe.xml	16 Jan 2002 15:36:23 -0000	1.10
+++ evolution-subscribe.xml	19 May 2004 15:19:30 -0000
@@ -3,7 +3,7 @@
     <submenu name="File" _label="_File">
 
         <menuitem name="FileCloseWin" verb=""
-        pixtype="stock" pixname="Close" _label="_Close" accel="*Control*w"/>
+        pixtype="stock" pixname="gtk-close" _label="_Close" accel="*Control*w"/>
 
     </submenu>
 
Index: evolution-tasks.xml
===================================================================
RCS file: /cvs/gnome/evolution/ui/evolution-tasks.xml,v
retrieving revision 1.34
diff -p -u -r1.34 evolution-tasks.xml
--- evolution-tasks.xml	31 Mar 2004 17:14:36 -0000	1.34
+++ evolution-tasks.xml	19 May 2004 15:19:30 -0000
@@ -60,9 +60,9 @@
 
     <separator/>
 
-    <toolitem name="Delete" _label="Delete" verb="TasksDelete"/>
-
     <toolitem name="Print" _label="Print" verb="TasksPrint"/>
+
+    <toolitem name="Delete" _label="Delete" verb="TasksDelete"/>
 
   </dockitem>
 
Index: evolution.xml
===================================================================
RCS file: /cvs/gnome/evolution/ui/evolution.xml,v
retrieving revision 1.91
diff -p -u -r1.91 evolution.xml
--- evolution.xml	19 May 2004 03:46:28 -0000	1.91
+++ evolution.xml	19 May 2004 15:19:30 -0000
@@ -5,10 +5,10 @@
       accel="*Control**Shift*w"/>
 
     <cmd name="FileClose" _label="Close" _tip="Close this window"
-      pixtype="stock" pixname="Close" accel="*Control*w"/>
+      pixtype="stock" pixname="gtk-close" accel="*Control*w"/>
 
     <cmd name="FileExit" _label="E_xit" _tip="Exit the program"
-      pixtype="stock" pixname="Quit" accel="*Control*q"/>
+      pixtype="stock" pixname="gtk-quit" accel="*Control*q"/>
 
     <cmd name="HelpSubmitBug" _label="Submit Bug Report"
       _tip="Submit a bug report using Bug Buddy"/>
@@ -20,7 +20,7 @@
     <cmd name="ForgetPasswords"
      _tip="Forget remembered passwords so you will be prompted for them again"/>
 
-    <cmd name="Settings" pixtype="pixbuf"/>
+    <cmd name="Settings" pixtype="stock" pixname="gtk-preferences"/>
 
     <cmd name="ToggleOffline" 
       _label="_Work Offline"
@@ -33,7 +33,7 @@
 
   <menu>
     <submenu name="File" _label="_File">
-      <submenu name="New" _label="_New">
+      <submenu name="New" _label="_New" pixtype="stock" pixname="gtk-new">
 	<placeholder name="ComponentItems"/>
       </submenu>
 
@@ -80,7 +80,7 @@
     </submenu>
 
     <submenu name="Tools" _label="_Tools">
-      <menuitem name="Settings" verb="" _label="_Settings..." _tip="Change Evolution's settings" pixtype="pixbuf"/>
+      <menuitem name="Settings" verb="" _label="_Settings..." _tip="Change Evolution's settings"/>
       <separator/>
       <placeholder name="ComponentPlaceholder"/>
       <menuitem name="PilotSettings" verb="" _label="Pi_lot Settings..." _tip="Set up Pilot configuration"/>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]