diff options
| author | Michael Meeks <michael.meeks@novell.com> | 2010-03-24 17:56:20 +0800 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2010-03-24 17:56:20 +0800 |
| commit | 077c7326355dd2881e3a4686ccdf4c2a7446df4f (patch) | |
| tree | 9c078555394d710e44605524d8492606f6eced2d /ui | |
| parent | 214456fd1524029de814281270c46106ff9aa883 (diff) | |
| download | gsoc2013-evolution-077c7326355dd2881e3a4686ccdf4c2a7446df4f.tar.gz gsoc2013-evolution-077c7326355dd2881e3a4686ccdf4c2a7446df4f.tar.zst gsoc2013-evolution-077c7326355dd2881e3a4686ccdf4c2a7446df4f.zip | |
Alter UI conditional syntax to be more familiar cpp style, which
avoids the need for intltool changes.
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/evolution-mail-reader.ui | 12 | ||||
| -rw-r--r-- | ui/evolution-mail.ui | 12 | ||||
| -rw-r--r-- | ui/evolution-shell.ui | 12 |
3 files changed, 18 insertions, 18 deletions
diff --git a/ui/evolution-mail-reader.ui b/ui/evolution-mail-reader.ui index 4ca9522e88..ad0b401676 100644 --- a/ui/evolution-mail-reader.ui +++ b/ui/evolution-mail-reader.ui @@ -25,10 +25,10 @@ <separator/> <placeholder name='mail-message-view-actions'> <menuitem action='mail-load-images'/> -<!-- if !EXPRESS --> +#if !EXPRESS <menuitem action='mail-show-all-headers'/> <menuitem action='mail-caret-mode'/> -<!-- endif --> +#endif <menuitem action='mail-show-source'/> <menu action='mail-zoom-menu'> <menuitem action='mail-zoom-in'/> @@ -122,19 +122,19 @@ </menu> </toolitem> <separator/> -<!-- if !EXPRESS --> +#if !EXPRESS <toolitem action='mail-print'/> -<!-- endif --> +#endif <toolitem action='mail-delete'/> <toolitem action='mail-mark-junk'/> <toolitem action='mail-mark-notjunk'/> </placeholder> <separator/> <placeholder name='mail-toolbar-navigation'> -<!-- if !EXPRESS --> +#if !EXPRESS <toolitem action='mail-previous'/> <toolitem action='mail-next'/> -<!-- endif --> +#endif </placeholder> </toolbar> <popup name='mail-message-popup'> diff --git a/ui/evolution-mail.ui b/ui/evolution-mail.ui index 6110b8d124..849d579eb6 100644 --- a/ui/evolution-mail.ui +++ b/ui/evolution-mail.ui @@ -61,21 +61,21 @@ </menu> </menubar> <toolbar name='main-toolbar'> -<!-- if EXPRESS --> +#if EXPRESS <placeholder name='toolbar-actions'> <toolitem action='new-addressbook-window'/> </placeholder> -<!-- endif --> +#endif <placeholder name='mail-toolbar-common'/> -<!-- if !EXPRESS --> +#if !EXPRESS <toolitem action='mail-stop'/> -<!-- endif --> +#endif <separator/> <placeholder name='mail-toolbar-navigation'/> -<!-- if EXPRESS --> +#if EXPRESS <separator/> <toolitem action='preferences'/> -<!-- endif --> +#endif </toolbar> <popup name='mail-folder-popup'> <placeholder name='mail-folder-popup-actions'/> diff --git a/ui/evolution-shell.ui b/ui/evolution-shell.ui index dfa6e761f0..2407260649 100644 --- a/ui/evolution-shell.ui +++ b/ui/evolution-shell.ui @@ -2,9 +2,9 @@ <menubar name='main-menu'> <menu action='file-menu'> <menu action='new-menu'/> -<!-- if !EXPRESS --> +#if !EXPRESS <menuitem action='new-window'/> -<!-- endif --> +#endif <separator/> <menuitem action='send-receive'/> <placeholder name='file-actions'/> @@ -45,16 +45,16 @@ <separator/> <menuitem action='gal-define-views'/> </menu> -<!-- if !EXPRESS --> +#if !EXPRESS <menu action='window-menu'/> -<!-- endif --> +#endif <menu action='layout-menu'> <menuitem action='show-toolbar'/> <menuitem action='show-taskbar'/> <menuitem action='show-sidebar'/> </menu> <placeholder name='view-custom-menus'/> -<!-- if !EXPRESS --> +#if !EXPRESS <menu action='switcher-menu'> <menuitem action='switcher-style-both'/> <menuitem action='switcher-style-icons'/> @@ -63,7 +63,7 @@ <separator/> <menuitem action='show-switcher'/> </menu> -<!-- endif --> +#endif </menu> <placeholder name='custom-menus'/> <menu action='search-menu'> |