alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mu4e: cosmetics (mu4e-main)

Browse Source
This commit is contained in:
djcb
2017-05-06 12:57:09 +03:00
parent 6bde2618ab
commit bbdee4e765
1 changed files with 42 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
mu4e/mu4e-main.el
View File

@ -87,31 +87,32 @@ when STR is clicked (using RET or mouse-2); if FUNC-OR-SHORTCUT is
a string, execute the corresponding keyboard action when it is a string, execute the corresponding keyboard action when it is
clicked." clicked."
(let ((newstr (let ((newstr
(replace-regexp-in-string (replace-regexp-in-string
"\\[\\(..?\\)\\]" "\\[\\(..?\\)\\]"
(lambda(m) (lambda(m)
(format "[%s]" (format "[%s]"
(propertize (match-string 1 m) 'face 'mu4e-highlight-face))) (propertize (match-string 1 m) 'face 'mu4e-highlight-face)))
str)) str))
(map (make-sparse-keymap)) (map (make-sparse-keymap))
(func (if (functionp func-or-shortcut) (func (if (functionp func-or-shortcut)
func-or-shortcut func-or-shortcut
(if (stringp func-or-shortcut) (if (stringp func-or-shortcut)
(lexical-let ((macro func-or-shortcut)) (lexical-let ((macro func-or-shortcut))
(lambda()(interactive) (lambda()(interactive)
(execute-kbd-macro macro))))))) (execute-kbd-macro macro)))))))
(define-key map [mouse-2] func) (define-key map [mouse-2] func)
(define-key map (kbd "RET") func) (define-key map (kbd "RET") func)
(put-text-property 0 (length newstr) 'keymap map newstr) (put-text-property 0 (length newstr) 'keymap map newstr)
(put-text-property (string-match "\\[.+$" newstr) (put-text-property (string-match "\\[.+$" newstr)
(- (length newstr) 1) 'mouse-face 'highlight newstr) newstr)) (- (length newstr) 1) 'mouse-face 'highlight newstr)
newstr))
;; NEW ;; NEW
;; This is the old `mu4e~main-view' function but without ;; This is the old `mu4e~main-view' function but without
;; buffer switching at the end. ;; buffer switching at the end.
(defun mu4e~main-view-real (ignore-auto noconfirm) (defun mu4e~main-view-real (ignore-auto noconfirm)
(let ((buf (get-buffer-create mu4e~main-buffer-name)) (let ((buf (get-buffer-create mu4e~main-buffer-name))
(inhibit-read-only t)) (inhibit-read-only t))
(with-current-buffer buf (with-current-buffer buf
(erase-buffer) (erase-buffer)
(insert (insert
@ -123,21 +124,24 @@ clicked."
;; crypto support, a big G when there's Guile support ;; crypto support, a big G when there's Guile support
" " " "
(propertize (propertize
(concat (concat
(when (plist-get mu4e~server-props :crypto) "C") (when (plist-get mu4e~server-props :crypto) "C")
(when (plist-get mu4e~server-props :guile) "G")) (when (plist-get mu4e~server-props :guile) "G"))
'face 'mu4e-title-face) 'face 'mu4e-title-face)
"\n\n" "\n\n"
(propertize " Basics\n\n" 'face 'mu4e-title-face) (propertize " Basics\n\n" 'face 'mu4e-title-face)
(mu4e~main-action-str "\t* [j]ump to some maildir\n" 'mu4e-jump-to-maildir) (mu4e~main-action-str
(mu4e~main-action-str "\t* enter a [s]earch query\n" 'mu4e-search) "\t* [j]ump to some maildir\n" 'mu4e-jump-to-maildir)
(mu4e~main-action-str "\t* [C]ompose a new message\n" 'mu4e-compose-new) (mu4e~main-action-str
"\t* enter a [s]earch query\n" 'mu4e-search)
(mu4e~main-action-str
"\t* [C]ompose a new message\n" 'mu4e-compose-new)
"\n" "\n"
(propertize " Bookmarks\n\n" 'face 'mu4e-title-face) (propertize " Bookmarks\n\n" 'face 'mu4e-title-face)
;; TODO: it's a bit uncool to hard-code the "b" shortcut... ;; TODO: it's a bit uncool to hard-code the "b" shortcut...
(mapconcat (mapconcat
(lambda (bm) (lambda (bm)
(mu4e~main-action-str (mu4e~main-action-str
(concat "\t* [b" (make-string 1 (mu4e-bookmark-key bm)) "] " (concat "\t* [b" (make-string 1 (mu4e-bookmark-key bm)) "] "
(mu4e-bookmark-name bm)) (mu4e-bookmark-name bm))
@ -154,7 +158,7 @@ clicked."
;; show the queue functions if `smtpmail-queue-dir' is defined ;; show the queue functions if `smtpmail-queue-dir' is defined
(if (file-directory-p smtpmail-queue-dir) (if (file-directory-p smtpmail-queue-dir)
(mu4e~main-view-queue) (mu4e~main-view-queue)
"") "")
"\n" "\n"
(mu4e~main-action-str "\t* [N]ews\n" 'mu4e-news) (mu4e~main-action-str "\t* [N]ews\n" 'mu4e-news)
(mu4e~main-action-str "\t* [A]bout mu4e\n" 'mu4e-about) (mu4e~main-action-str "\t* [A]bout mu4e\n" 'mu4e-about)
@ -167,28 +171,28 @@ clicked."
"Display queue-related actions in the main view." "Display queue-related actions in the main view."
(concat (concat
(mu4e~main-action-str "\t* toggle [m]ail sending mode " (mu4e~main-action-str "\t* toggle [m]ail sending mode "
'mu4e~main-toggle-mail-sending-mode) 'mu4e~main-toggle-mail-sending-mode)
"(currently " "(currently "
(propertize (if smtpmail-queue-mail "queued" "direct") (propertize (if smtpmail-queue-mail "queued" "direct")
'face 'mu4e-header-key-face) 'face 'mu4e-header-key-face)
")\n" ")\n"
(let ((queue-size (mu4e~main-queue-size))) (let ((queue-size (mu4e~main-queue-size)))
(if (zerop queue-size) (if (zerop queue-size)
"" ""
(mu4e~main-action-str (mu4e~main-action-str
(format "\t* [f]lush %s queued %s\n" (format "\t* [f]lush %s queued %s\n"
(propertize (int-to-string queue-size) (propertize (int-to-string queue-size)
'face 'mu4e-header-key-face) 'face 'mu4e-header-key-face)
(if (> queue-size 1) "mails" "mail")) (if (> queue-size 1) "mails" "mail"))
'smtpmail-send-queued-mail))))) 'smtpmail-send-queued-mail)))))
(defun mu4e~main-queue-size () (defun mu4e~main-queue-size ()
"Return, as an int, the number of emails in the queue." "Return, as an int, the number of emails in the queue."
(condition-case nil (condition-case nil
(with-temp-buffer (with-temp-buffer
(insert-file-contents (expand-file-name smtpmail-queue-index-file (insert-file-contents (expand-file-name smtpmail-queue-index-file
smtpmail-queue-dir)) smtpmail-queue-dir))
(count-lines (point-min) (point-max))) (count-lines (point-min) (point-max)))
(error 0))) (error 0)))
(defun mu4e~main-view () (defun mu4e~main-view ()
@ -211,7 +215,7 @@ clicked."
(setq smtpmail-queue-mail (not smtpmail-queue-mail)) (setq smtpmail-queue-mail (not smtpmail-queue-mail))
(message (message
(concat "Outgoing mail will now be " (concat "Outgoing mail will now be "
(if smtpmail-queue-mail "queued" "sent directly"))) (if smtpmail-queue-mail "queued" "sent directly")))
(mu4e~main-view-real nil nil) (mu4e~main-view-real nil nil)
(goto-char curpos))) (goto-char curpos)))