aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2002-03-21 08:07:49 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2002-03-21 08:07:49 +0800
commit364cb04c2b58a371d45a6645dbca8d9f069fba2e (patch)
tree8d74d92fcdf15bfd111f357f7dfc1213556f5355 /ui
parent9eeff8bfec181a1710b62926c64d617cce766054 (diff)
downloadgsoc2013-evolution-364cb04c2b58a371d45a6645dbca8d9f069fba2e.tar.gz
gsoc2013-evolution-364cb04c2b58a371d45a6645dbca8d9f069fba2e.tar.zst
gsoc2013-evolution-364cb04c2b58a371d45a6645dbca8d9f069fba2e.zip
Move the ComponentActionsPlaceholder into the Actions menu, instead of the
* evolution.xml: Move the ComponentActionsPlaceholder into the Actions menu, instead of the Actions menu being in the ComponentActionsPlaceholder. * evolution-addressbook.xml: Updated accordingly. * evolution-calendar.xml: Updated accordingly. * evolution-mail-global.xml: Updated accordingly. * evolution-mail-list.xml: Updated accordingly. * evolution-mail-message.xml: Updated accordingly. * evolution-mail-messagedisplay.xml: Updated accordingly. * evolution-tasks.xml: Updated accordingly. * evolution.xml: Add "SendReceive" verb, menu item and toolbar button. * evolution-mail-global.xml: Remove "MailGetSend" verb and menu item. * e-shell-view-menu.c (command_send_receive): New, implementation for the "SendReceive" verb. * e-shell.c (e_shell_send_receive): New. * evolution-shell-component.c (impl_sendReceive): Implementation of ShellComponent::sendReceive. (class_init): Add the "send_receive" signal. * evolution-shell-component.h: Added `send_receive' signal. * Evolution-ShellComponent.idl: Added ShellComponent::sendReceive. * component-factory.c (send_receive_cb): New, callback for the "send_receive" signal on the EvolutionShellComponent. (create_component): Connect. * folder-browser-ui.c: Remove verb "MailGetSend". * mail-callbacks.c (send_receive_mail): Removed. * mail-send-recv.c: Remove member current_folder from struct _send_data. (free_send_data): No need to unref here. (build_dialogue): Removed arg @current_folder. (mail_send_receive): Likewise. svn path=/trunk/; revision=16220
Diffstat (limited to 'ui')
-rw-r--r--ui/ChangeLog19
-rw-r--r--ui/evolution-addressbook.xml21
-rw-r--r--ui/evolution-calendar.xml8
-rw-r--r--ui/evolution-mail-global.xml17
-rw-r--r--ui/evolution-mail-list.xml8
-rw-r--r--ui/evolution-mail-message.xml8
-rw-r--r--ui/evolution-mail-messagedisplay.xml8
-rw-r--r--ui/evolution-tasks.xml8
-rw-r--r--ui/evolution.xml13
9 files changed, 65 insertions, 45 deletions
diff --git a/ui/ChangeLog b/ui/ChangeLog
index 08850b1722..de67f9955e 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,22 @@
+2002-03-20 Ettore Perazzoli <ettore@ximian.com>
+
+ * evolution.xml: Move the ComponentActionsPlaceholder into the
+ Actions menu, instead of the Actions menu being in the
+ ComponentActionsPlaceholder.
+ * evolution-addressbook.xml: Updated accordingly.
+ * evolution-calendar.xml: Updated accordingly.
+ * evolution-mail-global.xml: Updated accordingly.
+ * evolution-mail-list.xml: Updated accordingly.
+ * evolution-mail-message.xml: Updated accordingly.
+ * evolution-mail-messagedisplay.xml: Updated accordingly.
+ * evolution-tasks.xml: Updated accordingly.
+
+ * evolution.xml: Add "SendReceive" verb, menu item and toolbar
+ button.
+
+ * evolution-mail-global.xml: Remove "MailGetSend" verb and menu
+ item.
+
2002-03-14 Ettore Perazzoli <ettore@ximian.com>
* evolution.xml: Add a "Search" menu.
diff --git a/ui/evolution-addressbook.xml b/ui/evolution-addressbook.xml
index f6666ff0ce..a560f7cad0 100644
--- a/ui/evolution-addressbook.xml
+++ b/ui/evolution-addressbook.xml
@@ -121,17 +121,16 @@
verb="BonoboUIDump" _label="Dump"/>
</submenu>
- <placeholder name="ComponentActionsPlaceholder">
- <submenu name="Actions" _label="_Actions">
-
- <menuitem name="ContactsSendContactToOther"
- _label="_Forward Contact..." verb=""/>
-
- <menuitem name="ContactsSendMessageToContact"
- _label="_Send Message to Contact..." verb=""/>
- <menuitem name="ContactsCopyToFolder" _label="_Copy to Folder..." verb=""/>
- <menuitem name="ContactsMoveToFolder" _label="_Move to Folder..." verb=""/>
- </submenu>
+ <submenu name="Actions" _label="_Actions">
+ <placeholder name="ComponentActionsPlaceholder">
+ <separator f="" name="eadbk4"/>
+ <menuitem name="ContactsSendContactToOther"
+ _label="_Forward Contact..." verb=""/>
+
+ <menuitem name="ContactsSendMessageToContact"
+ _label="_Send Message to Contact..." verb=""/>
+ <menuitem name="ContactsCopyToFolder" _label="_Copy to Folder..." verb=""/>
+ <menuitem name="ContactsMoveToFolder" _label="_Move to Folder..." verb=""/>
</placeholder>
<submenu name="Tools">
diff --git a/ui/evolution-calendar.xml b/ui/evolution-calendar.xml
index 63b712b70c..b62c3030c9 100644
--- a/ui/evolution-calendar.xml
+++ b/ui/evolution-calendar.xml
@@ -57,11 +57,11 @@
</submenu>
- <placeholder name="ComponentActionsPlaceholder">
- <submenu name="Actions" _label="_Actions">
+ <submenu name="Actions" _label="_Actions">
+ <placeholder name="ComponentActionsPlaceholder">
<menuitem name="PublishFreeBusy" verb="" _label="_Publish Free/Busy Information"/>
- </submenu>
- </placeholder>
+ </placeholder>
+ </submenu_name>
</menu>
<dockitem name="Toolbar">
diff --git a/ui/evolution-mail-global.xml b/ui/evolution-mail-global.xml
index 90589de162..36f8471354 100644
--- a/ui/evolution-mail-global.xml
+++ b/ui/evolution-mail-global.xml
@@ -12,10 +12,6 @@
_tip="Open a window for composing a mail message"
pixtype="pixbuf"/>
- <cmd name="MailGetSend"
- _tip="Send queued mail and retrieve new mail"
- pixtype="pixbuf"/>
-
<cmd name="MailStop"
_tip="Cancel the current mail operation"
pixtype="stock" pixname="Stop"/>
@@ -72,9 +68,8 @@
</submenu>
</submenu>
- <placeholder name="ComponentActionsPlaceholder">
- <submenu name="Actions" _label="_Actions">
- <menuitem name="MailGetSend" verb="" _label="_Send / Receive" accel="F9"/>
+ <submenu name="Actions" _label="_Actions">
+ <placeholder name="ComponentActionsPlaceholder">
<menuitem name="ActionCompose" verb="MailCompose" _label="Compose _New Message"/>
<separator f="" name="emailglobal"/>
@@ -86,8 +81,8 @@
<placeholder name="MailListActions"/>
<menuitem name="EmptyTrash" verb="" _label="Empty _Trash"/>
- </submenu>
- </placeholder>
+ </placeholder>
+ </submenu>
<submenu name="Tools">
@@ -120,10 +115,6 @@
<dockitem name="Toolbar">
- <toolitem name="MailGetSend" verb=""
- _label="Send / Receive" priority="1"
- pixtype="pixbuf"/>
-
<separator f="" name="emailglobal1"/>
<placeholder name="MailMessageToolbar"/>
diff --git a/ui/evolution-mail-list.xml b/ui/evolution-mail-list.xml
index 9c54f255e2..0bc146043b 100644
--- a/ui/evolution-mail-list.xml
+++ b/ui/evolution-mail-list.xml
@@ -110,13 +110,13 @@
</placeholder>
</submenu>
- <placeholder name="ComponentActionsPlaceholder">
- <submenu name="Actions" _label="_Actions">
+ <submenu name="Actions" _label="_Actions">
+ <placeholder name="ComponentActionsPlaceholder">
<placeholder name="MailListActions">
<menuitem name="FolderExpunge" verb="" _label="_Expunge"/>
</placeholder>
- </submenu>
- </placeholder>
+ </placeholder>
+ </submenu>
</menu>
</Root>
diff --git a/ui/evolution-mail-message.xml b/ui/evolution-mail-message.xml
index f6d51a31cb..a1d02b089a 100644
--- a/ui/evolution-mail-message.xml
+++ b/ui/evolution-mail-message.xml
@@ -258,8 +258,8 @@
</placeholder>
</submenu>
- <placeholder name="ComponentActionsPlaceholder">
- <submenu name="Actions" _label="_Actions">
+ <submenu name="Actions" _label="_Actions">
+ <placeholder name="ComponentActionsPlaceholder">
<placeholder name="MailMessageActions">
<submenu name="GoTo" _label="_Go To">
<menuitem name="MailNext" verb="" _label="_Next Message"/>
@@ -303,8 +303,8 @@
<menuitem name="MessageApplyFilters" verb="" _label="A_pply Filters"/>
</placeholder>
- </submenu>
- </placeholder>
+ </placeholder>
+ </submenu>
<submenu name="Tools" _label="_Tools">
<placeholder name="ComponentPlaceholder">
diff --git a/ui/evolution-mail-messagedisplay.xml b/ui/evolution-mail-messagedisplay.xml
index a371498ee2..01107ae74c 100644
--- a/ui/evolution-mail-messagedisplay.xml
+++ b/ui/evolution-mail-messagedisplay.xml
@@ -28,11 +28,11 @@
<placeholder name="MailMessageView"/>
</submenu>
- <placeholder name="ComponentActionsPlaceholder">
- <submenu name="Actions" _label="_Actions">
+ <submenu name="Actions" _label="_Actions">
+ <placeholder name="ComponentActionsPlaceholder">
<placeholder name="MailMessageActions"/>
- </submenu>
- </placeholder>
+ </placeholder>
+ </submenu>
<submenu name="Tools">
<placeholder name="ComponentPlaceholder">
diff --git a/ui/evolution-tasks.xml b/ui/evolution-tasks.xml
index 1bd3e13794..c7fa81f0c6 100644
--- a/ui/evolution-tasks.xml
+++ b/ui/evolution-tasks.xml
@@ -42,11 +42,11 @@
</submenu>
</placeholder>
- <placeholder name="ComponentActionsPlaceholder">
- <submenu name="Actions" _label="_Actions">
+ <submenu name="Actions" _label="_Actions">
+ <placeholder name="ComponentActionsPlaceholder">
<menuitem name="TasksExpunge" verb="" pixtype="pixbuf"/>
- </submenu>
- </placeholder>
+ </placeholder>
+ </submenu>
</menu>
diff --git a/ui/evolution.xml b/ui/evolution.xml
index fc3de6a6b9..def37a3478 100644
--- a/ui/evolution.xml
+++ b/ui/evolution.xml
@@ -17,6 +17,10 @@
<cmd name="HelpSubmitBug" _label="Submit Bug Report"
_tip="Submit a bug report using Bug Buddy"/>
+ <cmd name="SendReceive"
+ _tip="Send queued items and retrieve new items"
+ pixtype="pixbuf"/>
+
<cmd name="ToggleOffline" _type="Toggle"
_label="_Work Offline"
_tip="Toggle whether we are working offline."/>
@@ -136,7 +140,10 @@
<placeholder name="ViewAfterControl"/>
</submenu>
- <placeholder name="ComponentActionsPlaceholder"/>
+ <submenu name="Actions" _label="_Actions">
+ <menuitem name="SendReceive" verb="" _label="_Send / Receive" accel="F9"/>
+ <placeholder name="ComponentActionsPlaceholder"/>
+ </submenu>
<submenu name="Tools" _label="_Tools">
<menuitem name="Settings" verb="" _label="_Configure..."/>
@@ -182,6 +189,10 @@
<control name="NewComboButton"/>
<separator f="" name="eshell4"/>
+ <toolitem name="SendReceive" verb="SendReceive"
+ _label="Send / Receive" priority="1"
+ pixtype="pixbuf"/>
+
</dockitem>
<popups>