aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@novell.com>2010-03-27 06:55:12 +0800
committerMichael Meeks <michael.meeks@novell.com>2010-03-29 16:54:49 +0800
commit4df23d489b8542ecb942e29289d2c28686d9dc9d (patch)
tree2e5fc048548ca30139732e994a892376b50174e9 /ui
parentcc9452d075be663ade764abf0326ba8695631c54 (diff)
downloadgsoc2013-evolution-4df23d489b8542ecb942e29289d2c28686d9dc9d.tar.gz
gsoc2013-evolution-4df23d489b8542ecb942e29289d2c28686d9dc9d.tar.zst
gsoc2013-evolution-4df23d489b8542ecb942e29289d2c28686d9dc9d.zip
Get the new contact sizing right despite the scrolled regions.
Add Claire's calendar popup feedback wrt. express mode
Diffstat (limited to 'ui')
-rw-r--r--ui/evolution-calendars.ui16
-rw-r--r--ui/evolution-contacts.ui4
2 files changed, 19 insertions, 1 deletions
diff --git a/ui/evolution-calendars.ui b/ui/evolution-calendars.ui
index bf4910328d..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'>
@@ -75,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'/>
@@ -92,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'/>
@@ -124,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'/>
@@ -140,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 aeb6c7998c..77061bb010 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'>
@@ -49,8 +51,8 @@
#if !EXPRESS
<toolitem action='send-receive'/>
<separator/>
-#endif
<toolitem action='address-book-print'/>
+#endif
<toolitem action='delete-selection'/>
<toolitem action='address-book-stop'/>
</toolbar>