ryuslash/mode-icons
1
0
Fork 0
mirror of https://github.com/ryuslash/mode-icons.git synced 2024-11-24 02:20:29 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add spacing between icons

Browse source
This commit is contained in:
Matthew L. Fidler 2016-02-20 00:09:35 -06:00
parent 24631c5322
commit 2f78ec906e
1 changed files with 59 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
mode-icons.el
View file

@ -193,11 +193,12 @@ This was stole/modified from `c-save-buffer-state'"
(read-only #xf023 FontAwesome) (read-only #xf023 FontAwesome)
(writable #xf09c FontAwesome) (writable #xf09c FontAwesome)
(save #xf0c7 FontAwesome) (save #xf0c7 FontAwesome)
(saved " " nil) (saved "" nil)
(apple #xf179 FontAwesome) (apple #xf179 FontAwesome)
(win #xf17a FontAwesome) (win #xf17a FontAwesome)
;; FIXME: use lsb_release to determine Linux variant and choose appropriate icon ;; FIXME: use lsb_release to determine Linux variant and choose appropriate icon
(unix #xf166 font-mfizz) ;; Use ubuntu, since I think it is the most common. (unix #xf166 font-mfizz) ;; Use ubuntu, since I think it is the most common.
("Text\\'" #xf0f6 FontAwesome)
;; Diminished modes ;; Diminished modes
("\\(?:ElDoc\\|Anzu\\|SP\\|Guide\\|PgLn\\|Undo-Tree\\|Ergo.*\\|,\\|Isearch\\|Ind\\|Fly\\)" nil nil) ("\\(?:ElDoc\\|Anzu\\|SP\\|Guide\\|PgLn\\|Undo-Tree\\|Ergo.*\\|,\\|Isearch\\|Ind\\|Fly\\)" nil nil)
) )
@ -497,36 +498,53 @@ ICON-SPEC should be a specification from `mode-icons'."
(split-string (format-mode-line "%n"))))))) (split-string (format-mode-line "%n")))))))
(defcustom mode-icons-read-only-space t
"Add Space after read-only icon."
:type 'boolean
:group 'mode-icons)
(defun mode-icons--read-only-status () (defun mode-icons--read-only-status ()
"Get Read Only Status icon." "Get Read Only Status icon."
(eval `(propertize (eval `(propertize
,(let ((ro (format-mode-line "%1*")) ,(let ((ro (format-mode-line "%1*"))
icon-spec) icon-spec)
(cond (setq ro (cond
((string= "%" ro) ((string= "%" ro)
(if (setq icon-spec (mode-icons-get-icon-spec 'read-only)) (if (setq icon-spec (mode-icons-get-icon-spec 'read-only))
(mode-icons-propertize-mode 'read-only icon-spec) (mode-icons-propertize-mode 'read-only icon-spec)
ro)) ro))
(t (t
(if (setq icon-spec (mode-icons-get-icon-spec 'writable)) (if (setq icon-spec (mode-icons-get-icon-spec 'writable))
(mode-icons-propertize-mode 'writable icon-spec) (mode-icons-propertize-mode 'writable icon-spec)
ro)))) ro))))
(when (and mode-icons-read-only-space
(not (string= ro "")))
(setq ro (concat ro " ")))
ro)
,@mode-icons-read-only-text-properties))) ,@mode-icons-read-only-text-properties)))
(defcustom mode-icons-modified-status-space t
"Add Space to modified status."
:type 'boolean
:group 'mode-icons)
(defun mode-icons--modified-status () (defun mode-icons--modified-status ()
"Get modified status icon." "Get modified status icon."
(eval `(propertize (eval `(propertize
,(let ((mod (format-mode-line "%1+")) ,(let ((mod (format-mode-line "%1+"))
icon-spec) icon-spec)
(cond (setq mod (cond
((string= "*" mod) ((string= "*" mod)
(if (setq icon-spec (mode-icons-get-icon-spec 'save)) (if (setq icon-spec (mode-icons-get-icon-spec 'save))
(mode-icons-propertize-mode 'save icon-spec) (mode-icons-propertize-mode 'save icon-spec)
mod)) mod))
(t (t
(if (setq icon-spec (mode-icons-get-icon-spec 'saved)) (if (setq icon-spec (mode-icons-get-icon-spec 'saved))
(mode-icons-propertize-mode 'saved icon-spec) (mode-icons-propertize-mode 'saved icon-spec)
mod)))) mod))))
(when (and mode-icons-modified-status-space
(not (string= mod "")))
(setq mod (concat mod " "))))
,@mode-icons-modified-text-properties))) ,@mode-icons-modified-text-properties)))
;; Based on rich-minority by Artur Malabarba ;; Based on rich-minority by Artur Malabarba
@ -562,27 +580,49 @@ ICON-SPEC should be a specification from `mode-icons'."
'(:eval (mode-icons--mode-line-eol-desc)) '(:eval (mode-icons--mode-line-eol-desc))
"End of Line Construct.") "End of Line Construct.")
(defcustom mode-icons-eol-space t
"Add a space to the end of line specification."
:type 'boolean
:group 'mode-icons)
(defcustom mode-icons-eol-text nil
"Describe end of line type
\(Unix) -> LF
\(DOS) -> CRLF
\(Mac) -> CR"
:type 'boolean
:group 'mode-icons)
(defun mode-icons--mode-line-eol-desc (&optional string) (defun mode-icons--mode-line-eol-desc (&optional string)
"Modify `mode-line-eol-desc' to have icons. "Modify `mode-line-eol-desc' to have icons.
STRING is the string to modify, or if absent, the value from `mode-line-eol-desc'." STRING is the string to modify, or if absent, the value from `mode-line-eol-desc'."
(let* ((str (or string (mode-line-eol-desc))) (let* ((str (or string (mode-line-eol-desc)))
(props (text-properties-at 0 str)) (props (text-properties-at 0 str))
lt2
icon-spec) icon-spec)
(setq str (cond (setq str (cond
((string= "(Unix)" str) ((string= "(Unix)" str)
(setq lt2 " LF")
(if (setq icon-spec (mode-icons-get-icon-spec 'unix)) (if (setq icon-spec (mode-icons-get-icon-spec 'unix))
(mode-icons-propertize-mode 'unix icon-spec) (mode-icons-propertize-mode 'unix icon-spec)
str)) str))
((or (string= str "(DOS)") ((or (string= str "(DOS)")
(string= str "\\")) (string= str "\\"))
(setq lt2 " CRLF")
(if (setq icon-spec (mode-icons-get-icon-spec 'win)) (if (setq icon-spec (mode-icons-get-icon-spec 'win))
(mode-icons-propertize-mode 'win icon-spec) (mode-icons-propertize-mode 'win icon-spec)
str)) str))
((string= str "(Mac)") ((string= str "(Mac)")
(setq lt2 " CR")
(if (setq icon-spec (mode-icons-get-icon-spec 'apple)) (if (setq icon-spec (mode-icons-get-icon-spec 'apple))
(mode-icons-propertize-mode 'apple icon-spec) (mode-icons-propertize-mode 'apple icon-spec)
str)) str))
(t str))) (t str)))
(when mode-icons-eol-text
(setq str (concat str lt2)))
(when (and mode-icons-eol-space
(not (string= "" str)))
(setq str (concat str " ")))
(add-text-properties 0 (length str) props str) (add-text-properties 0 (length str) props str)
str)) str))