alsabar: revert #275; remove buttons and beautiful deps

[etc/awesome.git] / widgets / fs.lua

diff --git a/widgets/fs.lua b/widgets/fs.lua
index d5dd49ad8ad3c30ab7112301d839e4d1bc44cbe5..391c26009ed3e9960d16bb9ca5e25895330bd486 100644 (file)
--- a/widgets/fs.lua
+++ b/widgets/fs.lua
@@ -9,7 +9,6 @@
 local helpers      = require("lain.helpers")
 
 local shell        = require("awful.util").shell
 local helpers      = require("lain.helpers")
 
 local shell        = require("awful.util").shell

-local beautiful    = require("beautiful")

 local focused      = require("awful.screen").focused
 local wibox        = require("wibox")
 local naughty      = require("naughty")
 local focused      = require("awful.screen").focused
 local wibox        = require("wibox")
 local naughty      = require("naughty")


@@ -27,6 +26,7 @@ local fs = {}
 fs.unit = { ["mb"] = 1024, ["gb"] = 1024^2 }
 
 function fs.hide()
 fs.unit = { ["mb"] = 1024, ["gb"] = 1024^2 }
 
 function fs.hide()

+    if not fs.notification then return end

     naughty.destroy(fs.notification)
     fs.notification = nil
 end
     naughty.destroy(fs.notification)
     fs.notification = nil
 end


@@ -61,7 +61,14 @@ local function worker(args)
 
     fs.options             = args.options
     fs.followtag           = args.followtag or false
 
     fs.options             = args.options
     fs.followtag           = args.followtag or false

-    fs.notification_preset = args.notification_preset or { fg = beautiful.fg_normal }
+    fs.notification_preset = args.notification_preset
+
+    if not fs.notification_preset then
+        fs.notification_preset      = naughty.config.defaults
+        fs.notification_preset.font = "Monospace 10"
+        fs.notification_preset.fg   = "#FFFFFF"
+        fs.notification_preset.bg   = "#000000"
+    end

 
     fs.widget = wibox.widget.textbox()
 
 
     fs.widget = wibox.widget.textbox()
 


@@ -98,9 +105,9 @@ local function worker(args)
             widget = fs.widget
             settings()
 
             widget = fs.widget
             settings()
 

-            if notify == "on" and fs_now.used >= 99 and not helpers.get_map(partition) then
+            if notify == "on" and tonumber(fs_now.used) >= 99 and not helpers.get_map(partition) then

                 naughty.notify({
                 naughty.notify({

-                    title   = "warning",
+                    title   = "Warning",

                     text    = partition .. " is empty!",
                     timeout = 8,
                     fg      = "#000000",
                     text    = partition .. " is empty!",
                     timeout = 8,
                     fg      = "#000000",