callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Fix #5503, Edit menu is empty and should be removed.]

Browse Source 
* 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.

svn path=/trunk/; revision=12632
This commit is contained in:
Ettore Perazzoli
2001-09-05 22:11:03 +00:00
parent 3199dc232a
commit dc75cabd4d
9 changed files with 94 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ui/ChangeLog
View File

@ -1,3 +1,19 @@
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/.

32
ui/evolution-addressbook.xml
View File

@ -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"/>
<placeholder name="EditPlaceholder">
<menuitem name="ContactDelete" verb=""
_label="Delete" pixtype="pixbuf"/>
<separator/>
<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="ContactsSelectAll" verb="" _label="_Select All"/>
</submenu>
<menuitem name="ContactDelete" verb=""
_label="Delete" pixtype="pixbuf"/>
<separator/>
<menuitem name="ContactsSelectAll" verb="" _label="_Select All"/>
</submenu>
</placeholder>
<submenu name="View">
</submenu>

14
ui/evolution-calendar.xml
View File

@ -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">

10
ui/evolution-mail-global.xml
View File

@ -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">

33
ui/evolution-mail-list.xml
View File

@ -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>
<separator/>
</placeholder>
<placeholder name="MailListEditFlags">
<menuitem name="MessageMarkAllAsRead" verb="" _label="Mark All as R_ead"/>
</placeholder>
</submenu>
<placeholder name="MailListEditFlags">
<menuitem name="MessageMarkAllAsRead" verb="" _label="Mark All as R_ead"/>
</placeholder>
</submenu>
</placeholder>
<submenu name="View">
<placeholder name="MailMessageView">

28
ui/evolution-mail-message.xml
View File

@ -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">

6
ui/evolution-mail-messagedisplay.xml
View File

@ -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"/>

17
ui/evolution-tasks.xml
View File

@ -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">

4
ui/evolution.xml
View File

@ -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"/>