Merge pull request #275 from ProfessorOptics/master

[etc/awesome.git] / widgets / contrib / tpbat / init.lua

diff --git a/widgets/contrib/tpbat/init.lua b/widgets/contrib/tpbat/init.lua
index 782bf353deafc00c5d0c39f0edb5cc17c162b6a1..8b53a4b25f986c9b294a3cc137478410289ef57b 100644 (file)
--- a/widgets/contrib/tpbat/init.lua
+++ b/widgets/contrib/tpbat/init.lua
@@ -34,22 +34,20 @@ local smapi        = require("smapi")
 local tpbat = { }
 local tpbat_notification = nil
 
 local tpbat = { }
 local tpbat_notification = nil
 

-function tpbat:hide()
-    if tpbat_notification ~= nil
-    then
-        naughty.destroy(tpbat_notification)
-        tpbat_notification = nil
-    end
+function tpbat.hide()
+    if not tpbat.notification then return end
+    naughty.destroy(tpbat.notification)
+    tpbat.notification = nil

 end
 
 end
 

-function tpbat:show(t_out)
-    tpbat:hide()
+function tpbat.show(t_out)
+    tpbat.hide()

 
     local bat   = self.bat
 
     local bat   = self.bat

-    local t_out = t_out or 0

 
     if bat == nil or not bat:installed() then return end
 
 
     if bat == nil or not bat:installed() then return end
 

+    local t_out = t_out or 0

     local mfgr   = bat:get('manufacturer') or "no_mfgr"
     local model  = bat:get('model') or "no_model"
     local chem   = bat:get('chemistry') or "no_chem"
     local mfgr   = bat:get('manufacturer') or "no_mfgr"
     local model  = bat:get('model') or "no_model"
     local chem   = bat:get('chemistry') or "no_chem"


@@ -73,7 +71,7 @@ function tpbat:show(t_out)
                 .. string.format("\n%s \t\t\t %s", status:upper(), msg)
 
     tpbat_notification = naughty.notify({
                 .. string.format("\n%s \t\t\t %s", status:upper(), msg)
 
     tpbat_notification = naughty.notify({

-        preset = { fg = beautiful.fg_normal },
+        preset = naughty.config.defaults,

         text = str,
         timeout = t_out,
         screen = client.focus and client.focus.screen or 1
         text = str,
         timeout = t_out,
         screen = client.focus and client.focus.screen or 1


@@ -159,10 +157,10 @@ function tpbat.register(args)
         settings()
     end
 
         settings()
     end
 

-    newtimer("tpbat", timeout, update)
+    newtimer("tpbat-" .. bat.name, timeout, update)

 
 

-    widget:connect_signal('mouse::enter', function () tpbat:show() end)
-    widget:connect_signal('mouse::leave', function () tpbat:hide() end)
+    widget:connect_signal('mouse::enter', function () tpbat.show() end)
+    widget:connect_signal('mouse::leave', function () tpbat.hide() end)

 
     return tpbat.widget
 end
 
     return tpbat.widget
 end