add icon for task widget

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

diff --git a/widgets/task.lua b/widgets/task.lua
index 31499f177fa8c1e3fa6d27e3abcdbd4c94c4ebb0..fdf439afd616b74e1ae07992eb9caf75b02ca704 100644 (file)
--- a/widgets/task.lua
+++ b/widgets/task.lua
@@ -13,7 +13,6 @@ local beautiful    = require("beautiful")
 local naughty      = require("naughty")
 
 local io           = io
-local os           = { date = os.date }
 local tonumber     = tonumber
 
 local setmetatable = setmetatable
@@ -30,70 +29,23 @@ function task:hide()
     end
 end
 
-function task:show(t_out, inc_offset)
+function task:show(t_out)
     task:hide()
 
-    local offs = inc_offset or 0
     local tims = t_out or 0
     local f, c_text
-    local today = tonumber(os.date('%d'))
-    local init_t = '/usr/bin/cal | sed -r -e "s/(^| )( '
     -- let's take font only, font size is set in task table
     local font = beautiful.font:sub(beautiful.font:find(""),
                  beautiful.font:find(" "))
 
-    if offs == 0
-    then -- current month showing, today highlighted
-        if today >= 10
-        then
-           init_t = '/usr/bin/cal | sed -r -e "s/(^| )('
-        end
-
-        task.offset = 0
-        task.notify_icon = task.icons .. today .. ".png"
-
-        -- bg and fg inverted to highlight today
-        f = io.popen( init_t .. today ..
-                      ')($| )/\\1<b><span foreground=\\"'
-                      .. task.bg ..
-                      '\\" background=\\"'
-                      .. task.fg ..
-                      '\\">\\2<\\/span><\\/b>\\3/"' )
-
-    else -- no current month showing, no day to highlight
-       local month = tonumber(os.date('%m'))
-       local year = tonumber(os.date('%Y'))
-
-       task.offset = task.offset + offs
-       month = month + task.offset
-
-       if month > 12 then
-           month = month % 12
-           year = year + 1
-           if month <= 0 then
-               month = 12
-           end
-       elseif month < 1 then
-           month = month + 12
-           year = year - 1
-           if month <= 0 then
-               month = 1
-           end
-       end
-
-       task.notify_icon = nil
-
-       f = io.popen('/usr/bin/cal ' .. month .. ' ' .. year)
-    end
-
 
-    --c_text = "<tt><span font='" .. font .. " "
-             --.. task.font_size .. "'><b>"
-             --.. f:read() .. "</b>\n\n"
-             --.. f:read() .. "\n"
-             --.. f:read("*all"):gsub("\n*$", "")
-             --.. "</span></tt>"
-    c_text = "hello tasks!"
+    f = io.popen('task')
+    c_text = "<tt><span font='" .. font .. " "
+             .. task.font_size+2 .. "'><b>Tasks next</b></span>\n"
+             .. "<span font='" .. font .. " "
+             .. task.font_size .. "'>"
+             .. f:read("*all") .. "\n"
+             .. "</span></tt>"
     f:close()
 
     task_notification = naughty.notify({ text = c_text,
@@ -106,14 +58,12 @@ end
 
 function task:attach(widget, args)
     local args = args or {}
-    task.icons = args.icons or icons_dir .. "cal/white/"
     task.font_size = tonumber(args.font_size) or 12
     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"
 
-    task.offset = 0
-    task.notify_icon = nil
+    task.notify_icon = icons_dir .. "taskwarrior.png"
 
     widget:connect_signal("mouse::enter", function () task:show() end)
     widget:connect_signal("mouse::leave", function () task:hide() end)