TakeV/spacemacs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Improve battery text info and faces

Browse source
This commit is contained in:
syl20bnr 2014-12-25 00:24:55 -05:00
parent f1187c1158
commit 7ebe1ae1a7
1 changed files with 29 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
spacemacs/packages.el
View file

@ -798,12 +798,27 @@ determine the state to enable when escaping from the insert state.")
:defer t :defer t
:init :init
(progn (progn
(defun spacemacs/mode-line-battery-info-toggle () (defun spacemacs/mode-line-battery-info-toggle ()
"Toggle display of battery info." "Toggle display of battery info."
(interactive) (interactive)
(if fancy-battery-mode (if fancy-battery-mode
(fancy-battery-mode -1) (fancy-battery-mode -1)
(fancy-battery-mode))) (fancy-battery-mode)))
(defun spacemacs/mode-line-battery-percentage ()
"Return the load percentage or an empty string."
(let ((p (cdr (assq ?p fancy-battery-last-status))))
(if (and fancy-battery-show-percentage p) (concat " " p "%%") "")))
(defun spacemacs/mode-line-battery-time ()
"Return the remaining time complete load or discharge."
(let ((time (cdr (assq ?t fancy-battery-last-status))))
(cond
((string= "0:00" time) "")
((string= "N/A" time) "(calculating...)")
(t (concat " (" time ")")))))
(setq-default fancy-battery-show-percentage t) (setq-default fancy-battery-show-percentage t)
(evil-leader/set-key "tmb" 'spacemacs/mode-line-battery-info-toggle)) (evil-leader/set-key "tmb" 'spacemacs/mode-line-battery-info-toggle))
:config :config
@ -816,23 +831,24 @@ determine the state to enable when escaping from the insert state.")
;; remove the fancy-battery message from global-mode-string ;; remove the fancy-battery message from global-mode-string
(setq global-mode-string (delq 'fancy-battery-mode-line (setq global-mode-string (delq 'fancy-battery-mode-line
global-mode-string)) global-mode-string))
(let* ((time (cdr (assq ?t fancy-battery-last-status))) (let* ((type (cdr (assq ?L fancy-battery-last-status)))
(percentage (cdr (assq ?p fancy-battery-last-status))) (percentage (spacemacs/mode-line-battery-percentage))
(status (if (or fancy-battery-show-percentage (time (spacemacs/mode-line-battery-time)))
(string= time "N/A")) (if type
(and percentage (concat (concat percentage "%%") (concat (if (string= "AC" type) " AC" "") percentage time)
" (" time ")"))
time)))
(if status (concat " " status)
;; Battery status is not available ;; Battery status is not available
"N/A")))) "No Battery Info"))))
(defun fancy-battery-powerline-face () (defun fancy-battery-powerline-face ()
"Return a face appropriate for powerline" "Return a face appropriate for powerline"
(pcase (cdr (assq ?b fancy-battery-last-status)) (let ((type (cdr (assq ?L fancy-battery-last-status))))
("!" 'fancy-battery-critical) (if (string= "AC" type)
("+" ' fancy-battery-charging) 'fancy-battery-charging
(_ 'fancy-battery-discharging)))) (pcase (cdr (assq ?b fancy-battery-last-status))
("!" 'fancy-battery-critical)
("+" 'fancy-battery-charging)
("-" 'fancy-battery-discharging)
(_ 'fancy-battery-discharging))))))
)) ))
(defun spacemacs/init-fancy-narrow () (defun spacemacs/init-fancy-narrow ()