From cb78b84aecf1c011e0b013cc94a079e2dc0eabbc Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@src.gnome.org>
Date: Fri, 26 Sep 2008 02:42:23 +0000
Subject: Tasks and memos progress.  Hoping to merge ECalendarTable and
 EMemoTable, or at least make EMemoTable derived from ECalendarTable. 
 Possibly do the same with other calendar/memo class pairs.

svn path=/branches/kill-bonobo/; revision=36454
---
 ui/evolution-memos.ui | 20 +++++++++++++++++---
 ui/evolution-tasks.ui | 18 ++++++++++++++++++
 2 files changed, 35 insertions(+), 3 deletions(-)

(limited to 'ui')

diff --git a/ui/evolution-memos.ui b/ui/evolution-memos.ui
index 8bee554ae0..9dfd75a594 100644
--- a/ui/evolution-memos.ui
+++ b/ui/evolution-memos.ui
@@ -5,8 +5,8 @@
         <menuitem action='memo-open'/>
       </placeholder>
       <placeholder name='print-actions'>
-        <menuitem action='memo-print-preview'/>
-        <menuitem action='memo-print'/>
+        <menuitem action='memo-list-print-preview'/>
+        <menuitem action='memo-list-print'/>
       </placeholder>
     </menu>
     <menu action='edit-menu'>
@@ -27,9 +27,23 @@
     <toolitem action='memo-clipboard-copy'>
     <toolitem action='memo-clipboard-paste'/>
     <separator/>
-    <toolitem action='memo-print'/>
+    <toolitem action='memo-list-print'/>
     <toolitem action='memo-delete'/>
   </toolbar>
+  <popup name='memo-popup'>
+    <menuitem action='memo-open'/>
+    <menuitem action='memo-open-url'/>
+    <menuitem action='memo-save-as'/>
+    <menuitem action='memo-print'/>
+    <separator/>
+    <menuitem action='memo-clipboard-cut'/>
+    <menuitem action='memo-clipboard-copy'/>
+    <menuitem action='memo-clipboard-paste'/>
+    <separator/>
+    <menuitem action='memo-forward'/>
+    <separator/>
+    <menuitem action='memo-delete'/>
+  </popup>
   <popup name='memo-list-popup'>
     <menuitem action='memo-list-new'/>
     <menuitem action='memo-list-copy'/>
diff --git a/ui/evolution-tasks.ui b/ui/evolution-tasks.ui
index 9646a13655..cf58c71b05 100644
--- a/ui/evolution-tasks.ui
+++ b/ui/evolution-tasks.ui
@@ -39,6 +39,24 @@
     <toolitem action='task-print'/>
     <toolitem action='task-delete'/>
   </toolbar>
+  <popup name='task-popup'>
+    <menuitem action='task-new'/>
+    <separator/>
+    <menuitem action='task-open'/>
+    <menuitem action='task-open-url'/>
+    <menuitem action='task-save-as'/>
+    <menuitem action='task-print'/>
+    <separator/>
+    <menuitem action='task-clipboard-cut'/>
+    <menuitem action='task-clipboard-copy'/>
+    <menuitem action='task-clipboard-paste'/>
+    <separator/>
+    <menuitem action='task-assign'/>
+    <menuitem action='task-forward'/>
+    <menuitem action='task-mark-complete'/>
+    <separator/>
+    <menuitem action='task-delete'/>
+  </popup>
   <popup name='task-list-popup'>
     <menuitem action='task-list-new'/>
     <menuitem action='task-list-copy'/>
-- 
cgit v1.2.3