From ebb89b17ef6820efce8134cd0dacf9ea03f1b6f5 Mon Sep 17 00:00:00 2001
From: William Jon McCann <mccann@jhu.edu>
Date: Tue, 25 May 2004 20:54:01 +0000
Subject: use stock icons where possible. Calendar and tasks already use stock

2004-05-25  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.

svn path=/trunk/; revision=26085
---
 ui/ChangeLog                         | 16 ++++++++++++++++
 ui/evolution-addressbook.xml         | 36 +++++++++++++++++-------------------
 ui/evolution-composer-entries.xml    |  6 +++---
 ui/evolution-contact-editor.xml      | 14 +++++++-------
 ui/evolution-contact-list-editor.xml | 10 +++++-----
 ui/evolution-mail-global.xml         |  2 +-
 ui/evolution-mail-list.xml           |  8 ++++----
 ui/evolution-mail-message.xml        |  6 +++---
 ui/evolution-message-composer.xml    |  9 +++++----
 ui/evolution-subscribe.xml           |  2 +-
 ui/evolution-tasks.xml               |  4 ++--
 ui/evolution.xml                     | 10 +++++-----
 12 files changed, 69 insertions(+), 54 deletions(-)

diff --git a/ui/ChangeLog b/ui/ChangeLog
index 0f1ae51d63..f8456588e8 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,19 @@
+2004-05-25  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.
diff --git a/ui/evolution-addressbook.xml b/ui/evolution-addressbook.xml
index e806fdb429..5571ab16f6 100644
--- a/ui/evolution-addressbook.xml
+++ b/ui/evolution-addressbook.xml
@@ -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"/>
diff --git a/ui/evolution-composer-entries.xml b/ui/evolution-composer-entries.xml
index ac960952b9..9462a67210 100644
--- a/ui/evolution-composer-entries.xml
+++ b/ui/evolution-composer-entries.xml
@@ -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"
diff --git a/ui/evolution-contact-editor.xml b/ui/evolution-contact-editor.xml
index 8511080764..e98969c8da 100644
--- a/ui/evolution-contact-editor.xml
+++ b/ui/evolution-contact-editor.xml
@@ -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"/>	
diff --git a/ui/evolution-contact-list-editor.xml b/ui/evolution-contact-list-editor.xml
index 5ce79661a3..182d9d76f8 100644
--- a/ui/evolution-contact-list-editor.xml
+++ b/ui/evolution-contact-list-editor.xml
@@ -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/>
 
diff --git a/ui/evolution-mail-global.xml b/ui/evolution-mail-global.xml
index 8e2059d62b..92bf2c0c65 100644
--- a/ui/evolution-mail-global.xml
+++ b/ui/evolution-mail-global.xml
@@ -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"/>
diff --git a/ui/evolution-mail-list.xml b/ui/evolution-mail-list.xml
index 709b179d8f..e13fb781bb 100644
--- a/ui/evolution-mail-list.xml
+++ b/ui/evolution-mail-list.xml
@@ -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"
diff --git a/ui/evolution-mail-message.xml b/ui/evolution-mail-message.xml
index 45965f1faf..8c8d6f0d9a 100644
--- a/ui/evolution-mail-message.xml
+++ b/ui/evolution-mail-message.xml
@@ -146,17 +146,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"
diff --git a/ui/evolution-message-composer.xml b/ui/evolution-message-composer.xml
index 0044a7e0d3..19d4365fe7 100644
--- a/ui/evolution-message-composer.xml
+++ b/ui/evolution-message-composer.xml
@@ -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"
diff --git a/ui/evolution-subscribe.xml b/ui/evolution-subscribe.xml
index a2eb86fb60..4a423e7d36 100644
--- a/ui/evolution-subscribe.xml
+++ b/ui/evolution-subscribe.xml
@@ -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>
 
diff --git a/ui/evolution-tasks.xml b/ui/evolution-tasks.xml
index df828aa0c7..dc867069a8 100644
--- a/ui/evolution-tasks.xml
+++ b/ui/evolution-tasks.xml
@@ -60,10 +60,10 @@
 
     <separator/>
 
-    <toolitem name="Delete" _label="Delete" verb="TasksDelete"/>
-
     <toolitem name="Print" _label="Print" verb="TasksPrint"/>
 
+    <toolitem name="Delete" _label="Delete" verb="TasksDelete"/>
+
   </dockitem>
 
 </Root>
diff --git a/ui/evolution.xml b/ui/evolution.xml
index eccfe089eb..0bc4314ead 100644
--- a/ui/evolution.xml
+++ b/ui/evolution.xml
@@ -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"/>
-- 
cgit