X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/e4c5d756c98141bfeeeda7a75be33b87ccca6a26..10cd5d629dbe917b220b1e54456ea79da07333f9:/widgets/contrib/task.lua?ds=inline
diff --git a/widgets/contrib/task.lua b/widgets/contrib/task.lua
index 88baa71..6425926 100644
--- a/widgets/contrib/task.lua
+++ b/widgets/contrib/task.lua
@@ -2,7 +2,6 @@
--[[
Licensed under GNU General Public License v2
- * (c) 2013, Luke Bonham
* (c) 2013, Jan Xie
--]]
@@ -20,7 +19,7 @@ local tonumber = tonumber
local setmetatable = setmetatable
-- Taskwarrior notification
--- lain.widgets.task
+-- lain.widgets.contrib.task
local task = {}
local task_notification = nil
@@ -38,11 +37,11 @@ function task:show()
local f, c_text
f = io.popen('task')
- c_text = ""
.. f:read("*all"):gsub("\n*$", "")
- .. ""
+ .. ""
f:close()
task_notification = naughty.notify({ title = "[task next]",
@@ -51,7 +50,8 @@ function task:show()
position = task.position,
fg = task.fg,
bg = task.bg,
- timeout = task.timeout })
+ timeout = task.timeout,
+ })
end
function task:prompt_add()
@@ -59,19 +59,20 @@ function task:prompt_add()
mypromptbox[mouse.screen].widget,
function (...)
local f = io.popen("task add " .. ...)
- c_text = "\n"
.. f:read("*all")
- .. ""
+ .. ""
+ f:close()
naughty.notify({
- text = c_text,
- icon = task.notify_icon,
+ text = c_text,
+ icon = task.notify_icon,
position = task.position,
- fg = task.fg,
- bg = task.bg,
- timeout = task.timeout
+ fg = task.fg,
+ bg = task.bg,
+ timeout = task.timeout,
})
end,
nil,
@@ -83,27 +84,28 @@ function task:prompt_search()
mypromptbox[mouse.screen].widget,
function (...)
local f = io.popen("task " .. ...)
- c_text = f:read("*all")
+ c_text = f:read("*all"):gsub(" \n*$", "")
f:close()
if string.len(c_text) == 0
then
c_text = "No results found."
else
- c_text = ""
- .. c_text .. "\n"
- .. ""
+ .. c_text
+ .. ""
end
naughty.notify({
- text = c_text,
- icon = task.notify_icon,
+ title = "[task next " .. ... .. "]",
+ text = c_text,
+ icon = task.notify_icon,
position = task.position,
- fg = task.fg,
- bg = task.bg,
- timeout = task.timeout
+ fg = task.fg,
+ bg = task.bg,
+ timeout = task.timeout,
})
end,
nil,