This commit was manufactured by cvs2svn to create tag 'gtkmm_1_2_4'.gtkmm_1_2_4

svn path=/tags/gtkmm_1_2_4/; revision=6452

14 files changed, 0 insertions, 1818 deletions

diff --git a/ui/.cvsignore b/ui/.cvsignore
deleted file mode 100644
index d6c55c7345..0000000000
--- a/ui/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-*.lo
-*.la
diff --git a/ui/ChangeLog b/ui/ChangeLog
deleted file mode 100644
index 94adfc3c12..0000000000
--- a/ui/ChangeLog
+++ /dev/null
@@ -1,136 +0,0 @@
-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 1cbc68539c..0000000000
--- a/ui/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-XML_FILES =				\
-	evolution.xml			\
-	evolution-addressbook.xml	\
-	evolution-addressbook-ldap.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
-
-uidir = $(datadir)/gnome/ui
-ui_DATA = $(XML_FILES)
-
-EXTRA_DIST = $(XML_FILES)
diff --git a/ui/evolution-addressbook-ldap.xml b/ui/evolution-addressbook-ldap.xml
deleted file mode 100644
index 67f887857a..0000000000
--- a/ui/evolution-addressbook-ldap.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<Root>
-	<menu>
-
-		<placeholder name="Component">
-
-			<submenu name="Actions" _label="_Actions">
-
-				<menuitem name="New Directory Server" verb="ContactNewServer"
-				_label="N_ew Directory Server"/>
-
-			</submenu>
-
-		</placeholder>
- 	</menu>
-</Root>
diff --git a/ui/evolution-addressbook.xml b/ui/evolution-addressbook.xml
deleted file mode 100644
index bda0509e9e..0000000000
--- a/ui/evolution-addressbook.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<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>
-	</menu>
-
-	<dockitem name="Toolbar">
-		<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/>
-
-		<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
diff --git a/ui/evolution-calendar.xml b/ui/evolution-calendar.xml
deleted file mode 100644
index 4e262a1e59..0000000000
--- a/ui/evolution-calendar.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<Root>
-
-	<menu>
-		<submenu name="File">
-
-			<submenu name="New" _label="_New">
-
-				<menuitem name="CalendarNew" verb=""
-				_label="New Ca_lendar" _tip="Create a new calendar"/>
-
-			</submenu>
-
-			<placeholder name="FileOps">
-				<submenu name="Open" _label="_Open">
-
-					<menuitem name="CalendarOpen" verb=""
-					_label="_Open Calendar" _tip="Open a calendar"/>
-
-				</submenu>
-
-				<menuitem name="CalendarSaveAs" verb=""
-				_label="_Save Calendar As"
-				_tip="Save calendar As something else"/>
-
-			</placeholder>
-
-			<placeholder name="Print">
-
-				<menuitem name="Print" verb="CalendarPrint"
-				_label="_Print this calendar"
-				pixtype="stock" pixname="Print"
-				accel="*Control*p"/>
-				
-			</placeholder>
-
-		</submenu>
-
-		<submenu name="Edit">
-
-			<menuitem name="Appointment" _label="_New appointment..."
-			verb="EditNewAppointment" _tip="Create a new appointment"/>
-
-		</submenu>
-
-		<submenu name="Settings">
-
-			<menuitem name="Preferences" _label="Calendar Preferences..."
-			verb="CalendarPreferences" _tip="Alter preferences"/>
-
-		</submenu>
-	</menu>
-
-	<dockitem name="Toolbar">
-		<toolitem name="New" _label="New"
-		_tip="Create a new appointment" verb="EditNewAppointment"
-		pixtype="stock" pixname="New"/>
-
-		<separator/>
-
-		<toolitem name="Print" _label="Print"
-		_tip="Print this calendar" verb="CalendarPrint"
-		pixtype="stock" pixname="Print"/>
-
-		<separator/>
-
-		<toolitem name="Prev" _label="Prev"
-		_tip="Go back in time" verb="CalendarPrev"
-		pixtype="stock" pixname="Back"/>
-
-		<toolitem name="Today" _label="Today"
-		_tip="Go to present time" verb="CalendarToday"
-		pixtype="stock" pixname="Home"/>
-
-		<toolitem name="Next" _label="Next"
-		_tip="Go forward in time" verb="CalendarNext"
-		pixtype="stock" pixname="Forward"/>
-
-		<separator/>
-
-		<toolitem name="Goto" _label="Go to"
-		_tip="Go to a specific date" verb="CalendarGoto"
-		pixtype="stock" pixname="Jump To"/>
-		
-		<separator/>
-
-		<toolitem name="DayView" _label="Day"
-		_tip="Show 1 day" verb="ShowDayView"
-		pixtype="pixbuf"/>
-
-		<toolitem name="WorkWeekView" _label="5 Days"
-		_tip="Show the working week" verb="ShowWorkWeekView"
-		pixtype="pixbuf"/>
-
-		<toolitem name="WeekView" _label="Week"
-		_tip="Show 1 week" verb="ShowWeekView"
-		pixtype="pixbuf"/>
-
-		<toolitem name="MonthView" _label="Month"
-		_tip="Show 1 month" verb="ShowMonthView"
-		pixtype="pixbuf"/>
-
-	</dockitem>
-
-</Root>
diff --git a/ui/evolution-contact-editor.xml b/ui/evolution-contact-editor.xml
deleted file mode 100644
index 6a074e7af2..0000000000
--- a/ui/evolution-contact-editor.xml
+++ /dev/null
@@ -1,248 +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="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 5460052e2b..0000000000
--- a/ui/evolution-event-editor.xml
+++ /dev/null
@@ -1,350 +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="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"/>
-
-	<menuitem name="ActionScheduleMeeting" _label="FIXME: Schedule Meeting"
-	_tip="Schedule some sort of a meeting"/>
-
-        <cmd name="HelpAbout" _label="About..." _tip="About this application"
-	 pixtype="stock" pixname="About"/>
-
-	<cmd name="HelpOnline" _label="FIXME: Help" _tip="See online help"
-	pixtype="stock" pixname="Help"/>
-
-	<cmd name="DebugDumpXml" _label="Dump XML" _tip="Dump the UI Xml description" hidden="1"/>
-
-</commands>
-
-<menu>
-
-<submenu name="File" _label="_File">
-        
-	<submenu name="New">
-
-		<menuitem name="c" _label="FIXME: _Mail Message"/>
-
-		<menuitem name="g" _label="FIXME: _Contact"/>
-
-		<menuitem name="a" _label="FIXME: _Task"/>
-
-		<menuitem name="b" _label="FIXME: Task _Request"/>
-
-		<menuitem name="h" _label="FIXME: _Journal Entry"/>
-
-		<menuitem name="i" _label="FIXME: _Note"/>
-
-		<separator/>
-
-		<menuitem name="j" _label="FIXME: Ch_oose Form..."/>
-
-	</submenu>
-
-	<placeholder name="Print">
-
-		<menuitem name="k" _label="FIXME: _Memo Style"/>
-
-		<menuitem name="l" _label="FIXME: Define Print _Styles"/>
-
-		<menuitem name="" _label="FIXME: Print Pre_view"/>
-
-	        <menuitem name="FilePrint" verb="" _label="_Print"/>
-	
-	        <menuitem name="FilePrintSetup" verb="" _label="Print S_etup..."/>
-
-	</placeholder>
-
-	<separator/>
-
-	<menuitem name="m" _label="FIXME: S_end"/>
-
-	<separator/>
-
-        <menuitem name="FileSave" verb=""  _label="_Save"/>
-
-        <menuitem name="FileSaveAs" _label="Save _As..."/>
-
-	<menuitem name="n" _label="FIXME: Save Attac_hments..."/>
-
-	<separator/>
-
-        <menuitem name="FileDelete" verb="" _label="_Delete"/>
-
-	<menuitem name="o" _label="FIXME: _Move to Folder..."/>
-
-	<menuitem name="p" _label="FIXME: Cop_y to Folder..."/>
-
-	<separator/>
-
-	<separator/>
-
-        <menuitem name="EditProperties" verb="" _label="_Properties..."/>
-
-	<separator/>
-
-        <menuitem name="FileClose" verb="" _label="_Close"/>
-
-</submenu>	
-
-<submenu name="Edit" _label="_Edit">
-
-        <menuitem name="EditUndo" verb="" _label="_Undo"/>
-	
-        <menuitem name="EditRedo" verb="" _label="_Redo"/>
-	
-	<separator/>
-
-        <menuitem name="EditCut" verb="" _label="C_ut"/>
-	
-        <menuitem name="EditCopy" verb="" _label="_Copy"/>
-	
-        <menuitem name="EditPaste" verb="" _label="_Paste"/>
-
-        <menuitem name="EditPasteSpecial" verb="" _label="FIXME: Paste _Special... "/>
-	
-        <menuitem name="EditClear" verb="" _label="C_lear"/>
-
-        <menuitem name="EditSelectAll" verb="" _label="C_lear"/>
-
-	<separator/>
-	
-        <menuitem name="EditFind" verb="" _label="_Find..."/>
-	
-        <menuitem name="EditFindAgain" verb="" _label="Find _Again"/>
-	
-        <menuitem name="EditReplace" verb="" _label="_Replace..."/>
-	
-	<placeholder name="EditOps"/>
-
-	<submenu name="object" _label="_Object">
-
-		<menuitem name="What" _label="FIXME: what goes here?"/>
-
-	</submenu>
-
-</submenu>
-
-<submenu _label="_View">
-
-	<submenu _label="Pre_vious">
-
-		<menuitem name="" _label="FIXME: _Item"/>
-
-		<menuitem name="" _label="FIXME: _Unread Item"/>
-
-		<menuitem name="" _label="FIXME: In_complete Task"/>
-
-		<menuitem name="" _label="FIXME: Fi_rst Item in Folder"/>
-
-	</submenu>
-
-	<submenu _label="N_ext">
-
-		<menuitem name="" _label="FIXME: _Item"/>
-
-		<menuitem name="" _label="FIXME: _Unread Item"/>
-
-		<menuitem name="" _label="FIXME: In_complete Task"/>
-
-		<menuitem name="" _label="FIXME: _Last Item in Folder"/>
-
-	</submenu>
-
-	<separator/>
-
-	<submenu _label="_Toolbars">
-
-		<menuitem type="toggle" _label="FIXME: _Standard"/>
-
-		<menuitem type="toggle" _label="FIXME: _Formatting"/>
-
-		<separator/>
-
-		<menuitem _label="FIXME: _Customize..."/>
-
-	</submenu>
-
-</submenu>
-
-<submenu _label="_Insert">
-
-	<menuitem name="" _label="FIXME: _File..."/>
-
-	<menuitem name="" _label="FIXME: It_em..."/>
-
-	<menuitem name="" _label="FIXME: _Object..."/>
-
-</submenu>
-
-<submenu _label="F_ormat">
-	<menuitem name="" _label="FIXME: _Font..."/>
-
-	<menuitem name="" _label="FIXME: _Paragraph..."/>
-
-</submenu>
-
-<submenu _label="_Tools">
-
-	<menuitem name="" _label="FIXME: _Spelling..."/>
-
-	<separator/>
-
-	<menuitem name="" _label="FIXME: Chec_k Names"/>
-
-	<menuitem name="" _label="FIXME: Address _Book..."/>
-
-	<separator/>
-
-	<submenu _label="_Forms">
-
-		<menuitem name="" _label="FIXME: Ch_oose Form..."/>
-
-		<separator/>
-
-		<menuitem name="" _label="FIXME: Desi_gn This Form"/>
-
-		<menuitem name="" _label="FIXME: D_esign a Form..."/>
-
-		<separator/>
-
-		<menuitem name="" _label="FIXME: Publish _Form..."/>
-
-		<menuitem name="" _label="FIXME: Pu_blish Form As..."/>
-
-		<separator/>
-
-		<menuitem name="" _label="FIXME: Script _Debugger"/>
-
-	</submenu>
-
-</submenu>
-
-<submenu _label="Actio_ns">
-
-	<menuitem name="" _label="FIXME: _New Appointment"/>
-
-	<separator/>
-
-	<menuitem name="" _label="FIXME: Rec_urrence..."/>
-
-	<separator/>
-
-	<menuitem name="ActionScheduleMeeting" verb="" _label="FIXME: Schedule _Meeting"/>
-
-	<separator/>
-
-	<menuitem name="" _label="FIXME: Forward as v_Calendar"/>
-
-	<menuitem name="" _label="FIXME: For_ward"/>
-
-</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 _label="FIXME: Insert File" pixtype="stock" pixname="Attach"/>
-
-	<separator/>
-
-	<toolitem name="GoPrevious" verb=""/>
-
-	<toolitem name="GoNext" verb=""/>
-
-	<toolitem name="HelpOnline" verb=""/>
-
-</dockitem>
-
-<status>
-	<item name="main"/>
-</status>
-
-</Root>
\ No newline at end of file
diff --git a/ui/evolution-executive-summary.xml b/ui/evolution-executive-summary.xml
deleted file mode 100644
index 2921bd45b6..0000000000
--- a/ui/evolution-executive-summary.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-  <dockitem name="Toolbar" relief="none" behavior="exclusive">
-
-    <toolitem name="AddService" verb="AddService"
-    _label="Add Service" _tip="Add a new service to the Executive Summary"
-    pixtype="pixbuf"/>
-
-  </dockitem>
-</Root>
diff --git a/ui/evolution-mail.xml b/ui/evolution-mail.xml
deleted file mode 100644
index 498ad063b7..0000000000
--- a/ui/evolution-mail.xml
+++ /dev/null
@@ -1,207 +0,0 @@
-<Root>
-
-  <commands>
-
-    <cmd name="ViewThreaded"
-      _label="_Threaded" _tip="Threaded Message list" type="toggle" />
- 
-  </commands>
-
-  <keybindings>
-
-	<accel name="D" verb="MessageDelete"/>
-
-  </keybindings>
-
-  <menu>
-
-    <submenu name="File">
-
-	<placeholder name="Print">
-
-        <menuitem name="Print" verb="PrintMessage"
-        _label="Print message..."
-        _tip="Print message to the printer"
-        pixtype="stock" pixname="Print"/>
-
-        <menuitem name="Print Preview" verb="PrintPreviewMessage"
-        _label="Print Preview of message..."
-        _tip="Previews the message to be printed"
-        pixtype="stock" pixname="Print"/>
-
-      </placeholder>
-
-    </submenu>
-
-    <submenu name="Edit">
-
-        <menuitem name="EditSelectAll" verb=""
-        _label="Select _All"/>
-
-        <menuitem name="EditInvertSelection" verb=""
-        _label="_Invert Selection"/>
-
-    </submenu>
-
-    <submenu name="View">
-
-      <menuitem/>
-
-      <menuitem name="Threaded" verb="ViewThreaded"/>
-
-    </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..."/>
-
-      <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"/>
-
-        <menuitem name="MessagePrint" verb=""
-        _label="_Print Message"/>
-
-        <menuitem/>
-
-        <menuitem name="MessageReplySndr" verb=""
-        _label="Reply to _Sender"/>
-
-        <menuitem name="MessageReplyAll" verb=""
-        _label="Reply to _All"/>
-
-        <menuitem name="MessageForward" verb=""
-        _label="_Forward"/>
-
-        <menuitem/>
-
-        <menuitem name="MessageMarkAsRead" verb=""
-        _label="Mar_k As Read"/>
-
-        <menuitem name="MessageMarkAsUnRead" verb=""
-        _label="Mark As U_nread"/>
-
-        <menuitem/>
-
-        <menuitem name="MessageMove" verb=""
-        _label="_Move to Folder..."/>
-
-        <menuitem name="MessageCopy" verb=""
-        _label="_Copy to Folder..."/>
-
-        <menuitem name="MessageDelete" verb=""
-        _label="_Delete"/>
-
-        <menuitem name="MessageUndelete" verb=""
-        _label="_Undelete"/>
-
-        <menuitem/>
-
-        <menuitem name="MessageApplyFilters" verb=""
-        _label="_Apply Filters"/>
-
-        <menuitem/>
-
-        <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"/>
-
-        <menuitem/>
-
-        <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 name="Folder" _label="F_older">
-
-        <menuitem name="FolderExpunge" verb=""
-        _label="_Expunge"/>
-
-        <menuitem name="FolderConfig" verb=""
-        _label="_Configure Folder"/>
-
-      </submenu>
-
-    </placeholder>
-  </menu>
-
-  <dockitem name="Toolbar">
-
-    <toolitem name="MailGet" verb=""
-    _label="Get Mail" _tip="Send queued mail and retrieve new mail"
-    pixtype="pixbuf"/>
-
-    <toolitem name="MailCompose" verb=""
-    _label="Compose" _tip="Compose a new message"
-    pixtype="pixbuf"/>
-
-    <separator/>
-
-    <toolitem name="Reply" verb="MessageReplySndr"
-    _label="Reply" _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"
-    pixtype="pixbuf"/>
-
-    <toolitem name="Forward" verb="MessageForward"
-    _label="Forward" _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"/>
-
-  </dockitem>
-</Root>
diff --git a/ui/evolution-message-composer.xml b/ui/evolution-message-composer.xml
deleted file mode 100644
index f33bb07c5c..0000000000
--- a/ui/evolution-message-composer.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<Root>
-	<commands>
-
-	        <cmd name="FileOpen" _label="Open" hidden="1"
-		_tip="Open a file" pixtype="stock" pixname="Open" accel="F3"/>
-	
-	        <cmd name="FileSave" _label="Save"
-		_tip="Save the current file" pixtype="stock" pixname="Save"
-		accel="*Control*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="*Control*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"
-		pixtype="stock" pixname="Send Mail" accel="*Control*Return"/>
-
-		<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"/>
-
-		<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"/> 
-	
-	</commands>
-
-	<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="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 _Now"/>
-
-			<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="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">
-
-		<toolitem name="FileSend" verb=""/>
-
-		<toolitem name="FileAttach" verb=""/>
-
-		<separator/>
-
-		<toolitem name="bold" type="toggle" _label="Bold"
-		_descr="Sets something as bold" pixtype="stock"
-		pixname="Open" id="bold"/>
-	
-	</dockitem>
-
-</Root>
\ No newline at end of file
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 bc150c4166..0000000000
--- a/ui/evolution-task-editor-dialog.xml
+++ /dev/null
@@ -1,361 +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="HelpOnline" _label="FIXME: Help" _tip="See online help"
-	pixtype="stock" pixname="Help"/>
-
-	<cmd name="DebugDumpXml" _label="Dump XML" _tip="Dump the UI Xml description" hidden="1"/>
-
-</commands>
-
-<menu>
-
-<submenu name="File" _label="_File">
-        
-	<submenu name="New">
-
-		<menuitem name="a" _label="FIXME: _Task"/>
-
-		<menuitem name="b" _label="FIXME: Task _Request"/>
-
-		<separator/>
-
-		<menuitem name="c" _label="FIXME: _Mail Message"/>
-
-		<menuitem name="e" _label="FIXME: _Appointment"/>
-
-		<menuitem name="f" _label="FIXME: Meeting Re_quest"/>
-
-		<menuitem name="g" _label="FIXME: _Contact"/>
-
-		<menuitem name="h" _label="FIXME: _Journal Entry"/>
-
-		<menuitem name="i" _label="FIXME: _note"/>
-
-		<separator/>
-
-		<menuitem name="j" _label="FIXME: Ch_oose Form..."/>
-
-	</submenu>
-
-	<placeholder name="Print">
-
-		<menuitem name="k" _label="FIXME: _Memo Style"/>
-
-		<menuitem name="l" _label="FIXME: Define Print _Styles"/>
-
-		<menuitem name="" _label="FIXME: Print Pre_view"/>
-
-	        <menuitem name="FilePrint" verb="" _label="_Print"/>
-	
-	        <menuitem name="FilePrintSetup" verb="" _label="Print S_etup..."/>
-
-	</placeholder>
-
-	<separator/>
-
-	<menuitem name="m" _label="FIXME: S_end"/>
-
-	<separator/>
-
-        <menuitem name="FileSave" verb=""  _label="_Save"/>
-
-        <menuitem name="FileSaveAs" _label="Save _As..."/>
-
-	<menuitem name="n" _label="FIXME: Save Attac_hments..."/>
-
-	<separator/>
-
-        <menuitem name="FileDelete" verb="" _label="_Delete"/>
-
-	<menuitem name="o" _label="FIXME: _Move to Folder..."/>
-
-	<menuitem name="p" _label="FIXME: Cop_y to Folder..."/>
-
-	<separator/>
-
-	<separator/>
-
-        <menuitem name="EditProperties" verb="" _label="_Properties..."/>
-
-	<separator/>
-
-        <menuitem name="FileClose" verb="" _label="_Close"/>
-
-</submenu>	
-
-<submenu name="Edit" _label="_Edit">
-
-        <menuitem name="EditUndo" verb="" _label="_Undo"/>
-	
-        <menuitem name="EditRedo" verb="" _label="_Redo"/>
-	
-	<separator/>
-
-        <menuitem name="EditCut" verb="" _label="C_ut"/>
-	
-        <menuitem name="EditCopy" verb="" _label="_Copy"/>
-	
-        <menuitem name="EditPaste" verb="" _label="_Paste"/>
-
-        <menuitem name="EditPasteSpecial" verb="" _label="FIXME: Paste _Special... "/>
-	
-        <menuitem name="EditClear" verb="" _label="C_lear"/>
-
-        <menuitem name="EditSelectAll" verb="" _label="C_lear"/>
-
-	<separator/>
-	
-        <menuitem name="EditFind" verb="" _label="_Find..."/>
-	
-        <menuitem name="EditFindAgain" verb="" _label="Find _Again"/>
-	
-        <menuitem name="EditReplace" verb="" _label="_Replace..."/>
-	
-	<placeholder name="EditOps"/>
-
-	<submenu name="object" _label="_Object">
-
-		<menuitem name="What" _label="FIXME: what goes here?"/>
-
-	</submenu>
-
-</submenu>
-
-<submenu _label="_View">
-
-	<submenu _label="Pre_vious">
-
-		<menuitem name="" _label="FIXME: _Item"/>
-
-		<menuitem name="" _label="FIXME: _Unread Item"/>
-
-		<menuitem name="" _label="FIXME: In_complete Task"/>
-
-		<menuitem name="" _label="FIXME: Fi_rst Item in Folder"/>
-
-	</submenu>
-
-	<submenu _label="N_ext">
-
-		<menuitem name="" _label="FIXME: _Item"/>
-
-		<menuitem name="" _label="FIXME: _Unread Item"/>
-
-		<menuitem name="" _label="FIXME: In_complete Task"/>
-
-		<menuitem name="" _label="FIXME: _Last Item in Folder"/>
-
-	</submenu>
-
-	<separator/>
-
-	<submenu _label="_Toolbars">
-
-		<menuitem type="toggle" _label="FIXME: _Standard"/>
-
-		<menuitem type="toggle" _label="FIXME: _Formatting"/>
-
-		<separator/>
-
-		<menuitem _label="FIXME: _Customize..."/>
-
-	</submenu>
-
-</submenu>
-
-<submenu _label="_Insert">
-
-	<menuitem name="" _label="FIXME: _File..."/>
-
-	<menuitem name="" _label="FIXME: It_em..."/>
-
-	<menuitem name="" _label="FIXME: _Object..."/>
-
-</submenu>
-
-<submenu _label="F_ormat">
-	<menuitem name="" _label="FIXME: _Font..."/>
-
-	<menuitem name="" _label="FIXME: _Paragraph..."/>
-
-</submenu>
-
-<submenu _label="_Tools">
-
-	<menuitem name="" _label="FIXME: _Spelling..."/>
-
-	<separator/>
-
-	<menuitem name="" _label="FIXME: Chec_k Names"/>
-
-	<menuitem name="" _label="FIXME: Address _Book..."/>
-
-	<separator/>
-
-	<submenu _label="_Forms">
-
-		<menuitem name="" _label="FIXME: Ch_oose Form..."/>
-
-		<separator/>
-
-		<menuitem name="" _label="FIXME: Desi_gn This Form"/>
-
-		<menuitem name="" _label="FIXME: D_esign a Form..."/>
-
-		<separator/>
-
-		<menuitem name="" _label="FIXME: Publish _Form..."/>
-
-		<menuitem name="" _label="FIXME: Pu_blish Form As..."/>
-
-		<separator/>
-
-		<menuitem name="" _label="FIXME: Script _Debugger"/>
-
-	</submenu>
-
-</submenu>
-
-<submenu _label="Actio_ns">
-
-	<menuitem name="" _label="FIXME: _New Task"/>
-
-	<separator/>
-
-	<menuitem name="" _label="FIXME: S_end Status Report"/>
-
-	<menuitem name="" _label="FIXME: _Mark Complete"/>
-
-	<separator/>
-
-	<menuitem name="" _label="FIXME: Rec_urrence..."/>
-
-	<menuitem name="" _label="FIXME: S_kip Occurrence"/>
-
-	<separator/>
-
-	<menuitem name="" _label="FIXME: Assig_n Task"/>
-
-	<separator/>
-
-	<menuitem name="" _label="FIXME: _Reply"/>
-
-	<menuitem name="" _label="FIXME: Reply to A_ll"/>
-
-	<menuitem name="" _label="FIXME: For_ward"/>
-
-</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=""/>
-
-	<separator/>
-
-	<toolitem name="FilePrint" verb=""/>
-
-	<toolitem _label="FIXME: Insert File" pixtype="stock" pixname="Attach"/>
-
-	<separator/>
-
-	<toolitem name="FileDelete" verb=""/>
-
-	<separator/>
-
-	<toolitem name="GoPrevious" verb=""/>
-
-	<toolitem name="GoNext" verb=""/>
-
-	<toolitem name="HelpOnline" verb=""/>
-
-</dockitem>
-
-<status>
-	<item name="main"/>
-</status>
-
-</Root>
\ No newline at end of file
diff --git a/ui/evolution.xml b/ui/evolution.xml
deleted file mode 100644
index 01e88fda4a..0000000000
--- a/ui/evolution.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<Root>
-	<commands>
-		<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"/>
-	</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 (FIXME)"
-				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"/>
-			</submenu>
-
-			<placeholder name="FileOps"/>
-
-			<separator/>
-
-			<menuitem name="FileGoToFolder" verb=""
-			_label="_Go to Folder..."
-			_tip="Display a different folder"/>
-
-			<menuitem name="FileCreateFolder" verb=""
-			_label="_Create New Folder..."
-			_tip="Create a new folder"/>
-
-			<placeholder name="Print" delimit="top"/>
-
-			<separator/>
-
-			<menuitem name="FileExit" verb=""
-			_label="E_xit" _tip="Exit the program"
-			pixtype="stock" pixname="Quit"
-			accel="*Control*q"/>
-			
-		</submenu>
-
-		<submenu name="Edit" _label="_Edit"/>
-
-		<submenu name="View" _label="_View">
-
-			<menuitem name="ShortcutBar" id="ViewShortcutBar"/>
-			<menuitem name="FolderBar" id="ViewFolderBar"/>
-
-		</submenu>
-
-		<submenu name="Settings" _label="_Settings"/>
-
-		<placeholder name="Component"/>
-
-		<submenu name="Help" _label="_Help">
-
-			<menuitem name="HelpIndex" verb=""
-			_label="_Index"/>
-
-			<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"/>
-
-			<menuitem/>
-
-			<menuitem name="HelpSubmitBug" verb=""
-			_label="_Submit Bug Report"
-			_tip="Submit bug report using Bug Buddy"/>
-
-			<menuitem/>
-
-			<menuitem name="HelpAbout" verb=""
-			_label="_About Evolution..."
-			_tip="Show information about Evolution"
-			pixtype="stock" pixname="About"/>
-
-		</submenu>
-	</menu>
-
-	<dockitem name="Toolbar" relief="none" behavior="exclusive"/>
-
-	<status>
-		<item name="main"/>
-		<control name="Progress"/>
-	</status>
-</Root>