Update menu-bar and tool-bar for draft mode.

diff --git a/ChangeLog b/ChangeLog
index 2a1ed95..c1a9c4e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-03-08  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
+
+       * etc/icons/wl-draft-save-and-exit-up.xpm: New file.
+
 2002-03-06  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
 
        * etc/icons/wl-write-current-folder-up.xpm: New file.

diff --git a/etc/icons/wl-draft-save-and-exit-up.xpm b/etc/icons/wl-draft-save-and-exit-up.xpm
new file mode 100644 (file)
index 0000000..1403999
--- /dev/null
+++ b/etc/icons/wl-draft-save-and-exit-up.xpm
@@ -0,0 +1,43 @@
+/* XPM */
+static char * wl_summary_delete_up_xpm[] = {
+"32 32 8 1",
+"      c #BEFBBEFBBEFB s backgroundToolBarColor",
+".     c #69A68E38EFBE",
+"X     c #000000000000",
+"o     c #9E798E3869A6",
+"O     c #FFFFE38DB6DA",
+"+     c #CF3CBAEA9658",
+"@     c #59656595C71B",
+"#     c #FFFFFFFFFFFF",
+"                                ",
+" XXXXXXXXXXXXXXXXXX             ",
+" X################X             ",
+" X#@@#    ########Xo            ",
+" X#@@#############Xo            ",
+" X####    ########Xo            ",
+" X################Xo .....      ",
+" X################Xo .....      ",
+" X################Xo .....      ",
+" X################Xo   ...      ",
+" XXXXXXXXXXXXXXXXXXo   ...      ",
+"  oooooooooooooooooo   ...      ",
+"                     .......    ",
+"           XXXXXX     .....     ",
+"          XooooooX     ...      ",
+"          XXXXXoooXXXXXX.X      ",
+"         XOOOOOXXXooooooooX     ",
+"        XO+++++OOOXXXXXXXoX     ",
+"        XO++++++++OOOOO++XX     ",
+"         XO++++++++++++++XX     ",
+"         XO+++++++++++++++X     ",
+"          XO++++++++++++++X     ",
+"          XO++++++++++++++X     ",
+"           XO+++++++++++++X     ",
+"       XX  XXXXXXXXXXXXXXXX     ",
+"      X  X                      ",
+"      X      X  X  X  XX        ",
+"       XX   XXX X  X X  X       ",
+"         X X  X X  X XXXX       ",
+"      X  X X  X  XX  X          ",
+"       XX   XXXX XX   XX        ",
+"                                "};

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 5490dea..8b82b63 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,5 +1,11 @@
 2002-03-08  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
 
+       * wl-e21.el (wl-draft-overload-menubar): Add wl-draft-preview-message
+       and wl-draft-save-and-exit.
+       (wl-draft-toolbar): Add wl-draft-save-and-exit.
+       * wl-xmas.el: Ditto.
+       * wl-mule.el: Ditto.
+
        * wl-folder.el (wl-folder-goto-draft-folder): New function.
        (wl-folder-mode-menu-spec): Add wl-folder-goto-draft-folder entry.
 

diff --git a/wl/wl-e21.el b/wl/wl-e21.el
index 8f7c028..ff9271c 100644 (file)
--- a/wl/wl-e21.el
+++ b/wl/wl-e21.el
@@ -167,6 +167,8 @@
      wl-draft-insert-signature t "Insert Signature"]
     [wl-draft-kill
      wl-draft-kill t "Kill Current Draft"]
+    [wl-draft-save-and-exit
+     wl-draft-save-and-exit t "Save Draft and Exit"]
     )
   "The Draft buffer toolbar.")
 
@@ -574,12 +576,16 @@
 
 (defun wl-draft-overload-menubar ()
   (let ((keymap (current-local-map)))
+    (define-key keymap [menu-bar mail preview]
+      '("Preview Message" . wl-draft-preview-message))
     (define-key keymap [menu-bar mail send]
       '("Send Message" . wl-draft-send-and-exit))
     (define-key keymap [menu-bar mail send-stay]
       '("Send, Keep Editing" . wl-draft-send))
     (define-key keymap [menu-bar mail cancel]
       '("Kill Current Draft" . wl-draft-kill))
+    (define-key keymap [menu-bar mail save]
+      '("Save Draft and Exit" . wl-draft-save-and-exit))
     (define-key keymap [menu-bar mail yank]
       '("Cite Message" . wl-draft-yank-original))
     (define-key keymap [menu-bar mail signature]

diff --git a/wl/wl-mule.el b/wl/wl-mule.el
index 8a2b8da..dd4d654 100644 (file)
--- a/wl/wl-mule.el
+++ b/wl/wl-mule.el
@@ -162,12 +162,16 @@ Special commands:
   (define-key wl-draft-mode-map "\C-c\C-d" 'wl-draft-elide-region))
 
 (defun wl-draft-overload-menubar ()
+  (local-set-key [menu-bar mail preview]
+    '("Preview Message" . wl-draft-preview-message))
   (local-set-key [menu-bar mail send]
     '("Send Message" . wl-draft-send-and-exit))
   (local-set-key [menu-bar mail send-stay]
     '("Send, Keep Editing" . wl-draft-send))
   (local-set-key [menu-bar mail cancel]
     '("Kill Current Draft" . wl-draft-kill))
+  (local-set-key [menu-bar mail save]
+    '("Save Draft and Exit" . wl-draft-save-and-exit))
   (local-set-key [menu-bar mail yank]
     '("Cite Message" . wl-draft-yank-original))
   (local-set-key [menu-bar mail signature]

diff --git a/wl/wl-xmas.el b/wl/wl-xmas.el
index e7a4ce5..bca0aed 100644 (file)
--- a/wl/wl-xmas.el
+++ b/wl/wl-xmas.el
@@ -135,6 +135,8 @@
      wl-draft-insert-signature t "Insert Signature"]
     [wl-draft-kill
      wl-draft-kill t "Kill Current Draft"]
+    [wl-draft-save-and-exit
+     wl-draft-save-and-exit t "Save Draft and Exit"]
     )
   "The Draft buffer toolbar.")
 
@@ -484,10 +486,14 @@
 
 (defun wl-draft-overload-menubar ()
   (when (featurep 'menubar)
+    (add-menu-item '("Mail") "Preview Message"
+                  'wl-draft-preview-message t "Preview Message")
     (add-menu-item '("Mail") "Send, Keep Editing"
                   'wl-draft-send t "Send Mail")
     (add-menu-item '("Mail") "Send Message"
                   'wl-draft-send-and-exit t "Send and Exit")
+    (add-menu-item '("Mail") "Save Draft and Exit"
+                  'wl-draft-save-and-exit t "Save Draft and Exit")
     (delete-menu-item '("Mail" "Send Mail"))
     (delete-menu-item '("Mail" "Send and Exit"))))