widget.calendar: some cleaning; #379

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

diff --git a/widget/contrib/tpbat/init.lua b/widget/contrib/tpbat/init.lua
index 49cc01acaa86b439e2c7fb695d2b2977255e245f..c62acd1be2bd3975e9de52537c65d75af8e097c4 100644 (file)
--- a/widget/contrib/tpbat/init.lua
+++ b/widget/contrib/tpbat/init.lua
@@ -1,17 +1,16 @@
-

 --[[
 --[[

-                                                               
-     tpbat.lua                                                 
-     Battery status widget for ThinkPad laptops that use SMAPI 
-     lain.widget.contrib.tpbat                                
-                                                               
-     More on tp_smapi: http://www.thinkwiki.org/wiki/Tp_smapi  
-                                                               
-     Licensed under GNU General Public License v2              
-      * (c) 2013,      Conor Heine                             
-      * (c) 2013,      Luke Bonham                             
-      * (c) 2010-2012, Peter Hofmann                           
-                                                               
+
+     tpbat.lua
+     Battery status widget for ThinkPad laptops that use SMAPI
+     lain.widget.contrib.tpbat
+
+     More on tp_smapi: http://www.thinkwiki.org/wiki/Tp_smapi
+
+     Licensed under GNU General Public License v2
+      * (c) 2013,      Conor Heine
+      * (c) 2013,      Luca CPZ
+      * (c) 2010-2012, Peter Hofmann
+

 --]]
 
 local debug        = { getinfo = debug.getinfo }
 --]]
 
 local debug        = { getinfo = debug.getinfo }


@@ -75,6 +74,8 @@ function tpbat.register(args)
     local args = args or {}
     local timeout = args.timeout or 30
     local battery = args.battery or "BAT0"
     local args = args or {}
     local timeout = args.timeout or 30
     local battery = args.battery or "BAT0"

+    local bat_low_perc = args.bat_low_perc or 15
+    local bat_critical_perc = args.bat_critical_perc or 5

     local settings = args.settings or function() end
 
     tpbat.bat = smapi:battery(battery) -- Create a new battery
     local settings = args.settings or function() end
 
     tpbat.bat = smapi:battery(battery) -- Create a new battery


@@ -126,14 +127,14 @@ function tpbat.register(args)
             -- notifications for low and critical states (when discharging)
             if bat_now.status == "discharging"
             then
             -- notifications for low and critical states (when discharging)
             if bat_now.status == "discharging"
             then

-                if bat_now.perc <= 5
+                if bat_now.perc <= bat_critical_perc

                 then
                     tpbat.id = naughty.notify({
                         preset = bat_notification_critical_preset,
                         replaces_id = tpbat.id,
                         screen = client.focus and client.focus.screen or 1
                     }).id
                 then
                     tpbat.id = naughty.notify({
                         preset = bat_notification_critical_preset,
                         replaces_id = tpbat.id,
                         screen = client.focus and client.focus.screen or 1
                     }).id

-                elseif bat_now.perc <= 15
+                elseif bat_now.perc <= bat_low_perc

                 then
                     tpbat.id = naughty.notify({
                         preset = bat_notification_low_preset,
                 then
                     tpbat.id = naughty.notify({
                         preset = bat_notification_low_preset,