Mail:

001-06-26  Peter Williams  <peterw@ximian.com>

	* folder-browser-ui.c: New file derived from folder-browser-factory.c.
	Contains the Bonobo UI code, split into three groups as described in
	ui/ChangeLog. Also contains the GalView stuff and the hookups into
	the Bonobo UI stuff.

	* folder-browser-factory.c: Move most of the UI stuff to folder-browser-ui.c.
	(control_activate): Add all three kinds of UI element to this folderbrowser.
	(control_deactivate): Remove all three kinds.

	* folder-browser-ui.h: New file. Prototypes functions to add UI elements
	to a FolderBrowser.

	* Makefile.am: Add folder-browser-ui.{c,h}

	* message-browser.c (PARENT_TYPE): Change to BONOBO_TYPE_WINDOW
	(message_browser_destroy): Chain to parent destroy function.
	(set_bonobo_ui): New function. Add the 'message' functions from the folder
	browser to our UI.
	(message_browser_close): BonoboVerbify this.

	* message-browser.h: Convert to BonoboWindow.

UI:

6-26  Peter Williams  <peterw@ximian.com>

	* evolution-mail-global.xml:
	* evolution-mail-list.xml:
	* evolution-mail-message.xml: New files. These are the result
	of splitting evolution-mail.xml into three pieces: one for the
	global mailer operations, one for the operations on a messagelist,
	and one for the operations on one or more messages.

	* evolution-mail-messagedisplay: New file. UI for the standalone
	message browser that you get when you double-click. Very skeleton.

	* evolution-mail.xml: Removed.

	* Makefile.am: Updated to install new files.

svn path=/trunk/; revision=10514

1 files changed, 139 insertions, 0 deletions

diff --git a/ui/evolution-mail-global.xml b/ui/evolution-mail-global.xml
new file mode 100644
index 0000000000..70aa517a4d
--- /dev/null
+++ b/ui/evolution-mail-global.xml
@@ -0,0 +1,139 @@
+<Root>
+
+  <commands>   <!-- Alphabetical by name, yo -->
+
+    <cmd name="EmptyTrash"
+     _tip="Permanently remove all deleted messages from all folders"/>
+
+    <cmd name="ForgetPasswords"
+     _tip="Forget remembered passwords so you will be prompted for them again"/>
+
+    <cmd name="MailCompose"
+     _tip="Open a window for composing a mail message"
+     pixtype="pixbuf"/>
+
+    <cmd name="MailGetSend"
+     _tip="Send queued mail and retrieve new mail"
+     pixtype="pixbuf"/>
+
+    <cmd name="MailStop"
+     _tip="Cancel the current mail operation"
+     pixtype="stock" pixname="Stop"/>
+
+    <cmd name="ToolsFilters"
+     _tip="Create or edit rules for filtering new mail"/>
+
+    <cmd name="ToolsSettings"
+     _tip="Create or edit mail accounts and other preferences"
+     pixtype="pixbuf"/>
+
+    <cmd name="ToolsSubscriptions"
+     _tip="Subscribe or unsubscribe to folders on remote servers"/>
+
+    <cmd name="ToolsVFolders"
+     _tip="Create or edit virtual folder definitions"/>
+
+    <cmd name="ViewPreview"
+     _tip="Show message preview window"
+     type="toggle"  />
+
+  </commands>
+
+  <keybindings>
+
+  </keybindings>
+
+  <menu>
+
+    <submenu name="File">
+      <submenu name="New">
+        <placeholder name="NewFirstItem">
+          <menuitem name="MessageNew" verb="MailCompose"
+           accel="*Control*n" _label="_Mail Message"
+           pixtype="pixbuf"/>
+
+          <separator/>
+        </placeholder>
+      </submenu>
+    </submenu>
+
+    <submenu name="View">
+      <menuitem name="ViewPreview" verb="" _label="_Preview Pane"/>
+      <separator/>
+      <placeholder name="MailMessageView"/>
+      <placeholder name="MailListView"/>
+    </submenu>
+
+    <submenu name="Edit">
+      <placeholder name="MailListEdit"/>
+      <placeholder name="MailMessageEdit"/>
+      <placeholder name="MailListEditFlags"/>
+    </submenu>
+
+    <submenu name="Actions">
+      <placeholder name="Component">
+        <menuitem name="MailGetSend" verb="" _label="_Send / Receive"/>
+
+        <separator/>
+
+        <placeholder name="MailMessageActions"/>
+
+        <menuitem name="ForgetPasswords" verb="" _label="Forget _Passwords"/>
+
+        <placeholder name="MailListActions"/>
+
+        <menuitem name="EmptyTrash" verb="" _label="Empty _Trash"/>
+      </placeholder>
+    </submenu>
+
+    <submenu name="Tools">
+      <placeholder name="Component">
+
+        <menuitem name="ToolsSettings" verb="" _label="_Mail Settings..."/>
+
+        <separator/>
+
+        <placeholder name="MailFilterTools">
+          <menuitem name="ToolsFilters" verb="" _label="_Filters..."/>
+        </placeholder>
+
+        <separator/>
+
+        <placeholder name="MailVFolderTools">
+          <menuitem name="ToolsVFolders" verb="" _label="Virtual Folder _Editor..."/>
+        </placeholder>
+
+        <separator/>
+
+        <menuitem name="ToolsSubscriptions" verb="" _label="Manage _Subscriptions..."/>
+
+        <separator/>
+
+      </placeholder>
+    </submenu>
+  </menu>
+
+  <dockitem name="Toolbar">
+
+    <toolitem name="MailGetSend" verb=""
+     _label="Send / Receive" priority="1"
+     pixtype="pixbuf"/>
+
+    <toolitem name="MailCompose" verb=""
+     _label="Compose" priority="1"
+     pixtype="pixbuf"/>
+
+    <separator/>
+
+    <placeholder name="MailMessageToolbar"/>
+
+    <toolitem name="MailStop" verb=""
+     _label="Cancel"/>
+
+    <separator/>
+
+    <placeholder name="MailNextButtons"/>
+
+  </dockitem>
+
+</Root>