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, 308 insertions, 0 deletions

diff --git a/ui/evolution-mail-message.xml b/ui/evolution-mail-message.xml
new file mode 100644
index 0000000000..7602683a91
--- /dev/null
+++ b/ui/evolution-mail-message.xml
@@ -0,0 +1,308 @@
+<Root>
+
+  <commands>   <!-- Alphabetical by name, yo -->
+
+    <cmd name="MailNext"
+     _tip="Display the next message"
+     accel="f"/>
+
+    <cmd name="MailNextFlagged"
+     _tip="Display the next important message"/>
+
+    <cmd name="MailNextUnread"
+     _tip="Display the next unread message"
+     accel="n"/>
+
+    <cmd name="MailNextThread"
+     _tip="Display the next unread thread"
+     accel="t"/>
+
+    <cmd name="MailPrevious"
+     _tip="Display the previous message"
+     accel="b"/>
+
+    <cmd name="MailPreviousFlagged"
+     _tip="Display the previous important message"/>
+
+    <cmd name="MailPreviousUnread"
+     _tip="Display the previous unread message"
+     accel="p"/>
+
+    <cmd name="MessageApplyFilters"
+     _tip="Apply filter rules to the selected messages"
+     accel="*Control*y"/>
+
+    <cmd name="MessageCopy"
+     _tip="Copy selected messages to another folder"
+     accel="*Control*c"
+     pixtype="pixbuf" />
+
+    <cmd name="MessageDelete"
+     _tip="Mark the selected messages for deletion"
+     accel="*Control*d"/>
+
+    <cmd name="MessageForward"
+     _tip="Forward the selected message to someone"
+     accel="*Control*f"
+     pixtype="pixbuf" />
+
+    <cmd name="MessageForwardAttached"
+     _tip="Forward the selected message to someone as an attachment"
+     accel="*Control*j"/>
+
+    <cmd name="MessageForwardInline"
+     _tip="Forward the selected message in the body of a new message"
+     accel="*Control**Shift*j"/>
+
+    <cmd name="MessageForwardQuoted"
+     _tip="Forward the selected message quoted like a reply"/>
+
+    <cmd name="MessageMarkAsRead"
+     _tip="Mark the selected messages as having been read"
+     accel="*Control*k"/>
+
+    <cmd name="MessageMarkAsUnRead"
+     _tip="Mark the selected messages as not having been read"
+     accel="*Control**Shift*k"/>
+
+    <cmd name="MessageMove"
+     _tip="Move selected messages to another folder"
+     accel="*Control*m"
+     pixtype="pixbuf"/>
+
+    <cmd name="MessageOpen"
+     _tip="Open the selected message in a new window"
+     accel="*Control*o"/>
+
+    <cmd name="MessageReplyAll"
+     _tip="Compose a reply to all of the recipients of the selected message"
+     accel="*Control**Shift*r"
+     pixtype="pixbuf"/>
+
+    <cmd name="MessageReplyList"
+     _tip="Compose a reply to the mailing list of the selected message"
+     accel=""
+     pixtype="pixbuf"/>
+
+    <cmd name="MessageReplySender"
+     _tip="Compose a reply to the sender of the selected message"
+     accel="*Control*r"
+     pixtype="pixbuf"/>
+
+    <cmd name="MessageResend"
+     _tip="Open the selected message in the composer to re-send it"/>
+
+    <cmd name="MessageSaveAs"
+     _tip="Save the message as a text file"
+     accel="*Control**Alt*s"
+     pixtype="stock" pixname="Save"/>
+
+    <cmd name="MessageSearch"
+     _tip="Search for text in the body of the displayed message"
+     accel="*Control*e"/>
+
+    <cmd name="MessageUndelete"
+     _tip="Un-delete the selected messages"
+     accel="*Control*u"/>
+
+    <cmd name="PrintMessage"
+     _tip="Print message to the printer"
+     accel="*Control*p"
+     pixtype="pixbuf"/>
+
+    <cmd name="PrintPreviewMessage"
+     _tip="Previews the message to be printed"
+     pixtype="pixbuf"/>
+
+    <cmd name="ToolsFilterMailingList"
+     _tip="Create a rule to filter messages to this mailing list"/>
+
+    <cmd name="ToolsFilterRecipient"
+     _tip="Create a rule to filter messages to these recipients"/>
+
+    <cmd name="ToolsFilterSender"
+     _tip="Create a rule to filter messages from this sender"/>
+
+    <cmd name="ToolsFilterSubject"
+     _tip="Create a rule to filter messages with this subject"/>
+
+    <cmd name="ToolsVFolderMailingList"
+     _tip="Create a virtual folder for this mailing list"/>
+
+    <cmd name="ToolsVFolderRecipient"
+     _tip="Create a virtual folder for these recipients"/>
+
+    <cmd name="ToolsVFolderSender"
+     _tip="Create a virtual folder for this sender"/>
+
+    <cmd name="ToolsVFolderSubject"
+     _tip="Create a virtual folder for this subject"/>
+
+    <cmd name="ViewFullHeaders"
+     _tip="Show message with all email headers"
+     type="radio" group="message_display"/>
+
+    <cmd name="ViewLoadImages"
+     _tip="Force images in HTML mail to be loaded"/>
+
+    <cmd name="ViewNormal"
+     _tip="Show message in the normal style"
+     type="radio" group="message_display"/>
+
+    <cmd name="ViewSource"
+     _tip="Show the raw email source of the message"
+     type="radio" group="message_display"/>
+
+  </commands>
+
+  <keybindings>
+
+  </keybindings>
+
+  <menu>
+
+    <submenu name="File">
+      <placeholder name="FileOps">
+        <menuitem name="MessageOpen" verb="" _label="_Open Message"/>
+        <menuitem name="MessageResend" verb="" _label="_Re-send Message"/>
+        <menuitem name="MessageSaveAs" verb="" _label="_Save As..."/>
+      </placeholder>
+
+      <placeholder name="Print">
+        <menuitem name="PrintPreviewMessage" verb="" _label="Print Preview..."/>
+        <menuitem name="PrintMessage" verb="" _label="Print Message..."/>
+      </placeholder>
+    </submenu>
+
+    <submenu name="Edit">
+      <placeholder name="MailMessageEdit">
+        <menuitem name="MessageSearch" verb="" _label="S_earch Message"/>
+
+        <separator/>
+
+        <menuitem name="MessageDelete" verb="" _label="_Delete"/>
+        <menuitem name="MessageUndelete" verb="" _label="_Undelete"/>
+
+        <separator/>
+
+        <menuitem name="MessageMarkAsRead" verb="" _label="Mar_k As Read"/>
+        <menuitem name="MessageMarkAsUnRead" verb="" _label="Mark As U_nread"/>
+      </placeholder>
+    </submenu>
+
+    <submenu name="View">
+      <placeholder name="MailMessageView">
+        <submenu name="MessageDisplay" _label="_Message Display">
+          <menuitem name="ViewLoadImages" verb="" _label="Load _Images"/>
+
+          <separator/>
+
+          <menuitem name="ViewNormal" verb="" _label="_Normal Display"/>
+	  <menuitem name="ViewFullHeaders" verb="" _label="Show Full _Headers"/>
+	  <menuitem name="ViewSource" verb="" _label="Show Email _Source"/>
+        </submenu>
+      </placeholder>
+    </submenu>
+
+    <submenu name="Actions">
+      <placeholder name="Component">
+        <placeholder name="MailMessageActions">
+          <menuitem name="MessageReplySender" verb="" _label="_Reply to Sender"/>
+          <menuitem name="MessageReplyList" verb="" _label="Reply to _List"/>
+          <menuitem name="MessageReplyAll" verb="" _label="Reply to _All"/>
+          <menuitem name="MessageForward" verb="" _label="_Forward Message"/>
+          <submenu name="ForwardAs" _label="Forward As">
+            <menuitem verb="MessageForwardAttached" _label="Forward _Attached"/>
+            <menuitem verb="MessageForwardInline" _label="Forward _Inline"/>
+            <menuitem verb="MessageForwardQuoted" _label="Forward _Quoted"/>
+
+            <separator/>
+
+            <menuitem name="Redirect" verb=""
+  	   _label="Redirect (FIXME: implement me)"/>
+          </submenu>
+
+          <separator/>
+
+          <menuitem name="MessageMove" verb="" _label="_Move to Folder"/>
+          <menuitem name="MessageCopy" verb="" _label="_Copy to Folder"/>
+
+          <separator/>
+
+          <menuitem name="MessageApplyFilters" verb="" _label="_Apply Filters"/>
+        </placeholder>
+      </placeholder>
+    </submenu>
+
+    <submenu name="Tools">
+      <placeholder name="Component">
+
+        <placeholder name="MailFilterTools">
+          <submenu name="ToolsFilterFromMessage" _label="_Create Filter From Message">
+            <menuitem name="ToolsFilterSubject" verb="" _label="Filter on _Subject"/>
+            <menuitem name="ToolsFilterSender" verb="" _label="Filter on Se_nder"/>
+            <menuitem name="ToolsFilterRecipient" verb="" _label="Filter on _Recipients"/>
+            <menuitem name="ToolsFilterMailingList" verb="" _label="Filter on Mailing _List"/>
+          </submenu>
+        </placeholder>
+
+        <placeholder name="MailVFolderTools">
+          <submenu name="ToolsVFolderFromMessage" _label="Create _Virtual Folder From Message">
+            <menuitem name="ToolsVFolderSubject" verb="" _label="VFolder on _Subject..."/>
+            <menuitem name="ToolsVFolderSender" verb="" _label="VFolder on Se_nder..."/>
+            <menuitem name="ToolsVFolderRecipient" verb="" _label="VFolder on _Recipients..."/>
+            <menuitem name="ToolsVFolderMailingList" verb="" _label="VFolder on Mailing _List..."/>
+          </submenu>
+        </placeholder>
+      </placeholder>
+    </submenu>
+  </menu>
+
+  <dockitem name="Toolbar">
+
+    <placeholder name="MailMessageToolbar">
+      <toolitem name="MessageReplySender" verb=""
+       _label="Reply" priority="1"
+       pixtype="pixbuf"/>
+
+      <toolitem name="MessageReplyAll" verb=""
+       _label="Reply to All" priority="1"
+       pixtype="pixbuf"/>
+
+      <toolitem name="MessageForward" verb=""
+       _label="Forward" priority="1"
+       pixtype="pixbuf"/>
+
+      <separator/>
+
+      <toolitem name="MessageMove" verb=""
+       _label="Move"
+       pixtype="pixbuf"/>
+ 
+      <toolitem name="MessageCopy" verb=""
+       _label="Copy"
+       pixtype="pixbuf"/>
+
+      <separator/>
+
+      <toolitem name="PrintMessage" verb=""
+       _label="Print"
+       pixtype="stock" pixname="Print"/>
+
+      <toolitem name="MessageDelete" verb=""
+       _label="Delete"
+       pixtype="stock" pixname="Trash"/>
+    </placeholder>
+
+    <placeholder name="MailNextButtons">
+      <toolitem name="MailPrevious" verb=""
+       _label="Previous"
+       pixtype="stock" pixname="Back"/>
+
+      <toolitem name="MailNext" verb=""
+       _label="Next"
+       pixtype="stock" pixname="Forward"/>
+    </placeholder>
+  </dockitem>
+
+</Root>