Blessed by Ettore.

Guided by Jacub Stener's mail, where he explaned which icons were renamed or
added, I added a bunch of new icons to menus, fixed renamed ones. Changed Trash
and Executive summary folder type icons. Fixed art/Makefile.am for these
changes.

Also, pulled icon cache from mailer and moved it to e-util/e-gui-utils.h, made
all components and dialogs use cache and not load pixmaps every time.

Accidentally got a couple of includes fix in, but they won't break anything.

svn path=/trunk/; revision=9092

6 files changed, 28 insertions, 27 deletions

diff --git a/ui/ChangeLog b/ui/ChangeLog
index e5e43744d8..27d40aeade 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,9 @@
+2001-04-01  Gediminas Paulauskas <menesis@delfi.lt>
+
+	* evolution-addressbook.xml, evolution-calendar.xml, evolution-mail.xml,
+	evolution-tasks.xml, evolution.xml: as Jacub suggested, added some icons,
+	replaced stock Print with ours, etc.
+
 2001-03-29  Not Zed  <NotZed@Ximian.com>
 
 	* evolution-mail.xml: Move the 'hide deleted' to the option list
diff --git a/ui/evolution-addressbook.xml b/ui/evolution-addressbook.xml
index 2f6f111566..1547e62f33 100644
--- a/ui/evolution-addressbook.xml
+++ b/ui/evolution-addressbook.xml
@@ -8,7 +8,7 @@
 	                        	<menuitem name="New"
 	                        	 _label="_Contact"
 	                                 verb="ContactNew"
-					 pixtype="stock" pixname="New"
+					 pixtype="pixbuf"
 					 accel="*Control*n"/>
 	                                <separator/>
 	                        </placeholder>
diff --git a/ui/evolution-calendar.xml b/ui/evolution-calendar.xml
index adf8b3cf9d..680d03f92c 100644
--- a/ui/evolution-calendar.xml
+++ b/ui/evolution-calendar.xml
@@ -32,7 +32,8 @@
 
 	                        <placeholder name="NewFirstItem">
 					<menuitem name="CalendarNew" verb="EditNewAppointment"
-					_label="_Appointment" accel="*Control*n"/>
+					_label="_Appointment" accel="*Control*n"
+					 pixtype="pixbuf"/>
 	                        </placeholder>
 			</submenu>
 
@@ -49,12 +50,12 @@
 			<placeholder name="Print">
 	                        <menuitem name="Print Preview" verb="CalendarPrintPreview"
                                 _label="Print Preview"
-		    	        _tip="Previews the message to be printed"/>
+		    	        _tip="Previews the calendar to be printed"
+				pixtype="pixbuf"/>
 	  
 				<menuitem name="Print" verb="CalendarPrint"
 				_label="_Print..." _tip="Print calendar"
-	                        pixtype="stock" pixname="Print"/>
-	                        accel="*Control*p"/>
+	                        accel="*Control*p" pixtype="pixbuf"/>
 			</placeholder>
 
 		</submenu>
@@ -86,13 +87,13 @@
                 <submenu name="Tools" _label="_Tools">
                 	<placeholder name="Component">
 				<menuitem name="CalendarPreferences" verb=""
-			 	_label="Settings..."/>
+			 	_label="Settings..." pixtype="pixbuf"/>
 	                </placeholder>
 		</submenu>
 
                 <submenu name="Actions">
                         <placeholder name="Component">
-	                        <menuitem verb="EditNewAppointment"/>
+	                        <menuitem name="CalendarNew" verb="EditNewAppointment"/>
 	                        <menuitem verb="EditNewEvent"/>
 	                </placeholder>
                 </submenu>
diff --git a/ui/evolution-mail.xml b/ui/evolution-mail.xml
index 0b4a8adce3..e894971911 100644
--- a/ui/evolution-mail.xml
+++ b/ui/evolution-mail.xml
@@ -34,7 +34,8 @@
         <submenu name="New">
     	    <placeholder name="NewFirstItem">
     		 <menuitem name="MessageNew" verb="MailCompose"
-    		 accel="*Control*n" _label="_Mail Message"/>
+    		 accel="*Control*n" _label="_Mail Message"
+		 pixtype="pixbuf"/>
     		 <separator/>
     	    </placeholder>
         </submenu>
@@ -73,7 +74,7 @@
     	    <menuitem name="Print" verb="PrintMessage"
     	    _label="Print..."
     	    _tip="Print message to the printer"
-    	    pixtype="stock" pixname="Print" accel="*Control*P"/>
+    	    pixtype="pixbuf" accel="*Control*P"/>
     
 	</placeholder>
 
@@ -139,7 +140,7 @@
     <submenu name="Actions">
         <placeholder name="Component">
       	    <menuitem name="SendReceive" verb="MailGetSend"
-      	     _label="_Send / Receive"/>
+      	     _label="_Send / Receive"pixtype="pixbuf"/>
       	    
       	    <separator/>
       	    
diff --git a/ui/evolution-tasks.xml b/ui/evolution-tasks.xml
index ff41ec6a91..c0cbe55166 100644
--- a/ui/evolution-tasks.xml
+++ b/ui/evolution-tasks.xml
@@ -13,7 +13,8 @@
 	  				<menuitem name="NewTask"
 	  				verb="TasksNewTask"
 					_label="_Task"
-	                                accel="*Control*n"/>
+	                                accel="*Control*n"
+					pixtype="pixbuf"/>
 	                        </placeholder>
 	                </submenu>
       
diff --git a/ui/evolution.xml b/ui/evolution.xml
index 7af5a7118a..401ae2f927 100644
--- a/ui/evolution.xml
+++ b/ui/evolution.xml
@@ -39,7 +39,8 @@
 
 				<menuitem name="Folder" verb="NewFolder"
 				_label="_Folder"
-				accel="*Control**Shift*e"/>
+				accel="*Control**Shift*e"
+				pixtype="pixbuf"/>
 
 				<menuitem name="Shortcut" verb="NewBarShortcut"
 				_label="Evolution bar _shortcut"
@@ -73,7 +74,8 @@
 	                <submenu name="Folder" _label="_Folder">
 				<menuitem name="Folder" verb="NewFolder"
 				_label="_New Folder"
-				accel="*Control**Shift*e"/>
+				accel="*Control**Shift*e"
+				pixtype="pixbuf"/>
 	                </submenu>
 	  
 			<menuitem name="FileGoToFolder" verb=""
@@ -84,14 +86,16 @@
 	
 			<menuitem name="FileImporter" verb=""
 			_label="_Import file..."
-			_tip="Import an external file format" accel="*Control*i"/>
+			_tip="Import an external file format" accel="*Control*i"
+			pixtype="pixbuf"/>
 
 			<placeholder name="Print" delimit="top"/>
 
 			<separator/>
 
 	                <menuitem name="WorkOffLine" verb=""
-	                _label="Work Offline"/>
+	                _label="Work Offline"
+			pixtype="pixbuf"/>
 	      
 			<menuitem name="FileClose" verb=""
 			_label="_Close"/>
@@ -165,15 +169,3 @@
 		<control name="Progress"/>
 	</status>
 </Root>
-
-
-
-
-
-
-
-
-
-
-
-