drasticaly shrink to just the new features available with ldap; don't

2000-10-14  Michael Meeks  <michael@helixcode.com>

	* evolution-addressbook-ldap.xml: drasticaly shrink to just the
	new features available with ldap; don't duplicate stuff.

	* evolution-addressbook.xml: fix tooltips.

	* *.xml: remove redundant attributes causing toolber rebuilds.

svn path=/trunk/; revision=5919

6 files changed, 25 insertions, 82 deletions

diff --git a/ui/ChangeLog b/ui/ChangeLog
index 0849371d22..579e047af4 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,5 +1,14 @@
 2000-10-14  Michael Meeks  <michael@helixcode.com>
 
+	* evolution-addressbook-ldap.xml: drasticaly shrink to just the
+	new features available with ldap; don't duplicate stuff.
+
+	* evolution-addressbook.xml: fix tooltips.
+
+	* *.xml: remove redundant attributes causing toolber rebuilds.
+
+2000-10-14  Michael Meeks  <michael@helixcode.com>
+
 	* *.xml: add translation '_'s to some labels.
 
 2000-10-12  Damon Chaplin  <damon@helixcode.com>
diff --git a/ui/evolution-addressbook-ldap.xml b/ui/evolution-addressbook-ldap.xml
index 6429604c0e..67f887857a 100644
--- a/ui/evolution-addressbook-ldap.xml
+++ b/ui/evolution-addressbook-ldap.xml
@@ -1,39 +1,5 @@
 <Root>
-
 	<menu>
-		<submenu name="File">
-
-			<placeholder name="Print">
-
-				<menuitem name="Print" verb="ContactsPrint"
-				_label="_Print Contacts..."
-				pixtype="stock" pixname="Print"/>
-				
-			</placeholder>
-
-		</submenu>
-
-		<submenu name="View">
-
-			<menuitem name="AsTable" _label="As _Table"
-			verb="ViewAsTable"/>
-
-			<menuitem name="ViewNewContact" verb=""
-			_label="_New Contact"/>
-
-		</submenu>
-
-		<placeholder name="Component">
-
-			<submenu name="Tools" _label="_Tools">
-
-				<menuitem name="Search" verb="ToolSearch"
-				_label="_Search for contacts"
-				pixtype="stock" pixname="Search"/>
-
-			</submenu>
-
-		</placeholder>
 
 		<placeholder name="Component">
 
@@ -45,39 +11,5 @@
 			</submenu>
 
 		</placeholder>
-	</menu>
-
-	<dockitem name="Toolbar" relief="none" behavior="exclusive">
-		<toolitem name="New" _label="New"
-		_tip="Create a new contact" verb="ContactNew"
-		pixtype="stock" pixname="New"/>
-
-		<separator/>
-
-		<toolitem name="Find" _label="Find"
-		_tip="Find a contact" verb="ContactFind"
-		pixtype="stock" pixname="Search"/>
-
-		<toolitem name="Print" _label="Print"
-		_tip="Print contacts" verb="ContactsPrint"
-		pixtype="stock" pixname="Print"/>
-
-		<toolitem name="Delete" _label="Delete"
-		_tip="Delete a contact" verb="ContactDelete"
-		pixtype="stock" pixname="Trash"/>
-
-		<separator/>
-
-		<control name="QuickSearch"/>
-
-		<toolitem name="View All" _label="View All"
-		_tip="View all contacts" verb="ContactViewAll"
-		pixtype="stock" pixname="Multiple"/>
-
-		<toolitem name="Stop" _label="Stop"
-		_tip="Stop Loading" verb="ContactStop"
-		pixtype="stock" pixname="Stop"/>
-
-	</dockitem>
-
-</Root>
\ No newline at end of file
+ 	</menu>
+</Root>
diff --git a/ui/evolution-addressbook.xml b/ui/evolution-addressbook.xml
index 6799043d74..9cdeb83616 100644
--- a/ui/evolution-addressbook.xml
+++ b/ui/evolution-addressbook.xml
@@ -36,23 +36,23 @@
 		</placeholder>
 	</menu>
 
