From b75505b2dec2fb9367b5d7556d70658b25910482 Mon Sep 17 00:00:00 2001
From: Ettore Perazzoli <ettore@src.gnome.org>
Date: Fri, 22 Feb 2002 02:22:02 +0000
Subject: Add NewComboButton and a separator.

* evolution.xml: Add NewComboButton and a separator.

* evolution-calendar.xml: remove CalendarNewAppointment and
CalendarNewTask from the toolbar.

* evolution-tasks.xml: Remove TasksNewTask button from the
toolbar.

* evolution-addressbook.xml: Remove ContactNew and ContactNewList
from the toolbar.

* evolution-mail-global.xml: Remove the MessageNew from the
toolbar.

svn path=/trunk/; revision=15787
---
 ui/ChangeLog                 | 16 ++++++++++++++++
 ui/evolution-addressbook.xml | 10 ----------
 ui/evolution-calendar.xml    |  8 --------
 ui/evolution-mail-global.xml |  4 ----
 ui/evolution-tasks.xml       |  4 ----
 ui/evolution.xml             |  2 ++
 6 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/ui/ChangeLog b/ui/ChangeLog
index 97ab15e310..1458dd01cc 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,19 @@
+2002-02-21  Ettore Perazzoli  <ettore@ximian.com>
+
+	* evolution.xml: Add NewComboButton and a separator.
+
+	* evolution-calendar.xml: remove CalendarNewAppointment and
+	CalendarNewTask from the toolbar.
+
+	* evolution-tasks.xml: Remove TasksNewTask button from the
+	toolbar.
+
+	* evolution-addressbook.xml: Remove ContactNew and ContactNewList
+	from the toolbar.
+
+	* evolution-mail-global.xml: Remove the MessageNew from the
+	toolbar.
+
 2002-02-13  Christopher James Lahey  <clahey@ximian.com>
 
 	* evolution-addressbook.xml: Added Copy to Folder and Move to
diff --git a/ui/evolution-addressbook.xml b/ui/evolution-addressbook.xml
index 97c04cba00..95bdf043e2 100644
--- a/ui/evolution-addressbook.xml
+++ b/ui/evolution-addressbook.xml
@@ -151,16 +151,6 @@
 	</menu>
 
 	<dockitem name="Toolbar">
-		<toolitem name="ContactNew" verb=""
-		_label="New Contact"
-		pixtype="pixbuf" priority="1"/>
-
-		<toolitem name="ContactNewList" verb=""
-		_label="New List"
-		pixtype="pixbuf" priority="1"/>
-
-		<separator f="" name="eadbk4"/>
-
 		<toolitem name="ContactsPrint" verb=""
 		_label="Print" pixtype="pixbuf"/>
 
diff --git a/ui/evolution-calendar.xml b/ui/evolution-calendar.xml
index 361953c787..175b388f05 100644
--- a/ui/evolution-calendar.xml
+++ b/ui/evolution-calendar.xml
@@ -103,14 +103,6 @@
 
   <dockitem name="Toolbar">
   
-    <toolitem name="New" verb="CalendarNewAppointment" _label="New Appointment"
-	      priority="1" pixtype="pixbuf"/>
-
-    <toolitem name="NewTask" verb="CalendarNewTask" _label="New Task"
-	      priority="1" pixtype="pixbuf"/>
-
-    <separator f="" name="ecal1"/>
-
     <toolitem name="Print" verb="CalendarPrint" pixtype = "pixbuf"/>
     <toolitem name="Delete" verb="" pixtype="pixbuf"/>
 
diff --git a/ui/evolution-mail-global.xml b/ui/evolution-mail-global.xml
index 5dfb19e789..90589de162 100644
--- a/ui/evolution-mail-global.xml
+++ b/ui/evolution-mail-global.xml
@@ -120,10 +120,6 @@
 
   <dockitem name="Toolbar">
 
-     <toolitem name="MailCompose" verb=""
-     _label="New Message" priority="1"
-     pixtype="pixbuf"/>
-
     <toolitem name="MailGetSend" verb=""
      _label="Send / Receive" priority="1"
      pixtype="pixbuf"/>
diff --git a/ui/evolution-tasks.xml b/ui/evolution-tasks.xml
index 5fdb80c51b..8aea207c62 100644
--- a/ui/evolution-tasks.xml
+++ b/ui/evolution-tasks.xml
@@ -62,10 +62,6 @@
   </menu>
 
   <dockitem name="Toolbar">
-    <toolitem name="New" _label="New Task" verb="TasksNewTask" priority="1" pixtype="pixbuf"/>
-
-    <separator/>
-
     <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"/>
diff --git a/ui/evolution.xml b/ui/evolution.xml
index 255c3874e0..7bd5a849a8 100644
--- a/ui/evolution.xml
+++ b/ui/evolution.xml
@@ -174,6 +174,8 @@
 	    vlook="icon">
 
     <control name="NewComboButton"/>
+    <separator f="" name="eshell4"/>
+
   </dockitem>
 
   <popups>
-- 
cgit