From 8c9ee34262ef869ba257b36935f35c26866936f6 Mon Sep 17 00:00:00 2001
From: Damon Chaplin <damon@ximian.com>
Date: Sun, 19 Aug 2001 02:41:14 +0000
Subject: used the new Cut/Copy/Paste icons. Removed the Save As/Print/Print
 Preview

2001-08-18  Damon Chaplin  <damon@ximian.com>

	* evolution-tasks.xml: used the new Cut/Copy/Paste icons.
	Removed the Save As/Print/Print Preview commands as they do nothing.

	* evolution-comp-editor.xml: used the new Save/Save As icons.

	* evolution-calendar.xml: used the new Cut/Copy/Paste icons.

svn path=/trunk/; revision=12213
---
 ui/ChangeLog                 |  9 +++++++++
 ui/evolution-calendar.xml    | 15 ++++++---------
 ui/evolution-comp-editor.xml | 14 +++++++-------
 ui/evolution-tasks.xml       | 40 ++++++----------------------------------
 4 files changed, 28 insertions(+), 50 deletions(-)

(limited to 'ui')

diff --git a/ui/ChangeLog b/ui/ChangeLog
index b90e922178..5f4dab35ab 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,12 @@
+2001-08-18  Damon Chaplin  <damon@ximian.com>
+
+	* evolution-tasks.xml: used the new Cut/Copy/Paste icons.
+	Removed the Save As/Print/Print Preview commands as they do nothing.
+
+	* evolution-comp-editor.xml: used the new Save/Save As icons.
+
+	* evolution-calendar.xml: used the new Cut/Copy/Paste icons.
+
 2001-08-18  Ettore Perazzoli  <ettore@ximian.com>
 
 	* evolution-addressbook.xml: Set the pixtype for
diff --git a/ui/evolution-calendar.xml b/ui/evolution-calendar.xml
index 0527d71c3f..2dccc968bd 100644
--- a/ui/evolution-calendar.xml
+++ b/ui/evolution-calendar.xml
@@ -19,12 +19,9 @@
     <cmd name="ShowWeekView" _tip="Show one week" pixtype="pixbuf"/>
     <cmd name="ShowMonthView" _tip="Show one month" pixtype="pixbuf"/>
 
-    <cmd name="CutEvent" _tip="Cut the selection" pixtype="stock"
-	 pixname="Cut" accel="*Control*x"/>
-    <cmd name="CopyEvent" _tip="Copy the selection" pixtype="stock" 
-	 pixname="Copy" accel="*Control*c"/>
-    <cmd name="PasteEvent" _tip="Paste the clipboard" pixtype="stock" 
-	 pixname="Paste" accel="*Control*v"/>
+    <cmd name="CutEvent" _tip="Cut the selection" accel="*Control*x"/>
+    <cmd name="CopyEvent" _tip="Copy the selection" accel="*Control*c"/>
+    <cmd name="PasteEvent" _tip="Paste the clipboard" accel="*Control*v"/>
 
     <cmd name="PublishFreeBusy" _tip="Publish Free/Busy information for this calendar"/>
   </commands>
@@ -55,9 +52,9 @@
     </submenu>
 
     <submenu name="Edit">
-      <menuitem name="CutEvent" verb="" _label="C_ut"/>
-      <menuitem name="CopyEvent" verb="" _label="_Copy"/>
-      <menuitem name="PasteEvent" verb="" _label="_Paste"/>
+      <menuitem name="CutEvent" verb="" _label="C_ut" pixtype="pixbuf"/>
+      <menuitem name="CopyEvent" verb="" _label="_Copy" pixtype="pixbuf"/>
+      <menuitem name="PasteEvent" verb="" _label="_Paste" pixtype="pixbuf"/>
     </submenu>
 
     <submenu name="View">
diff --git a/ui/evolution-comp-editor.xml b/ui/evolution-comp-editor.xml
index 011f0418b5..f8562a7f98 100644
--- a/ui/evolution-comp-editor.xml
+++ b/ui/evolution-comp-editor.xml
@@ -13,15 +13,15 @@
 
         <cmd name="FileSave" _label="Save"
 	_tip="Save the item and close the dialog box"
-	pixtype="stock" pixname="Save" accel="*Control*s"/>
+	accel="*Control*s"/>
 
         <cmd name="FileSaveAndClose" _label="Save and Close"
 	_tip="Save the item and close the dialog box"
