aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ui/ChangeLog12
-rw-r--r--ui/evolution-addressbook.xml27
-rw-r--r--ui/evolution-calendar.xml9
-rw-r--r--ui/evolution-mail-global.xml12
-rw-r--r--ui/evolution-mail-message.xml10
-rw-r--r--ui/evolution-mail-messagedisplay.xml14
-rw-r--r--ui/evolution-tasks.xml15
-rw-r--r--ui/evolution.xml8
-rw-r--r--ui/my-evolution.xml9
9 files changed, 68 insertions, 48 deletions
diff --git a/ui/ChangeLog b/ui/ChangeLog
index 3c33bc1597..1ebf896794 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -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>
* evolution.xml: Don't allow the default toolbar to be
diff --git a/ui/evolution-addressbook.xml b/ui/evolution-addressbook.xml
index 792b442646..73f07252a4 100644
--- a/ui/evolution-addressbook.xml
+++ b/ui/evolution-addressbook.xml
@@ -108,18 +108,6 @@
<submenu name="View">
</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">
<submenu name="Actions" _label="_Actions">
@@ -130,6 +118,21 @@
_label="Send _Message to Contact..." verb=""/>
</submenu>
</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>
<dockitem name="Toolbar">
diff --git a/ui/evolution-calendar.xml b/ui/evolution-calendar.xml
index 0122fbc971..1261adcb19 100644
--- a/ui/evolution-calendar.xml
+++ b/ui/evolution-calendar.xml
@@ -71,11 +71,12 @@
</submenu>
- <placeholder name="ComponentToolsPlaceholder">
- <submenu name="Tools" _label="_Tools">
+ <submenu name="Tools">
+ <placeholder name="ComponentPlaceholder">
<menuitem name="CalendarSettings" verb="" _label="_Calendar Settings..." pixtype="pixbuf"/>
- </submenu>
- </placeholder>
+ <separator/>
+ </placeholder>
+ </submenu>
<placeholder name="ComponentActionsPlaceholder">
<submenu name="Actions" _label="_Actions">
diff --git a/ui/evolution-mail-global.xml b/ui/evolution-mail-global.xml
index d3de6d8597..fa9ae97cd7 100644
--- a/ui/evolution-mail-global.xml
+++ b/ui/evolution-mail-global.xml
@@ -89,8 +89,9 @@
</submenu>
</placeholder>
- <placeholder name="ComponentToolsPlaceholder">
- <submenu name="Tools" _label="_Tools">
+ <submenu name="Tools">
+
+ <placeholder name="ComponentPlaceholder">
<menuitem name="ToolsSettings" verb="" _label="_Mail Settings..."/>
@@ -110,8 +111,11 @@
<menuitem name="ToolsSubscriptions" verb="" _label="_Subscribe to Folders..."/>
- </submenu>
- </placeholder>
+ <separator/>
+
+ </placeholder>
+
+ </submenu>
</menu>
<dockitem name="Toolbar">
diff --git a/ui/evolution-mail-message.xml b/ui/evolution-mail-message.xml
index 926b224d19..0efb07a612 100644
--- a/ui/evolution-mail-message.xml
+++ b/ui/evolution-mail-message.xml
@@ -257,9 +257,8 @@
</submenu>
</placeholder>
- <placeholder name="ComponentToolsPlaceholder">
- <submenu name="Tools" _label="_Tools">
-
+ <submenu name="Tools" _label="_Tools">
+ <placeholder name="ComponentPlaceholder">
<placeholder name="MailFilterTools">
<submenu name="ToolsFilterFromMessage" _label="_Create Filter From Message">
<menuitem name="ToolsFilterSubject" verb="" _label="Filter on _Subject..."/>
@@ -268,7 +267,6 @@
<menuitem name="ToolsFilterMailingList" verb="" _label="Filter on Mailing _List..."/>
</submenu>
</placeholder>
-
<placeholder name="MailVFolderTools">
<submenu name="ToolsVFolderFromMessage" _label="Create _Virtual Folder From Message">
<menuitem name="ToolsVFolderSubject" verb="" _label="VFolder on _Subject..."/>
@@ -277,8 +275,8 @@
<menuitem name="ToolsVFolderMailingList" verb="" _label="VFolder on Mailing _List..."/>
</submenu>
</placeholder>
- </submenu>
- </placeholder>
+ </placeholder>
+ </submenu>
</menu>
<dockitem name="Toolbar">
diff --git a/ui/evolution-mail-messagedisplay.xml b/ui/evolution-mail-messagedisplay.xml
index 63996d6b01..6c8a6a7eff 100644
--- a/ui/evolution-mail-messagedisplay.xml
+++ b/ui/evolution-mail-messagedisplay.xml
@@ -34,14 +34,12 @@
</submenu>
</placeholder>
- <placeholder name="ComponentToolsPlaceholder">
- <submenu name="Tools" _label="_Tools">
- <placeholder name="Component">
- <placeholder name="MailFilterTools"/>
- <placeholder name="MailVFolderTools"/>
- </placeholder>
- </submenu>
- </placeholder>
+ <submenu name="Tools">
+ <placeholder name="ComponentPlaceholder">
+ <placeholder name="MailFilterTools"/>
+ <placeholder name="MailVFolderTools"/>
+ </placeholder>
+ </submenu>
</menu>
diff --git a/ui/evolution-tasks.xml b/ui/evolution-tasks.xml
index 53a1391b8b..f2d3cb7b1b 100644
--- a/ui/evolution-tasks.xml
+++ b/ui/evolution-tasks.xml
@@ -41,13 +41,14 @@
</submenu>
</placeholder>
- <placeholder name="ComponentToolsPlaceholder">
- <submenu name="Tools" _label="_Tools">
- <menuitem name="TasksSettings"
- _label="Tasks Settings..."
- verb="TasksSettings" pixtype="pixbuf"/>
- </submenu>
- </placeholder>
+ <submenu name="Tools">
+ <placeholder name="ComponentPlaceholder">
+ <menuitem name="TasksSettings"
+ _label="Tasks Settings..."
+ verb="TasksSettings" pixtype="pixbuf"/>
+ <separator/>
+ </placeholder>
+ </submenu>
</menu>
<dockitem name="Toolbar">
diff --git a/ui/evolution.xml b/ui/evolution.xml
index 1e73aa9093..112488738b 100644
--- a/ui/evolution.xml
+++ b/ui/evolution.xml
@@ -136,10 +136,12 @@
<placeholder name="ViewAfterControl"/>
</submenu>
- <placeholder name="Component"/>
-
<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">
diff --git a/ui/my-evolution.xml b/ui/my-evolution.xml
index f1fe463d63..a62f0469c8 100644
--- a/ui/my-evolution.xml
+++ b/ui/my-evolution.xml
@@ -21,12 +21,13 @@
</placeholder>
</submenu>
- <placeholder name="ComponentToolsPlaceholder">
- <submenu name="Tools" _label="_Tools">
+ <submenu name="Tools" _label="_Tools">
+ <placeholder name="ComponentPlaceholder">
<menuitem name="ToolsSettings" verb=""
_label="_Summary Settings..."/>
- </submenu>
- </placeholder>
+ <separator/>
+ </placeholder>
+ </submenu>
</menu>
<dockitem name="Toolbar">