]> git.madduck.net Git - etc/awesome.git/blobdiff - widgets/task.lua

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

projects / etc / awesome.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
add prompt function for task widget
[etc/awesome.git] / widgets / task.lua
diff --git a/widgets/task.lua b/widgets/task.lua
index 31499f177fa8c1e3fa6d27e3abcdbd4c94c4ebb0..f2b49f45b74df8e7e97bd52e292a81e167fe5101 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 naughty      = require("naughty")
 
 local io           = io
-local os           = { date = os.date }
 local tonumber     = tonumber
 
 local setmetatable = setmetatable
 local tonumber     = tonumber
 
 local setmetatable = setmetatable
@@ -30,70 +29,18 @@ function task:hide()
     end
 end
 
     end
 end
 
-function task:show(t_out, inc_offset)
+function task:show()
     task:hide()
 
     task:hide()
 
-    local offs = inc_offset or 0
-    local tims = t_out or 0
     local f, c_text
     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='" .. task.font .. " "
+             .. task.font_size+2 .. "'><b>Tasks next</b></span>\n"
+             .. "<span font='" .. task.font .. " "
+             .. task.font_size .. "'>"
+             .. f:read("*all") .. "\n"
+             .. "</span></tt>"
     f:close()
 
     task_notification = naughty.notify({ text = c_text,
     f:close()
 
     task_notification = naughty.notify({ text = c_text,
@@ -101,19 +48,70 @@ function task:show(t_out, inc_offset)
                                         position = task.position,
                                         fg = task.fg,
                                         bg = task.bg,
                                         position = task.position,
                                         fg = task.fg,
                                         bg = task.bg,
-                                        timeout = tims })
+                                        timeout = task.timeout })
+end
+
+function task:add(...)
+  local f = io.popen("task add " .. ...)
+  c_text = "<tt><span font='" .. task.font .. " "
+           .. task.font_size .. "'>"
+           .. f:read("*all") .. "\n"
+           .. "</span></tt>"
+
+  naughty.notify({ text = c_text,
+                   icon = task.notify_icon,
+                   position = task.position,
+                   fg = task.fg,
+                   bg = task.bg,
+                   timeout = task.timeout})
+end
+
+function task:prompt_add()
+  awful.prompt.run( { prompt = "Add task: " },
+                    mypromptbox[mouse.screen].widget,
+                    function (...)
+                      task:add(...)
+                    end,
+                    nil,
+                    awful.util.getdir("cache") .. "/history_task_add")
+end
+
+function task:execute(...)
+  local f = io.popen("task " .. ...)
+  c_text = "<tt><span font='" .. task.font .. " "
+           .. task.font_size .. "'>"
+           .. f:read("*all") .. "\n"
+           .. "</span></tt>"
+
+  naughty.notify({ text = c_text,
+                   icon = task.notify_icon,
+                   position = task.position,
+                   fg = task.fg,
+                   bg = task.bg,
+                   timeout = task.timeout})
+end
+
+function task:prompt()
+  awful.prompt.run( { prompt = "Task: " },
+                    mypromptbox[mouse.screen].widget,
+                    function (...)
+                      task:execute(...)
+                    end,
+                    nil,
+                    awful.util.getdir("cache") .. "/history_task")
 end
 
 function task:attach(widget, args)
     local args = args or {}
 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.font_size = tonumber(args.font_size) or 12
+    task.font = beautiful.font:sub(beautiful.font:find(""),
+                beautiful.font:find(" "))
     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.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.timeout = args.timeout or 7
 
 
-    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)
 
     widget:connect_signal("mouse::enter", function () task:show() end)
     widget:connect_signal("mouse::leave", function () task:hide() end)
awesome window-manager configuration

Legalese

All content available in this repository is copyright © martin f. krafft, unless otherwise noted.

All files and their content are released under the terms of the Artistic Licence 2.0, unless otherwise noted.

The operator of this repository shall not be held liable for offending content in pages linking to or linked from these page, nor does he endorse their content unless stated otherwise.