Move the Tools menu outside the ComponentToolsPlaceholder. Likewise.

* evolution.xml: Move the Tools menu outside the
ComponentToolsPlaceholder.
* evolution-addressbook.xml: Likewise.
* evolution-calendar.xml: Likewise.
* evolution-mail-global.xml: Likewise.
* evolution-mail-message.xml: Likewise.
* evolution-mail-messagedisplay.xml: Likewise.
* evolution-tasks.xml: Likewise.
* my-evolution.xml: Likewise.

svn path=/trunk/; revision=13202
This commit is contained in:
Ettore Perazzoli
2001-09-27 23:11:49 +00:00
parent c3d6f44895
commit cb77c52063
9 changed files with 68 additions and 48 deletions

View File

@ -1,3 +1,15 @@
2001-09-27 Ettore Perazzoli <ettore@ximian.com>
* evolution.xml: Move the Tools menu outside the
ComponentToolsPlaceholder.
* evolution-addressbook.xml: Likewise.
* evolution-calendar.xml: Likewise.
* evolution-mail-global.xml: Likewise.
* evolution-mail-message.xml: Likewise.
* evolution-mail-messagedisplay.xml: Likewise.
* evolution-tasks.xml: Likewise.
* my-evolution.xml: Likewise.
2001-09-06 Ettore Perazzoli <ettore@ximian.com> 2001-09-06 Ettore Perazzoli <ettore@ximian.com>
* evolution.xml: Don't allow the default toolbar to be * evolution.xml: Don't allow the default toolbar to be

View File

@ -108,18 +108,6 @@
<submenu name="View"> <submenu name="View">
</submenu> </submenu>
<placeholder name="ComponentToolsPlaceholder">
<submenu name="Tools" _label="_Tools">
<menuitem name="ToolSearch" verb=""
_label="_Search for Contacts"
pixtype="pixbuf"/>
<menuitem name="AddressbookConfig" verb=""
_label="_Addressbook Sources..."
pixtype ="pixbuf"/>
</submenu>
</placeholder>
<placeholder name="ComponentActionsPlaceholder"> <placeholder name="ComponentActionsPlaceholder">
<submenu name="Actions" _label="_Actions"> <submenu name="Actions" _label="_Actions">
@ -130,6 +118,21 @@
_label="Send _Message to Contact..." verb=""/> _label="Send _Message to Contact..." verb=""/>
</submenu> </submenu>
</placeholder> </placeholder>
<submenu name="Tools">
<placeholder name="ComponentPlaceholder">
<menuitem name="ToolSearch"
verb=""
_label="_Search for Contacts"
pixtype="pixbuf"/>
<menuitem name="AddressbookConfig" verb=""
_label="_Addressbook Sources..."
pixtype ="pixbuf"/>
<separator/>
</placeholder>
</submenu>
</menu> </menu>
<dockitem name="Toolbar"> <dockitem name="Toolbar">

View File

@ -71,11 +71,12 @@
</submenu> </submenu>
<placeholder name="ComponentToolsPlaceholder"> <submenu name="Tools">
<submenu name="Tools" _label="_Tools"> <placeholder name="ComponentPlaceholder">
<menuitem name="CalendarSettings" verb="" _label="_Calendar Settings..." pixtype="pixbuf"/> <menuitem name="CalendarSettings" verb="" _label="_Calendar Settings..." pixtype="pixbuf"/>
</submenu> <separator/>
</placeholder> </placeholder>
</submenu>
<placeholder name="ComponentActionsPlaceholder"> <placeholder name="ComponentActionsPlaceholder">
<submenu name="Actions" _label="_Actions"> <submenu name="Actions" _label="_Actions">

View File

@ -89,8 +89,9 @@
</submenu> </submenu>
</placeholder> </placeholder>
<placeholder name="ComponentToolsPlaceholder"> <submenu name="Tools">
<submenu name="Tools" _label="_Tools">
<placeholder name="ComponentPlaceholder">
<menuitem name="ToolsSettings" verb="" _label="_Mail Settings..."/> <menuitem name="ToolsSettings" verb="" _label="_Mail Settings..."/>
@ -110,8 +111,11 @@
<menuitem name="ToolsSubscriptions" verb="" _label="_Subscribe to Folders..."/> <menuitem name="ToolsSubscriptions" verb="" _label="_Subscribe to Folders..."/>
</submenu> <separator/>
</placeholder>
</placeholder>
</submenu>
</menu> </menu>
<dockitem name="Toolbar"> <dockitem name="Toolbar">

View File