-	<dockitem name="Toolbar" relief="none" behavior="exclusive">
+	<dockitem name="Toolbar">
 		<toolitem name="New" _label="New"
-		_descr="Create a new contact" verb="ContactNew"
+		_tip="Create a new contact" verb="ContactNew"
 		pixtype="stock" pixname="New"/>
 
 		<separator/>
 
 		<toolitem name="Find" _label="Find"
-		_descr="Find a contact" verb="ContactFind"
+		_tip="Find a contact" verb="ContactFind"
 		pixtype="stock" pixname="Search"/>
 
 		<toolitem name="Print" _label="Print"
-		_descr="Print contacts" verb="ContactsPrint"
+		_tip="Print contacts" verb="ContactsPrint"
 		pixtype="stock" pixname="Print"/>
 
 		<toolitem name="Delete" _label="Delete"
-		_descr="Delete a contact" verb="ContactDelete"
+		_tip="Delete a contact" verb="ContactDelete"
 		pixtype="stock" pixname="Trash"/>
 
 		<separator/>
@@ -60,11 +60,11 @@
 		<control name="QuickSearch"/>
 
 		<toolitem name="View All" _label="View All"
-		_descr="View all contacts" verb="ContactViewAll"
+		_tip="View all contacts" verb="ContactViewAll"
 		pixtype="stock" pixname="Multiple"/>
 
 		<toolitem name="Stop" _label="Stop"
-		_descr="Stop Loading" verb="ContactStop"
+		_tip="Stop Loading" verb="ContactStop"
 		pixtype="stock" pixname="Stop"/>
 
 	</dockitem>
diff --git a/ui/evolution-calendar.xml b/ui/evolution-calendar.xml
index 65242f7fba..4e262a1e59 100644
--- a/ui/evolution-calendar.xml
+++ b/ui/evolution-calendar.xml
@@ -50,7 +50,7 @@
 		</submenu>
 	</menu>
 
-	<dockitem name="Toolbar" relief="none" behavior="exclusive">
+	<dockitem name="Toolbar">
 		<toolitem name="New" _label="New"
 		_tip="Create a new appointment" verb="EditNewAppointment"
 		pixtype="stock" pixname="New"/>
diff --git a/ui/evolution-mail.xml b/ui/evolution-mail.xml
index 95785fc127..33f88c46e2 100644
--- a/ui/evolution-mail.xml
+++ b/ui/evolution-mail.xml
@@ -149,7 +149,7 @@
     </placeholder>
   </menu>
 
-  <dockitem name="Toolbar" relief="none" behavior="exclusive">
+  <dockitem name="Toolbar">
 
     <toolitem name="MailGet" verb=""
     _label="Get Mail" _tip="Send queued mail and retrieve new mail"
diff --git a/ui/evolution.xml b/ui/evolution.xml
index 65fd73f8b4..01e88fda4a 100644
--- a/ui/evolution.xml
+++ b/ui/evolution.xml
@@ -23,7 +23,7 @@
 				_label="Evolution bar _shortcut"
 				accel="*Control**Shift*s"/>
 
-				<menuitem/>
+				<separator/>
 
 				<menuitem name="Mail" verb="NewMailMessage"
 				_label="_Mail message (FIXME)"
@@ -44,7 +44,7 @@
 
 			<placeholder name="FileOps"/>
 
-			<menuitem/>
+			<separator/>
 
 			<menuitem name="FileGoToFolder" verb=""
 			_label="_Go to Folder..."
@@ -54,7 +54,9 @@
 			_label="_Create New Folder..."
 			_tip="Create a new folder"/>
 
-			<placeholder name="Print" delimit="bottom"/>
+			<placeholder name="Print" delimit="top"/>
+
+			<separator/>
 
 			<menuitem name="FileExit" verb=""
 			_label="E_xit" _tip="Exit the program"