aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
Diffstat (limited to 'ui')
-rw-r--r--ui/ChangeLog5
-rw-r--r--ui/Makefile.am2
-rw-r--r--ui/evolution-composer-entries.xml40
-rw-r--r--ui/evolution-message-composer.xml181
4 files changed, 5 insertions, 223 deletions
diff --git a/ui/ChangeLog b/ui/ChangeLog
index ca90d40629..b10f2ea2ce 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-02 Matthew Barnes <mbarnes@redhat.com>
+
+ * evolution-composer-entries.xml:
+ Remove this file; obsoleted by new composer.
+
2008-01-28 Andre Klapper <a9016009@gmx.de>
* evolution-mail-message.xml: Added translator comments.
diff --git a/ui/Makefile.am b/ui/Makefile.am
index 56743c53e9..f1631f896b 100644
--- a/ui/Makefile.am
+++ b/ui/Makefile.am
@@ -2,13 +2,11 @@ XML_FILES = \
evolution.xml \
evolution-addressbook.xml \
evolution-calendar.xml \
- evolution-composer-entries.xml \
evolution-mail-message.xml \
evolution-mail-list.xml \
evolution-mail-global.xml \
evolution-mail-messagedisplay.xml \
evolution-memos.xml \
- evolution-message-composer.xml \
evolution-signature-editor.xml \
evolution-subscribe.xml \
evolution-event-editor.xml \
diff --git a/ui/evolution-composer-entries.xml b/ui/evolution-composer-entries.xml
deleted file mode 100644
index f8cc923bf7..0000000000
--- a/ui/evolution-composer-entries.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<Root>
- <commands>
-
- <cmd name="EditCut"
- _tip="Cut selected text to the clipboard"
- accel="*Control*x" pixtype="pixbuf"/>
-
- <cmd name="EditCopy"
- _tip="Copy selected text to the clipboard"
- accel="*Control*c" pixtype="pixbuf"/>
-
- <cmd name="EditPaste"
- _tip="Paste text from the clipboard"
- accel="*Control*v" pixtype="pixbuf"/>
-
- <cmd name="EditSelectAll"
- _tip="Select all text"
- accel="*Control*a"/>
-
- </commands>
-
- <menu>
- <submenu name="Edit" _label="_Edit">
- <placeholder name="EditCutCopyPaste">
- <menuitem name="EditCut" verb="" _label="Cu_t"/>
- <menuitem name="EditCopy" verb="" _label="_Copy"/>
- <menuitem name="EditPaste" verb="" _label="_Paste"/>
- <separator/>
- <menuitem name="EditSelectAll" verb="" _label="Select _All"/>
- </placeholder>
- </submenu>
- </menu>
-
- <dockitem name="Toolbar">
- <toolitem name="EditCut" verb="" _label="Cut" _tip="Cut selection to clipboard"/>
- <toolitem name="EditCopy" verb="" _label="Copy" _tip="Copy selection to clipboard"/>
- <toolitem name="EditPaste" verb="" _label="Paste" _tip="Paste from clipboard"/>
- </dockitem>
-
-</Root>
diff --git a/ui/evolution-message-composer.xml b/ui/evolution-message-composer.xml
deleted file mode 100644
index 0533a0e486..0000000000
--- a/ui/evolution-message-composer.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<Root>
- <commands>
-
- <cmd name="FileOpen" _label="Open" hidden="1"
- _tip="Open a file" pixtype="pixbuf" accel="*Control*o"/>
-
- <cmd name="FileSave" _label="Save"
- _tip="Save the current file" pixtype="pixbuf"
- accel="*Ctrl*s"/>
-
- <cmd name="FileSaveDraft" _label="Save Draft"
- _tip="Save as draft" pixtype="pixbuf"
- accel="*Ctrl**Shift*s"/>
-
- <cmd name="FileSaveAs" _label="Save As"
- _tip="Save the current file with a different name"
- pixtype="pixbuf"/>
-
- <cmd name="FileClose" _label="Close"
- _tip="Close the current file" pixtype="pixbuf"
- accel="*Ctrl*w"/>
-
- <cmd name="FileSaveInFolder" _label="Save in folder..."
- _tip="Save the message in a specified folder"/>
-
- <cmd name="FileSend" _label="Send" _tip="Send this message"
- accel="*Ctrl*Return"
- pixtype="pixbuf"/>
-
- <cmd name="FileAttach" _label="Attach" _tip="Attach a file"
- accel="*Ctrl*m"
- pixtype="pixbuf"/>
-
- <cmd name="DeleteAll" _label="_Delete all"
- pixtype="pixbuf"
- _tip="Delete all but signature"/>
-
- <cmd name="RequestReceipt" _label="R_equest Read Receipt"
- _tip="Get delivery notification when your message is read"
- type="toggle" state="0"/>
-
- <cmd name="SetPriority" _label="_Prioritize Message"
- _tip="Set the message priority to high"
- type="toggle" state="0"/>
-
- <cmd name="FormatHtml" _label="HT_ML" _tip="Send the mail in HTML format"
- type="toggle" state="0"/>
-
- <cmd name="ViewFrom" _label="_From Field"
- _tip="Toggles whether the From chooser is displayed" type="toggle" state="0"/>
-
- <cmd name="ViewTo" _label="_To Field"
- _tip="Toggles whether the To field is displayed"
- type="toggle" state="0"/>
-
- <cmd name="ViewPostTo" _label="_Post-To Field"
- _tip="Toggles whether the Post-To field is displayed"
- type="toggle" state="0"/>
-
- <cmd name="ViewReplyTo" _label="_Reply-To Field"
- _tip="Toggles whether the Reply-To field is displayed"
- type="toggle" state="0"/>
-
- <cmd name="ViewCC" _label="_Cc Field"
- _tip="Toggles whether the CC field is displayed"
- type="toggle" state="0"/>
-
- <cmd name="ViewBCC" _label="_Bcc Field"
- _tip="Toggles whether the BCC field is displayed"
- type="toggle" state="0"/>
-
-
- <cmd name="SecurityPGPSign" _label="PGP Sign" _tip="Sign this message with your PGP key"
- type="toggle" state="0"/>
-
- <cmd name="SecurityPGPEncrypt" _label="PGP Encrypt" _tip="Encrypt this message with PGP"
- type="toggle" state="0"/>
-
- <cmd name="SecuritySMimeSign" _label="S/MIME Sign"
- _tip="Sign this message with your S/MIME Signature Certificate"
- type="toggle" state="0" hidden="1"/>
-
- <cmd name="SecuritySMimeEncrypt" _label="S/MIME Encrypt"
- _tip="Encrypt this message with your S/MIME Encryption Certificate"
- type="toggle" state="0" hidden="1"/>
-
- <cmd name="InsertXSendOptions" _tip="Insert Send options"/>
-
- </commands>
-
- <keybindings>
-
- </keybindings>
-
- <menu>
- <submenu name="File" _label="_File">
- <menuitem name="FileOpen" verb="" _label="_Open..."/>
- <placeholder name="FileOps"/>
- <menuitem name="FileSend" verb="" _label="S_end"/>
-
- <separator f="" name="emailcomposer1"/>
-
- <menuitem name="FileSave" verb="" _label="_Save"/>
- <menuitem name="FileSaveAs" verb="" _label="Save _As..."/>
- <menuitem name="FileSaveDraft" verb="" _label="Save _Draft"/>
- <placeholder name="Print" delimit="top"/>
-
- <separator f="" name="emailcomposer2"/>
-
- <menuitem name="FileClose" verb="" _label="_Close"/>
- </submenu>
-
- <submenu name="Edit" _label="_Edit">
- <placeholder name="EditUndoRedo"/>
- <separator f="" name="emailcomposer1"/>
- <placeholder name="EditCutCopyPaste"/>
- <separator f="" name="emailcomposer2"/>
- <placeholder name="EditFindReplace"/>
- <separator f="" name="emailcomposer3"/>
- <placeholder name="EncodingPlaceholder"/>
- <separator f="" name="emailcomposer4"/>
- <placeholder name="EditMisc"/>
- </submenu>
-
- <submenu name="View" _label="_View">
- <menuitem name="ViewFrom" verb=""/>
- <menuitem name="ViewTo" verb=""/>
- <menuitem name="ViewPostTo" verb=""/>
- <menuitem name="ViewReplyTo" verb=""/>
- <menuitem name="ViewCC" verb=""/>
- <menuitem name="ViewBCC" verb=""/>
- </submenu>
-
- <submenu name="Insert" _label="I_nsert">
- <menuitem name="FileAttach" verb=""
- _label="_Attachment..."/>
- <separator/>
- <menuitem name="InsertXSendOptions" verb="" _label="_Send Options"/>
- <separator/>
- <placeholder name="Component"/>
- <separator f="" name="emailcomposer"/>
- <menuitem name="RequestReceipt" verb=""/>
- <menuitem name="SetPriority" verb=""/>
- </submenu>
-
- <submenu name="Format" _label="For_mat">
- <menuitem name="FormatHtml" verb=""/>
-
- <separator/>
- <placeholder name="FormatParagraph"/>
- </submenu>
-
- <submenu name="Security" _label="_Security">
- <menuitem name="SecurityPGPSign" verb="" _label="PGP _Sign"/>
- <menuitem name="SecurityPGPEncrypt" verb="" _label="PGP _Encrypt"/>
- <menuitem name="SecuritySMimeSign" verb="" _label="S/MIME Sig_n"/>
- <menuitem name="SecuritySMimeEncrypt" verb="" _label="S/MIME En_crypt"/>
- </submenu>
-
- </menu>
-
- <dockitem name="Toolbar" behavior="exclusive" look="system">
- <toolitem name="FileSend" verb="" pixtype="pixbuf" priority="1"/>
- <separator f="" name="emailcomposer2"/>
- <toolitem name="FileSaveDraft" verb="" pixtype="pixbuf" priority="1"/>
- <toolitem name="FileAttach" verb="" pixtype="pixbuf" priority="1"/>
-
- <separator f="" name="emailcomposer"/>
- </dockitem>
-</Root>
-
-
-
-
-
-
-
-
-
-
-
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-14 04:58:04 +0800