From 08bd7765721e5d866c4d7a546b94f691cf62d972 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@src.gnome.org>
Date: Wed, 13 Aug 2008 20:31:08 +0000
Subject: Get a basic shell window working.

svn path=/branches/kill-bonobo/; revision=35982
---
 ui/evolution-shell.ui | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 ui/evolution-shell.ui

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

diff --git a/ui/evolution-shell.ui b/ui/evolution-shell.ui
new file mode 100644
index 0000000000..76e635ffe4
--- /dev/null
+++ b/ui/evolution-shell.ui
@@ -0,0 +1,57 @@
+<ui>
+  <menubar name='main-menu'>
+    <menu action='file-menu'>
+      <menu action='new-menu'/>
+      <menuitem action='new-window'/>
+      <separator/>
+      <menuitem action='send-receive'/>
+      <separator/>
+      <menuitem action='import'/>
+      <separator/>
+      <menuitem action='page-setup'/>
+      <placeholder name='print-actions'/>
+      <separator/>
+      <menuitem action='forget-passwords'/>
+      <menuitem action='work-online'/>
+      <menuitem action='work-offline'/>
+      <menuitem action='close'/>
+      <menuitem action='quit'/>
+    </menu>
+    <menu action='edit-menu'>
+      <menuitem action='sync-options'/>
+      <menuitem action='preferences'/>
+    </menu>
+    <menu action='view-menu'>
+      <menu action='window-menu'/>
+      <menu action='layout-menu'>
+        <menuitem action='show-toolbar'/>
+	<menuitem action='show-statusbar'/>
+	<menuitem action='show-sidebar'/>
+      </menu>
+      <menu action='switcher-menu'>
+        <menuitem action='switcher-style-both'/>
+	<menuitem action='switcher-style-icons'/>
+	<menuitem action='switcher-style-text'/>
+	<menuitem action='switcher-style-user'/>
+	<separator/>
+	<menuitem action='show-switcher'/>
+      </menu>
+    </menu>
+    <placeholder name='custom-menus'/>
+    <menu action='search-menu'/>
+    <menu action='help-menu'>
+      <menuitem action='contents'/>
+      <menuitem action='quick-reference'/>
+      <separator/>
+      <menuitem action='faq'/>
+      <menuitem action='submit-bug'/>
+      <separator/>
+      <menuitem action='about'/>
+    </menu>
+  </menubar>
+  <toolbar name='main-toolbar'>
+    <separator/>
+    <toolitem action='send-receive'/>
+    <separator/>
+  </toolbar>
+</ui>
-- 
cgit v1.2.3


From cf3b01017162cbba568ee4317eee2efe5f6fdc10 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@src.gnome.org>
Date: Tue, 26 Aug 2008 20:22:32 +0000
Subject: Progress update:

  - Further refinements of the shell API.
  - Kill ESMenu and EUserCreatableItemsHandler.
  - Start ripping apart the addressbook component.


svn path=/branches/kill-bonobo/; revision=36093
---
 ui/evolution-shell.ui | 3 +++
 1 file changed, 3 insertions(+)

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

diff --git a/ui/evolution-shell.ui b/ui/evolution-shell.ui
index 76e635ffe4..4cf5dbc428 100644
--- a/ui/evolution-shell.ui
+++ b/ui/evolution-shell.ui
@@ -5,6 +5,7 @@
       <menuitem action='new-window'/>
       <separator/>
       <menuitem action='send-receive'/>
+      <placeholder name='file-actions'/>
       <separator/>
       <menuitem action='import'/>
       <separator/>
@@ -18,6 +19,8 @@
       <menuitem action='quit'/>
     </menu>
     <menu action='edit-menu'>
+      <placeholder name='edit-actions'/>
+      <separator/>
       <menuitem action='sync-options'/>
       <menuitem action='preferences'/>
     </menu>
-- 
cgit v1.2.3


From 02a9eb68308537fe712e757017ae4bb372863a8c Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@src.gnome.org>
Date: Wed, 27 Aug 2008 19:56:31 +0000
Subject: Miscellaneous tweaks.  Nothing major.

