From: luke bonham Date: Tue, 4 Feb 2014 07:59:04 +0000 (+0100) Subject: Merge branch 'master' of https://github.com/copycat-killer/lain X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/cc8863390582a712845441c56000ab06367baa0a?ds=sidebyside;hp=-c Merge branch 'master' of https://github.com/copycat-killer/lain --- cc8863390582a712845441c56000ab06367baa0a diff --combined widgets/bat.lua index 21b5c43,4a25d63..4526c85 --- a/widgets/bat.lua +++ b/widgets/bat.lua @@@ -32,6 -32,22 +32,22 @@@ local function worker(args bat.widget = wibox.widget.textbox('') + bat_notification_low_preset = { + title = "Battery low", + text = "Plug the cable!", + timeout = 15, + fg = "#202020", + bg = "#CDCDCD" + } + + bat_notification_critical_preset = { + title = "Battery exhausted", + text = "Shutdown imminent", + timeout = 15, + fg = "#000000", + bg = "#FFFFFF" + } + function update() bat_now = { status = "Not present", @@@ -59,7 -75,7 +75,7 @@@ bat_now.status = first_line(bstr .. "/status") or "N/A" - rate = tonumber(rate) + rate = tonumber(rate) or 1 ratev = tonumber(ratev) rem = tonumber(rem) tot = tonumber(tot) @@@ -96,39 -112,28 +112,28 @@@ bat_now.watt = "N/A" end - -- notifications for low and critical states - if bat_now.status == "Discharging" and notify == "on" - then - if tonumber(bat_now.perc) <= 5 - then - bat.id = naughty.notify({ - text = "shutdown imminent", - title = "battery nearly exhausted", - position = "top_right", - timeout = 15, - fg="#000000", - bg="#ffffff", - ontop = true, - replaces_id = bat.id - }).id - elseif tonumber(bat_now.perc) <= 15 - then - bat.id = naughty.notify({ - text = "plug the cable", - title = "battery low", - position = "top_right", - timeout = 15, - fg="#202020", - bg="#cdcdcd", - ontop = true, - replaces_id = bat.id - }).id - end - end end widget = bat.widget settings() + + -- notifications for low and critical states + if bat_now.status == "Discharging" and notify == "on" + then + if tonumber(bat_now.perc) <= 5 + then + bat.id = naughty.notify({ + preset = bat_notification_critical_preset, + replaces_id = bat.id + }).id + elseif tonumber(bat_now.perc) <= 15 + then + bat.id = naughty.notify({ + preset = bat_notification_low_preset, + replaces_id = bat.id + }).id + end + end end newtimer("bat", timeout, update)