diff options
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/evolution-calendars.ui | 32 | ||||
| -rw-r--r-- | ui/evolution-contacts.ui | 8 | ||||
| -rw-r--r-- | ui/evolution-mail.ui | 6 | ||||
| -rw-r--r-- | ui/evolution-memos.ui | 18 | ||||
| -rw-r--r-- | ui/evolution-shell.ui | 5 | ||||
| -rw-r--r-- | ui/evolution-tasks.ui | 4 |
6 files changed, 61 insertions, 12 deletions
diff --git a/ui/evolution-calendars.ui b/ui/evolution-calendars.ui index feef83de6c..f38fa2e7d3 100644 --- a/ui/evolution-calendars.ui +++ b/ui/evolution-calendars.ui @@ -5,8 +5,10 @@ <menuitem action='event-open'/> </placeholder> <placeholder name='print-actions'> +#if !EXPRESS <menuitem action='calendar-print-preview'/> <menuitem action='calendar-print'/> +#endif </placeholder> </menu> <menu action='edit-menu'> @@ -28,20 +30,36 @@ </placeholder> </menubar> <toolbar name='main-toolbar'> +#if !EXPRESS + <toolitem action='send-receive'/> + <separator/> <toolitem action='calendar-print'/> <toolitem action='delete-selection'/> <separator/> +#endif <toolitem action='calendar-go-back'/> <toolitem action='calendar-go-today'/> <toolitem action='calendar-go-forward'/> +#if !EXPRESS <separator/> <toolitem action='calendar-jump-to'/> +#endif <separator/> <toolitem action='calendar-view-day'/> <toolitem action='calendar-view-workweek'/> +#if !EXPRESS <toolitem action='calendar-view-week'/> +#endif + <toolitem action='calendar-view-month'/> +#if !EXPRESS <toolitem action='calendar-view-list'/> +#endif +#if EXPRESS + <separator expand="true"/> + <toolitem action='quit-calendar'/> +#endif + </toolbar> <popup name='calendar-popup'> <menuitem action='calendar-new'/> @@ -59,12 +77,15 @@ <menuitem action='event-new'/> <menuitem action='event-all-day-new'/> <menuitem action='event-meeting-new'/> +#if !EXPRESS <menuitem action='task-new'/> <separator/> <menuitem action='event-popup-print'/> <separator/> +#endif <menuitem action='popup-paste-clipboard'/> <separator/> +#if !EXPRESS <menu action='gal-view-menu'> <menuitem action='calendar-view-day'/> <menuitem action='calendar-view-workweek'/> @@ -76,24 +97,31 @@ </menu> <menuitem action='calendar-popup-go-today'/> <menuitem action='calendar-popup-jump-to'/> +#endif </popup> <popup name='calendar-event-popup'> <menuitem action='event-popup-open'/> <menuitem action='event-popup-save-as'/> +#if !EXPRESS <menuitem action='event-popup-print'/> +#endif <separator/> <menuitem action='popup-cut-clipboard'/> <menuitem action='popup-copy-clipboard'/> <menuitem action='popup-paste-clipboard'/> +#if !EXPRESS <separator/> <menuitem action='event-popup-copy'/> <menuitem action='event-popup-move'/> +#endif <menuitem action='event-popup-delegate'/> <menuitem action='event-popup-schedule'/> <menuitem action='event-popup-schedule-appointment'/> +#if !EXPRESS <menuitem action='event-popup-forward'/> <menuitem action='event-popup-reply'/> <menuitem action='event-popup-reply-all'/> +#endif <separator/> <menuitem action='event-popup-occurrence-movable'/> <menuitem action='event-popup-delete'/> @@ -108,7 +136,9 @@ <menuitem action='calendar-memopad-open'/> <menuitem action='calendar-memopad-open-url'/> <menuitem action='calendar-memopad-save-as'/> +#if !EXPRESS <menuitem action='calendar-memopad-print'/> +#endif <separator/> <menuitem action='popup-cut-clipboard'/> <menuitem action='popup-copy-clipboard'/> @@ -124,7 +154,9 @@ <menuitem action='calendar-taskpad-open'/> <menuitem action='calendar-taskpad-open-url'/> <menuitem action='calendar-taskpad-save-as'/> +#if !EXPRESS <menuitem action='calendar-taskpad-print'/> +#endif <separator/> <menuitem action='popup-cut-clipboard'/> <menuitem action='popup-copy-clipboard'/> diff --git a/ui/evolution-contacts.ui b/ui/evolution-contacts.ui index 11dc1f20d0..a258060184 100644 --- a/ui/evolution-contacts.ui +++ b/ui/evolution-contacts.ui @@ -7,8 +7,10 @@ <menuitem action='address-book-save-as'/> </placeholder> <placeholder name='print-actions'> +#if !EXPRESS <menuitem action='address-book-print-preview'/> <menuitem action='address-book-print'/> +#endif </placeholder> </menu> <menu action='edit-menu'> @@ -46,7 +48,11 @@ </placeholder> </menubar> <toolbar name='main-toolbar'> +#if !EXPRESS + <toolitem action='send-receive'/> + <separator/> <toolitem action='address-book-print'/> +#endif <toolitem action='delete-selection'/> <toolitem action='address-book-stop'/> </toolbar> @@ -66,7 +72,9 @@ <separator/> <menuitem action='contact-popup-open'/> <menuitem action='contact-popup-save-as'/> +#if !EXPRESS <menuitem action='contact-popup-print'/> +#endif <separator/> <menuitem action='popup-cut-clipboard'/> <menuitem action='popup-copy-clipboard'/> 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 2407260649..5e249daa2e 100644 --- a/ui/evolution-shell.ui +++ b/ui/evolution-shell.ui @@ -10,8 +10,10 @@ <placeholder name='file-actions'/> <separator/> <menuitem action='import'/> +#if !EXPRESS <separator/> <menuitem action='page-setup'/> +#endif <placeholder name='print-actions'/> <separator/> <placeholder name='long-running-actions'/> @@ -89,8 +91,7 @@ </menu> </menubar> <toolbar name='main-toolbar'> - <toolitem action='send-receive'/> - <separator/> <placeholder name='toolbar-actions'/> </toolbar> + <toolbar name='search-toolbar'/> </ui> 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'/> |