svn path=/branches/kill-bonobo/; revision=36138
---
 ui/evolution-shell.ui | 1 -
 1 file changed, 1 deletion(-)

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

diff --git a/ui/evolution-shell.ui b/ui/evolution-shell.ui
index 4cf5dbc428..7c526de91d 100644
--- a/ui/evolution-shell.ui
+++ b/ui/evolution-shell.ui
@@ -53,7 +53,6 @@
     </menu>
   </menubar>
   <toolbar name='main-toolbar'>
-    <separator/>
     <toolitem action='send-receive'/>
     <separator/>
   </toolbar>
-- 
cgit v1.2.3


From eca687589d106ff87cd4fca7bf581cb0532caf96 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@src.gnome.org>
Date: Fri, 5 Sep 2008 15:47:38 +0000
Subject: Saving progress.  Lots of changes.  Things are a bit broken at the
 moment.

svn path=/branches/kill-bonobo/; revision=36260
---
 ui/evolution-shell.ui | 8 ++++++++
 1 file changed, 8 insertions(+)

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

diff --git a/ui/evolution-shell.ui b/ui/evolution-shell.ui
index 7c526de91d..b0b9b353cd 100644
--- a/ui/evolution-shell.ui
+++ b/ui/evolution-shell.ui
@@ -25,6 +25,14 @@
       <menuitem action='preferences'/>
     </menu>
     <menu action='view-menu'>
+      <menu action='gal-view-menu'>
+        <placeholder name='gal-view-list'/>
+        <separator/>
+        <menuitem action='gal-custom-view'/>
+        <menuitem action='gal-save-custom-view'/>
+        <separator/>
+        <menuitem action='gal-define-views'/>
+      </menu>
       <menu action='window-menu'/>
       <menu action='layout-menu'>
         <menuitem action='show-toolbar'/>
-- 
cgit v1.2.3


From 52d683e48cf1103a9806da95c72abce2db3ae1f4 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@src.gnome.org>
Date: Sun, 7 Sep 2008 04:02:27 +0000
Subject: Progress update:

	- Contacts module mostly working now.
	- View and search UI not yet working.
	- Still refining shell design.


svn path=/branches/kill-bonobo/; revision=36268
---
 ui/evolution-shell.ui | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

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

diff --git a/ui/evolution-shell.ui b/ui/evolution-shell.ui
index b0b9b353cd..633703f24a 100644
--- a/ui/evolution-shell.ui
+++ b/ui/evolution-shell.ui
@@ -49,7 +49,14 @@
       </menu>
     </menu>
     <placeholder name='custom-menus'/>
-    <menu action='search-menu'/>
+    <menu action='search-menu'>
+      <menuitem action='search-execute'/>
+      <menuitem action='search-clear'/>
+      <menuitem action='search-advanced'/>
+      <separator/>
+      <menuitem action='search-save'/>
+      <menuitem action='search-edit'/>
+    </menu>
     <menu action='help-menu'>
       <menuitem action='contents'/>
       <menuitem action='quick-reference'/>
-- 
cgit v1.2.3


From 73c370019c4de89d4c901ee8c25cc0cbb55992fb Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@src.gnome.org>
Date: Mon, 22 Sep 2008 21:03:28 +0000
Subject: Search UI is kinda sorta working.  Still some outstanding issues.

svn path=/branches/kill-bonobo/; revision=36427
---
 ui/evolution-shell.ui | 4 ++++
 1 file changed, 4 insertions(+)

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

diff --git a/ui/evolution-shell.ui b/ui/evolution-shell.ui
index 633703f24a..e2f33f8307 100644
--- a/ui/evolution-shell.ui
+++ b/ui/evolution-shell.ui
@@ -56,6 +56,10 @@
       <separator/>
       <menuitem action='search-save'/>
       <menuitem action='search-edit'/>
+      <separator/>
+      <placeholder name='search-actions'/>
+      <separator/>
+      <placeholder name='custom-rules'/>
     </menu>
     <menu action='help-menu'>
       <menuitem action='contents'/>
-- 
cgit v1.2.3


From 098ea8aad8d3249d9faca5df5b4fe67b94ba660f Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@src.gnome.org>
Date: Mon, 29 Sep 2008 16:14:46 +0000
Subject: Get Memos to come up.  Doesn't really work yet, but the widgets are
 all there.

