X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=emacs%2Fnotmuch-hello.el;h=cbe414f1e9a0d111fac4aba2b215845a34ae2ed2;hb=9b85872ed4526688a6195cfa8af19be20ed869c2;hp=09bc6b7203f27f7efe0952c8c93cc255f3a7e311;hpb=7fa6306cae69ed56c15f0a233c2c3318a5573372;p=notmuch diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el index 09bc6b72..cbe414f1 100644 --- a/emacs/notmuch-hello.el +++ b/emacs/notmuch-hello.el @@ -27,33 +27,31 @@ (require 'notmuch-mua) (declare-function notmuch-search "notmuch" (query &optional oldest-first target-thread target-line continuation)) -(declare-function notmuch-folder-count "notmuch" (search)) +(declare-function notmuch-poll "notmuch" ()) (defvar notmuch-hello-search-bar-marker nil "The position of the search bar within the notmuch-hello buffer.") -(defcustom notmuch-hello-recent-searches-max 10 +(defcustom notmuch-recent-searches-max 10 "The number of recent searches to store and display." :type 'integer :group 'notmuch) -(defcustom notmuch-hello-show-empty-saved-searches nil +(defcustom notmuch-show-empty-saved-searches nil "Should saved searches with no messages be listed?" :type 'boolean :group 'notmuch) -(defcustom notmuch-hello-indent 4 - "How much to indent non-headers." - :type 'integer - :group 'notmuch) +(defvar notmuch-hello-indent 4 + "How much to indent non-headers.") -(defcustom notmuch-hello-saved-searches notmuch-folders - "A list of saved searches to display." - :type '(alist :key-type string :value-type string) +(defcustom notmuch-show-logo t + "Should the notmuch logo be shown?" + :type 'boolean :group 'notmuch) -(defcustom notmuch-hello-show-logo t - "Should the notmuch logo be shown?" +(defcustom notmuch-show-all-tags-list nil + "Should all tags be shown in the notmuch-hello view?" :type 'boolean :group 'notmuch) @@ -76,7 +74,7 @@ (if (not (member search notmuch-hello-recent-searches)) (push search notmuch-hello-recent-searches)) (if (> (length notmuch-hello-recent-searches) - notmuch-hello-recent-searches-max) + notmuch-recent-searches-max) (setq notmuch-hello-recent-searches (butlast notmuch-hello-recent-searches)))) (defun notmuch-hello-trim (search) @@ -96,17 +94,17 @@ (symbol-value (widget-get widget :notmuch-saved-search-widget)))) (name (completing-read "Name for saved search: " - notmuch-hello-saved-searches))) + notmuch-saved-searches))) ;; If an existing saved search with this name exists, remove it. - (setq notmuch-hello-saved-searches - (loop for elem in notmuch-hello-saved-searches + (setq notmuch-saved-searches + (loop for elem in notmuch-saved-searches if (not (equal name (car elem))) collect elem)) ;; Add the new one. - (customize-save-variable 'notmuch-hello-saved-searches + (customize-save-variable 'notmuch-saved-searches (push (cons name search) - notmuch-hello-saved-searches)) + notmuch-saved-searches)) (message "Saved '%s' as '%s'." search name) (notmuch-hello-update))) @@ -144,6 +142,9 @@ diagonal." notmuch-search-oldest-first nil nil #'notmuch-hello-search-continuation)) +(defun notmuch-saved-search-count (search) + (car (process-lines notmuch-command "count" search))) + (defun notmuch-hello-insert-tags (tag-alist widest target) (let* ((tags-per-line (max 1 (/ (- (window-width) notmuch-hello-indent) @@ -162,15 +163,14 @@ diagonal." do (progn ;; (not elem) indicates an empty slot in the matrix. (when elem - (widget-insert (format "%6s " (notmuch-folder-count (cdr elem)))) - (if (string= (car elem) target) - (progn - (setq found-target-pos (point-marker)))) + (widget-insert (format "%6s " (notmuch-saved-search-count (cdr elem)))) + (if (string= (format "%s " (car elem)) target) + (setq found-target-pos (point-marker))) (widget-create 'push-button :notify #'notmuch-hello-widget-search :notmuch-search-terms (cdr elem) - (car elem)) - (insert (make-string (- widest (length (car elem))) ? ))) + (format "%s " (car elem))) + (insert (make-string (1+ (- widest (length (car elem)))) ? ))) (setq count (1+ count)) (if (eq (% count tags-per-line) 0) (widget-insert "\n")))) @@ -196,9 +196,20 @@ diagonal." (interactive) (notmuch-hello no-display)) +(defun notmuch-hello-poll-and-update () + "Invoke `notmuch-poll' to import mail, then refresh the current view." + (interactive) + (notmuch-poll) + (notmuch-hello-update)) + (defun notmuch-hello (&optional no-display) (interactive) + ; Jump through a hoop to get this value from the deprecated variable + ; name (`notmuch-folders') or from the default value. + (if (not notmuch-saved-searches) + (setq notmuch-saved-searches (notmuch-saved-searches))) + (if no-display (set-buffer "*notmuch-hello*") (switch-to-buffer "*notmuch-hello*")) @@ -220,7 +231,7 @@ diagonal." (mapc 'delete-overlay (car all)) (mapc 'delete-overlay (cdr all))) - (when notmuch-hello-show-logo + (when notmuch-show-logo (let ((image notmuch-hello-logo)) ;; The notmuch logo uses transparency. That can display poorly ;; when inserting the image into an emacs buffer (black logo on @@ -257,10 +268,10 @@ diagonal." (final-target-pos nil)) (let* ((saved-alist ;; Filter out empty saved seaches if required. - (if notmuch-hello-show-empty-saved-searches - notmuch-hello-saved-searches - (loop for elem in notmuch-hello-saved-searches - if (> (string-to-number (notmuch-folder-count (cdr elem))) 0) + (if notmuch-show-empty-saved-searches + notmuch-saved-searches + (loop for elem in notmuch-saved-searches + if (> (string-to-number (notmuch-saved-search-count (cdr elem))) 0) collect elem))) (saved-widest (notmuch-hello-longest-label saved-alist)) (alltags-alist (mapcar '(lambda (tag) (cons tag (concat "tag:" tag))) @@ -272,7 +283,7 @@ diagonal." (widget-insert "Saved searches: ") (widget-create 'push-button :notify (lambda (&rest ignore) - (customize-variable 'notmuch-hello-saved-searches)) + (customize-variable 'notmuch-saved-searches)) "edit") (widget-insert "\n\n") (setq final-target-pos (point-marker)) @@ -339,12 +350,26 @@ diagonal." (indent-rigidly start (point) notmuch-hello-indent))) (when alltags-alist - (widget-insert "\nAll tags:\n\n") - (let ((start (point))) - (setq found-target-pos (notmuch-hello-insert-tags alltags-alist widest target)) - (if (not final-target-pos) - (setq final-target-pos found-target-pos)) - (indent-rigidly start (point) notmuch-hello-indent)))) + (if notmuch-show-all-tags-list + (progn + (widget-insert "\nAll tags: ") + (widget-create 'push-button + :notify (lambda (widget &rest ignore) + (setq notmuch-show-all-tags-list nil) + (notmuch-hello-update)) + "hide") + (widget-insert "\n\n") + (let ((start (point))) + (setq found-target-pos (notmuch-hello-insert-tags alltags-alist widest target)) + (if (not final-target-pos) + (setq final-target-pos found-target-pos)) + (indent-rigidly start (point) notmuch-hello-indent))) + (widget-insert "\n") + (widget-create 'push-button + :notify (lambda (widget &rest ignore) + (setq notmuch-show-all-tags-list t) + (notmuch-hello-update)) + "Show all tags")))) (let ((start (point))) (widget-insert "\n\n") @@ -352,7 +377,7 @@ diagonal." (when notmuch-hello-recent-searches (widget-insert "Hit RET to re-submit a previous search. Edit it first if you like.\n") (widget-insert "Save recent searches with the `save' button.\n")) - (when notmuch-hello-saved-searches + (when notmuch-saved-searches (widget-insert "Edit saved searches with the `edit' button.\n")) (widget-insert "Hit RET or click on a saved search or tag name to view matching threads.\n") (widget-insert "`=' refreshes this screen. `s' jumps to the search box. `q' to quit.\n") @@ -361,6 +386,7 @@ diagonal." (use-local-map widget-keymap) (local-set-key "=" 'notmuch-hello-update) + (local-set-key "G" 'notmuch-hello-poll-and-update) (local-set-key "m" 'notmuch-mua-mail) (local-set-key "q" '(lambda () (interactive) (kill-buffer (current-buffer)))) (local-set-key "s" 'notmuch-hello-goto-search) @@ -373,6 +399,12 @@ diagonal." (if (not (widget-at)) (widget-forward 1))))) +;;;###autoload +(defun notmuch-folder () + "Deprecated function for invoking notmuch---calling `notmuch' is preferred now." + (interactive) + (notmuch-hello)) + ;; (provide 'notmuch-hello)