aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
Diffstat (limited to 'ui')
-rw-r--r--ui/ChangeLog16
-rw-r--r--ui/evolution-addressbook.xml36
-rw-r--r--ui/evolution-calendar.xml14
-rw-r--r--ui/evolution-mail-global.xml10
-rw-r--r--ui/evolution-mail-list.xml33
-rw-r--r--ui/evolution-mail-message.xml28
-rw-r--r--ui/evolution-mail-messagedisplay.xml6
-rw-r--r--ui/evolution-tasks.xml17
-rw-r--r--ui/evolution.xml4
9 files changed, 96 insertions, 68 deletions
diff --git a/ui/ChangeLog b/ui/ChangeLog
index f5d9632190..55d8531b75 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,5 +1,21 @@
2001-09-05 Ettore Perazzoli <ettore@ximian.com>
+ [Fix #5503, Edit menu is empty and should be removed.]
+
+ * evolution-addressbook.xml: Put the Edit menu in the
+ EditPlaceholder.
+ * evolution-calendar.xml: Likewise.
+ * evolution-mail-list.xml: Likewise.
+ * evolution-mail-global.xml: Likewise.
+ * evolution-mail-message.xml: Likewise.
+ * evolution-mail-messagedisplay.xml: Likewise.
+ * evolution-tasks.xml: Likewise.
+
+ * evolution.xml: Don't put an Edit menu here. Instead, put a
+ EditPlaceholder instead.
+
+2001-09-05 Ettore Perazzoli <ettore@ximian.com>
+
* evolution.xml: s/Evolution/Ximian Evolution/.
2001-09-04 Ettore Perazzoli <ettore@ximian.com>
diff --git a/ui/evolution-addressbook.xml b/ui/evolution-addressbook.xml
index 2481bbba95..792b442646 100644
--- a/ui/evolution-addressbook.xml
+++ b/ui/evolution-addressbook.xml
@@ -84,22 +84,26 @@
</submenu>
- <submenu name="Edit">
- <menuitem name="ContactsCut" verb="" _label="C_ut"
- pixtype="pixbuf"/>
-
- <menuitem name="ContactsCopy" verb="" _label="_Copy"
- pixtype="pixbuf"/>
-
- <menuitem name="ContactsPaste" verb="" _label="_Paste"
- pixtype="pixbuf"/>
-
- <menuitem name="ContactDelete" verb=""
- _label="Delete" pixtype="pixbuf"/>
- <separator/>
-
- <menuitem name="ContactsSelectAll" verb="" _label="_Select All"/>
- </submenu>
+ <placeholder name="EditPlaceholder">
+
+ <submenu name="Edit" _label="_Edit">
+ <menuitem name="ContactsCut" verb="" _label="C_ut"
+ pixtype="pixbuf"/>
+
+ <menuitem name="ContactsCopy" verb="" _label="_Copy"
+ pixtype="pixbuf"/>
+
+ <menuitem name="ContactsPaste" verb="" _label="_Paste"
+ pixtype="pixbuf"/>
+
+ <menuitem name="ContactDelete" verb=""
+ _label="Delete" pixtype="pixbuf"/>
+ <separator/>
+
+ <menuitem name="ContactsSelectAll" verb="" _label="_Select All"/>
+ </submenu>
+
+ </placeholder>
<submenu name="View">
</submenu>
diff --git a/ui/evolution-calendar.xml b/ui/evolution-calendar.xml
index fc574d8c57..0122fbc971 100644
--- a/ui/evolution-calendar.xml
+++ b/ui/evolution-calendar.xml
@@ -53,12 +53,14 @@
</submenu>
- <submenu name="Edit">
- <menuitem name="CutEvent" verb="" _label="C_ut" pixtype="pixbuf"/>
- <menuitem name="CopyEvent" verb="" _label="_Copy" pixtype="pixbuf"/>
- <menuitem name="PasteEvent" verb="" _label="_Paste" pixtype="pixbuf"/>
- <menuitem name="DeleteEvent" verb="" _label="_Delete" pixtype="pixbuf"/>
- </submenu>
+ <placeholder name="EditPlaceholder">
+ <submenu name="Edit" _label="_Edit">
+ <menuitem name="CutEvent" verb="" _label="C_ut" pixtype="pixbuf"/>
+ <menuitem name="CopyEvent" verb="" _label="_Copy" pixtype="pixbuf"/>
+ <menuitem name="PasteEvent" verb="" _label="_Paste" pixtype="pixbuf"/>
+ <menuitem name="DeleteEvent" verb="" _label="_Delete" pixtype="pixbuf"/>
+ </submenu>
+ </placeholder>
<submenu name="View">
<placeholder name="ViewBegin">
diff --git a/ui/evolution-mail-global.xml b/ui/evolution-mail-global.xml
index 289713b031..d3de6d8597 100644
--- a/ui/evolution-mail-global.xml
+++ b/ui/evolution-mail-global.xml
@@ -64,10 +64,12 @@
<placeholder name="MailListView"/>
</submenu>
- <submenu name="Edit">
- <placeholder name="MailListEdit"/>
- <placeholder name="MailMessageEdit"/>
- <placeholder name="MailListEditFlags"/>
+ <submenu name="EditPlaceholder">
+ <submenu name="Edit">
+ <placeholder name="MailListEdit"/>
+ <placeholder name="MailMessageEdit"/>
+ <placeholder name="MailListEditFlags"/>
+ </submenu>
</submenu>
<placeholder name="ComponentActionsPlaceholder">
diff --git a/ui/evolution-mail-list.xml b/ui/evolution-mail-list.xml
index 9e91695697..837f35daff 100644
--- a/ui/evolution-mail-list.xml
+++ b/ui/evolution-mail-list.xml
@@ -74,26 +74,27 @@
</submenu>
</submenu>
- <submenu name="Edit">
- <placeholder name="MailListEdit">
- <menuitem name="EditSelectAll" verb="" _label="Select _All"/>
- <menuitem name="EditSelectThread" verb="" _label="Select _Thread"/>
- <menuitem name="EditInvertSelection" verb="" _label="_Invert Selection"/>
+ <placeholder name="EditPlaceholder">
+ <submenu name="Edit" _label="_Edit">
+ <placeholder name="MailListEdit">
+ <menuitem name="EditSelectAll" verb="" _label="Select _All"/>
+ <menuitem name="EditSelectThread" verb="" _label="Select _Thread"/>
+ <menuitem name="EditInvertSelection" verb="" _label="_Invert Selection"/>
- <separator/>
+ <separator/>
- <menuitem name="EditCut" verb="" _label="Cu_t"/>
- <menuitem name="EditCopy" verb="" _label="_Copy"/>
- <menuitem name="EditPaste" verb="" _label="_Paste"/>
+ <menuitem name="EditCut" verb="" _label="Cu_t"/>
+ <menuitem name="EditCopy" verb="" _label="_Copy"/>
+ <menuitem name="EditPaste" verb="" _label="_Paste"/>
- <separator/>
- </placeholder>
-
- <placeholder name="MailListEditFlags">
- <menuitem name="MessageMarkAllAsRead" verb="" _label="Mark All as R_ead"/>
- </placeholder>
+ <separator/>
+ </placeholder>
- </submenu>
+ <placeholder name="MailListEditFlags">
+ <menuitem name="MessageMarkAllAsRead" verb="" _label="Mark All as R_ead"/>
+ </placeholder>
+ </submenu>
+ </placeholder>
<submenu name="View">
<placeholder name="MailMessageView">
diff --git a/ui/evolution-mail-message.xml b/ui/evolution-mail-message.xml
index 44e0e630eb..926b224d19 100644
--- a/ui/evolution-mail-message.xml
+++ b/ui/evolution-mail-message.xml
@@ -188,23 +188,25 @@
</placeholder>
</submenu>
- <submenu name="Edit">
- <placeholder name="MailMessageEdit">
- <menuitem name="MessageSearch" verb="" _label="S_earch Message..."/>
+ <placeholder name="EditPlaceholder">
+ <submenu name="Edit">
+ <placeholder name="MailMessageEdit">
+ <menuitem name="MessageSearch" verb="" _label="S_earch Message..."/>
- <separator/>
+ <separator/>
- <menuitem name="MessageDelete" verb="" _label="_Delete"/>
- <menuitem name="MessageUndelete" verb="" _label="_Undelete"/>
+ <menuitem name="MessageDelete" verb="" _label="_Delete"/>
+ <menuitem name="MessageUndelete" verb="" _label="_Undelete"/>
- <separator/>
+ <separator/>
- <menuitem name="MessageMarkAsRead" verb="" _label="Mar_k as Read"/>
- <menuitem name="MessageMarkAsUnRead" verb="" _label="Mark as U_nread"/>
- <menuitem name="MessageMarkAsImportant" verb="" _label="Mark as I_mportant"/>
- <menuitem name="MessageMarkAsUnimportant" verb="" _label="Mark as Unimp_ortant"/>
- </placeholder>
- </submenu>
+ <menuitem name="MessageMarkAsRead" verb="" _label="Mar_k as Read"/>
+ <menuitem name="MessageMarkAsUnRead" verb="" _label="Mark as U_nread"/>
+ <menuitem name="MessageMarkAsImportant" verb="" _label="Mark as I_mportant"/>
+ <menuitem name="MessageMarkAsUnimportant" verb="" _label="Mark as Unimp_ortant"/>
+ </placeholder>
+ </submenu>
+ </placeholder>
<submenu name="View">
<placeholder name="MailMessageView">
diff --git a/ui/evolution-mail-messagedisplay.xml b/ui/evolution-mail-messagedisplay.xml
index 1be99c0a5d..63996d6b01 100644
--- a/ui/evolution-mail-messagedisplay.xml
+++ b/ui/evolution-mail-messagedisplay.xml
@@ -19,8 +19,10 @@
</submenu>
- <submenu name="Edit" _label="_Edit">
- </submenu>
+ <placeholder name="EditPlaceholder">
+ <submenu name="Edit" _label="_Edit">
+ </submenu>
+ </placeholder>
<submenu name="View" _label="_View">
<placeholder name="MailMessageView"/>
diff --git a/ui/evolution-tasks.xml b/ui/evolution-tasks.xml
index 4571f9aeb0..53a1391b8b 100644
--- a/ui/evolution-tasks.xml
+++ b/ui/evolution-tasks.xml
@@ -32,15 +32,14 @@
</submenu>
- <submenu name="Edit">
-
- <menuitem name="Cut" verb="TasksCut" _label="C_ut" pixtype="pixbuf"/>
- <menuitem name="Copy" verb="TasksCopy" _label="_Copy" pixtype="pixbuf"/>
- <menuitem name="Paste" verb="TasksPaste" _label="_Paste" pixtype="pixbuf"/>
- <menuitem name="Delete" verb="TasksDelete"
- _label="_Delete" pixtype="pixbuf"/>
-
- </submenu>
+ <placeholder name="EditPlaceholder">
+ <submenu name="Edit" _label="_Edit">
+ <menuitem name="Cut" verb="TasksCut" _label="C_ut" pixtype="pixbuf"/>
+ <menuitem name="Copy" verb="TasksCopy" _label="_Copy" pixtype="pixbuf"/>
+ <menuitem name="Paste" verb="TasksPaste" _label="_Paste" pixtype="pixbuf"/>
+ <menuitem name="Delete" verb="TasksDelete" _label="_Delete" pixtype="pixbuf"/>
+ </submenu>
+ </placeholder>
<placeholder name="ComponentToolsPlaceholder">
<submenu name="Tools" _label="_Tools">
diff --git a/ui/evolution.xml b/ui/evolution.xml
index 89809833fb..769d664e97 100644
--- a/ui/evolution.xml
+++ b/ui/evolution.xml
@@ -126,8 +126,8 @@
<menuitem name="FileExit" verb="FileExit"/>
</submenu>
- <submenu name="Edit" _label="_Edit">
- </submenu>
+ <placeholder name="EditPlaceholder">
+ </placeholder>
<submenu name="View" _label="_View">
<placeholder name="ViewBegin"/>