Kill EMMenu and EMPopup.

Also finish adapting Templates plugin to EPluginUI.
It was still leaning pretty hard on EMPopup.

1 files changed, 0 insertions, 426 deletions

diff --git a/ui/evolution-mail-message.xml b/ui/evolution-mail-message.xml
deleted file mode 100644
index f90e737c24..0000000000
--- a/ui/evolution-mail-message.xml
+++ /dev/null
@@ -1,426 +0,0 @@
-<Root>
-
-  <commands>   <!-- Alphabetical by name, yo -->
-
-    <cmd name="AddSenderToAddressbook"
-     _tip="Add Sender to Address Book"/>
-
-    <cmd name="CaretMode"
-    _tip="Show a blinking cursor in the body of displayed messages"
-    type="toggle" state="0" accel="F7"/>
-
-    <cmd name="EditCut"
-     _tip="Cut selected messages to the clipboard"
-     accel="*Control*x" pixtype="pixbuf"/>
-
-    <cmd name="EditCopy"
-     _tip="Copy selected messages to the clipboard"
-     accel="*Control*c" pixtype="pixbuf"/>
-
-    <cmd name="EditPaste"
-     _tip="Paste messages from the clipboard"
-     accel="*Control*v" pixtype="pixbuf"/>
-
-    <cmd name="MailNext"
-     _tip="Display the next message"
-     accel="*Control*Page_Down"/>
-
-    <cmd name="MailNextFlagged"
-     _tip="Display the next important message"/>
-
-    <cmd name="MailNextUnread"
-     _tip="Display the next unread message"
-     accel="*Control*bracketright"/>
-
-    <cmd name="MailNextThread"
-     _tip="Display the next thread"/>
-
-    <cmd name="MailPrevious"
-     _tip="Display the previous message"
-     accel="*Control*Page_Up"/>
-
-    <cmd name="MailPreviousFlagged"
-     _tip="Display the previous important message"/>
-
-    <cmd name="MailPreviousUnread"
-     _tip="Display the previous unread message"
-     accel="*Control*bracketleft"/>
-
-    <cmd name="MessageApplyFilters"
-     _tip="Apply filter rules to the selected messages"
-     accel="*Control*y"
-     pixtype="pixbuf"/>
-
-    <cmd name="MessageCopy"
-     _tip="Copy selected messages to another folder"
-     accel="*Control**Shift*y"
-     pixtype="pixbuf"/>
-
-    <cmd name="MessageDelete"
-     _tip="Mark the selected messages for deletion"
-     pixtype="pixbuf"/>
-
-    <cmd name="MessageFollowUpFlag"
-     _tip="Flag selected messages for follow-up"
-     accel="*Control**Shift*G"
-     pixtype="pixbuf"/>
-
-    <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"/>
-
-    <cmd name="MessageForwardInline"
-     _tip="Forward the selected message in the body of a new message"/>
-
-    <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"
-     pixtype="pixbuf"/>
-
-    <cmd name="MessageMarkAsUnRead"
-     _tip="Mark the selected messages as not having been read"
-     accel="*Control**Shift*k"
-     pixtype="pixbuf"/>
-
-    <cmd name="MessageMarkAsImportant"
-     _tip="Mark the selected messages as important"
-     pixtype="pixbuf"/>
-
-    <cmd name="MessageMarkAsUnimportant"
-     _tip="Mark the selected messages as unimportant"/>
-
-    <cmd name="MessageMarkAsJunk"
-     _tip="Mark the selected messages as junk"
-     accel="*Control*j"
-     pixtype="pixbuf"/>
-
-    <cmd name="MessageMarkAsNotJunk"
-     _tip="Mark the selected messages as not being junk"
-     accel="*Control**Shift*j"
-     pixtype="pixbuf"/>
-
-    <cmd name="MessageFilterJunk"
-     _tip="Filter the selected messages for junk status"
-     pixtype="pixbuf"/>
-
-    <cmd name="MailCompose"
-     _tip="Open a window for composing a mail message"
-     pixtype="pixbuf"
-     accel="*Control**Shift*m"/>
-
-    <cmd name="MessageMove"
-     _tip="Move selected messages to another folder"
-     accel="*Control**Shift*v"
-     pixtype="pixbuf"/>
-
-    <cmd name="MessageEdit"
-     _tip="Open the selected messages in the composer for editing"/>
-
-    <cmd name="MessageOpen"
-     _tip="Open the selected messages in a new window"
-     accel="*Control*o"/>
-
-    <cmd name="MessageRedirect"
-     _tip="Redirect (bounce) the selected message to someone"
-     accel=""/>
-
-    <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="*Control*l"/>
-
-    <cmd name="MessageReplySender"
-     _tip="Compose a reply to the sender of the selected message"
-     accel="*Control*r"
-     pixtype="pixbuf"/>
-
-    <cmd name="MessageSaveAs"
-     _tip="Save the selected messages as a text file"
-     accel="*Control*s"
-     pixtype="pixbuf"/>
-
-    <cmd name="MessageSearch"
-     _tip="Search for text in the body of the displayed message"
-     accel="*Control**Shift*f"
-     pixtype="pixbuf"/>
-
-    <cmd name="MessageUndelete"
-     _tip="Undelete the selected messages"
-     accel="*Control**Shift*d"/>
-
-    <cmd name="PrintMessage"
-     _tip="Print this message"
-     accel="*Control*p"
-     pixtype="pixbuf"/>
-
-    <cmd name="PrintPreviewMessage"
-     _tip="Preview the message to be printed"
-     pixtype="pixbuf"/>
-
-    <cmd name="PrintSetup"
-     _tip="Set up the page settings for your current printer"/>
-
-    <cmd name="SelectAllText"
-     _tip="Select all the text in a message"
-     accel="*Control**Shift*x"/>
-
-    <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 Search Folder for this mailing list"/>
-
-    <cmd name="ToolsVFolderRecipient"
-     _tip="Create a Search Folder for these recipients"/>
-
-    <cmd name="ToolsVFolderSender"
-     _tip="Create a Search Folder for this sender"/>
-
-    <cmd name="ToolsVFolderSubject"
-     _tip="Create a Search Folder for this subject"/>
-
-    <cmd name="ViewFullHeaders"
-     _tip="Show messages with all email headers"
-     type="toggle" state="0"/>
-
-    <cmd name="ViewLoadImages"
-     _tip="Force images in HTML mail to be loaded"
-     accel="*Control*i" pixtype="pixbuf"/>
-
-    <cmd name="ViewSource"
-     _tip="Show the raw email source of the message"
-     accel="*Control*u"/>
-
-    <cmd name="TextZoomIn"
-    _tip="Increase the text size"
-    accel="*Control*plus" pixtype="pixbuf"/>
-
-    <cmd name="TextZoomOut"
-    _tip="Decrease the text size"
-    accel="*Control*minus" pixtype="pixbuf"/>
-
-    <cmd name="TextZoomReset"
-    _tip="Reset the text to its original size"
-    accel="*Control*0" pixtype="pixbuf"/>
-
-  </commands>
-
-  <keybindings>
-    <accel verb="MailPreviousUnread" name="*Control*comma"/>
-    <accel verb="MailPreviousUnread" name="comma"/>
-    <accel verb="MailPreviousUnread" name="bracketleft"/>
-    <accel verb="MailNextUnread"     name="*Control*period"/>
-    <accel verb="MailNextUnread"     name="period"/>
-    <accel verb="MailNextUnread"     name="bracketright"/>
-    <accel verb="MessageDeleteKey"   name="Delete"/>
-    <accel verb="MessageDeleteKey"   name="KP_Delete"/>
-    <accel verb="MessageDeleteKey"   name="*Control*d"/>
-  </keybindings>
-
-  <menu>
-
-    <submenu name="File">
-      <placeholder name="FileOps">
-        <menuitem name="MessageSaveAs" verb="" _label="_Save Message..."/>
-      </placeholder>
-
-      <placeholder name="Print">
-        <menuitem name="PrintPreviewMessage" verb="" _label="Print Pre_view"/>
-        <menuitem name="PrintMessage" verb="" _label="_Print..."/>
-      </placeholder>
-    </submenu>
-
-    <submenu name="Edit">
-      <placeholder name="EditPlaceholder">
-        <placeholder name="MailMessageEdit">
-          <menuitem name="EditCopy" verb="" _label="_Copy"/>
-
-	  <separator f="" name="emaillist1"/>
-
-          <menuitem name="SelectAllText" verb="" _label="Select _All Text"/>
-
- 	  <separator f="" name="emaillist2"/>
-
-          <menuitem name="MessageDelete" verb="" _label="_Delete Message"/>
-          <menuitem name="MessageUndelete" verb="" _label="_Undelete Message"/>
-
-	  <separator f="" name="emaillist3"/>
-
-          <menuitem name="MessageSearch" verb="" _label="_Find in Message..."/>
-        </placeholder>
-      </placeholder>
-    </submenu>
-
-    <submenu name="View">
-       <placeholder name="MailMessageZoom">
-          <submenu name="zoom" _label="_Zoom">
- 	  <menuitem name="TextZoomIn" verb="" _label="_Zoom In"/>
- 	  <menuitem name="TextZoomOut" verb="" _label="Zoom _Out"/>
- 	  <menuitem name="TextZoomReset" verb="" _label="_Normal Size"/>
-	  </submenu>
-       </placeholder>
-
-       <placeholder name="MailViewType">
-         <menuitem name="ViewLoadImages" verb="" _label="_Load Images"/>
-         <menuitem name="ViewFullHeaders" verb="" _label="All Message _Headers"/>
-           <menuitem name="CaretMode" verb="" _label="_Caret Mode"/>
-           <menuitem name="ViewSource" verb="" _label="_Message Source"/>
-
-       </placeholder>
-
-    </submenu>
-
-    <placeholder name="MessagePlaceholder">
-      <submenu name="Message" _label="_Message">
-        <placeholder name="MessageTopActions">
-          <menuitem name="ActionCompose" verb="MailCompose" _label="Compose _New Message"/>
-          <menuitem name="MessageOpen" verb="" _label="_Open in New Window"/>
-          <menuitem name="MessageEdit" verb="" _label="_Edit as New Message..."/>
-          <menuitem name="AddSenderToAddressbook" verb="" _label="A_dd Sender to Address Book"/>
-        </placeholder>
-
-        <placeholder name="MessageNavigation">
-          <submenu name="GoTo" _label="_Go To" pixtype="pixbuf">
-            <menuitem name="MailNext" verb="" _label="_Next Message"/>
-            <menuitem name="MailNextUnread" verb="" _label="Next _Unread Message"/>
-            <menuitem name="MailNextFlagged" verb="" _label="Next _Important Message"/>
-            <menuitem name="MailNextThread" verb="" _label="Next _Thread"/>
-	    <separator f="" name="emaillist"/>
-            <menuitem name="MailPrevious" verb="" _label="_Previous Message"/>
-            <menuitem name="MailPreviousUnread" verb="" _label="P_revious Unread Message"/>
-            <menuitem name="MailPreviousFlagged" verb="" _label="Pr_evious Important Message"/>
-          </submenu>
-	</placeholder>
-
-        <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"/>
-          <submenu name="ForwardAs" _label="F_orward As...">
-            <menuitem verb="MessageForwardAttached" _label="_Attached"/>
-            <menuitem verb="MessageForwardInline" _label="_Inline"/>
-            <menuitem verb="MessageForwardQuoted" _label="_Quoted"/>
-            <separator f="" name="forwardlist1"/>
-            <menuitem verb="MessageRedirect" _label="Re_direct"/>
-          </submenu>
-
-	  <separator f="" name="emaillist3"/>
-
-          <menuitem name="MessageMove" verb="" _label="_Move to Folder"/>
-          <menuitem name="MessageCopy" verb="" _label="_Copy to Folder"/>
-
-	  <separator f="" name="emaillist4"/>
-
-          <submenu name="MessageMarkAs" _label="Mar_k as">
-	    <!-- Translators: "Read" as in "has been read" (evolution-mail-message.xml) -->
-            <menuitem name="MessageMarkAsRead" verb="" _label="_Read"/>
-            <menuitem name="MessageMarkAsUnRead" verb="" _label="_Unread"/>
-
-            <separator f="" name="emailmark1"/>
-
-            <menuitem name="MessageMarkAsImportant" verb="" _label="_Important"/>
-            <menuitem name="MessageMarkAsUnimportant" verb="" _label="Uni_mportant"/>
-
-            <separator f="" name="emailmark2"/>
-
-            <menuitem name="MessageMarkAsJunk" verb="" _label="_Junk"/>
-            <menuitem name="MessageMarkAsNotJunk" verb="" _label="_Not Junk"/>
-
-      	    <separator f="" name="emaillist2"/>
-
-            <menuitem name="MessageFollowUpFlag" verb="" _label="Follow _Up..."/>
-            <menuitem name="MessageFollowUpClear" verb="" _label="_Clear Flag"/>
-            <menuitem name="MessageFollowUpComplete" verb="" _label="_Flag Completed"/>
-
-          </submenu>
-          <menuitem name="MessageApplyFilters" verb="" _label="A_pply Filters"/>
-          <menuitem name="MessageFilterJunk" verb="" _label="Check for _Junk"/>
-        </placeholder>
-
-        <placeholder name="MessageRuleCreate">
-          <submenu name="CreateRule" _label="Create R_ule">
-            <menuitem name="ToolsVFolderSubject" verb="" _label="Search Folder from S_ubject..."/>
-            <menuitem name="ToolsVFolderSender" verb="" _label="Search Folder from Sen_der..."/>
-            <menuitem name="ToolsVFolderRecipient" verb="" _label="Search Folder from Recipien_ts..."/>
-            <menuitem name="ToolsVFolderMailingList" verb="" _label="Search Folder from Mailing _List..."/>
-
-            <separator f="" name="RuleSeparator"/>
-
-            <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>
-      </submenu>
-    </placeholder>
-  </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 f="" name="emaillist2"/>
-
-      <toolitem name="PrintMessage" verb=""
-       _label="Print"
-       pixtype="pixbuf"/>
-
-      <toolitem name="MessageDelete" verb=""
-       _label="Delete"
-       pixtype="pixbuf"/>
-
-      <toolitem name="MessageMarkAsJunk" verb=""
-       _label="Junk"
-       pixtype="pixbuf"/>
-      <toolitem name="MessageMarkAsNotJunk" verb=""
-       _label="Not Junk"
-       pixtype="pixbuf"/>
-    </placeholder>
-
-    <placeholder name="MailNextButtons">
-      <toolitem name="MailPrevious" verb=""
-       _label="Previous"
-       pixtype="pixbuf"/>
-
-      <toolitem name="MailNext" verb=""
-       _label="Next"
-       pixtype="pixbuf"/>
-    </placeholder>
-  </dockitem>
-
-</Root>