diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-03-28 20:41:22 +0800 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2010-04-07 19:25:37 +0800 |
| commit | 99b11b37ddf25706b3baadcecbc0b54df437e0d8 (patch) | |
| tree | 15ec7f56f40302662913b876f7e399460b6bbbe3 | |
| parent | d9fb3008135d71dcbc512325087aceb19016ace7 (diff) | |
| download | gsoc2013-evolution-99b11b37ddf25706b3baadcecbc0b54df437e0d8.tar.gz gsoc2013-evolution-99b11b37ddf25706b3baadcecbc0b54df437e0d8.tar.zst gsoc2013-evolution-99b11b37ddf25706b3baadcecbc0b54df437e0d8.zip | |
Only show "Send/Receive" in mailer when using express mode.
| -rw-r--r-- | ui/evolution-calendars.ui | 2 | ||||
| -rw-r--r-- | ui/evolution-contacts.ui | 4 | ||||
| -rw-r--r-- | ui/evolution-mail.ui | 6 | ||||
| -rw-r--r-- | ui/evolution-memos.ui | 18 | ||||
| -rw-r--r-- | ui/evolution-shell.ui | 2 | ||||
| -rw-r--r-- | ui/evolution-tasks.ui | 4 |
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'/> |