From fce12a88e89677023d0b4a0c4dcadb738f3e91a8 Mon Sep 17 00:00:00 2001
From: Ettore Perazzoli <ettore@src.gnome.org>
Date: Thu, 25 Jan 2001 22:27:56 +0000
Subject: Change the toolbars to only display some labels, on the right of the
 icons.

svn path=/trunk/; revision=7826
---
 ui/evolution-addressbook.xml |  6 +++---
 ui/evolution-calendar.xml    |  6 +++---
 ui/evolution-mail.xml        | 27 +++++----------------------
 ui/evolution-tasks.xml       |  2 +-
 ui/evolution.xml             |  2 +-
 5 files changed, 13 insertions(+), 30 deletions(-)

(limited to 'ui')

diff --git a/ui/evolution-addressbook.xml b/ui/evolution-addressbook.xml
index dfa75e5d53..927c6a79ff 100644
--- a/ui/evolution-addressbook.xml
+++ b/ui/evolution-addressbook.xml
@@ -42,9 +42,9 @@
 	</menu>
 
 	<dockitem name="Toolbar">
-		<toolitem name="New" _label="New"
-		_tip="Create a new contact" verb="ContactNew"
-		pixtype="stock" pixname="New"/>
+		<toolitem name="New" _label="New contact"
+		_tip="Create new contact" verb="ContactNew"
+		pixtype="stock" pixname="New" priority="1"/>
 
 		<separator/>
 
diff --git a/ui/evolution-calendar.xml b/ui/evolution-calendar.xml
index 6d3be66151..997ab31fd4 100644
--- a/ui/evolution-calendar.xml
+++ b/ui/evolution-calendar.xml
@@ -52,8 +52,8 @@
 	</menu>
 
 	<dockitem name="Toolbar">
-		<toolitem name="New" _label="New"
-		_tip="Create a new appointment" verb="EditNewAppointment"
+		<toolitem name="New" _label="New appointment"
+		priority="1" _tip="Create a new appointment" verb="EditNewAppointment"
 		pixtype="stock" pixname="New"/>
 
 		<separator/>
@@ -78,7 +78,7 @@
 
 		<separator/>
 
-		<toolitem name="Goto" _label="Go to"
+		<toolitem name="Goto" _label="Go to" priority="1"
 		_tip="Go to a specific date" verb="CalendarGoto"
 		pixtype="stock" pixname="Jump To"/>
 		
diff --git a/ui/evolution-mail.xml b/ui/evolution-mail.xml
index e17314f863..ea71175a26 100644
--- a/ui/evolution-mail.xml
+++ b/ui/evolution-mail.xml
@@ -208,25 +208,25 @@
   <dockitem name="Toolbar">
 
     <toolitem name="MailGet" verb=""
-    _label="Get Mail" _tip="Send queued mail and retrieve new mail"
+    _label="Get Mail" priority="1" _tip="Send queued mail and retrieve new mail"
     pixtype="pixbuf"/>
 
     <toolitem name="MailCompose" verb=""
-    _label="Compose" _tip="Compose a new message"
+    _label="Compose" priority="1" _tip="Compose a new message"
     pixtype="pixbuf"/>
 
     <separator/>
 
     <toolitem name="Reply" verb="MessageReplySndr"
-    _label="Reply" _tip="Reply to the sender of this message"
+    _label="Reply" priority="1" _tip="Reply to the sender of this message"
     pixtype="pixbuf"/>
 
     <toolitem name="ReplyAll" verb="MessageReplyAll"
-    _label="Reply to All" _tip="Reply to all recipients of this message"
+    _label="Reply to All" priority="1" _tip="Reply to all recipients of this message"
     pixtype="pixbuf"/>
 
     <toolitem name="Forward" verb="MessageForwardAttached"
-    _label="Forward" _tip="Forward this message"
+    _label="Forward" priority="1" _tip="Forward this message"
     pixtype="pixbuf"/>
 
     <separator/>
@@ -253,14 +253,6 @@
     _label="Stop"
     pixtype="stock" pixname="Stop"/>
 
-    <toolitem name="Previous" verb="MailPrevious"
-    _label="Previous"
-    pixtype="stock" pixname="Back"/>
-
-    <toolitem name="Next" verb="MailNext"
-    _label="Next"
-    pixtype="stock" pixname="Forward"/>
-
   </dockitem>
 </Root>
 
@@ -269,12 +261,3 @@
 
 
 
-
-
-
-
-
-
-
-
-
diff --git a/ui/evolution-tasks.xml b/ui/evolution-tasks.xml
index fd86f0428a..eaf8135645 100644
--- a/ui/evolution-tasks.xml
+++ b/ui/evolution-tasks.xml
@@ -39,7 +39,7 @@
 
 	<dockitem name="Toolbar">
 		<toolitem name="New" _label="New"
-		_tip="Create a new task" verb="TasksNewTask"
+		priority="1" _tip="Create a new task" verb="TasksNewTask"
 		pixtype="stock" pixname="New"/>
 
 		<separator/>
diff --git a/ui/evolution.xml b/ui/evolution.xml
index f5eeb24e42..03994309b4 100644
--- a/ui/evolution.xml
+++ b/ui/evolution.xml
@@ -143,7 +143,7 @@
 	</menu>
 
 	<dockitem name="Toolbar" relief="none" behavior="exclusive"
-	 _tip="Main toolbar"/>
+	 _tip="Main toolbar" look="text"/>
 
 	<status>
 		<item name="main"/>
-- 
cgit v1.2.3