X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/c846e5e31ac14ba6b9125d6caa630caad1dda8ec..037f2c36412a5b82d972557fbd4d4566732a1436:/widget/contrib/task.lua?ds=sidebyside diff --git a/widget/contrib/task.lua b/widget/contrib/task.lua index 302642e..536e006 100644 --- a/widget/contrib/task.lua +++ b/widget/contrib/task.lua @@ -1,9 +1,8 @@ - --[[ - - Licensed under GNU General Public License v2 - * (c) 2013, Jan Xie - + + Licensed under GNU General Public License v2 + * (c) 2013, Jan Xie + --]] local helpers = require("lain.helpers") @@ -11,7 +10,7 @@ local markup = require("lain.util").markup local awful = require("awful") local naughty = require("naughty") local mouse = mouse -local string = { format = string.format, gsub = string.gsub } +local string = string -- Taskwarrior notification -- lain.widget.contrib.task @@ -24,12 +23,7 @@ function task.hide() end function task.show(scr) - - if task.followtag then - task.notification_preset.screen = awful.screen.focused() - elseif scr then - task.notification_preset.screen = scr - end + task.notification_preset.screen = task.followtag and awful.screen.focused() or scr or 1 helpers.async({ awful.util.shell, "-c", task.show_cmd }, function(f) local widget_focused = true @@ -46,12 +40,12 @@ function task.show(scr) if widget_focused then task.hide() - task.notification = naughty.notify({ - preset = task.notification_preset, - title = "task next", - text = markup.font(task.notification_preset.font, - awful.util.escape(f:gsub("\n*$", ""))) - }) + task.notification = naughty.notify { + preset = task.notification_preset, + title = "task next", + text = markup.font(task.notification_preset.font, + awful.util.escape(f:gsub("\n*$", ""))) + } end end) end