Merge branch 'Veratil-awesome-v4-layout-fix'

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

diff --git a/widgets/contrib/task.lua b/widgets/contrib/task.lua
index 2f57317d70a58e3ccb6da56e5b77f37aa3e26ced..afc9f930d38a3da5b4eb4659113a92d9e79af767 100644 (file)
--- a/widgets/contrib/task.lua
+++ b/widgets/contrib/task.lua
@@ -30,11 +30,10 @@ function task.show(scr)
         task.notification_preset.screen = scr
     end
 
         task.notification_preset.screen = scr
     end
 

-    helpers.async(string.format("%s -c '%s'", awful.util.shell, task.cmd),
-    function(f)
+    helpers.async(task.show_cmd, function(f)

         task.notification = naughty.notify({
             preset = task_notification_preset,
         task.notification = naughty.notify({
             preset = task_notification_preset,

-            title  = task.cmd,
+            title  = task.show_cmd,

             text   = markup.font(task.notification_preset.font,
                      awful.util.escape(f:gsub("\n*$", "")))
         })
             text   = markup.font(task.notification_preset.font,
                      awful.util.escape(f:gsub("\n*$", "")))
         })


@@ -46,10 +45,9 @@ function task.prompt()
         prompt       = task.prompt_text,
         textbox      = awful.screen.focused().mypromptbox.widget,
         exe_callback = function(t)
         prompt       = task.prompt_text,
         textbox      = awful.screen.focused().mypromptbox.widget,
         exe_callback = function(t)

-            helpers.async(string.format("%s -c '%s'", awful.util.shell, t),
-            function(f)
+            helpers.async(t, function(f)

                 naughty.notify {
                 naughty.notify {

-                    preset = task_notification_preset,
+                    preset = task.notification_preset,

                     title    = t,
                     text     = markup.font(task.notification_preset.font,
                                awful.util.escape(f:gsub("\n*$", "")))
                     title    = t,
                     text     = markup.font(task.notification_preset.font,
                                awful.util.escape(f:gsub("\n*$", "")))


@@ -62,15 +60,16 @@ end
 
 function task.attach(widget, args)
     local args               = args or {}
 
 function task.attach(widget, args)
     local args               = args or {}

-    task.show_cmd            = args.cmd or "task"
+    task.show_cmd            = args.show_cmd or "task next"

     task.prompt_text         = args.prompt_text or "Enter task command: "
     task.followtag           = args.followtag or false
     task.notification_preset = args.notification_preset
 
     if not task.notification_preset then
     task.prompt_text         = args.prompt_text or "Enter task command: "
     task.followtag           = args.followtag or false
     task.notification_preset = args.notification_preset
 
     if not task.notification_preset then

-        task.notification_preset      = naughty.config.defaults
-        task.notification_preset.font = "Monospace 10"
-        task.notification_preset.icon = helpers.icons_dir .. "/taskwarrior.png"
+        task.notification_preset = {
+            font = "Monospace 10",
+            icon = helpers.icons_dir .. "/taskwarrior.png"
+        }

     end
 
     if widget then
     end
 
     if widget then