aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ui/ChangeLog14
-rw-r--r--ui/evolution-addressbook.xml10
-rw-r--r--ui/evolution-calendar.xml8
-rw-r--r--ui/evolution-mail-global.xml8
-rw-r--r--ui/evolution-mail-list.xml8
-rw-r--r--ui/evolution-mail-message.xml8
-rw-r--r--ui/evolution-mail-messagedisplay.xml7
-rw-r--r--ui/evolution-tasks.xml8
-rw-r--r--ui/evolution.xml11
9 files changed, 46 insertions, 36 deletions
diff --git a/ui/ChangeLog b/ui/ChangeLog
index 5cc96f5fe7..61d66d6941 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,5 +1,19 @@
2004-12-16 Rodney Dawes <dobey@novell.com>
+ * evolution.xml: Move Tools->Settings... to Edit->Preferences
+ Remove the separator above "Quick Reference" in the Help menu
+
+ * evolution-addressbok.xml:
+ * evolution-calendar.xml:
+ * evolution-mail-*.xml:
+ * evolution-tasks.xml:
+ Update the EditPlaceholder items to work properly with the changes in
+ evolution.xml to move Tools->Settings... to Edit->Preferences
+
+ Fixes #43681
+
+2004-12-16 Rodney Dawes <dobey@novell.com>
+
* evolution-mail-message.xml: Add stock zoom icons for the text size
menu items
diff --git a/ui/evolution-addressbook.xml b/ui/evolution-addressbook.xml
index 8a5a8858ce..5e90d9f01c 100644
--- a/ui/evolution-addressbook.xml
+++ b/ui/evolution-addressbook.xml
@@ -87,9 +87,8 @@
<menuitem name="ContactsViewPreview" verb="" _label="_Preview Pane"/>
</submenu>
- <placeholder name="EditPlaceholder">
-
- <submenu name="Edit" _label="_Edit">
+ <submenu name="Edit" _label="_Edit">
+ <placeholder name="EditPlaceholder">
<menuitem name="ContactsSelectAll" verb="" _label="_Select All"/>
<separator f="" name="eadbk2"/>
@@ -103,9 +102,8 @@
<separator f="" name="eadbk6"/>
<menuitem name="ContactDelete" verb="" _label="_Delete"/>
- </submenu>
-
- </placeholder>
+ </placeholder>
+ </submenu>
<submenu name="Actions" _label="_Actions">
<placeholder name="ComponentActionsPlaceholder">
diff --git a/ui/evolution-calendar.xml b/ui/evolution-calendar.xml
index f64d1011e0..fa0ad0a63a 100644
--- a/ui/evolution-calendar.xml
+++ b/ui/evolution-calendar.xml
@@ -43,8 +43,8 @@
</submenu>
- <placeholder name="EditPlaceholder">
- <submenu name="Edit" _label="_Edit">
+ <submenu name="Edit" _label="_Edit">
+ <placeholder name="EditPlaceholder">
<menuitem name="Cut" verb="" _label="C_ut"/>
<menuitem name="Copy" verb="" _label="_Copy"/>
<menuitem name="Paste" verb="" _label="_Paste"/>
@@ -54,8 +54,8 @@
<menuitem name="Delete" verb="" _label="_Delete"/>
<menuitem name="DeleteOccurrence" verb="" _label="Delete this Occurrence"/>
<menuitem name="DeleteAllOccurrences" verb="" _label="Delete All Occurrences"/>
- </submenu>
- </placeholder>
+ </placeholder>
+ </submenu>
<submenu name="View">
<placeholder name="ViewBegin">
diff --git a/ui/evolution-mail-global.xml b/ui/evolution-mail-global.xml
index 92bf2c0c65..bbdd142957 100644
--- a/ui/evolution-mail-global.xml
+++ b/ui/evolution-mail-global.xml
@@ -41,13 +41,13 @@
<placeholder name="MailListView"/>
</submenu>
- <placeholder name="EditPlaceholder">
- <submenu name="Edit">
+ <submenu name="Edit">
+ <placeholder name="EditPlaceholder">
<placeholder name="MailListEdit"/>
<placeholder name="MailMessageEdit"/>
<placeholder name="MailListEditFlags"/>
- </submenu>
- </placeholder>
+ </placeholder>
+ </submenu>
<submenu name="Actions" _label="_Actions">
<placeholder name="ComponentActionsPlaceholder">
diff --git a/ui/evolution-mail-list.xml b/ui/evolution-mail-list.xml
index 5ba4a79129..2699155524 100644
--- a/ui/evolution-mail-list.xml
+++ b/ui/evolution-mail-list.xml
@@ -75,8 +75,8 @@
</placeholder>
</submenu>
- <placeholder name="EditPlaceholder">
- <submenu name="Edit" _label="_Edit">
+ <submenu name="Edit" _label="_Edit">
+ <placeholder name="EditPlaceholder">
<placeholder name="MailListEdit">
<menuitem name="EditSelectAll" verb="" _label="Select _All"/>
<menuitem name="EditSelectThread" verb="" _label="Select _Thread"/>
@@ -88,8 +88,8 @@
<placeholder name="MailListEditFlags">
<menuitem name="MessageMarkAllAsRead" verb="" _label="Mark All as _Read"/>
</placeholder>
- </submenu>
- </placeholder>
+ </placeholder>
+ </submenu>
<submenu name="View">
<placeholder name="MailMessageView">
diff --git a/ui/evolution-mail-message.xml b/ui/evolution-mail-message.xml
index 67ed2d06d0..7f575399f8 100644
--- a/ui/evolution-mail-message.xml
+++ b/ui/evolution-mail-message.xml
@@ -249,8 +249,8 @@
</placeholder>
</submenu>
- <placeholder name="EditPlaceholder">
- <submenu name="Edit">
+ <submenu name="Edit">
+ <placeholder name="EditPlaceholder">
<placeholder name="MailMessageEdit">
<menuitem name="EditCut" verb="" _label="Cu_t"/>
<menuitem name="EditCopy" verb="" _label="_Copy"/>
@@ -274,8 +274,8 @@
<menuitem name="MessageMarkAsJunk" verb="" _label="Mark as _Junk"/>
<menuitem name="MessageMarkAsNotJunk" verb="" _label="Mark as _Not Junk"/>
</placeholder>
- </submenu>
- </placeholder>
+ </placeholder>
+ </submenu>
<submenu name="View">
<placeholder name="MailMessageView">
diff --git a/ui/evolution-mail-messagedisplay.xml b/ui/evolution-mail-messagedisplay.xml
index 29f9642b13..c21b218cfc 100644
--- a/ui/evolution-mail-messagedisplay.xml
+++ b/ui/evolution-mail-messagedisplay.xml
@@ -19,10 +19,9 @@
</submenu>
- <placeholder name="EditPlaceholder">
- <submenu name="Edit" _label="_Edit">
- </submenu>
- </placeholder>
+ <submenu name="Edit" _label="_Edit">
+ <placeholder name="EditPlaceholder"/>
+ </submenu>
<submenu name="View" _label="_View">
<placeholder name="MailMessageView"/>
diff --git a/ui/evolution-tasks.xml b/ui/evolution-tasks.xml
index dc867069a8..1287c5e30c 100644
--- a/ui/evolution-tasks.xml
+++ b/ui/evolution-tasks.xml
@@ -28,8 +28,8 @@
</submenu>
- <placeholder name="EditPlaceholder">
- <submenu name="Edit" _label="_Edit">
+ <submenu name="Edit" _label="_Edit">
+ <placeholder name="EditPlaceholder">
<menuitem name="TasksCut" verb="" _label="C_ut"/>
<menuitem name="TasksCopy" verb="" _label="_Copy"/>
<menuitem name="TasksPaste" verb="" _label="_Paste"/>
@@ -41,8 +41,8 @@
<separator/>
<menuitem name="TasksMarkComplete" verb="" _label="Mar_k as Complete"/>
- </submenu>
- </placeholder>
+ </placeholder>
+ </submenu>
<submenu name="Actions" _label="_Actions">
<placeholder name="ComponentActionsPlaceholder">
diff --git a/ui/evolution.xml b/ui/evolution.xml
index 1a5e2656ce..b024dd785f 100644
--- a/ui/evolution.xml
+++ b/ui/evolution.xml
@@ -67,8 +67,11 @@
<menuitem name="FileExit" verb="FileExit"/>
</submenu>
- <placeholder name="EditPlaceholder">
- </placeholder>
+ <submenu name="Edit" _label="_Edit">
+ <placeholder name="EditPlaceholder"/>
+ <separator/>
+ <menuitem name="Settings" verb="" _label="Prefere_nces" _tip="Change Evolution's settings"/>
+ </submenu>
<submenu name="View" _label="_View">
<placeholder name="ViewBegin"/>
@@ -84,8 +87,6 @@
</submenu>
<submenu name="Tools" _label="_Tools">
- <menuitem name="Settings" verb="" _label="_Settings..." _tip="Change Evolution's settings"/>
- <separator/>
<placeholder name="ComponentPlaceholder"/>
<menuitem name="PilotSettings" verb="" _label="Pi_lot Settings..." _tip="Set up Pilot configuration"/>
</submenu>
@@ -97,8 +98,6 @@
<placeholder name="BuiltMenuItems"/>
- <separator f="" name="eshell1"/>
-
<menuitem name="QuickReference" verb=""
_label="_Quick Reference"/>
generated by cgit (git 2.34.1) at 2024-11-12 03:46:48 +0800