Fixes #45524

2003-07-01  Rodrigo Moya <rodrigo@ximian.com>

	Fixes #45524

	* evolution-tasks.xml:
	* evolution-calendar.xml: use stock icons where appropriate.

svn path=/trunk/; revision=21714

3 files changed, 54 insertions, 50 deletions

diff --git a/ui/ChangeLog b/ui/ChangeLog
index 2374e05399..e729e4e5a8 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,6 +1,13 @@
+2003-07-01  Rodrigo Moya <rodrigo@ximian.com>
+
+	Fixes #45524
+
+	* evolution-tasks.xml:
+	* evolution-calendar.xml: use stock icons where appropriate.
+
 2003-06-25  Bolian Yin <bolian.yin@sun.com>
 
 	Fixes #45423
 
 	* evolution-calendar.xml: added keyboard shortcuts for "Go to today"
-	and "Go to date" menu/toolbar items.
\ No newline at end of file
+	and "Go to date" menu/toolbar items.
diff --git a/ui/evolution-calendar.xml b/ui/evolution-calendar.xml
index a34e4663f2..10e21941dd 100644
--- a/ui/evolution-calendar.xml
+++ b/ui/evolution-calendar.xml
@@ -1,26 +1,26 @@
 <Root>
   <commands>
-    <cmd name="CalendarPrint" _tip="Print this calendar" pixtype="pixbuf" 
+    <cmd name="CalendarPrint" _tip="Print this calendar" pixtype="stock" pixname="gtk-print"
 	 accel="*Control*p"/>
-    <cmd name="CalendarPrintPreview" _tip="Previews the calendar to be printed" pixtype="pixbuf"/>
+    <cmd name="CalendarPrintPreview" _tip="Previews the calendar to be printed" pixtype="stock" pixname="gtk-print-preview"/>
 
-    <cmd name="CalendarPrev" _tip="Go back" pixtype="pixbuf"/>
+    <cmd name="CalendarPrev" _tip="Go back" pixtype="stock" pixname="gtk-go-back"/>
     <cmd name="CalendarToday" _tip="Go to today" pixtype="stock" pixname="Home"/>
-    <cmd name="CalendarNext" _tip="Go forward" pixtype="pixbuf"/>
-    <cmd name="CalendarGoto" _tip="Go to a specific date"/>
+    <cmd name="CalendarNext" _tip="Go forward" pixtype="stock" pixname="gtk-go-forward"/>
+    <cmd name="CalendarGoto" _tip="Go to a specific date" pixtype="stock" pixname="gtk-jump-to"/>
 
     <cmd name="ShowDayView" _tip="Show one day" pixtype="pixbuf"/>
     <cmd name="ShowWorkWeekView" _tip="Show the working week" pixtype="pixbuf"/>
     <cmd name="ShowWeekView" _tip="Show one week" pixtype="pixbuf"/>
     <cmd name="ShowMonthView" _tip="Show one month" pixtype="pixbuf"/>
 
-    <cmd name="Cut" _tip="Cut the selection" accel="*Control*x"/>
-    <cmd name="Copy" _tip="Copy the selection" accel="*Control*c"/>
-    <cmd name="Paste" _tip="Paste the clipboard" accel="*Control*v"/>
+    <cmd name="Cut" _tip="Cut the selection" accel="*Control*x" pixtype="stock" pixname="gtk-cut"/>
+    <cmd name="Copy" _tip="Copy the selection" accel="*Control*c" pixtype="stock" pixname="gtk-copy"/>
+    <cmd name="Paste" _tip="Paste the clipboard" accel="*Control*v" pixtype="stock" pixname="gtk-paste"/>
 
-    <cmd name="Delete" _tip="Delete the appointment" accel="*Control*d"/>
-    <cmd name="DeleteOccurrence" _tip="Delete this occurrence"/>
-    <cmd name="DeleteAllOccurrences" _tip="Delete All Occurrences"/>
+    <cmd name="Delete" _tip="Delete the appointment" accel="*Control*d" pixtype="stock" pixname="gtk-delete"/>
+    <cmd name="DeleteOccurrence" _tip="Delete this occurrence" pixtype="stock" pixname="gtk-delete"/>
+    <cmd name="DeleteAllOccurrences" _tip="Delete All Occurrences" pixtype="stock" pixname="gtk-delete"/>
 
     <cmd name="PublishFreeBusy" _tip="Publish Free/Busy information for this calendar"/>
   </commands>
