aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2001-08-09 14:44:34 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2001-08-09 14:44:34 +0800
commit3a1dbfa0440d6472047685dfe3fc078e163ccfa6 (patch)
tree25e577d5ba7a4134fe6797c030284796dfc41c37
parent00225dc415ff808fae151d3eeef5bc1889d2b0a4 (diff)
downloadgsoc2013-evolution-3a1dbfa0440d6472047685dfe3fc078e163ccfa6.tar
gsoc2013-evolution-3a1dbfa0440d6472047685dfe3fc078e163ccfa6.tar.gz
gsoc2013-evolution-3a1dbfa0440d6472047685dfe3fc078e163ccfa6.tar.bz2
gsoc2013-evolution-3a1dbfa0440d6472047685dfe3fc078e163ccfa6.tar.lz
gsoc2013-evolution-3a1dbfa0440d6472047685dfe3fc078e163ccfa6.tar.xz
gsoc2013-evolution-3a1dbfa0440d6472047685dfe3fc078e163ccfa6.tar.zst
gsoc2013-evolution-3a1dbfa0440d6472047685dfe3fc078e163ccfa6.zip
Put the "Tools" and "Actions" menus in the "ComponentToolsPlaceholder" and
* evolution-addressbook.xml: Put the "Tools" and "Actions" menus in the "ComponentToolsPlaceholder" and "ComponentActionsPlaceholder", respectively. * evolution-calendar.xml: Likewise. * evolution-contact-editor.xml: Likewise. * evolution-mail-global.xml: Likewise. * evolution-mail-message.xml: Likewise. * evolution.xml: Remove "Tools" and "Actions" menus. Create a "ComponentActionsPlaceholder" and a "ComponentToolsPlaceholder" instead. * evolution-mail-messagedisplay.xml: Likewise, put "Tools" and "Actions" in placeholders. svn path=/trunk/; revision=11822
-rw-r--r--ui/ChangeLog20
-rw-r--r--ui/evolution-addressbook.xml29
-rw-r--r--ui/evolution-calendar.xml16
-rw-r--r--ui/evolution-mail-global.xml16
-rw-r--r--ui/evolution-mail-message.xml16
-rw-r--r--ui/evolution.xml9
6 files changed, 58 insertions, 48 deletions
diff --git a/ui/ChangeLog b/ui/ChangeLog
index 5b549477bb..1b4c52f78b 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,8 +1,24 @@
-2001-08-08 Anna Marie Dirks <anna@ximian.com>
+2001-08-09 Ettore Perazzoli <ettore@ximian.com>
+
+ * evolution-addressbook.xml: Put the "Tools" and "Actions" menus
+ in the "ComponentToolsPlaceholder" and
+ "ComponentActionsPlaceholder", respectively.
+ * evolution-calendar.xml: Likewise.
+ * evolution-contact-editor.xml: Likewise.
+ * evolution-mail-global.xml: Likewise.
+ * evolution-mail-message.xml: Likewise.
+
+ * evolution.xml: Remove "Tools" and "Actions" menus. Create a
+ "ComponentActionsPlaceholder" and a "ComponentToolsPlaceholder"
+ instead.
+ * evolution-mail-messagedisplay.xml: Likewise, put "Tools" and
+ "Actions" in placeholders.
+
+2001-08-08 Anna Marie Dirks <anna@ximian.com>
+
* evolution-mail-list.xml: Changed the "Show All" menu item
to be "Show Hidden Messages".
-
2001-08-08 Chris Toshok <toshok@ximian.com>
* evolution-contact-list-editor.xml: improvements, make it look
diff --git a/ui/evolution-addressbook.xml b/ui/evolution-addressbook.xml
index e38a778391..9696240938 100644
--- a/ui/evolution-addressbook.xml
+++ b/ui/evolution-addressbook.xml
@@ -95,30 +95,29 @@
</submenu>
<submenu name="View">
-
</submenu>
- <submenu name="Tools" _label="_Tools">
- <placeholder name="Component">
+ <placeholder name="ComponentToolsPlaceholder">
+ <submenu name="Tools" _label="_Tools">
<menuitem name="ToolSearch" verb=""
- _label="_Search for contacts"
- pixtype="stock" pixname="Search" />
-
- <menuitem name="AddressbookConfig" verb=""
- _label="_Addressbook Sources..."
- pixtype ="pixbuf"/>
- </placeholder>
- </submenu>
- <submenu name="Actions" _label="_Actions">
- <placeholder name="Component">
+ _label="_Search for contacts"
+ pixtype="stock" pixname="Search" />
+ <menuitem name="AddressbookConfig" verb=""
+ _label="_Addressbook Sources..."
+ pixtype ="pixbuf"/>
+ </submenu>
+ <placeholder/>
+
+ <placeholder name="ComponentActionsPlaceholder">
+ <submenu name="Actions" _label="_Actions">
<menuitem name="ContactsSendContactToOther"
_label="Send _contact to other" verb=""/>
<menuitem name="ContactsSendMessageToContact"
_label="Send _message to contact" verb=""/>
- </placeholder>
- </submenu>
+ </submenu>
+ </placeholder>
</menu>
<dockitem name="Toolbar">
diff --git a/ui/evolution-calendar.xml b/ui/evolution-calendar.xml
index 7ded8a0479..4fae92b30a 100644
--- a/ui/evolution-calendar.xml
+++ b/ui/evolution-calendar.xml
@@ -74,14 +74,14 @@
</placeholder>
</submenu>
- <submenu name="Tools" _label="_Tools">
- <placeholder name="Component">
+ <placeholder name="ComponentToolsPlaceholder">
+ <submenu name="Tools" _label="_Tools">
<menuitem name="CalendarSettings" verb="" _label="_Calendar Settings..." pixtype="pixbuf"/>
- </placeholder>
- </submenu>
+ </submenu>
+ </placeholder>
- <submenu name="Actions">
- <placeholder name="Component">
+ <placeholder name="ComponentActionsPlaceholder">
+ <submenu name="Actions" _label="_Actions">
<menuitem name="NewAppointment" verb="CalendarNewAppointment"
_label="Create a _New Appointment" pixtype="pixbuf"/>
<menuitem name="NewEvent" verb="CalendarNewEvent" _label="Create a New All-Day _Event"/>
@@ -89,8 +89,8 @@
<separator/>
<menuitem name="PublishFreeBusy" verb="" _label="Publish Free/Busy Information"/>
- </placeholder>
- </submenu>
+ </submenu>
+ </placeholder>
</menu>
<dockitem name="Toolbar">
diff --git a/ui/evolution-mail-global.xml b/ui/evolution-mail-global.xml
index df84f0f748..809552c5e6 100644
--- a/ui/evolution-mail-global.xml
+++ b/ui/evolution-mail-global.xml
@@ -69,8 +69,8 @@
<placeholder name="MailListEditFlags"/>
</submenu>
- <submenu name="Actions">
- <placeholder name="Component">
+ <placeholder name="ComponentActionsPlaceholder">
+ <submenu name="Actions" _label="_Actions">
<menuitem name="MailGetSend" verb="" _label="_Send / Receive"/>
<menuitem name="ActionCompose" verb="MailCompose" _label="Compose _New Message"/>
@@ -83,11 +83,11 @@
<placeholder name="MailListActions"/>
<menuitem name="EmptyTrash" verb="" _label="Empty _Trash"/>
- </placeholder>
- </submenu>
+ </submenu>
+ </placeholder>
- <submenu name="Tools">
- <placeholder name="Component">
+ <placeholder name="ComponentToolsPlaceholder">
+ <submenu name="Tools" _label="_Tools">
<menuitem name="ToolsSettings" verb="" _label="_Mail Settings..."/>
@@ -109,8 +109,8 @@
<separator/>
- </placeholder>
- </submenu>
+ </submenu>
+ </placeholder>
</menu>
<dockitem name="Toolbar">
diff --git a/ui/evolution-mail-message.xml b/ui/evolution-mail-message.xml
index 0b2cdcd020..c6af20053a 100644
--- a/ui/evolution-mail-message.xml
+++ b/ui/evolution-mail-message.xml
@@ -214,8 +214,8 @@
</placeholder>
</submenu>
- <submenu name="Actions">
- <placeholder name="Component">
+ <placeholder name="ComponentActionsPlaceholder">
+ <submenu name="Actions" _label="_Actions">
<placeholder name="MailMessageActions">
<submenu name="GoTo" _label="Go To">
<menuitem name="MailNext" verb="" _label="Next Message"/>
@@ -246,11 +246,11 @@
<menuitem name="MessageApplyFilters" verb="" _label="_Apply Filters"/>
</placeholder>
- </placeholder>
- </submenu>
+ </submenu>
+ </placeholder>
- <submenu name="Tools">
- <placeholder name="Component">
+ <placeholder name="ComponentToolsPlaceholder">
+ <submenu name="Tools" _label="_Tools">
<placeholder name="MailFilterTools">
<submenu name="ToolsFilterFromMessage" _label="_Create Filter From Message">
@@ -269,8 +269,8 @@
<menuitem name="ToolsVFolderMailingList" verb="" _label="VFolder on Mailing _List..."/>
</submenu>
</placeholder>
- </placeholder>
- </submenu>
+ </submenu>
+ </placeholder>
</menu>
<dockitem name="Toolbar">
diff --git a/ui/evolution.xml b/ui/evolution.xml
index 683945598f..8b5772d465 100644
--- a/ui/evolution.xml
+++ b/ui/evolution.xml
@@ -158,13 +158,8 @@
<placeholder name="Component"/>
- <submenu name="Actions" _label="_Actions">
- <placeholder name="Component"/>
- </submenu>
-
- <submenu name="Tools" _label="_Tools">
- <placeholder name="Component"/>
- </submenu>
+ <placeholder name="ComponentActionsPlaceholder"/>
+ <placeholder name="ComponentToolsPlaceholder"/>
<submenu name="Help" _label="_Help">