This commit was manufactured by cvs2svn to create tagGNOME_UTILS_1_4_0

'GNOME_UTILS_1_4_0'.

svn path=/tags/GNOME_UTILS_1_4_0/; revision=8493

16 files changed, 0 insertions, 2100 deletions

diff --git a/ui/.cvsignore b/ui/.cvsignore
deleted file mode 100644
index 22bfb15732..0000000000
--- a/ui/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-*.lo
-*.la
-*.h
diff --git a/ui/ChangeLog b/ui/ChangeLog
deleted file mode 100644
index 32b7fed707..0000000000
--- a/ui/ChangeLog
+++ /dev/null
@@ -1,377 +0,0 @@
-2001-02-21  Not Zed  <NotZed@Ximian.com>
-
-	* evolution-mail.xml: Setup a command for MailStop.
-
-2001-02-05  Iain Holmes  <iain@ximian.com>
-
-	* evolution-executive-summary.xml: Add a priority.
-
-2001-02-02  Michael Meeks  <michael@helixcode.com>
-
-	* evolution-calendar.xml: cmd / widgetify.
-
-2001-01-30  Michael Meeks  <michael@helixcode.com>
-
-	* evolution.xml: Use hlook and vlook so by default we get
-	no text in vertical mode, and priority only in horizontal
-	mode.
-
-2001-01-27  JP Rosevear  <jpr@ximian.com>
-
-	* evolution-event-editor.xml: Menu cleanups
-
-	* evolution-task-editor-dialog.xml: ditto
-
-2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-addressbook.xml, evolution-calendar.xml,
-	evolution-mail.xml, evolution-tasks.xml, evolution.xml: Change the
-	toolbars to only show some of the labels, a la Outlook.
-
-2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-mail.xml: Set the `pixtype' of the "PrintMessage" and
-	"PrintPreviewMessage" items to "pixbuf".  Likewise for
-	"MessageSaveAs", "MessageEdit", "MessagePrint", "MessageMove", "MessageReplySndr"
-	and "MessageReplyAll".
-
-2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-mail.xml: Set the `pixtype' of the "Configure Folder"
-	and "Mail Configuration" items to "pixbuf".
-
-2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-addressbook.xml: Change the type of the "Find a
-	contact" item to "pixbuf".  Also set the type to "pixbuf" for
-	"Addressbook Configuration", and "Print Contacts".
-
-2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-addressbook.xml: Change the type of the "View All"
-	button to "pixbuf".
-
-2001-01-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-message-composer.xml: Change Security* to SecurityPGP*
-	as we may someday have S/MIME sign/encrypt.
-
-2001-01-24  Jason Leach  <jasonleach@usa.net>
-
-	(Fix #1252: Need a File->Close way to close a view)
-	
-	* evolution.xml: new File->Close menu item and associated command.
-
-2001-01-22  Not Zed  <NotZed@Ximian.com>
-
-	* evolution-mail.xml: Removed the temporary get mail button.
-
-2001-01-19  Not Zed  <NotZed@Ximian.com>
-
-	* evolution-mail.xml: Added a temporary button to test new receive
-	code.
-
-2001-01-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-mail.xml: Added Next/Previous toolbar buttons.
-
-2001-01-15  Michael Meeks  <michael@helixcode.com>
-
-	* evolution.xml: progressive cmd/widgetization and
-	add the 'Customize' entry.
-
-2001-01-16  Not Zed  <NotZed@Ximian.com>
-
-	* evolution-mail.xml: Add a stop button to the toolbar.
-
-2001-01-15  Jason Leach  <jasonleach@usa.net>
-
-	(Bug #1143: Add elipses to more menu items that lead to dialogs)
-	
-	* evolution-mail.xml: "Folder/Configure Folder..."
-	* evolution.xml: "File/Import file..."
-	
-2001-01-10  Miguel de Icaza  <miguel@helixcode.com>
-
-	* evolution.xml: Remove fixme from NewMailMessage.
-
-2001-01-11  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* evolution-message-composer.xml: Added SaveDraft bonobo menu verb
-	thingy.
-
-2001-01-08  Damon Chaplin  <damon@helixcode.com>
-
-	* evolution-tasks.xml: new file for the Tasks controls.
-
-	* Makefile.am (XML_FILES): added the above file.
-
-2001-01-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* evolution-event-editor.xml:
-	* evolution-task-editor-dialog.xml: Make the ordering of the
-	toolbar items consistent.
-
-2001-01-01  Michael Meeks  <michael@helixcode.com>
-
-	* Makefile.am: remove evolution-addressbook-ldap.xml so we
-	build again.
-
-2000-12-29  Chris Toshok  <toshok@helixcode.com>
-
-	* evolution-addressbook.xml: add "Settings/Addressbook
-	Configuration..."  Analogous to "Settings/Mail Configuration..." in
-	evolution-mail.
-
-	* evolution-addressbook-ldap.xml: removed.
-	
-2000-12-23  Jason Leach  <jasonleach@usa.net>
-
-	* evolution-mail.xml: Added ellipsis to Settings menu entries that
-	  bring up dialogs.  Bug #1019.
-
-2000-12-23  Michael Meeks  <michael@helixcode.com>
-
-	* evolution-mail.xml: s/<menuitem\/>/<separator\/>/
-
-	* evolution.xml: ditto.
-
-2000-12-21  Michael Meeks  <michael@helixcode.com>
-
-	* evolution.xml: remove wierd extraneous '>'
-
-2000-12-14  Michael Meeks  <michael@helixcode.com>
-
-	* evolution-executive-summary.xml: stop executive summary
-	making the UI flicker when switching to / from it.
-
-2000-12-19  JP Rosevear  <jpr@helixcode.com>
-
-	* evolution-calendar.xml: Fix bug #635
-
-2000-12-18  Chris Toshok  <toshok@helixcode.com>
-
-	* evolution-addressbook.xml: give View->As Table its verb back so
-	it works.
-
-2000-12-14  Not Zed  <NotZed@HelixCode.com>
-
-	* evolution-mail.xml: Added message hiding items.
-
-2000-12-15  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* evolution-message-composer.xml: Added Security menu
-
-2000-12-13  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-mail.xml: Make the forward button in the toolbar
-	forward as an attachment.
-
-2000-12-13  Radek Doulik  <rodo@helixcode.com>
-
-	* evolution-message-composer.xml: redone shortcuts
-
-2000-12-12  Radek Doulik  <rodo@helixcode.com>
-
-	* evolution-message-composer.xml: removed Bold item from toolbar
-
-2000-12-04  Dan Winship  <danw@helixcode.com>
-
-	* evolution-mail.xml: Fix typo
-
-2000-12-04  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-mail.xml: Renamed "MessageForward" to
-	"MessageForwardInlined" and "MessageForwardAttach" to
-	"MessageForwardAttached".  Make the attached forward the default,
-	and the one advertised on the toolbar as well.
-
-2000-12-01  Anna Marie Dirks  <anna@helixcode.com>
-
-	* evolution.xml: Redid all the keyboard shortcuts to comply with GNOME
-	standards. Removed unnecessary shortcuts from less commonly used menu 
-	items, changed all references to "alt", etc. 
-	* evolution-addressbook.xml: see above
-	* evolution-mail.xml: see above
-	* evolution-calendar.xml: Same as above, but I also reorganized menus slightly by moving "new appointment" from the edit menu to the file menu.   
-
-2000-11-28  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* evolution-mail.xml: Added Save As...
-
-2000-11-25  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-message-composer.xml: Make "Toolbar"'s behavior
-	"exclusive".
-	* evolution-task-editor-dialog.xml: Likewise.
-
-2000-11-21  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* evolution-mail.xml: Moved ViewSource to the View menu and made
-	it a toggle menu.
-
-2000-11-16  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* evolution-mail.xml: Added View Message Source.
-
-2000-11-15  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* evolution-mail.xml: Added Forward as Attachment.
-
-2000-11-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* evolution-contact-editor.xml: Added Send contact as attachment
-	and Send to contact to menus.
-
-2000-11-09  Anna Marie Dirks <anna@helixcode.com>
-	* evolution-calendar.xml: Added (and cleaned up) keyboard shortcuts.
-	* evolution-addressbook.xml: Added keyboard shortcuts.  
-
-2000-11-08  Anna Marie Dirks <anna@helixcode.com>
-	* evolution.xml: Added keyboard shortcuts to all shell menus.
-	* evolution-mail.xml: Added keyboard shortcuts to all shell menus.
-
-2000-11-08  Anna Marie Dirks <anna@helixcode.com>
-        * evolution-message-composer.xml: Added keyboard shortcuts
-	to all of the composer menus.
-
-2000-11-07  Jesse Pavel	  <jpavel@helixcode.com>
-
-	* evolution-event-editor.xml: removed ``FIXME'' from the
-	``Schedule Meeting'' menu.
-
-2000-11-06  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* evolution-mail.xml: Updated Message menu.
-
-2000-11-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* evolution-contact-editor.xml: Added print envelope menus.  Added
-	...s.
-
-2000-11-05  Michael Meeks  <michael@helixcode.com>
-
-	* Makefile.am (uidir): kill all the bonob-ui-extract crud.
-
-2000-11-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* evolution-addressbook.xml: Removed QuickSearch widget.
-
-2000-11-01  Radek Doulik  <rodo@helixcode.com>
-
-	* evolution-message-composer.xml: added accel="*Control*Return" to
-	FileSend
-	replace FileSendNow with FileSend as FileSendNow wasn't defined
-	
-2000-10-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* evolution-mail.xml: Added a MessageApplyFilters menu item.
-
-	* evolution-subscribe.xml: Don't have a Unselect All, use Invert
-	Selection instead.
-
-2000-10-19  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am (H_FILES): New.
-	(EXTRA_DIST): Add `$(H_FILES)'.
-
-2000-10-19  Michael Meeks  <michael@helixcode.com>
-
-	* evolution-message-composer.xml: add.
-
-	* checking all generated .h files ( sim. to glade ) to make
-	translator's lives easier.
-
-2000-10-19  Michael Meeks  <michael@helixcode.com>
-
-	* evolution-event-editor.xml: added.
-
-2000-10-18  Michael Meeks  <michael@helixcode.com>
-
-	* evolution-task-editor-dialog.xml: added.
-
-2000-10-14  Michael Meeks  <michael@helixcode.com>
-
-	* Makefile.am: Add rule to use bonobo-ui-extract to build
-	translatable files.
-
-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>
-
-	* evolution-calendar.xml: Added toolbar buttons to switch views.
-	We'll use plain buttons for the view buttons for now, until Bonobo
-	toolbars support radio buttons.
-
-2000-10-11  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-addressbook-ldap.xml: Apply behavior "exclusive" to
-	"Toolbar".
-	* evolution.xml: Likewise.
-	* evolution-addressbook.xml: Likewise.
-	* evolution-mail.xml: Likewise.
-	* evolution-contact-editor.xml: Likewise.
-	* evolution-subscribe.xml: Likewise.
-
-2000-10-08  Damon Chaplin  <damon@helixcode.com>
-
-	* evolution-calendar.xml: moved the calendar settings menu item to the
-	Settings menu and renamed it to "Calendar Preferences".
-
-2000-10-09  Michael Meeks  <michael@helixcode.com>
-
-	* *.xml: s/Menu_//
-
-2000-10-09  Michael Meeks  <michael@helixcode.com>
-
-	* *.xml fix the mess with separators.
-
-2000-10-09  Michael Meeks  <michael@helixcode.com>
-
-	* evolution-subscribe.xml: s/descr/tip/
-
-2000-10-05  Michael Meeks  <michael@helixcode.com>
-
-	* evolution-mail.xml: remove redundant separator.
-
-	* *.xml: Remove replicated attributes from structural elements.
-
-2000-10-05  Michael Meeks  <michael@helixcode.com>
-
-	* evolution.xml: fix from Darin toolbar -> dockitem.
-
-2000-10-04  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* evolution-mail.xml: Add Invert Selection
-
-2000-10-04  Michael Meeks  <michael@helixcode.com>
-
-	* evolution-mail.xml: bind 'D' to MessageDelete; a proto binding.
-
-2000-10-04  Michael Meeks  <michael@helixcode.com>
-
-	* evolution-calendar.xml: move Open, Save into FileOps
-
-	* evolution.xml: add FileOps placeholder.
-
-2000-09-15  Michael Meeks  <michael@helixcode.com>
-
-	* *.xml: Update to new keybinding syntax.
-
-2000-09-14  Michael Meeks  <michael@helixcode.com>
-
-	* evolution-mail.xml: remove stock icons on toolbar.
-	add back 2 stocks I lost somewhere.
-
-	* ui/evolution.xml: Add status bar
diff --git a/ui/Makefile.am b/ui/Makefile.am
deleted file mode 100644
index a6b55836c6..0000000000
--- a/ui/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-XML_FILES =				\
-	evolution.xml			\
-	evolution-addressbook.xml	\
-	evolution-calendar.xml		\
-	evolution-contact-editor.xml	\
-	evolution-event-editor.xml	\
-	evolution-executive-summary.xml	\
-	evolution-mail.xml		\
-	evolution-message-composer.xml	\
-	evolution-subscribe.xml		\
-	evolution-task-editor-dialog.xml\
-	evolution-tasks.xml
-
-uidir = $(datadir)/gnome/ui
-ui_DATA = $(XML_FILES)
-
-EXTRA_DIST = $(XML_FILES)
diff --git a/ui/evolution-addressbook.h b/ui/evolution-addressbook.h
deleted file mode 100644
index 3128ccfb83..0000000000
--- a/ui/evolution-addressbook.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- *  This file is autogenerated from evolution-addressbook.xml, do not edit
- *
- *  This file contains translatable strings generated by
- * bonobo-ui-extract. Add this file to your project's
- * POTFILES.in. DO NOT compile it as part of your application.
- */
-
-gchar *s = N_("_Print Contacts...");
-gchar *s = N_("As _Table");
-gchar *s = N_("_New Contact");
-gchar *s = N_("_Tools");
-gchar *s = N_("_Search for contacts");
-gchar *s = N_("New");
-gchar *s = N_("Create a new contact");
-gchar *s = N_("Find");
-gchar *s = N_("Find a contact");
-gchar *s = N_("Print");
-gchar *s = N_("Print contacts");
-gchar *s = N_("Delete");
-gchar *s = N_("Delete a contact");
-gchar *s = N_("View All");
-gchar *s = N_("View all contacts");
-gchar *s = N_("Stop");
-gchar *s = N_("Stop Loading");
diff --git a/ui/evolution-addressbook.xml b/ui/evolution-addressbook.xml
deleted file mode 100644
index 927c6a79ff..0000000000
--- a/ui/evolution-addressbook.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<Root>
-
-	<menu>
-		<submenu name="File">
-
-			<placeholder name="Print">
-
-				<menuitem name="Print" verb="ContactsPrint"
-				_label="_Print Contacts..."
-				pixtype="pixbuf"
-                                accel="*Control*p"/>
-				
-			</placeholder>
-
-		</submenu>
-
-		<submenu name="View">
-
-			<menuitem name="AsTable" verb="ViewAsTable" _label="As _Table"
-		        />
-
-		</submenu>
-
-		<submenu name="Settings">
-
-			<menuitem name="AddressbookConfig" verb="AddressbookConfig" _label="_Addressbook Configuration..."
-			pixtype ="pixbuf"/>
-
-		</submenu>
-
-		<placeholder name="Component">
-
-			<submenu name="Tools" _label="_Tools">
-
-				<menuitem name="Search" verb="ToolSearch"
-				_label="_Search for contacts"
-				pixtype="stock" pixname="Search" />
-
-			</submenu>
-
-		</placeholder>
-	</menu>
-
-	<dockitem name="Toolbar">
-		<toolitem name="New" _label="New contact"
-		_tip="Create new contact" verb="ContactNew"
-		pixtype="stock" pixname="New" priority="1"/>
-
-		<separator/>
-
-		<toolitem name="Find" _label="Find"
-		_tip="Find a contact" verb="ContactFind"
-		pixtype="pixbuf"/>
-
-		<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/>
-
-		<toolitem name="View All" _label="View All"
-		_tip="View all contacts" verb="ContactViewAll"
-		pixtype="pixbuf"/>
-
-		<toolitem name="Stop" _label="Stop"
-		_tip="Stop Loading" verb="ContactStop"
-		pixtype="stock" pixname="Stop"/>
-
-	</dockitem>
-
-</Root>
diff --git a/ui/evolution-calendar.xml b/ui/evolution-calendar.xml
deleted file mode 100644
index b512405c0e..0000000000
--- a/ui/evolution-calendar.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<Root>
-	<commands>
-		<cmd name="CalendarNew"    _tip="Create a new calendar" _label="Calendar"/>
-		<cmd name="CalendarOpen"   _tip="Open Calendar" _label="Open"/>
-		<cmd name="CalendarSaveAs" _tip="Save calendar as something else" _label="Save As"/>
-		<cmd name="CalendarPrint"  _tip="Print this Calendar" _label="Print"
-		 pixtype="stock" pixname="Print"/>
-		<cmd name="CalendarPreferences" _tip="Alter preferences"/>
-		<cmd name="EditNewAppointment" _label="New appointment"
-		 priority="1" _tip="Create a new appointment" pixtype="stock" pixname="New"/>
-		<cmd name="CalendarPrev" _label="Prev" _tip="Go back in time"
-		 pixtype="stock" pixname="Back"/>
-		<cmd name="CalendarToday" _label="Today" _tip="Go to present time"
-		 pixtype="stock" pixname="Home"/>
-		<cmd name="CalendarNext" _label="Next" _tip="Go forward in time" 
-		 pixtype="stock" pixname="Forward"/>
-		<cmd name="CalendarGoto" _label="Go to" priority="1"
-		 _tip="Go to a specific date" pixtype="stock" pixname="Jump To"/>
-		<cmd name="ShowDayView" _label="Day" _tip="Show 1 day" pixtype="pixbuf"/>
-		<cmd name="ShowWorkWeekView" _label="5 Days" _tip="Show the working week"
-		 pixtype="pixbuf"/>
-		<cmd name="ShowWeekView" _label="Week" _tip="Show 1 week" pixtype="pixbuf"/>
-		<cmd name="ShowMonthView" _label="Month" _tip="Show 1 month" pixtype="pixbuf"/>
-	</commands>
-
-	<menu>
-		<submenu name="File">
-
-			<submenu name="New" _label="_New">
-
-				<menuitem name="CalendarNew" verb=""
-				_label="Ca_lendar" accel="*Control**Shift*l"/>
-
-			</submenu>
-
-			<placeholder name="FileOps">
-				
-				<menuitem name="CalendarOpen" verb=""
-					_label="_Open Calendar" accel="*Control*o"/>
-
-				<menuitem name="CalendarSaveAs" verb=""
-				_label="_Save As..." accel="*Control*a"/>
-
-			</placeholder>
-
-			<placeholder name="Print">
-				<menuitem name="Print" verb="CalendarPrint"
-				_label="_Print this calendar" accel="*Control*p"/>
-			</placeholder>
-
-		</submenu>
-
-		<submenu name="Edit">
-
-		</submenu>
-
-		<submenu name="Settings">
-
-			<menuitem name="CalendarPreferences" verb=""
-			 _label="Calendar Preferences..."/>
-
-		</submenu>
-	</menu>
-
-	<dockitem name="Toolbar">
-		<toolitem name="New" verb="EditNewAppointment"/>
-
-		<separator/>
-
-		<toolitem name="Print" verb="CalendarPrint"/>
-
-		<separator/>
-
-		<toolitem name="Prev" verb="CalendarPrev"/>
-
-		<toolitem name="Today" verb="CalendarToday"/>
-
-		<toolitem name="Next" verb="CalendarNext"/>
-
-		<separator/>
-
-		<toolitem name="Goto" verb="CalendarGoto"/>
-		
-		<separator/>
-
-		<toolitem name="DayView" verb="ShowDayView"/>
-
-		<toolitem name="WorkWeekView" verb="ShowWorkWeekView"/>
-
-		<toolitem name="WeekView" verb="ShowWeekView"/>
-
-		<toolitem name="MonthView" verb="ShowMonthView"/>
-
-	</dockitem>
-
-</Root>
diff --git a/ui/evolution-contact-editor.xml b/ui/evolution-contact-editor.xml
deleted file mode 100644
index c0594838b4..0000000000
--- a/ui/evolution-contact-editor.xml
+++ /dev/null
@@ -1,256 +0,0 @@
-<Root>
-<!--
-
-/* Menu bar */
-
-static GnomeUIInfo file_new_menu[] = {
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Appointment"), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Meeting Re_quest"), NULL, NULL),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Mail Message"), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Contact"), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Task"), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Task _Request"), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Journal Entry"), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Note"), NULL, NULL),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Ch_oose Form..."), NULL, NULL),
-	GNOMEUIINFO_END
-};
-
-static GnomeUIInfo file_page_setup_menu[] = {
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Memo Style"), NULL, NULL),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Define Print _Styles..."), NULL, NULL),
-	GNOMEUIINFO_END
-};
-
-static GnomeUIInfo file_menu[] = {
-	GNOMEUIINFO_MENU_NEW_SUBTREE (file_new_menu),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: S_end"), NULL, NULL),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_MENU_SAVE_ITEM (file_save_cb, NULL),
-	GNOMEUIINFO_MENU_SAVE_AS_ITEM (file_save_as_cb, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Save Attac_hments..."), NULL, NULL),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_ITEM_NONE (N_("_Delete"), NULL, delete_cb),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Move to Folder..."), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Cop_y to Folder..."), NULL, NULL),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_SUBTREE (N_("Page Set_up"), file_page_setup_menu),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Print Pre_view"), NULL, NULL),
-	GNOMEUIINFO_MENU_PRINT_ITEM (print_cb, NULL),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_MENU_PROPERTIES_ITEM (NULL, NULL),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_MENU_CLOSE_ITEM (file_close_cb, NULL),
-	GNOMEUIINFO_END
-};
-
-static GnomeUIInfo edit_object_menu[] = {
-	GNOMEUIINFO_ITEM_NONE ("FIXME: what goes here?", NULL, NULL),
-	GNOMEUIINFO_END
-};
-
-static GnomeUIInfo edit_menu[] = {
-	GNOMEUIINFO_MENU_UNDO_ITEM (NULL, NULL),
-	GNOMEUIINFO_MENU_REDO_ITEM (NULL, NULL),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_MENU_CUT_ITEM (NULL, NULL),
-	GNOMEUIINFO_MENU_COPY_ITEM (NULL, NULL),
-	GNOMEUIINFO_MENU_PASTE_ITEM (NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Paste _Special..."), NULL, NULL),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_MENU_CLEAR_ITEM (NULL, NULL),
-	GNOMEUIINFO_MENU_SELECT_ALL_ITEM (NULL, NULL),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Mark as U_nread"), NULL, NULL),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_MENU_FIND_ITEM (NULL, NULL),
-	GNOMEUIINFO_MENU_FIND_AGAIN_ITEM (NULL, NULL),
-	GNOMEUIINFO_SUBTREE (N_("_Object"), edit_object_menu),
-	GNOMEUIINFO_END
-};
-
-static GnomeUIInfo view_previous_menu[] = {
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Item"), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Unread Item"), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Fi_rst Item in Folder"), NULL, NULL),
-	GNOMEUIINFO_END
-};
-
-static GnomeUIInfo view_next_menu[] = {
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Item"), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Unread Item"), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Last Item in Folder"), NULL, NULL),
-	GNOMEUIINFO_END
-};
-
-static GnomeUIInfo view_toolbars_menu[] = {
-	{ GNOME_APP_UI_TOGGLEITEM, N_("FIXME: _Standard"), NULL, NULL, NULL, NULL,
-	  GNOME_APP_PIXMAP_NONE, NULL, 0, 0, NULL },
-	{ GNOME_APP_UI_TOGGLEITEM, N_("FIXME: __Formatting"), NULL, NULL, NULL, NULL,
-	  GNOME_APP_PIXMAP_NONE, NULL, 0, 0, NULL },
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Customize..."), NULL, NULL),
-	GNOMEUIINFO_END
-};
-
-static GnomeUIInfo view_menu[] = {
-	GNOMEUIINFO_SUBTREE (N_("Pre_vious"), view_previous_menu),
-	GNOMEUIINFO_SUBTREE (N_("Ne_xt"), view_next_menu),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_SUBTREE (N_("_Toolbars"), view_toolbars_menu),
-	GNOMEUIINFO_END
-};
-
-static GnomeUIInfo insert_menu[] = {
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _File..."), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: It_em..."), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Object..."), NULL, NULL),
-	GNOMEUIINFO_END
-};
-
-static GnomeUIInfo format_menu[] = {
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Font..."), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Paragraph..."), NULL, NULL),
-	GNOMEUIINFO_END
-};
-
-static GnomeUIInfo tools_forms_menu[] = {
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Ch_oose Form..."), NULL, NULL),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Desi_gn This Form"), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: D_esign a Form..."), NULL, NULL),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Publish _Form..."), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Pu_blish Form As..."), NULL, NULL),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Script _Debugger"), NULL, NULL),
-	GNOMEUIINFO_END
-};
-
-static GnomeUIInfo tools_menu[] = {
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Spelling..."), NULL, NULL),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_SUBTREE (N_("_Forms"), tools_forms_menu),
-	GNOMEUIINFO_END
-};
-
-static GnomeUIInfo actions_menu[] = {
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _New Contact"), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: New _Contact from Same Company"), NULL, NULL),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: New _Letter to Contact"), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: New _Message to Contact"), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: New Meetin_g with Contact"), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Plan a Meeting..."), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: New _Task for Contact"), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: New _Journal Entry for Contact"), NULL, NULL),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Flag for Follow Up..."), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Display Map of Address"), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Open Web Page"), NULL, NULL),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: Forward as _vCard"), NULL, NULL),
-	GNOMEUIINFO_ITEM_NONE (N_("FIXME: For_ward"), NULL, NULL)
-};
-
-static GnomeUIInfo help_menu[] = {
-	GNOMEUIINFO_ITEM_NONE ("FIXME: fix Bonobo so it supports help items!", NULL, NULL),
-	GNOMEUIINFO_END
-};
-
-static GnomeUIInfo main_menu[] = {
-	GNOMEUIINFO_MENU_FILE_TREE (file_menu),
-	GNOMEUIINFO_MENU_EDIT_TREE (edit_menu),
-	GNOMEUIINFO_MENU_VIEW_TREE (view_menu),
-	GNOMEUIINFO_SUBTREE (N_("_Insert"), insert_menu),
-	GNOMEUIINFO_SUBTREE (N_("F_ormat"), format_menu),
-	GNOMEUIINFO_SUBTREE (N_("_Tools"), tools_menu),
-	GNOMEUIINFO_SUBTREE (N_("Actio_ns"), actions_menu),
-	GNOMEUIINFO_MENU_HELP_TREE (help_menu),
-	GNOMEUIINFO_END
-};
--->
-	<menu>
-
-		<submenu name="File" _label="_File">
-
-		        <menuitem name="Save" verb="ContactEditorSave"
-			_label="_Save"
-			pixtype="stock" pixname="Save"/>
-
-		        <menuitem name="SaveAs" verb="ContactEditorSaveAs"
-			_label="Save _As..."
-			pixtype="stock" pixname="SaveAs"/>
-
-			<separator/>
-
-		        <menuitem name="SendAs" verb="ContactEditorSendAs"
-			_label="Se_nd contact to other..."/>
-
-		        <menuitem name="SendTo" verb="ContactEditorSendTo"
-			_label="Send _message to contact..."/>
-
-			<separator/>
-
-		        <menuitem name="Delete" verb="ContactEditorDelete"
-			_label="Delete..."
-			pixtype="stock" pixname="Trash"/>
-
-			<separator/>
-
-			<placeholder name="Print">
-
-				<menuitem name="Print" verb="ContactEditorPrint"
-				_label="_Print..."
-				pixtype="stock" pixname="Print"/>
-
-				<menuitem name="PrintEnv" verb="ContactEditorPrintEnvelope"
-				_label="Print En_velope..."
-				pixtype="stock" pixname="Print"/>
-
-			</placeholder>
-
-			<separator/>
-
-		        <menuitem name="Close" verb="ContactEditorClose"
-			_label="Close"
-			pixtype="stock" pixname="Close"/>
-
-		</submenu>
-	</menu>
-
-	<dockitem name="Toolbar" relief="none" behavior="exclusive">
-	        <toolitem name="Save and Close" _label="Save and Close"
-		_tip="Save the contact and close the dialog box" verb="ContactEditorSaveClose"
-		pixtype="stock" pixname="Save"/>
-
-		<separator/>
-
-		<toolitem name="Print" _label="Print..."
-		_tip="Print this item" verb="ContactEditorPrint"
-		pixtype="stock" pixname="Print"/>
-
-		<toolitem name="Delete" _label="Delete..."
-		_tip="Delete this item" verb="ContactEditorDelete"
-		pixtype="stock" pixname="Trash"/>
-
-<!--
-		<toolitem name="Help" _label="Help"
-		_tip="See online help" verb="ContactEditorHelp"
-		pixtype="stock" pixname="Help"/>
-
-	GNOMEUIINFO_ITEM_STOCK (N_("FIXME: Previous"),
-				N_("Go to the previous item"), NULL,
-				GNOME_STOCK_PIXMAP_BACK),
-	GNOMEUIINFO_ITEM_STOCK (N_("FIXME: Next"),
-				N_("Go to the next item"), NULL,
-				GNOME_STOCK_PIXMAP_FORWARD),
--->
-
-	</dockitem>
-
-</Root>
\ No newline at end of file
diff --git a/ui/evolution-event-editor.xml b/ui/evolution-event-editor.xml
deleted file mode 100644
index 489eca6ef1..0000000000
--- a/ui/evolution-event-editor.xml
+++ /dev/null
@@ -1,225 +0,0 @@
-<Root>
-
-<commands>
-
-        <cmd name="FileSave" _label="Save"
-	_tip="Save the current file" pixtype="stock" pixname="Save"
-	accel="*Control*s"/>
-
-        <cmd name="FileSaveAndClose" _label="Save and Close"
-	_tip="Save the appointment and close the dialog box"
-	pixtype="stock" pixname="Save"/>
-
-	<cmd name="FileDelete" _label="Delete"
-	_tip="Delete this appointment"
-	pixtype="stock" pixname="Trash"/>
-
-        <cmd name="FilePrint" _label="Print..."
-	_tip="Print this item" pixtype="stock" pixname="Print"/>
-
-        <cmd name="FilePrintSetup" _label="Print Setup"
-          _tip="Setup the page settings for your current printer"
-	  pixtype="stock" pixname="Print"/>
-
-        <cmd name="FileClose" _label="Close"
-	_tip="Close this appointment" pixtype="stock" pixname="Close"
-	accel="*Control*w"/>
-
-        <cmd name="EditCut" _label="Cut" _tip="Cut the selection"
-          pixtype="stock" pixname="Cut" accel="*Control*x"/>
-	
-        <cmd name="EditCopy" _label="Copy"
-	_tip="Copy the selection" pixtype="stock" pixname="Copy"
-	accel="*Control*c"/>
-	
-        <cmd name="EditPaste" _label="Paste"
-	_tip="Paste the clipboard" pixtype="stock" pixname="Paste"
-	accel="*Control*v"/>
-	
-        <cmd name="EditClear" _label="Clear"
-	_tip="Clear the selection"/>
-	
-	<cmd name="EditSelectAll" _label="Select All" _tip="Select everything"/>
-
-        <cmd name="EditProperties" _label="Properties" _tip="Modify the file's properties"
-	  pixtype="stock" pixname="Properties"/>
-
-	<cmd name="GoPrevious" _label="Previous" _tip="Go to the previous item"
-	pixtype="stock" pixname="Back"/>
-
-	<cmd name="GoNext" _label="Next" _tip="Go to the next item"
-	pixtype="stock" pixname="Forward"/>
-
-	<menuitem name="ActionScheduleMeeting" _label="Schedule Meeting"
-	_tip="Schedule some sort of a meeting"/>
-
-        <cmd name="HelpAbout" _label="About..." _tip="About this application"
-	 pixtype="stock" pixname="About"/>
-
-	<cmd name="DebugDumpXml" _label="Dump XML" _tip="Dump the UI Xml description" hidden="1"/>
-
-</commands>
-
-<menu>
-
-<submenu name="File" _label="_File">
-        
-	<submenu name="New" _label="_New">
-
-		<menuitem name="c" _label="_Mail Message (FIXME)"/>
-
-		<menuitem name="g" _label="_Contact (FIXME)"/>
-
-		<menuitem name="a" _label="_Task (FIXME)"/>
-
-		<menuitem name="b" _label="Task _Request (FIXME)"/>
-
-		<menuitem name="h" _label="_Journal Entry (FIXME)"/>
-
-		<menuitem name="i" _label="_Note (FIXME)"/>
-
-	</submenu>
-
-	<separator/>
-
-        <menuitem name="FileSave" verb=""  _label="_Save"/>
-
-        <menuitem name="FileSaveAs" _label="Save _As..."/>
-
-	<separator/>
-
-        <menuitem name="FileDelete" verb="" _label="_Delete"/>
-
-	<separator/>
-
-	<menuitem name="o" _label="_Move to Folder... (FIXME)"/>
-
-	<menuitem name="p" _label="Cop_y to Folder... (FIXME)"/>
-
-	<separator/>
-
-	<placeholder name="Print">
-
-		<menuitem name="FilePrintPrevie" _label="Print Pre_view"/>
-
-	        <menuitem name="FilePrint" verb="" _label="_Print"/>
-	
-	        <menuitem name="FilePrintSetup" verb="" _label="Print S_etup..."/>
-
-	</placeholder>
-
-	<separator/>
-
-        <menuitem name="EditProperties" verb="" _label="_Properties..."/>
-
-	<separator/>
-
-        <menuitem name="FileClose" verb="" _label="_Close"/>
-
-</submenu>	
-
-<submenu name="Edit" _label="_Edit">
-
-        <menuitem name="EditCut" verb="" _label="C_ut"/>
-	
-        <menuitem name="EditCopy" verb="" _label="_Copy"/>
-	
-        <menuitem name="EditPaste" verb="" _label="_Paste"/>
-
-        <menuitem name="EditClear" verb="" _label="C_lear"/>
-
-        <menuitem name="EditSelectAll" verb="" _label="_Select All"/>
-
-	<placeholder name="EditOps"/>
-
-</submenu>
-
-<submenu _label="_View">
-
-	<submenu _label="Pre_vious">
-
-		<menuitem name="" _label="_Item (FIXME)"/>
-
-		<menuitem name="" _label="_Unread Item (FIXME)"/>
-
-		<menuitem name="" _label="In_complete Task (FIXME)"/>
-
-		<menuitem name="" _label="Fi_rst Item in Folder (FIXME)"/>
-
-	</submenu>
-
-	<submenu _label="N_ext">
-
-		<menuitem name="" _label="_Item (FIXME)"/>
-
-		<menuitem name="" _label="_Unread Item (FIXME)"/>
-
-		<menuitem name="" _label="In_complete Task (FIXME)"/>
-
-		<menuitem name="" _label="_Last Item in Folder (FIXME)"/>
-
-	</submenu>
-
-</submenu>
-
-<submenu _label="_Tools">
-
-	<menuitem name="" _label="Chec_k Names (FIXME)"/>
-
-	<menuitem name="" _label="Address _Book... (FIXME)"/>
-
-</submenu>
-
-<submenu _label="Actio_ns">
-
-	<menuitem name="ActionScheduleMeeting" verb="" _label="Schedule _Meeting"/>
-
-	<separator/>
-
-	<menuitem name="" _label="For_ward (FIXME)"/>
-
-	<menuitem name="" _label="Forward as v_Calendar (FIXME)"/>
-
-</submenu>
-
-<submenu name="Help" _label="_Help">
-	
-	<placeholder name="BuiltMenuItems"/>
-
-        <menuitem name="HelpAbout" verb="" _label="_About..."/>
-
-</submenu>
-
-<submenu name="Debug" _label="_Debug" hidden="1">
-
-	<menuitem name="DebugDumpXml"/>
-
-</submenu>
-
-</menu>
-
-<dockitem name="Toolbar">
-
-	<toolitem name="FileSaveAndClose" verb=""/>
-
-	<toolitem name="FileDelete" verb=""/>
-
-	<toolitem name="FileClose" verb=""/>
-
-	<separator/>
-
-	<toolitem name="FilePrint" verb=""/>
-
-	<separator/>
-
-	<toolitem name="GoPrevious" verb=""/>
-
-	<toolitem name="GoNext" verb=""/>
-
-</dockitem>
-
-<status>
-	<item name="main"/>
-</status>
-
-</Root>
diff --git a/ui/evolution-executive-summary.xml b/ui/evolution-executive-summary.xml
deleted file mode 100644
index 3b5a4dfeba..0000000000
--- a/ui/evolution-executive-summary.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<Root>
-  <menu>
-
-    <submenu name="Settings">
-
-	<menuitem name="ESummarySettings" verb="ESummarySettings"
-	_label="Executive Summary Settings..."/>
-
-    </submenu>
-
-  </menu>
-
-  <dockitem name="Toolbar">
-
-    <toolitem name="AddService" verb="AddService"
-    _label="Add Service" priority="1" _tip="Add a new service to the Executive Summary"
-    pixtype="pixbuf"/>
-
-    <separator/>
-
-    <toolitem name="NewMail" verb="NewMail"
-    _label="New Mail" _tip="Create a new email"
-    pixtype="pixbuf"/>
-
-  </dockitem>
-</Root>
-
diff --git a/ui/evolution-mail.xml b/ui/evolution-mail.xml
deleted file mode 100644
index 246ad19162..0000000000
--- a/ui/evolution-mail.xml
+++ /dev/null
@@ -1,258 +0,0 @@
-<Root>
-
-  <commands>
-
-    <cmd name="ViewThreaded"
-      _label="_Threaded" _tip="Threaded Message list" type="toggle" />
-
-    <cmd name="ViewSource"
-      _label="S_ource" _tip="View Raw Message Source" type="toggle" />
-
-    <cmd name="MailStop"
-      pixtype="stock" pixname="Stop"/>
-
-  </commands>
-
-  <keybindings>
-
-  </keybindings>
-
-  <menu>
-
-    <submenu name="File">
-
-	<placeholder name="Print">
-
-        <menuitem name="Print" verb="PrintMessage"
-        _label="Print message..."
-        _tip="Print message to the printer"
-        pixtype="pixbuf" accel="*Control*P"/>
-
-        <menuitem name="Print Preview" verb="PrintPreviewMessage"
-        _label="Print Preview of message..."
-        _tip="Previews the message to be printed"
-        pixtype="pixbuf"/>
-
-      </placeholder>
-
-    </submenu>
-
-    <submenu name="Edit">
-
-        <menuitem name="EditSelectAll" verb=""
-        _label="Select _All" accel="*Control*a"/>
-
-        <menuitem name="EditInvertSelection" verb=""
-        _label="_Invert Selection" accel="*Control*i"/>
-
-    </submenu>
-
-    <submenu name="View">
-
-      <separator/>
-
-      <menuitem name="Threaded" verb="ViewThreaded" accel="*Control*t"/>
-
-      <menuitem name="Source" verb="ViewSource" accel=""/>
-
-      <separator/>
-
-      <menuitem name="MessageHideClear" verb="" _label="Show _All Messages"/>
-
-      <separator/>
-
-      <menuitem name="MessageHideSelected" verb="" _label="Hide S_elected Messages"/>
-      <menuitem name="MessageHideRead" verb="" _label="Hide _Read messages"/>
-      <menuitem name="MessageHideDeleted" verb="" _label="Hide _Deleted Messages"/>
-
-    </submenu>
-
-    <submenu name="Settings">
-
-      <menuitem name="MailFilters" verb="SetMailFilter" _label="Mail _Filters..."/>
-
-      <menuitem name="VFolderEdit" verb="SetVFolder" _label="_Virtual Folder Editor..."/>
-
-      <menuitem name="SetMailConfig" verb="" _label="_Mail Configuration..." pixtype="pixbuf"/>
-
-      <menuitem name="SetSubscribe" verb="" _label="Manage Subscriptions..."/>
-
-      <menuitem name="SetForgetPwd" verb="" _label="Forget _Passwords"/>
-
-    </submenu>
-
-    <placeholder name="Component">
-
-      <submenu name="Message" _label="_Message">
-
-        <menuitem name="MessageOpenNewWnd" verb=""
-        _label="_Open in New Window"
-        accel="*Control*o"/>
-
-        <menuitem name="MessageEdit" verb=""
-        _label="_Edit Message"
-	pixbuf="pixbuf"
-         accel="*Control*e"/>
-
-        <menuitem name="MessageSaveAs" verb=""
-        _label="_Save Message As..."
-	pixtype="pixbuf"
-         accel="*Control**Alt*s"/>
-
-        <menuitem name="MessagePrint" verb=""
-        _label="_Print Message"
-	pixtype="pixbuf"
-         accel="*Control*p"/>
-
-        <separator/>
-
-        <menuitem name="MessageReplySndr" verb=""
-        _label="Reply to _Sender"
-	pixtype="pixbuf"
-        accel="*Control*r"/>
-
-        <menuitem name="MessageReplyAll" verb=""
-        _label="Reply to _All"
-	pixtype="pixbuf"
-	accel="*Control**Shift*r"/>
-
-        <menuitem name="MessageForwardAttached" verb=""
-        _label="_Forward"
-         accel="*Control*j"/>
-
-        <menuitem name="MessageForwardInlined" verb=""
-        _label="Forward inline"
-         accel="*Control**Shift*j"/>
-
-        <separator/>
-
-        <menuitem name="MessageMarkAsRead" verb=""
-        _label="Mar_k As Read"
-         accel="*Control*k"/>
-
-        <menuitem name="MessageMarkAsUnRead" verb=""
-        _label="Mark As U_nread"
-         accel="*Control**Shift*k"/>
-
-        <separator/>
-
-        <menuitem name="MessageMove" verb=""
-        _label="_Move to Folder..."
-	pixtype="pixbuf"
-	accel="*Control*m"/>
-
-        <menuitem name="MessageCopy" verb=""
-        _label="_Copy to Folder..."
-         accel="*Control*c"/>
-
-        <menuitem name="MessageDelete" verb=""
-        _label="_Delete"
-         accel="*Control*d"/>
-
-        <menuitem name="MessageUndelete" verb=""
-        _label="_Undelete"
-         accel="*Control*u"/>
-
-        <separator/>
-
-        <menuitem name="MessageApplyFilters" verb=""
-        _label="_Apply Filters"
-         accel="*Control*y"/>
-
-        <separator/>
-
-        <submenu name="MessageCreateRuleFromMessage" _label="Create Rule">
-
-          <menuitem name="MessageVFolderSubj" verb=""
-          _label="_VFolder on Subject"
-           />
-
-          <menuitem name="MessageVFolderSndr" verb=""
-          _label="VFolder on Se_nder"
-           />
-
-          <menuitem name="MessageVFolderRecip" verb=""
-          _label="VFolder on _Recipients"
-           />
-
-          <separator/>
-
-          <menuitem name="MessageFilterSubj" verb=""
-          _label="_Filter on Subject"
-           />
-
-          <menuitem name="MessageFilterSndr" verb=""
-          _label="Fi_lter on Sender"
-           />
-
-          <menuitem name="MessageFilterRecip" verb=""
-          _label="Filter on Rec_ipients"
-           />
-
-        </submenu>
-
-      </submenu>
-      
-      <submenu name="Folder" _label="F_older">
-
-        <menuitem name="FolderExpunge" verb=""
-        _label="_Expunge"
-         accel="*Control*x"/>
-
-        <menuitem name="FolderConfig" verb=""
-        _label="_Configure Folder..."
-	pixtype="pixbuf"/>
-
-      </submenu>
-
-    </placeholder>
-  </menu>
-
-  <dockitem name="Toolbar">
-
-    <toolitem name="MailGet" verb=""
-    _label="Get Mail" priority="1" _tip="Send queued mail and retrieve new mail"
-    pixtype="pixbuf"/>
-
-    <toolitem name="MailCompose" verb=""
-    _label="Compose" priority="1" _tip="Compose a new message"
-    pixtype="pixbuf"/>
-
-    <separator/>
-
-    <toolitem name="Reply" verb="MessageReplySndr"
-    _label="Reply" priority="1" _tip="Reply to the sender of this message"
-    pixtype="pixbuf"/>
-
-    <toolitem name="ReplyAll" verb="MessageReplyAll"
-    _label="Reply to All" priority="1" _tip="Reply to all recipients of this message"
-    pixtype="pixbuf"/>
-
-    <toolitem name="Forward" verb="MessageForwardAttached"
-    _label="Forward" priority="1" _tip="Forward this message"
-    pixtype="pixbuf"/>
-
-    <separator/>
-
-    <toolitem name="Move" verb="MessageMove"
-    _label="Move" _tip="Move message to a new folder"
-    pixtype="pixbuf"/>
-
-    <toolitem name="Copy" verb="MessageCopy"
-    _label="Copy" _tip="Copy message to a new folder"
-    pixtype="pixbuf"/>
-
-    <separator/>
-
-    <toolitem name="Print" verb="MessagePrint"
-    _label="Print" _tip="Print the selected message"
-    pixtype="stock" pixname="Print"/>
-
-    <toolitem name="Delete" verb="MessageDelete"
-    _label="Delete" _tip="Delete this message"
-    pixtype="stock" pixname="Trash"/>
-
-    <toolitem name="Stop" verb="MailStop" _label="Stop"/>
-
-  </dockitem>
-</Root>
diff --git a/ui/evolution-message-composer.h b/ui/evolution-message-composer.h
deleted file mode 100644
index bcc259c4d5..0000000000
--- a/ui/evolution-message-composer.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- *  This file is autogenerated from evolution-message-composer.xml, do not edit
- *
- *  This file contains translatable strings generated by
- * bonobo-ui-extract. Add this file to your project's
- * POTFILES.in. DO NOT compile it as part of your application.
- */
-
-gchar *s = N_("Open");
-gchar *s = N_("Open a file");
-gchar *s = N_("Save");
-gchar *s = N_("Save the current file");
-gchar *s = N_("Save As");
-gchar *s = N_("Save the current file with a different name");
-gchar *s = N_("Close");
-gchar *s = N_("Close the current file");
-gchar *s = N_("Save in folder...");
-gchar *s = N_("Save the message in a specified folder");
-gchar *s = N_("Insert text file...");
-gchar *s = N_("Insert a file as text into the message");
-gchar *s = N_("Send");
-gchar *s = N_("Send the message now");
-gchar *s = N_("Send _later");
-gchar *s = N_("Send the message later");
-gchar *s = N_("Attach");
-gchar *s = N_("Attach a file");
-gchar *s = N_("HTML");
-gchar *s = N_("Send the mail in HTML format");
-gchar *s = N_("Show attachments");
-gchar *s = N_("Show / hide attachments");
-gchar *s = N_("_File");
-gchar *s = N_("_Open...");
-gchar *s = N_("_Save");
-gchar *s = N_("Save _As...");
-gchar *s = N_("Save in _folder... (FIXME)");
-gchar *s = N_("_Insert text file... (FIXME)");
-gchar *s = N_("Send");
-gchar *s = N_("Send _Later");
-gchar *s = N_("_Close");
-gchar *s = N_("_Edit");
-gchar *s = N_("F_ormat");
-gchar *s = N_("_View");
-gchar *s = N_("Show _attachments");
-gchar *s = N_("_Help");
-gchar *s = N_("_About...");
-gchar *s = N_("_Debug");
-gchar *s = N_("Send this message now");
-gchar *s = N_("Bold");
-gchar *s = N_("Sets something as bold");
-
-
-
-
diff --git a/ui/evolution-message-composer.xml b/ui/evolution-message-composer.xml
deleted file mode 100644
index 06152658fc..0000000000
--- a/ui/evolution-message-composer.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<Root>
-	<commands>
-
-	        <cmd name="FileOpen" _label="Open" hidden="1"
-		_tip="Open a file" pixtype="stock" pixname="Open" accel="*Control*o"/>
-	
-	        <cmd name="FileSave" _label="Save"
-		_tip="Save the current file" pixtype="stock" pixname="Save"
-		accel="*Ctrl*s"/>
-	
-	        <cmd name="FileSaveAs" _label="Save As"
-	          _tip="Save the current file with a different name"
-		  pixtype="stock" pixname="Save As"/>
-
-	        <cmd name="FileClose" _label="Close"
-		_tip="Close the current file" pixtype="stock" pixname="Close"
-		accel="*Ctrl*w"/>
-
-		<cmd name="FileSaveInFolder" _label="Save in folder..."
-		_tip="Save the message in a specified folder"/>
-	
-		<cmd name="FileInsertFile" _label="Insert text file..."
-		_tip="Insert a file as text into the message"/>
-
-		<cmd name="FileSend" _label="Send" _tip="Send the message now"
-		accel="*Ctrl*Return"
-                pixtype="stock" pixname="Send Mail"/>
-
-		<cmd name="FileSendLater" _label="Send _later" _tip="Send the message later"
-		pixtype="stock" pixname="Send Mail"/> 
-
-		<cmd name="FileAttach" _label="Attach" _tip="Attach a file"
-		pixtype="stock" pixname="Attach" accel="*Ctrl**Alt*A"/>
-
-		<cmd name="FormatHtml" _label="HTML" _tip="Send the mail in HTML format"
-		type="toggle" state="0"/> 
-
-		<cmd name="ViewAttach" _label="Show attachments" _tip="Show / hide attachments"
-		type="toggle" state="0"/> 
-	
-                <cmd name="SecurityPGPSign" _label="PGP Sign" _tip="Sign this message with your PGP key"
-		type="toggle" state="0"/>
-
-                <cmd name="SecurityPGPEncrypt" _label="PGP Encrypt" _tip="Encrypt this message with PGP"
-		type="toggle" state="0"/>
-
-	</commands>
-
-
-        <keybindings>
-
-        </keybindings>
-
-	<menu>
-
-		<submenu name="File" _label="_File">
-
-			<menuitem name="FileOpen" verb="" _label="_Open..."/>
-
-			<placeholder name="FileOps"/>
-
-			<menuitem name="FileSave" verb="" _label="_Save"/>
-
-			<menuitem name="FileSaveAs" verb="" _label="Save _As..."/>
-
-                        <menuitem name="FileSaveDraft" verb="" _label="Save _Draft"/>
-
-			<menuitem name="FileSaveInFolder" verb="" _label="Save in _folder... (FIXME)"/>
-
-			<placeholder name="Print" delimit="top"/>
-			<separator/>
-
-			<menuitem name="FileInsertFile" verb="" _label="_Insert text file... (FIXME)"/>
-
-			<separator/>
-
-			<menuitem name="FileSend" verb="" _label="Send"/>
-
-			<menuitem name="FileSendLater" verb="" _label="Send _Later"/>
-
-			<separator/>
-
-			<menuitem name="FileClose" verb="" _label="_Close"/>
-
-		</submenu>
-
-
-		<submenu name="Edit" _label="_Edit"/>
-              
-
-		<submenu name="Format" _label="F_ormat">
-
-			<menuitem name="FormatHtml" verb=""/>
-
-		</submenu>
-
-		<submenu name="View" _label="_View">
-
-			<menuitem name="ViewAttach" verb="" _label="Show _attachments"/>
-
-		</submenu>
-
-		<placeholder name="Component"/>
-
-                <submenu name="Security" _label="_Security">
-
-                        <menuitem name="SecurityPGPSign" verb="" _label="PGP Sign"/>
-
-                        <menuitem name="SecurityPGPEncrypt" verb="" _label="PGP Encrypt"/>
-
-                </submenu>
-
-		<submenu name="Help" _label="_Help">
-	
-			<placeholder name="BuiltMenuItems"/>
-
-		        <menuitem name="HelpAbout" verb="" _label="_About..."/>
-
-		</submenu>
-
-		<submenu name="Debug" _label="_Debug" hidden="1">
-
-			<menuitem name="DebugDumpXml" verb=""/>
-
-		</submenu>
-
-	</menu>
-
-	<dockitem name="Toolbar" behavior="exclusive">
-
-		<toolitem name="FileSend" verb=""  _tip="Send this message now"/>
-
-		<toolitem name="FileAttach" verb=""/>
-
-		<separator/>
-
-	</dockitem>
-
-</Root>
diff --git a/ui/evolution-subscribe.xml b/ui/evolution-subscribe.xml
deleted file mode 100644
index 3bd3529587..0000000000
--- a/ui/evolution-subscribe.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<Root>
-  <menu>
-    <submenu name="File" _label="_File">
-
-        <menuitem name="FileCloseWin" verb=""
-        _label="Close"/>
-
-    </submenu>
-
-    <submenu name="Edit" _label="_Edit">
-
-        <menuitem name="EditSelectAll" verb=""
-        _label="Select _All"/>
-
-        <menuitem name="EditInvertSelection" verb=""
-        _label="_Invert Selection"/>
-
-    </submenu>
-
-    <placeholder name="Component">
-
-      <submenu name="Folder" _label="F_older">
-
-        <menuitem name="SubscribeFolder" verb=""
-        _label="Subscribe"/>
-
-        <menuitem name="UnsubscribeFolder" verb=""
-        _label="Unsubscribe"/>
-
-      </submenu>
-    </placeholder>
-  </menu>
-
-  <dockitem name="Toolbar" relief="none" behavior="exclusive">
-
-    <toolitem name="SubscribeFolder" verb=""
-    _label="Subscribe" _tip="Add folder to your list of subscribed folders"
-    pixtype="pixbuf"/>
-
-    <toolitem name="UnsubscribeFolder" verb=""
-    _label="Unsubscribe" _tip="Remove folder from your list of subscribed folders"
-    pixtype="pixbuf"/>
-
-    <separator/>
-
-    <toolitem name="RefreshList" verb=""
-    _label="Refresh List" _tip="Refresh List of Folders"
-    pixtype="pixbuf"/>
-
-    <separator/>
-
-    <control name="FolderSearch"/>
-
-  </dockitem>
-</Root>
diff --git a/ui/evolution-task-editor-dialog.xml b/ui/evolution-task-editor-dialog.xml
deleted file mode 100644
index 2fdbd9ae87..0000000000
--- a/ui/evolution-task-editor-dialog.xml
+++ /dev/null
@@ -1,255 +0,0 @@
-<Root>
-
-<commands>
-
-        <cmd name="FileSave" _label="Save"
-	_tip="Save the current file" pixtype="stock" pixname="Save"
-	accel="*Control*s"/>
-
-        <cmd name="FileSaveAndClose" _label="Save and Close"
-	_tip="Save the task and close the dialog box"
-	pixtype="stock" pixname="Save"/>
-
-	<cmd name="FileDelete" _label="Delete"
-	_tip="Delete this task"
-	pixtype="stock" pixname="Trash"/>
-
-        <cmd name="FilePrint" _label="Print..."
-	_tip="Print this item" pixtype="stock" pixname="Print"/>
-
-        <cmd name="FilePrintSetup" _label="Print Setup"
-          _tip="Setup the page settings for your current printer"
-	  pixtype="stock" pixname="Print"/>
-
-        <cmd name="FileClose" _label="Close"
-	_tip="Close the current file" pixtype="stock" pixname="Close"
-	accel="*Control*w"/>
-
-        <cmd name="EditCut" _label="Cut" _tip="Cut the selection"
-          pixtype="stock" pixname="Cut" accel="*Control*x"/>
-	
-        <cmd name="EditCopy" _label="Copy"
-	_tip="Copy the selection" pixtype="stock" pixname="Copy"
-	accel="*Control*c"/>
-	
-        <cmd name="EditPaste" _label="Paste"
-	_tip="Paste the clipboard" pixtype="stock" pixname="Paste"
-	accel="*Control*v"/>
-	
-        <cmd name="EditClear" _label="Clear"
-	_tip="Clear the selection"/>
-	
-        <cmd name="EditUndo" _label="Undo" _tip="Undo the last action"
-          pixtype="stock" pixname="Undo" accel="*Control*z"/>
-	
-        <cmd name="EditRedo" _label="Redo" _tip="Redo the undone action"
-          pixtype="stock" pixname="Redo" accel="*Control*r"/>
-	
-        <cmd name="EditFind" _label="Find" _tip="Search for a string"
-          pixtype="stock" pixname="Search" accel="F6"/>
-	
-        <cmd name="EditFindAgain" _label="Find Again" _tip="Search again for the same string"
-          pixtype="stock" pixname="Search" accel="*Shift*F6"/>
-	
-        <cmd name="EditReplace" _label="Replace" _tip="Replace a string"
-          pixtype="stock" pixname="Search/Replace" accel="F7"/>
-
-	<cmd name="EditSelectAll" _label="Select All" _tip="Select everything"/>
-
-        <cmd name="EditProperties" _label="Properties" _tip="Modify the file's properties"
-	  pixtype="stock" pixname="Properties"/>
-
-	<cmd name="GoPrevious" _label="Previous" _tip="Go to the previous item"
-	pixtype="stock" pixname="Back"/>
-
-	<cmd name="GoNext" _label="Next" _tip="Go to the next item"
-	pixtype="stock" pixname="Forward"/>
-
-        <cmd name="HelpAbout" _label="About..." _tip="About this application"
-	 pixtype="stock" pixname="About"/>
-
-	<cmd name="DebugDumpXml" _label="Dump XML" _tip="Dump the UI Xml description" hidden="1"/>
-
-</commands>
-
-<menu>
-
-<submenu name="File" _label="_File">
-        
-	<submenu name="New" _label="_New">
-
-		<menuitem name="a" _label="_Task (FIXME)"/>
-
-		<menuitem name="b" _label="Task _Request (FIXME)"/>
-
-		<separator/>
-
-		<menuitem name="c" _label="_Mail Message (FIXME)"/>
-
-		<menuitem name="e" _label="_Appointment (FIXME)"/>
-
-		<menuitem name="f" _label="Meeting Re_quest (FIXME)"/>
-
-		<menuitem name="g" _label="_Contact (FIXME)"/>
-
-		<menuitem name="h" _label="_Journal Entry (FIXME)"/>
-
-		<menuitem name="i" _label="_Note (FIXME)"/>
-
-	</submenu>
-
-	<separator/>
-
-        <menuitem name="FileSave" verb="" _label="_Save"/>
-
-        <menuitem name="FileSaveAs" _label="Save _As..."/>
-
-	<separator/>
-
-        <menuitem name="FileDelete" verb="" _label="_Delete"/>
-
-	<separator/>
-
-	<menuitem name="o" _label="_Move to Folder... (FIXME)"/>
-
-	<menuitem name="p" _label="Cop_y to Folder... (FIXME)"/>
-
-	<separator/>
-
-	<placeholder name="Print">
-
-		<menuitem name="" _label="Print Pre_view"/>
-
-	        <menuitem name="FilePrint" verb="" _label="_Print"/>
-	
-	        <menuitem name="FilePrintSetup" verb="" _label="Print S_etup..."/>
-
-	</placeholder>
-
-	<separator/>
-
-        <menuitem name="EditProperties" verb="" _label="_Properties..."/>
-
-	<separator/>
-
-        <menuitem name="FileClose" verb="" _label="_Close"/>
-
-</submenu>	
-
-<submenu name="Edit" _label="_Edit">
-
-        <menuitem name="EditCut" verb="" _label="C_ut"/>
-	
-        <menuitem name="EditCopy" verb="" _label="_Copy"/>
-	
-        <menuitem name="EditPaste" verb="" _label="_Paste"/>
-
-        <menuitem name="EditClear" verb="" _label="C_lear"/>
-
-        <menuitem name="EditSelectAll" verb="" _label="_Select All"/>
-
-	<placeholder name="EditOps"/>
-
-</submenu>
-
-<submenu _label="_View">
-
-	<submenu _label="Pre_vious">
-
-		<menuitem name="" _label="_Item (FIXME)"/>
-
-		<menuitem name="" _label="_Unread Item (FIXME)"/>
-
-		<menuitem name="" _label="In_complete Task (FIXME)"/>
-
-		<menuitem name="" _label="Fi_rst Item in Folder (FIXME)"/>
-
-	</submenu>
-
-	<submenu _label="N_ext">
-
-		<menuitem name="" _label="_Item (FIXME)"/>
-
-		<menuitem name="" _label="_Unread Item (FIXME)"/>
-
-		<menuitem name="" _label="In_complete Task (FIXME)"/>
-
-		<menuitem name="" _label="_Last Item in Folder (FIXME)"/>
-
-	</submenu>
-
-</submenu>
-
-<submenu _label="_Tools">
-
-	<menuitem name="" _label="Chec_k Names (FIXME)"/>
-
-	<menuitem name="" _label="Address _Book... (FIXME)"/>
-
-</submenu>
-
-<submenu _label="Actio_ns">
-
-	<menuitem name="" _label="S_end Status Report (FIXME)"/>
-
-	<menuitem name="" _label="_Mark Complete (FIXME)"/>
-
-	<separator/>
-
-	<menuitem name="" _label="S_kip Occurrence (FIXME)"/>
-
-	<separator/>
-
-	<menuitem name="" _label="Assig_n Task (FIXME)"/>
-
-	<separator/>
-
-	<menuitem name="" _label="_Reply (FIXME)"/>
-
-	<menuitem name="" _label="Reply to A_ll (FIXME)"/>
-
-	<menuitem name="" _label="For_ward (FIXME)"/>
-
-</submenu>
-
-<submenu name="Help" _label="_Help">
-	
-	<placeholder name="BuiltMenuItems"/>
-
-        <menuitem name="HelpAbout" verb="" _label="_About..."/>
-
-</submenu>
-
-<submenu name="Debug" _label="_Debug" hidden="1">
-
-	<menuitem name="DebugDumpXml"/>
-
-</submenu>
-
-</menu>
-
-<dockitem name="Toolbar" behavior="exclusive">
-
-	<toolitem name="FileSaveAndClose" verb=""/>
-
-	<toolitem name="FileDelete" verb=""/>
-
-	<toolitem name="FileClose" verb=""/>
-
-	<separator/>
-
-	<toolitem name="FilePrint" verb=""/>
-
-	<separator/>
-
-	<toolitem name="GoPrevious" verb=""/>
-
-	<toolitem name="GoNext" verb=""/>
-
-</dockitem>
-
-<status>
-	<item name="main"/>
-</status>
-
-</Root>
diff --git a/ui/evolution-tasks.xml b/ui/evolution-tasks.xml
deleted file mode 100644
index eaf8135645..0000000000
--- a/ui/evolution-tasks.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<Root>
-
-	<menu>
-		<submenu name="File">
-
-			<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" verb="TasksPrint"
-				_label="_Print"
-				pixtype="stock" pixname="Print"
-				accel="*Control*p"/>
-				
-			</placeholder>
-
-		</submenu>
-
-		<submenu name="Edit">
-
-
-		</submenu>
-
-		<submenu name="Settings">
-
-			<menuitem name="Preferences" _label="Tasks Preferences..."
-			verb="TasksPreferences" _tip="Alter preferences"
-                        />
-
-		</submenu>
-	</menu>
-
-	<dockitem name="Toolbar">
-		<toolitem name="New" _label="New"
-		priority="1" _tip="Create a new task" verb="TasksNewTask"
-		pixtype="stock" pixname="New"/>
-
-		<separator/>
-
-		<toolitem name="Print" _label="Print"
-		_tip="Print" verb="TasksPrint"
-		pixtype="stock" pixname="Print"/>
-
-	</dockitem>
-
-</Root>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/ui/evolution.xml b/ui/evolution.xml
deleted file mode 100644
index 40d9be4cbd..0000000000
--- a/ui/evolution.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<Root>
-	<commands>
-		<cmd name="FileClose" _label="Close" _tip="Close this window"
-			pixtype="stock" pixname="Close" accel="*Control*w"/>
-
-	        <cmd name="FileExit" _label="Exit" _tip="Exit the program"
-			pixtype="stock" pixname="Exit" accel="*Control*q"/>
-
-		<cmd name="ViewShortcutBar" type="toggle"
-			_label="Show the _Shortcut Bar"
-			_tip="Toggle whether to show the shortcut bar"/>
-
-		<cmd name="ViewFolderBar" type="toggle"
-			_label="Show the _Folder Bar"
-			_tip="Toggle whether to show the folder bar"/>
-
-		<cmd name="HelpSubmitBug" _label="Submit Bug Report"
-			_tip="Submit bug report using Bug Buddy."/>
-
-
-		<cmd name="HelpAbout" _label="About Evolution..."
-			_tip="Show information about Evolution"
-			pixtype="stock" pixname="About"/>
-
-		<cmd name="BonoboCustomize" _label="Customize"
-			_tip="Customize toolbars"
-			pixtype="stock" pixname="Preferences"/>
-	</commands>
-
-	<menu>
-		<submenu name="File" _label="_File">
-			<submenu name="New" _label="_New">
-				<menuitem name="View" verb="NewView" _label="_View"
-				accel="*Control**Shift*v"
-				pixtype="stock" pixname="New"/>
-
-				<menuitem name="Folder" verb="NewFolder"
-				_label="_Folder"
-				accel="*Control**Shift*f"/>
-
-				<menuitem name="Shortcut" verb="NewBarShortcut"
-				_label="Evolution bar _shortcut"
-				accel="*Control**Shift*s"/>
-
-				<separator/>
-
-				<menuitem name="Mail" verb="NewMailMessage"
-				_label="_Mail message"
-				accel="*Control**Shift*m"/>
-
-				<menuitem name="Appointment" verb="NewAppointment"
-				_label="_Appointment (FIXME)"
-				accel="*Control**Shift*a"/>
-
-				<menuitem name="Contact" verb="NewContact"
-				_label="_Contact (FIXME)"
-				accel="*Control**Shift*c"/>
-
-				<menuitem name="Task" verb="NewTask"
-				_label="_Task (FIXME)"
-				accel="*Control**Shift*t"/>
-			
-				<placeholder name="NewItems"/>
-			</submenu>
-
-			<placeholder name="FileOps"/>
-
-			<separator/>
-
-			<menuitem name="FileImporter" verb=""
-			_label="_Import file..."
-			_tip="Import an external file format" accel="*Control*i"/>
-
-			<menuitem name="FileGoToFolder" verb=""
-			_label="_Go to Folder..."
-			_tip="Display a different folder" accel="*Control*g"/>
-
-			<placeholder name="Print" delimit="top"/>
-
-			<separator/>
-
-			<menuitem name="FileClose" verb=""
-			_label="_Close"/>
-
-			<menuitem name="FileExit" verb="" _label="E_xit"/>
-
-		</submenu>
-
-		<submenu name="Edit" _label="_Edit">
-
-			<placeholder/>
-
-			<menuitem name="BonoboCustomize" verb=""
-			 _label="Customi_ze..." pos="bottom"/>
-
-		</submenu>
-
-		<submenu name="View" _label="_View">
-
-			<menuitem name="ShortcutBar" id="ViewShortcutBar" 
-				  accel="*Control*s"/>
-			<menuitem name="FolderBar" id="ViewFolderBar" accel="*Control*f"/>
-
-		</submenu>
-
-		<submenu name="Settings" _label="_Settings"/>
-
-		<placeholder name="Component"/>
-
-		<submenu name="Help" _label="_Help">
-
-			<menuitem name="HelpIndex" verb=""
-			_label="_Index"
-                        accel="*Control*h"/>
-
-			<menuitem name="HelpGetStarted" verb=""
-			_label="Getting _Started"
-			 />
-
-			<menuitem name="HelpUsingMail" verb=""
-			_label="Using the _Mailer"
-			 />
-
-			<menuitem name="HelpUsingCalendar" verb=""
-			_label="Using the _Calendar"
-			 />
-
-			<menuitem name="HelpUsingContact" verb=""
-			_label="Using the C_ontact Manager"
-			 />
-
-			<separator/>
-
-			<menuitem name="HelpSubmitBug" verb=""
-			_label="Submit _Bug Report"/>
-
-			<separator/>
-
-			<menuitem name="HelpAbout" verb=""
-			_label="_About Evolution..."/>
-
-		</submenu>
-	</menu>
-
-	<dockitem name="Toolbar" relief="none" behavior="exclusive"
-	 _tip="Main toolbar" hlook="text" vlook="icon"/>
-
-	<status>
-		<item name="main"/>
-		<control name="Progress"/>
-	</status>
-</Root>
-
-
-
-
-
-
-
-
-
-
-
-