Progress update:

	- Calendar is kind of a mess at the moment.  Doesn't compile.

	- Roughed in the Mail module, including all the actions.
	  That _does_ compile.  Runs, even.


svn path=/branches/kill-bonobo/; revision=36611

4 files changed, 277 insertions, 0 deletions

diff --git a/ui/Makefile.am b/ui/Makefile.am
index fb02f4f427..a794a869fb 100644
--- a/ui/Makefile.am
+++ b/ui/Makefile.am
@@ -8,6 +8,7 @@ XML_FILES =					\
 UI_FILES =					\
 	evolution-calendars.ui			\
 	evolution-contacts.ui			\
+	evolution-mail.ui			\
 	evolution-memos.ui			\
 	evolution-shell.ui			\
 	evolution-tasks.ui
diff --git a/ui/evolution-calendars.ui b/ui/evolution-calendars.ui
index a32cf182bc..761b7fd14a 100644
--- a/ui/evolution-calendars.ui
+++ b/ui/evolution-calendars.ui
@@ -54,6 +54,76 @@
     <separator/>
     <menuitem action='calendar-properties'/>
   </popup>
+  <popup name='calendar-empty-popup'>
+    <menuitem action='event-new'/>
+    <menuitem action='event-all-day-new'/>
+    <menuitem action='event-meeting-new'/>
+    <separator/>
+    <menuitem action='event-print'/>
+    <separator/>
+    <menuitem action='event-clipboard-paste'/>
+    <separator/>
+    <menuitem action='gal-view-menu'/>
+    <menuitem action='calendar-go-today'/>
+    <menuitem action='calendar-jump-to'/>
+  </popup>
+  <popup name='calendar-event-popup'>
+    <menuitem action='event-open'/>
+    <menuitem action='event-save-as'/>
+    <menuitem action='event-print'/>
+    <separator/>
+    <menuitem action='event-clipboard-cut'/>
+    <menuitem action='event-clipboard-copy'/>
+    <menuitem action='event-clipboard-paste'/>
+    <separator/>
+    <menuitem action='event-copy'/>
+    <menuitem action='event-move'/>
+    <menuitem action='event-delegate'/>
+    <menuitem action='event-schedule'/>
+    <menuitem action='event-forward'/>
+    <menuitem action='event-reply'/>
+    <menuitem action='event-reply-all'/>
+    <separator/>
+    <menuitem action='event-occurrence-movable'/>
+    <menuitem action='event-delete'/>
+    <menuitem action='event-delete-occurrence'/>
+    <menuitem action='event-delete-occurrence-all'/>
+  </popup>
+  <popup name='calendar-memopad-popup'>
+    <menuitem action='calendar-memopad-new'/>
+    <separator/>
+    <menuitem action='calendar-memopad-open'/>
+    <menuitem action='calendar-memopad-open-url'/>
+    <menuitem action='calendar-memopad-save-as'/>
+    <menuitem action='calendar-memopad-print'/>
+    <separator/>
+    <menuitem action='calendar-memopad-clipboard-cut'/>
+    <menuitem action='calendar-memopad-clipboard-copy'/>
+    <menuitem action='calendar-memopad-clipboard-paste'/>
+    <separator/>
+    <menuitem action='calendar-memopad-forward'/>
+    <separator/>
+    <menuitem action='calendar-memopad-delete'/>
+  </popup>
+  <popup name='calendar-taskpad-popup'>
+    <menuitem action='calendar-taskpad-new'/>
+    <separator/>
+    <menuitem action='calendar-taskpad-open'/>
+    <menuitem action='calendar-taskpad-open-url'/>
+    <menuitem action='calendar-taskpad-save-as'/>
+    <menuitem action='calendar-taskpad-print'/>
+    <separator/>
+    <menuitem action='calendar-taskpad-clipboard-cut'/>
+    <menuitem action='calendar-taskpad-clipboard-copy'/>
+    <menuitem action='calendar-taskpad-clipboard-paste'/>
+    <separator/>
+    <menuitem action='calendar-taskpad-assign'/>
+    <menuitem action='calendar-taskpad-forward'/>
+    <menuitem action='calendar-taskpad-mark-complete'/>
+    <menuitem action='calendar-taskpad-mark-incomplete'/>
+    <separator/>
+    <menuitem action='calendar-taskpad-delete'/>
+  </popup>
   <popup name='calendar-search-options'>
     <menuitem action='calendar-search-summary-contains'/>
     <menuitem action='calendar-search-description-contains'/>
