aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2010-03-28 20:41:22 +0800
committerMatthew Barnes <mbarnes@redhat.com>2010-03-28 20:42:37 +0800
commitbf58178b2a47da0c540582091b4a6a079f6c8359 (patch)
tree77b55394036de04b46d1f639eb528d263603d4d6
parent9b004420959bf14bb50d82d2668d4789061dac17 (diff)
downloadgsoc2013-evolution-bf58178b2a47da0c540582091b4a6a079f6c8359.tar.gz
gsoc2013-evolution-bf58178b2a47da0c540582091b4a6a079f6c8359.tar.zst
gsoc2013-evolution-bf58178b2a47da0c540582091b4a6a079f6c8359.zip
Only show "Send/Receive" in mailer when using express mode.
-rw-r--r--ui/evolution-calendars.ui2
-rw-r--r--ui/evolution-contacts.ui4
-rw-r--r--ui/evolution-mail.ui6
-rw-r--r--ui/evolution-memos.ui18
-rw-r--r--ui/evolution-shell.ui2
-rw-r--r--ui/evolution-tasks.ui4
6 files changed, 24 insertions, 12 deletions
diff --git a/ui/evolution-calendars.ui b/ui/evolution-calendars.ui
index 8cc6bf2f91..bf4910328d 100644
--- a/ui/evolution-calendars.ui
+++ b/ui/evolution-calendars.ui
@@ -29,6 +29,8 @@
</menubar>
<toolbar name='main-toolbar'>
#if !EXPRESS
+ <toolitem action='send-receive'/>
+ <separator/>
<toolitem action='calendar-print'/>
<toolitem action='delete-selection'/>
<separator/>
diff --git a/ui/evolution-contacts.ui b/ui/evolution-contacts.ui
index 11dc1f20d0..aeb6c7998c 100644
--- a/ui/evolution-contacts.ui
+++ b/ui/evolution-contacts.ui
@@ -46,6 +46,10 @@
</placeholder>
</menubar>
<toolbar name='main-toolbar'>
+#if !EXPRESS
+ <toolitem action='send-receive'/>
+ <separator/>
+#endif
<toolitem action='address-book-print'/>
<toolitem action='delete-selection'/>
<toolitem action='address-book-stop'/>
diff --git a/ui/evolution-mail.ui b/ui/evolution-mail.ui
index 849d579eb6..d0c305197a 100644
--- a/ui/evolution-mail.ui
+++ b/ui/evolution-mail.ui
@@ -61,11 +61,13 @@
</menu>
</menubar>
<toolbar name='main-toolbar'>
-#if EXPRESS
<placeholder name='toolbar-actions'>
+ <toolitem action='send-receive'/>
+ <separator/>
+#if EXPRESS
<toolitem action='new-addressbook-window'/>
- </placeholder>
#endif
+ </placeholder>
<placeholder name='mail-toolbar-common'/>
#if !EXPRESS
<toolitem action='mail-stop'/>
diff --git a/ui/evolution-memos.ui b/ui/evolution-memos.ui
index dbe42c7714..b204605ab9 100644
--- a/ui/evolution-memos.ui
+++ b/ui/evolution-memos.ui
@@ -29,14 +29,16 @@
</menu>
</menubar>
<toolbar name='main-toolbar'>
- <placeholder name='toolbar-actions'>
- <toolitem action='cut-clipboard'/>
- <toolitem action='copy-clipboard'/>
- <toolitem action='paste-clipboard'/>
- <separator/>
- <toolitem action='memo-list-print'/>
- <toolitem action='delete-selection'/>
- </placeholder>
+#if !EXPRESS
+ <toolitem action='send-receive'/>
+ <separator/>
+#endif
+ <toolitem action='cut-clipboard'/>
+ <toolitem action='copy-clipboard'/>
+ <toolitem action='paste-clipboard'/>
+ <separator/>
+ <toolitem action='memo-list-print'/>
+ <toolitem action='delete-selection'/>
</toolbar>
<popup name='memo-popup'>
<menuitem action='memo-new'/>
diff --git a/ui/evolution-shell.ui b/ui/evolution-shell.ui
index fc41ed17e2..30bd8c6080 100644
--- a/ui/evolution-shell.ui
+++ b/ui/evolution-shell.ui
@@ -89,8 +89,6 @@
</menu>
</menubar>
<toolbar name='main-toolbar'>
- <toolitem action='send-receive'/>
- <separator/>
<placeholder name='toolbar-actions'/>
</toolbar>
<toolbar name='search-toolbar'/>
diff --git a/ui/evolution-tasks.ui b/ui/evolution-tasks.ui
index 62d9f023b7..8993e5c43a 100644
--- a/ui/evolution-tasks.ui
+++ b/ui/evolution-tasks.ui
@@ -39,6 +39,10 @@
</placeholder>
</menubar>
<toolbar name='main-toolbar'>
+#if !EXPRESS
+ <toolitem action='send-receive'/>
+ <separator/>
+#endif
<toolitem action='cut-clipboard'/>
<toolitem action='copy-clipboard'/>
<toolitem action='paste-clipboard'/>