From c909b67a6a12f159e1ed3cda53ea609b1b2798f2 Mon Sep 17 00:00:00 2001 From: Dmitry Sidorov Date: Sat, 16 Jul 2016 12:24:59 +0300 Subject: [PATCH 1/2] fs widget: make notification and popup configurable --- widgets/fs.lua | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/widgets/fs.lua b/widgets/fs.lua index 6ec8dac..5215c86 100644 --- a/widgets/fs.lua +++ b/widgets/fs.lua @@ -58,6 +58,8 @@ local function worker(args) local args = args or {} local timeout = args.timeout or 600 local partition = args.partition or "/" + local showpopup = args.showpopup or "on" + local notify = args.notify or "on" local settings = args.settings or function() end fs.followmouse = args.followmouse or false @@ -96,7 +98,7 @@ local function worker(args) widget = fs.widget settings() - if fs_now.used >= 99 and not helpers.get_map(partition) + if notify == "on" and fs_now.used >= 99 and not helpers.get_map(partition) then naughty.notify({ title = "warning", @@ -111,8 +113,10 @@ local function worker(args) end end - fs.widget:connect_signal('mouse::enter', function () fs:show(0) end) - fs.widget:connect_signal('mouse::leave', function () fs:hide() end) + if showpopup == "on" then + fs.widget:connect_signal('mouse::enter', function () fs:show(0) end) + fs.widget:connect_signal('mouse::leave', function () fs:hide() end) + end helpers.newtimer(partition, timeout, update) From ca11d6acbea616cefabaf376d8d38b9a364958f0 Mon Sep 17 00:00:00 2001 From: Dmitry Sidorov Date: Sun, 17 Jul 2016 11:24:00 +0300 Subject: [PATCH 2/2] tasks widget: Ability to specify font name --- widgets/contrib/task.lua | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/widgets/contrib/task.lua b/widgets/contrib/task.lua index 946966a..f721548 100644 --- a/widgets/contrib/task.lua +++ b/widgets/contrib/task.lua @@ -25,6 +25,11 @@ local task = {} local task_notification = nil +function findLast(haystack, needle) + local i=haystack:match(".*"..needle.."()") + if i==nil then return nil else return i-1 end +end + function task:hide() if task_notification ~= nil then naughty.destroy(task_notification) @@ -125,8 +130,8 @@ function task:attach(widget, args) local args = args or {} task.font_size = tonumber(args.font_size) or 12 - task.font = beautiful.font:sub(beautiful.font:find(""), - beautiful.font:find(" ")) + task.font = args.font or beautiful.font:sub(beautiful.font:find(""), + findLast(beautiful.font, " ")) task.fg = args.fg or beautiful.fg_normal or "#FFFFFF" task.bg = args.bg or beautiful.bg_normal or "#FFFFFF" task.position = args.position or "top_right"