X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/ddbf283f0ebbc6772d485fe76c5dccf338d3b837..c754dde180c2b18cdfb538dbf715abb20af20e21:/widgets/contrib/tpbat/init.lua diff --git a/widgets/contrib/tpbat/init.lua b/widgets/contrib/tpbat/init.lua index 3342e02..20a10f4 100644 --- a/widgets/contrib/tpbat/init.lua +++ b/widgets/contrib/tpbat/init.lua @@ -28,7 +28,7 @@ local smapi = require("smapi") -- ThinkPad SMAPI-enabled battery info widget -- lain.widgets.contrib.tpbat -local tpbat = { } +local tpbat = {} function tpbat.hide() if not tpbat.notification then return end @@ -39,7 +39,7 @@ end function tpbat.show(t_out) tpbat.hide() - local bat = tpbat.bat + local bat = tpbat.bat if bat == nil or not bat:installed() then return end @@ -51,10 +51,8 @@ function tpbat.show(t_out) local time = bat:remaining_time() local msg = "\t" - if status ~= "idle" and status ~= "nil" - then - if time == "N/A" - then + if status ~= "idle" and status ~= "nil" then + if time == "N/A" then msg = "...Calculating time remaining..." else msg = time .. (status == "charging" and " until charged" or " remaining") @@ -67,10 +65,9 @@ function tpbat.show(t_out) .. string.format("\n%s \t\t\t %s", status:upper(), msg) tpbat.notification = naughty.notify({ - preset = naughty.config.defaults, - text = str, + text = str, timeout = t_out, - screen = client.focus and client.focus.screen or 1 + screen = client.focus and client.focus.screen or 1 }) end @@ -111,7 +108,7 @@ function tpbat.register(args) }) end - function update() + function tpbat.update() bat_now = { status = "Not present", perc = "N/A", @@ -150,15 +147,16 @@ function tpbat.register(args) end widget = tpbat.widget + settings() end - newtimer("tpbat-" .. bat.name, timeout, update) + newtimer("tpbat-" .. bat.name, timeout, tpbat.update) widget:connect_signal('mouse::enter', function () tpbat.show() end) widget:connect_signal('mouse::leave', function () tpbat.hide() end) - return tpbat.widget + return tpbat end return setmetatable(tpbat, { __call = function(_, ...) return tpbat.register(...) end })