@@ -30,25 +30,25 @@
 
       <placeholder name="Print">
 	<menuitem name="PrintPreview" verb="CalendarPrintPreview"
-		  _label="Print Pre_view" pixtype="pixbuf"/>
+		  _label="Print Pre_view"/>
 
 	<menuitem name="Print" verb="CalendarPrint" accel="*Control*p"
-		  _label="_Print..." pixtype="pixbuf"/>
+		  _label="_Print..."/>
       </placeholder>
 
     </submenu>
 
     <placeholder name="EditPlaceholder">
       <submenu name="Edit" _label="_Edit">
-      	<menuitem name="Cut" verb="" _label="C_ut" pixtype="pixbuf"/>
-      	<menuitem name="Copy" verb="" _label="_Copy" pixtype="pixbuf"/>
-      	<menuitem name="Paste" verb="" _label="_Paste" pixtype="pixbuf"/>
+      	<menuitem name="Cut" verb="" _label="C_ut"/>
+      	<menuitem name="Copy" verb="" _label="_Copy"/>
+      	<menuitem name="Paste" verb="" _label="_Paste"/>
 
       	<separator/>
 
-      	<menuitem name="Delete" verb="" _label="_Delete" pixtype="pixbuf"/>
-	<menuitem name="DeleteOccurrence" verb="" _label="Delete this Occurrence" pixtype="pixbuf"/>
-	<menuitem name="DeleteAllOccurrences" verb="" _label="Delete All Occurrences" pixtype="pixbuf"/>
+      	<menuitem name="Delete" verb="" _label="_Delete"/>
+	<menuitem name="DeleteOccurrence" verb="" _label="Delete this Occurrence"/>
+	<menuitem name="DeleteAllOccurrences" verb="" _label="Delete All Occurrences"/>
       </submenu>
     </placeholder>
 
@@ -56,8 +56,7 @@
       <placeholder name="ViewBegin">
 	<menuitem name="Today" verb="CalendarToday" _label="Go to _Today"
                   accel="*Control**Alt*t"/>
-	<menuitem name="Goto" verb="CalendarGoto" _label="Go to _Date"
-                  pixtype="pixbuf" accel="*Control**Alt*g"/>
+	<menuitem name="Goto" verb="CalendarGoto" _label="Go to _Date" accel="*Control**Alt*g"/>
 	<separator f="" name="ecal"/>
       </placeholder>
 
@@ -72,18 +71,18 @@
 
   <dockitem name="Toolbar">
   
-    <toolitem name="Print" verb="CalendarPrint" pixtype = "pixbuf"/>
-    <toolitem name="Delete" verb="" pixtype="pixbuf"/>
+    <toolitem name="Print" verb="CalendarPrint"/>
+    <toolitem name="Delete" verb=""/>
 
     <separator f="" name="ecal2"/>
 
-    <toolitem name="Prev" verb="CalendarPrev" pixtype="pixbuf"/>
+    <toolitem name="Prev" verb="CalendarPrev"/>
     <toolitem name="Today" verb="CalendarToday"/>
-    <toolitem name="Next" verb="CalendarNext" pixtype="pixbuf"/>
+    <toolitem name="Next" verb="CalendarNext"/>
 
     <separator f="" name="ecal3"/>
 
-    <toolitem name="Goto" verb="CalendarGoto" _label="Go To" priority="1" pixtype="pixbuf"/>
+    <toolitem name="Goto" verb="CalendarGoto" _label="Go To" priority="1"/>
 
     <separator f="" name="ecal4"/>
 
diff --git a/ui/evolution-tasks.xml b/ui/evolution-tasks.xml
index c7fa81f0c6..1fb255a330 100644
--- a/ui/evolution-tasks.xml
+++ b/ui/evolution-tasks.xml
@@ -1,40 +1,38 @@
 <Root>
   <commands>
-    <cmd name="TasksPrint" _tip="Print the list of tasks" pixtype="pixbuf" 
+    <cmd name="TasksPrint" _tip="Print the list of tasks" pixtype="stock" pixname="gtk-print"
 	 accel="*Control*p"/>
-    <cmd name="TasksPrintPreview" _tip="Previews the list of tasks to be printed" pixtype="pixbuf"/>
+    <cmd name="TasksPrintPreview" _tip="Previews the list of tasks to be printed" pixtype="stock" pixname="gtk-print-preview"/>
 