diff --git a/ui/evolution-mail.ui b/ui/evolution-mail.ui
new file mode 100644
index 0000000000..ec1934d0ef
--- /dev/null
+++ b/ui/evolution-mail.ui
@@ -0,0 +1,203 @@
+<ui>
+  <menubar name='main-menu'>
+    <menu action='file-menu'>
+      <placeholder name='print-actions'>
+        <menuitem action='mail-print-preview'/>
+        <menuitem action='mail-print'/>
+      </placeholder>
+      <placeholder name='long-running-actions'>
+        <menuitem action='mail-empty-trash'/>
+        <menuitem action='mail-download'/>
+      </placeholder>
+    </menu>
+    <menu action='edit-menu'>
+      <placeholder name='edit-actions'>
+        <menuitem action='mail-clipboard-copy'/>
+        <separator/>
+        <menuitem action='mail-select-all'/>
+        <separator/>
+        <menuitem action='mail-delete'/>
+        <menuitem action='mail-undelete'/>
+        <separator/>
+        <menuitem action='mail-find'/>
+      </placeholder>
+      <placeholder name='administrative-actions'>
+        <menuitem action='mail-tools-filters'/>
+        <menuitem action='mail-tools-search-folders'/>
+      </placeholder>
+    </menu>
+    <menu action='view-menu'>
+      <placeholder name='view-custom-menus'>
+        <menu action='mail-preview-menu'>
+          <menuitem action='mail-preview'/>
+          <separator/>
+          <menuitem action='mail-view-classic'/>
+          <menuitem action='mail-view-vertical'/>
+        </menu>
+      </placeholder>
+      <separator/>
+      <menuitem action='mail-threads-group-by'/>
+      <menuitem action='mail-threads-expand-all'/>
+      <menuitem action='mail-threads-collapse-all'/>
+      <separator/>
+      <menuitem action='mail-hide-deleted'/>
+      <menuitem action='mail-hide-selected'/>
+      <menuitem action='mail-hide-read'/>
+      <menuitem action='mail-show-hidden'/>
+      <separator/>
+      <menuitem action='mail-load-images'/>
+      <menuitem action='mail-show-all-headers'/>
+      <menuitem action='mail-caret-mode'/>
+      <menuitem action='mail-show-source'/>
+      <menu action='mail-zoom-menu'>
+        <menuitem action='mail-zoom-in'/>
+        <menuitem action='mail-zoom-out'/>
+        <menuitem action='mail-zoom-100'/>
+      </menu>
+      <menu action='mail-encoding-menu'/>
+    </menu>
+    <placeholder name='custom-menus'>
+      <menu action='mail-folder-menu'>
+        <menuitem action='mail-folder-new'/>
+        <menuitem action='mail-tools-subscriptions'/>
+        <separator/>
+        <menuitem action='mail-folder-copy'/>
+        <menuitem action='mail-folder-move'/>
+        <separator/>
+        <menuitem action='mail-folder-select-all'/>
+        <menuitem action='mail-folder-select-thread'/>
+        <menuitem action='mail-folder-select-subthread'/>
+        <menuitem action='mail-folder-mark-all-as-read'/>
+        <menuitem action='mail-folder-expunge'/>
+        <separator/>
+        <menuitem action='mail-folder-rename'/>
+        <menuitem action='mail-folder-refresh'/>
+        <menuitem action='mail-folder-delete'/>
+        <separator/>
+        <menuitem action='mail-folder-properties'/>
+      </menu>
+      <menu action='mail-message-menu'>
+        <menuitem action='mail-message-new'/>
+        <menuitem action='mail-message-post'/>
+        <menuitem action='mail-message-open'/>
+        <menuitem action='mail-message-edit'/>
+        <menuitem action='mail-add-sender'/>
+        <separator/>
+        <menu action='mail-goto-menu'>
+          <menuitem action='mail-next'/>
+          <menuitem action='mail-next-unread'/>
+          <menuitem action='mail-next-important'/>
+          <menuitem action='mail-next-thread'/>
+          <separator/>
+          <menuitem action='mail-previous'/>
+          <menuitem action='mail-previous-unread'/>
+          <menuitem action='mail-previous-important'/>
+        </menu>
+        <menuitem action='mail-reply-sender'/>
+        <menuitem action='mail-reply-list'/>
+        <menuitem action='mail-reply-all'/>
+        <menuitem action='mail-reply-post'/>
+        <menuitem action='mail-forward'/>
+        <menu action='mail-forward-as-menu'>
+          <menuitem action='mail-forward-attached'/>
+          <menuitem action='mail-forward-inline'/>
+          <menuitem action='mail-forward-quoted'/>
+          <separator/>
+          <menuitem action='mail-redirect'/>
+        </menu>
+        <separator/>
+        <menuitem action='mail-copy'/>
+        <menuitem action='mail-move'/>
+        <separator/>
+        <menu action='mail-mark-as-menu'>
+          <menuitem action="mail-mark-read"/>
+          <menuitem action="mail-mark-unread"/>
+          <separator/>
+          <menuitem action="mail-mark-important"/>
+          <menuitem action="mail-mark-unimportant"/>
+          <separator/>
+          <menuitem action="mail-mark-junk"/>
+          <menuitem action="mail-mark-notjunk"/>
+          <separator/>
+          <menuitem action="mail-flag-for-followup"/>
+          <menuitem action="mail-flag-clear"/>
+          <menuitem action="mail-flag-completed"/>
+        </menu>
+        <menuitem action='mail-filters-apply'/>
+        <menuitem action='mail-check-for-junk'/>
+        <separator/>
+        <menu action='mail-create-rule-menu'>
+          <menuitem action='mail-filter-on-subject'/>
+          <menuitem action='mail-filter-on-sender'/>
+          <menuitem action='mail-filter-on-recipients'/>
+          <menuitem action='mail-filter-on-mailing-list'/>
+          <separator/>
+          <menuitem action='mail-search-folder-from-subject'/>
+          <menuitem action='mail-search-folder-from-sender'/>
+          <menuitem action='mail-search-folder-from-recipients'/>
+          <menuitem action='mail-search-folder-from-mailing-list'/>
+        </menu>
+      </menu>
+    </placeholder>
+    <menu action='search-menu'>
+      <placeholder name='search-actions'>
+        <menuitem action='mail-create-search-folder'/>
+      </placeholder>
+    </menu>
+  </menubar>
+  <toolbar name='main-toolbar'>
+    <toolitem action='mail-reply-sender'/>
+    <toolitem action='mail-reply-all'/>
+    <toolitem action='mail-forward'/>
+    <separator/>
+    <toolitem action='mail-print'/>
+    <toolitem action='mail-delete'/>
+    <toolitem action='mail-mark-junk'/>
+    <toolitem action='mail-mark-notjunk'/>
+    <toolitem action='mail-stop'/>
+    <separator/>
+    <toolitem action='mail-previous'/>
+    <toolitem action='mail-next'/>
+  </toolbar>
+  <popup name='mail-folder-popup'>
+    <menuitem action='mail-folder-copy'/>
+    <menuitem action='mail-folder-move'/>
+    <separator/>
+    <menuitem action='mail-folder-new'/>
+    <menuitem action='mail-folder-delete'/>
+    <menuitem action='mail-folder-rename'/>
+    <menuitem action='mail-folder-refresh'/>
+    <separator/>
+    <menuitem action='mail-folder-properties'/>
+  </popup>
+  <popup name='mail-message-popup'>
+    <menuitem action='mail-reply-sender'/>
+    <menuitem action='mail-reply-all'/>
+    <menuitem action='mail-forward'/>
+    <separator/>
+    <menuitem action='mail-message-edit'/>
+    <menuitem action='mail-save-as'/>
+    <menuitem action='mail-print'/>
+    <separator/>
+    <menuitem action='mail-delete'/>
+    <menuitem action='mail-copy'/>
+    <menuitem action='mail-move'/>
+    <separator/>
+    <menuitem action='mail-mark-unread'/>
+    <menuitem action='mail-mark-important'/>
+    <menuitem action='mail-mark-junk'/>
+    <menuitem action='mail-flag-for-followup'/>
+    <menu action='mail-label-menu'/>
+  </popup>
+  <popup name='mail-search-options'>
+    <menuitem action='mail-search-subject-or-sender-contains'/>
+    <menuitem action='mail-search-subject-or-recipients-contains'/>
+    <menuitem action='mail-search-recipients-contain'/>
+    <menuitem action='mail-search-message-contains'/>
+    <menuitem action='mail-search-subject-contains'/>
+    <menuitem action='mail-search-sender-contains'/>
+    <menuitem action='mail-search-body-contains'/>
+    <separator/>
+    <menuitem action='search-advanced'/>
+  </popup>
+</ui>
diff --git a/ui/evolution-shell.ui b/ui/evolution-shell.ui
index 6204055e82..9802059a6c 100644
--- a/ui/evolution-shell.ui
+++ b/ui/evolution-shell.ui
@@ -12,6 +12,7 @@
       <menuitem action='page-setup'/>
       <placeholder name='print-actions'/>
       <separator/>
+      <placeholder name='long-running-actions'/>
       <menuitem action='forget-passwords'/>
       <menuitem action='work-online'/>
       <menuitem action='work-offline'/>
@@ -22,6 +23,7 @@
       <placeholder name='edit-actions'/>
       <separator/>
       <menuitem action='sync-options'/>
+      <placeholder name='administrative-actions'/>
       <menuitem action='preferences'/>
     </menu>
     <menu action='view-menu'>
@@ -39,6 +41,7 @@
 	<menuitem action='show-statusbar'/>
 	<menuitem action='show-sidebar'/>
       </menu>
+      <placeholder name='view-custom-menus'/>
       <menu action='switcher-menu'>
         <menuitem action='switcher-style-both'/>
 	<menuitem action='switcher-style-icons'/>