]> git.madduck.net Git - etc/awesome.git/commitdiff

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:

add prompt function for task widget
authorJan Xie <jan.h.xie@gmail.com>
Wed, 25 Sep 2013 03:20:13 +0000 (11:20 +0800)
committerJan Xie <jan.h.xie@gmail.com>
Wed, 25 Sep 2013 03:20:13 +0000 (11:20 +0800)
widgets/task.lua

index fdf439afd616b74e1ae07992eb9caf75b02ca704..f2b49f45b74df8e7e97bd52e292a81e167fe5101 100644 (file)
@@ -29,20 +29,15 @@ function task:hide()
     end
 end
 
     end
 end
 
-function task:show(t_out)
+function task:show()
     task:hide()
 
     task:hide()
 
-    local tims = t_out or 0
     local f, c_text
     local f, c_text
-    -- let's take font only, font size is set in task table
-    local font = beautiful.font:sub(beautiful.font:find(""),
-                 beautiful.font:find(" "))
-
 
     f = io.popen('task')
 
     f = io.popen('task')
-    c_text = "<tt><span font='" .. font .. " "
+    c_text = "<tt><span font='" .. task.font .. " "
              .. task.font_size+2 .. "'><b>Tasks next</b></span>\n"
              .. task.font_size+2 .. "'><b>Tasks next</b></span>\n"
-             .. "<span font='" .. font .. " "
+             .. "<span font='" .. task.font .. " "
              .. task.font_size .. "'>"
              .. f:read("*all") .. "\n"
              .. "</span></tt>"
              .. task.font_size .. "'>"
              .. f:read("*all") .. "\n"
              .. "</span></tt>"
@@ -53,15 +48,68 @@ function task:show(t_out)
                                         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 {}
     task.font_size = tonumber(args.font_size) or 12
 end
 
 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.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.notify_icon = icons_dir .. "taskwarrior.png"
 
 
     task.notify_icon = icons_dir .. "taskwarrior.png"