From 4cc6bd4673115dff52a403d31e9613deea402d0e Mon Sep 17 00:00:00 2001
From: Srinivasa Ragavan <sragavan@gnome.org>
Date: Fri, 19 Mar 2010 22:41:25 +0530
Subject: Redo Calendar for express mode. Just design/layout changes.

---
 ui/evolution-calendars.ui | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'ui/evolution-calendars.ui')

diff --git a/ui/evolution-calendars.ui b/ui/evolution-calendars.ui
index feef83de6c..d3ef98a75b 100644
--- a/ui/evolution-calendars.ui
+++ b/ui/evolution-calendars.ui
@@ -28,20 +28,34 @@
     </placeholder>
   </menubar>
   <toolbar name='main-toolbar'>
+<!-- if !EXPRESS -->		  
     <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'/>
-- 
cgit v1.2.3


From a8333818241c60c0c111e7b7ac68ca80ec8fdb5d Mon Sep 17 00:00:00 2001
From: Michael Meeks <michael.meeks@novell.com>
Date: Tue, 23 Mar 2010 10:24:31 +0000
Subject: Alter UI conditional syntax to be more familiar cpp style, which
 avoids the need for intltool changes.

---
 ui/evolution-calendars.ui | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'ui/evolution-calendars.ui')

diff --git a/ui/evolution-calendars.ui b/ui/evolution-calendars.ui
index d3ef98a75b..8cc6bf2f91 100644
--- a/ui/evolution-calendars.ui
+++ b/ui/evolution-calendars.ui
@@ -28,33 +28,33 @@
     </placeholder>
   </menubar>
   <toolbar name='main-toolbar'>
-<!-- if !EXPRESS -->		  
+#if !EXPRESS
     <toolitem action='calendar-print'/>
     <toolitem action='delete-selection'/>
     <separator/>
-<!-- endif -->    
+#endif
     <toolitem action='calendar-go-back'/>
     <toolitem action='calendar-go-today'/>
     <toolitem action='calendar-go-forward'/>
-<!-- if !EXPRESS -->		      
+#if !EXPRESS
     <separator/>
     <toolitem action='calendar-jump-to'/>
-<!-- endif -->        
+#endif
     <separator/>
     <toolitem action='calendar-view-day'/>
     <toolitem action='calendar-view-workweek'/>
-<!-- if !EXPRESS -->		      
+#if !EXPRESS
     <toolitem action='calendar-view-week'/>
-<!-- endif -->    
+#endif
 
     <toolitem action='calendar-view-month'/>
-<!-- if !EXPRESS -->		      
+#if !EXPRESS
     <toolitem action='calendar-view-list'/>
-<!-- endif -->    
-<!-- if EXPRESS -->
+#endif
+#if EXPRESS
     <separator expand="true"/>
     <toolitem action='quit-calendar'/>
-<!-- endif -->    
+#endif
 
   </toolbar>
   <popup name='calendar-popup'>
-- 
cgit v1.2.3


From 99b11b37ddf25706b3baadcecbc0b54df437e0d8 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Sun, 28 Mar 2010 08:41:22 -0400
Subject: Only show "Send/Receive" in mailer when using express mode.

---
 ui/evolution-calendars.ui | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'ui/evolution-calendars.ui')

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/>
-- 
cgit v1.2.3


From 28bf4aa38a9a1e7796caf6fa6ebc1f5a1c470848 Mon Sep 17 00:00:00 2001
From: Michael Meeks <michael.meeks@novell.com>
Date: Fri, 26 Mar 2010 22:55:12 +0000
Subject: Get the new contact sizing right despite the scrolled regions. Add
 Claire's calendar popup feedback wrt. express mode

---
 ui/evolution-calendars.ui | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'ui/evolution-calendars.ui')

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'/>
-- 
cgit v1.2.3


From b9a0dc4021e9d3ff8a171a0249dc3a1b8ce491cd Mon Sep 17 00:00:00 2001
From: Michael Meeks <michael.meeks@novell.com>
Date: Wed, 14 Apr 2010 21:03:10 +0100
Subject: remove custom close / searchbar hiding hacks for express mode, use
 the new / stock shell versions now.

---
 ui/evolution-calendars.ui | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'ui/evolution-calendars.ui')

diff --git a/ui/evolution-calendars.ui b/ui/evolution-calendars.ui
index f38fa2e7d3..404101910b 100644
--- a/ui/evolution-calendars.ui
+++ b/ui/evolution-calendars.ui
@@ -55,10 +55,6 @@
 #if !EXPRESS
     <toolitem action='calendar-view-list'/>
 #endif
-#if EXPRESS
-    <separator expand="true"/>
-    <toolitem action='quit-calendar'/>
-#endif
 
   </toolbar>
   <popup name='calendar-popup'>
-- 
cgit v1.2.3


From ac73bb166c4227a02c703697d906b78569ebadb1 Mon Sep 17 00:00:00 2001
From: Srinivasa Ragavan <sragavan@gnome.org>
Date: Fri, 30 Apr 2010 09:42:11 +0530
Subject: Show preferences toolbutton on the calendar view.

---
 ui/evolution-calendars.ui | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'ui/evolution-calendars.ui')

diff --git a/ui/evolution-calendars.ui b/ui/evolution-calendars.ui
index 404101910b..cbffb867b0 100644
--- a/ui/evolution-calendars.ui
+++ b/ui/evolution-calendars.ui
@@ -55,6 +55,10 @@
 #if !EXPRESS
     <toolitem action='calendar-view-list'/>
 #endif
+#if EXPRESS
+    <separator/>
+    <toolitem action='preferences'/>
+#endif
 
   </toolbar>
   <popup name='calendar-popup'>
-- 
cgit v1.2.3


From bde1bc6bca4c5ed63a193f7dc50252e550a0fb40 Mon Sep 17 00:00:00 2001
From: Srinivasa Ragavan <sragavan@gnome.org>
Date: Tue, 11 May 2010 18:47:09 +0530
Subject: Handle adding 'X' close button on the menu bar. Restore adding the
 same for adding in calendar since it doesn't have a toolbar.

---
 ui/evolution-calendars.ui | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'ui/evolution-calendars.ui')

diff --git a/ui/evolution-calendars.ui b/ui/evolution-calendars.ui
index cbffb867b0..8bd41d4bb1 100644
--- a/ui/evolution-calendars.ui
+++ b/ui/evolution-calendars.ui
@@ -59,7 +59,12 @@
     <separator/>
     <toolitem action='preferences'/>
 #endif
-
+  </toolbar>
+  <toolbar name='close-toolbar'>
+#if EXPRESS
+    <separator expand="true"/>
+    <toolitem action='quit-calendar'/>
+#endif
   </toolbar>
   <popup name='calendar-popup'>
     <menuitem action='calendar-new'/>
-- 
cgit v1.2.3