-    <cmd name="TasksCut" _tip="Cut selected task" accel="*Control*x"/>
-    <cmd name="TasksCopy" _tip="Copy selected task" accel="*Control*c"/>
-    <cmd name="TasksPaste" _tip="Paste task from the clipboard" accel="*Control*v"/>
-    <cmd name="TasksDelete" _tip="Delete selected tasks" accel="*Control*d" sensitive="0"/>
-    <cmd name="TasksMarkComplete" _tip="Delete selected tasks" accel="*Control*k" sensitive="0"/>
+    <cmd name="TasksCut" _tip="Cut selected task" accel="*Control*x" pixtype="stock" pixname="gtk-cut"/>
+    <cmd name="TasksCopy" _tip="Copy selected task" accel="*Control*c" pixtype="stock" pixname="gtk-copy"/>
+    <cmd name="TasksPaste" _tip="Paste task from the clipboard" accel="*Control*v" pixtype="stock" pixname="gtk-paste"/>
+    <cmd name="TasksDelete" _tip="Delete selected tasks" accel="*Control*d" sensitive="0"
+         pixtype="stock" pixname="gtk-delete"/>
+    <cmd name="TasksMarkComplete" _tip="Mark selected tasks as complete" accel="*Control*k" sensitive="0"/>
 
-    <cmd name="TasksExpunge" _label="_Expunge" _tip="Delete completed tasks" 
-         accel="*Control*e"/>
+    <cmd name="TasksExpunge" _label="_Expunge" _tip="Delete completed tasks" accel="*Control*e"/>
   </commands>
   
   <menu>
     <submenu name="File">
       <placeholder name="Print">
-	<menuitem name="PrintPreview" verb="TasksPrintPreview"
-		  _label="Print Pre_view" pixtype="pixbuf"/>
+	<menuitem name="PrintPreview" verb="TasksPrintPreview" _label="Print Pre_view"/>
 
-	<menuitem name="Print" verb="TasksPrint" accel="*Control*p"
-		  _label="_Print..." pixtype="pixbuf"/>
+	<menuitem name="Print" verb="TasksPrint" accel="*Control*p" _label="_Print..."/>
       </placeholder>
 
     </submenu>
 
     <placeholder name="EditPlaceholder">
       <submenu name="Edit" _label="_Edit">
-	<menuitem name="TasksCut" verb="" _label="C_ut" pixtype="pixbuf"/>
-	<menuitem name="TasksCopy" verb="" _label="_Copy" pixtype="pixbuf"/>
-	<menuitem name="TasksPaste" verb="" _label="_Paste" pixtype="pixbuf"/>
+	<menuitem name="TasksCut" verb="" _label="C_ut"/>
+	<menuitem name="TasksCopy" verb="" _label="_Copy"/>
+	<menuitem name="TasksPaste" verb="" _label="_Paste"/>
 
 	<separator/>
 
-	<menuitem name="TasksDelete" verb="" _label="_Delete" pixtype="pixbuf"/>
+	<menuitem name="TasksDelete" verb="" _label="_Delete"/>
 
 	<separator/>
 
@@ -44,22 +42,22 @@
 
     <submenu name="Actions" _label="_Actions">
       <placeholder name="ComponentActionsPlaceholder">
-	<menuitem name="TasksExpunge" verb="" pixtype="pixbuf"/>
+	<menuitem name="TasksExpunge" verb=""/>
       </placeholder>
     </submenu>
 
   </menu>
 
   <dockitem name="Toolbar">
-    <toolitem name="Cut" _label="Cut" verb="TasksCut" pixtype="pixbuf"/>
-    <toolitem name="Copy" _label="Copy" verb="TasksCopy" pixtype="pixbuf"/>
-    <toolitem name="Paste" _label="Paste" verb="TasksPaste" pixtype="pixbuf"/>
+    <toolitem name="Cut" _label="Cut" verb="TasksCut"/>
+    <toolitem name="Copy" _label="Copy" verb="TasksCopy"/>
+    <toolitem name="Paste" _label="Paste" verb="TasksPaste"/>
 
     <separator/>
 
-    <toolitem name="Delete" verb="TasksDelete" pixtype="pixbuf"/>
+    <toolitem name="Delete" verb="TasksDelete"/>
 
-    <toolitem name="Print" verb="TasksPrint" pixtype = "pixbuf"/>
+    <toolitem name="Print" verb="TasksPrint"/>
 
   </dockitem>