svn path=/branches/kill-bonobo/; revision=36491
---
 ui/evolution-shell.ui | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/ui/evolution-shell.ui b/ui/evolution-shell.ui
index e2f33f8307..6204055e82 100644
--- a/ui/evolution-shell.ui
+++ b/ui/evolution-shell.ui
@@ -74,5 +74,6 @@
   <toolbar name='main-toolbar'>
     <toolitem action='send-receive'/>
     <separator/>
+    <placeholder name='toolbar-actions'/>
   </toolbar>
 </ui>
-- 
cgit v1.2.3


From 79aa45cfed7e87150de85869795ef0dd3be06db0 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@src.gnome.org>
Date: Mon, 13 Oct 2008 17:57:46 +0000
Subject: Progress update:

	- Calendar is kind of a mess at the moment.  Doesn't compile.

	- Roughed in the Mail module, including all the actions.
	  That _does_ compile.  Runs, even.


svn path=/branches/kill-bonobo/; revision=36611
---
 ui/evolution-shell.ui | 3 +++
 1 file changed, 3 insertions(+)

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

diff --git a/ui/evolution-shell.ui b/ui/evolution-shell.ui
index 6204055e82..9802059a6c 100644
--- a/ui/evolution-shell.ui
+++ b/ui/evolution-shell.ui
@@ -12,6 +12,7 @@
       <menuitem action='page-setup'/>
       <placeholder name='print-actions'/>
       <separator/>
+      <placeholder name='long-running-actions'/>
       <menuitem action='forget-passwords'/>
       <menuitem action='work-online'/>
       <menuitem action='work-offline'/>
@@ -22,6 +23,7 @@
       <placeholder name='edit-actions'/>
       <separator/>
       <menuitem action='sync-options'/>
+      <placeholder name='administrative-actions'/>
       <menuitem action='preferences'/>
     </menu>
     <menu action='view-menu'>
@@ -39,6 +41,7 @@
 	<menuitem action='show-statusbar'/>
 	<menuitem action='show-sidebar'/>
       </menu>
+      <placeholder name='view-custom-menus'/>
       <menu action='switcher-menu'>
         <menuitem action='switcher-style-both'/>
 	<menuitem action='switcher-style-icons'/>
-- 
cgit v1.2.3


From 8c0bd86d5fdd6d87c3170e2a01423e7c7018a981 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@src.gnome.org>
Date: Fri, 14 Nov 2008 03:56:01 +0000
Subject: Rearranged some of the addressbook code to try and eliminate some
 circular dependencies in our libraries.  The circular dependency between the
 composer and the mail module is still causing me headaches.  And it doesn't
 help that the addressbook and calendar also want to link to the composer.

svn path=/branches/kill-bonobo/; revision=36782
---
 ui/evolution-shell.ui | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

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

diff --git a/ui/evolution-shell.ui b/ui/evolution-shell.ui
index 9802059a6c..7a89e11adc 100644
--- a/ui/evolution-shell.ui
+++ b/ui/evolution-shell.ui
@@ -38,17 +38,17 @@
       <menu action='window-menu'/>
       <menu action='layout-menu'>
         <menuitem action='show-toolbar'/>
-	<menuitem action='show-statusbar'/>
-	<menuitem action='show-sidebar'/>
+        <menuitem action='show-statusbar'/>
+        <menuitem action='show-sidebar'/>
       </menu>
       <placeholder name='view-custom-menus'/>
       <menu action='switcher-menu'>
         <menuitem action='switcher-style-both'/>
-	<menuitem action='switcher-style-icons'/>
-	<menuitem action='switcher-style-text'/>
-	<menuitem action='switcher-style-user'/>
-	<separator/>
-	<menuitem action='show-switcher'/>
+        <menuitem action='switcher-style-icons'/>
+        <menuitem action='switcher-style-text'/>
+        <menuitem action='switcher-style-user'/>
+        <separator/>
+        <menuitem action='show-switcher'/>
       </menu>
     </menu>
     <placeholder name='custom-menus'/>
-- 
cgit v1.2.3