@ -257,9 +257,8 @@
</submenu> </submenu>
</placeholder> </placeholder>
<placeholder name="ComponentToolsPlaceholder"> <submenu name="Tools" _label="_Tools">
<submenu name="Tools" _label="_Tools"> <placeholder name="ComponentPlaceholder">
<placeholder name="MailFilterTools"> <placeholder name="MailFilterTools">
<submenu name="ToolsFilterFromMessage" _label="_Create Filter From Message"> <submenu name="ToolsFilterFromMessage" _label="_Create Filter From Message">
<menuitem name="ToolsFilterSubject" verb="" _label="Filter on _Subject..."/> <menuitem name="ToolsFilterSubject" verb="" _label="Filter on _Subject..."/>
@ -268,7 +267,6 @@
<menuitem name="ToolsFilterMailingList" verb="" _label="Filter on Mailing _List..."/> <menuitem name="ToolsFilterMailingList" verb="" _label="Filter on Mailing _List..."/>
</submenu> </submenu>
</placeholder> </placeholder>
<placeholder name="MailVFolderTools"> <placeholder name="MailVFolderTools">
<submenu name="ToolsVFolderFromMessage" _label="Create _Virtual Folder From Message"> <submenu name="ToolsVFolderFromMessage" _label="Create _Virtual Folder From Message">
<menuitem name="ToolsVFolderSubject" verb="" _label="VFolder on _Subject..."/> <menuitem name="ToolsVFolderSubject" verb="" _label="VFolder on _Subject..."/>
@ -277,8 +275,8 @@
<menuitem name="ToolsVFolderMailingList" verb="" _label="VFolder on Mailing _List..."/> <menuitem name="ToolsVFolderMailingList" verb="" _label="VFolder on Mailing _List..."/>
</submenu> </submenu>
</placeholder> </placeholder>
</submenu> </placeholder>
</placeholder> </submenu>
</menu> </menu>
<dockitem name="Toolbar"> <dockitem name="Toolbar">

View File

@ -34,14 +34,12 @@
</submenu> </submenu>
</placeholder> </placeholder>
<placeholder name="ComponentToolsPlaceholder"> <submenu name="Tools">
<submenu name="Tools" _label="_Tools"> <placeholder name="ComponentPlaceholder">
<placeholder name="Component"> <placeholder name="MailFilterTools"/>
<placeholder name="MailFilterTools"/> <placeholder name="MailVFolderTools"/>
<placeholder name="MailVFolderTools"/> </placeholder>
</placeholder> </submenu>
</submenu>
</placeholder>
</menu> </menu>

View File

@ -41,13 +41,14 @@
</submenu> </submenu>
</placeholder> </placeholder>
<placeholder name="ComponentToolsPlaceholder"> <submenu name="Tools">
<submenu name="Tools" _label="_Tools"> <placeholder name="ComponentPlaceholder">
<menuitem name="TasksSettings" <menuitem name="TasksSettings"
_label="Tasks Settings..." _label="Tasks Settings..."
verb="TasksSettings" pixtype="pixbuf"/> verb="TasksSettings" pixtype="pixbuf"/>
</submenu> <separator/>
</placeholder> </placeholder>
</submenu>
</menu> </menu>
<dockitem name="Toolbar"> <dockitem name="Toolbar">

View File

@ -136,10 +136,12 @@
<placeholder name="ViewAfterControl"/> <placeholder name="ViewAfterControl"/>
</submenu> </submenu>
<placeholder name="Component"/>
<placeholder name="ComponentActionsPlaceholder"/> <placeholder name="ComponentActionsPlaceholder"/>
<placeholder name="ComponentToolsPlaceholder"/>
<submenu name="Tools" _label="_Tools">
<placeholder name="ComponentPlaceholder"/>
<menuitem name="PilotSettings" verb="" _label="_Pilot Settings..."/>
</submenu>
<submenu name="Help" _label="_Help"> <submenu name="Help" _label="_Help">

View File

@ -21,12 +21,13 @@
</placeholder> </placeholder>
</submenu> </submenu>
<placeholder name="ComponentToolsPlaceholder"> <submenu name="Tools" _label="_Tools">
<submenu name="Tools" _label="_Tools"> <placeholder name="ComponentPlaceholder">
<menuitem name="ToolsSettings" verb="" <menuitem name="ToolsSettings" verb=""
_label="_Summary Settings..."/> _label="_Summary Settings..."/>
</submenu> <separator/>
</placeholder> </placeholder>
</submenu>
</menu> </menu>
<dockitem name="Toolbar"> <dockitem name="Toolbar">