-	pixtype="stock" pixname="Save" accel="*Control*s"/>
+	accel="*Control*s"/>
 
         <cmd name="FileSaveAs" _label="Save As..."
 	_tip="Save this item to disk"
-        pixtype="stock" pixname="Save" accel="*Control*Alt*s"/>
+        accel="*Control*Alt*s"/>
 
 	<cmd name="FileDelete" _label="Delete"
 	_tip="Delete this item"
@@ -37,11 +37,11 @@
 
 <submenu name="File" _label="_File">
 
-        <menuitem name="FileSave" verb=""/>
+        <menuitem name="FileSave" verb="" pixtype="pixbuf"/>
 
-        <menuitem name="FileSaveAndClose" verb=""/>
+        <menuitem name="FileSaveAndClose" verb="" pixtype="pixbuf"/>
 
-        <menuitem name="FileSaveAs" verb=""/>
+        <menuitem name="FileSaveAs" verb="" pixtype="pixbuf"/>
 
 	<separator/>
 
@@ -72,7 +72,7 @@
 <dockitem name="Toolbar"relief="none" behavior="exclusive"
  _tip="Main toolbar" hlook="text" vlook="icon">
 
-        <toolitem name="FileSaveAndClose" verb="" _label="Save and Close" priority="1"/>
+        <toolitem name="FileSaveAndClose" verb="" _label="Save and Close" priority="1" pixtype="pixbuf"/>
 
 	<separator/>
         
diff --git a/ui/evolution-tasks.xml b/ui/evolution-tasks.xml
index c2d0c94eba..61070f0c65 100644
--- a/ui/evolution-tasks.xml
+++ b/ui/evolution-tasks.xml
@@ -7,11 +7,11 @@
 		 _tip="Delete selected tasks" verb="TasksDelete"
 		 accel="Delete" sensitive="0"/>
 
-		<cmd name="TasksCut" pixtype="stock" pixname="Cut"
+		<cmd name="TasksCut"
 		 _tip="Cut selected task" verb="TasksCut" accel="*Control*x"/>
-		<cmd name="TasksCopy" pixtype="stock" pixname="Copy"
+		<cmd name="TasksCopy"
 		 _tip="Copy selected task" verb="TasksCopy" accel="*Control*c"/>
-		<cmd name="TasksPaste" pixtype="stock" pixname="Paste"
+		<cmd name="TasksPaste"
 		 _tip="Paste task from the clipboard" verb="TasksPaste" accel="*Control*v"/>
 
 		<cmd name="TasksSettings" _tip="Configure the task view's settings"/>
@@ -30,35 +30,13 @@
 	                        </placeholder>
 	                </submenu>
       
-			<placeholder name="FileOps">
-				
-				<menuitem name="TasksSaveAs" verb=""
-				_label="_Save As..."
-				_tip="Save task as something else"
-                                accel="*Control*a"/>
-
-			</placeholder>
-
-			<placeholder name="Print">
-
-				<menuitem name="Print Preview" verb="TasksPrintPreview"
-				_label="Print Pre_view"
-				pixtype="pixbuf"/>
-
-				<menuitem name="Print" verb="TasksPrint"
-				_label="_Print Task..."
-				pixtype="pixbuf"
-				accel="*Control*p"/>
-				
-			</placeholder>
-
 		</submenu>
 
 		<submenu name="Edit">
 
-			<menuitem name="Cut" verb="TasksCut" _label="C_ut"/>
-			<menuitem name="Copy" verb="TasksCopy" _label="_Copy"/>
-			<menuitem name="Paste" verb="TasksPaste" _label="_Paste"/>
+			<menuitem name="Cut" verb="TasksCut" _label="C_ut" pixtype="pixbuf"/>
+			<menuitem name="Copy" verb="TasksCopy" _label="_Copy" pixtype="pixbuf"/>
+			<menuitem name="Paste" verb="TasksPaste" _label="_Paste" pixtype="pixbuf"/>
 			<menuitem name="Delete" verb="TasksDelete"
 			_label="_Delete"/>
 
@@ -79,12 +57,6 @@
 
 	  	<separator/>
 
-		<toolitem name="Print" _label="Print"
-		_tip="Print" verb="TasksPrint"
-		pixtype="pixbuf"/>
-
-		<separator/>
-
 		<toolitem name="Delete" verb="TasksDelete"/>
 
 	</dockitem>
-- 
cgit v1.2.3