mirror of https://github.com/lcpz/lain.git
#66 removed hardcoded screen def in widgets notification
This commit is contained in:
parent
f5d391e7b6
commit
b0bcf77ccc
|
@ -77,12 +77,10 @@ function alsabar.notify()
|
||||||
alsabar._notify = naughty.notify ({
|
alsabar._notify = naughty.notify ({
|
||||||
replaces_id = alsabar._notify.id,
|
replaces_id = alsabar._notify.id,
|
||||||
preset = preset,
|
preset = preset,
|
||||||
screen = client.focus and client.focus.screen or 1
|
|
||||||
})
|
})
|
||||||
else
|
else
|
||||||
alsabar._notify = naughty.notify ({
|
alsabar._notify = naughty.notify ({
|
||||||
preset = preset,
|
preset = preset,
|
||||||
screen = client.focus and client.focus.screen or 1
|
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -130,14 +130,12 @@ local function worker(args)
|
||||||
bat.id = naughty.notify({
|
bat.id = naughty.notify({
|
||||||
preset = bat_notification_critical_preset,
|
preset = bat_notification_critical_preset,
|
||||||
replaces_id = bat.id,
|
replaces_id = bat.id,
|
||||||
screen = client.focus and client.focus.screen or 1
|
|
||||||
}).id
|
}).id
|
||||||
elseif nperc <= 15
|
elseif nperc <= 15
|
||||||
then
|
then
|
||||||
bat.id = naughty.notify({
|
bat.id = naughty.notify({
|
||||||
preset = bat_notification_low_preset,
|
preset = bat_notification_low_preset,
|
||||||
replaces_id = bat.id,
|
replaces_id = bat.id,
|
||||||
screen = client.focus and client.focus.screen or 1
|
|
||||||
}).id
|
}).id
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -99,7 +99,6 @@ function calendar:show(t_out, inc_offset)
|
||||||
fg = calendar.fg,
|
fg = calendar.fg,
|
||||||
bg = calendar.bg,
|
bg = calendar.bg,
|
||||||
timeout = tims,
|
timeout = tims,
|
||||||
screen = client.focus and client.focus.screen or 1
|
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,6 @@
|
||||||
|
|
||||||
Licensed under GNU General Public License v2
|
Licensed under GNU General Public License v2
|
||||||
* (c) 2013, Luke Bonham
|
* (c) 2013, Luke Bonham
|
||||||
* (c) 2010-2012, Peter Hofmann
|
|
||||||
|
|
||||||
--]]
|
--]]
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,6 @@
|
||||||
--[[
|
--[[
|
||||||
|
|
||||||
Licensed under GNU General Public License v2
|
Licensed under GNU General Public License v2
|
||||||
* (c) 2013, Luke Bonham
|
|
||||||
* (c) 2013, Jan Xie
|
* (c) 2013, Jan Xie
|
||||||
|
|
||||||
--]]
|
--]]
|
||||||
|
@ -20,7 +19,7 @@ local tonumber = tonumber
|
||||||
local setmetatable = setmetatable
|
local setmetatable = setmetatable
|
||||||
|
|
||||||
-- Taskwarrior notification
|
-- Taskwarrior notification
|
||||||
-- lain.widgets.task
|
-- lain.widgets.contrib.task
|
||||||
local task = {}
|
local task = {}
|
||||||
|
|
||||||
local task_notification = nil
|
local task_notification = nil
|
||||||
|
@ -52,7 +51,6 @@ function task:show()
|
||||||
fg = task.fg,
|
fg = task.fg,
|
||||||
bg = task.bg,
|
bg = task.bg,
|
||||||
timeout = task.timeout,
|
timeout = task.timeout,
|
||||||
screen = client.focus and client.focus.screen or 1
|
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -75,7 +73,6 @@ function task:prompt_add()
|
||||||
fg = task.fg,
|
fg = task.fg,
|
||||||
bg = task.bg,
|
bg = task.bg,
|
||||||
timeout = task.timeout,
|
timeout = task.timeout,
|
||||||
screen = client.focus and client.focus.screen or 1
|
|
||||||
})
|
})
|
||||||
end,
|
end,
|
||||||
nil,
|
nil,
|
||||||
|
@ -109,7 +106,6 @@ function task:prompt_search()
|
||||||
fg = task.fg,
|
fg = task.fg,
|
||||||
bg = task.bg,
|
bg = task.bg,
|
||||||
timeout = task.timeout,
|
timeout = task.timeout,
|
||||||
screen = client.focus and client.focus.screen or 1
|
|
||||||
})
|
})
|
||||||
end,
|
end,
|
||||||
nil,
|
nil,
|
||||||
|
|
|
@ -47,7 +47,6 @@ function fs:show(t_out)
|
||||||
preset = fs_notification_preset,
|
preset = fs_notification_preset,
|
||||||
text = ws,
|
text = ws,
|
||||||
timeout = t_out,
|
timeout = t_out,
|
||||||
screen = client.focus and client.focus.screen or 1
|
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -100,7 +99,6 @@ local function worker(args)
|
||||||
timeout = 8,
|
timeout = 8,
|
||||||
fg = "#000000",
|
fg = "#000000",
|
||||||
bg = "#FFFFFF",
|
bg = "#FFFFFF",
|
||||||
screen = client.focus and client.focus.screen or 1
|
|
||||||
})
|
})
|
||||||
helpers.set_map("fs", true)
|
helpers.set_map("fs", true)
|
||||||
else
|
else
|
||||||
|
|
|
@ -77,7 +77,6 @@ local function worker(args)
|
||||||
naughty.notify({
|
naughty.notify({
|
||||||
preset = mail_notification_preset,
|
preset = mail_notification_preset,
|
||||||
text = nt,
|
text = nt,
|
||||||
screen = client.focus and client.focus.screen or 1
|
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -91,7 +91,6 @@ local function worker(args)
|
||||||
preset = mpd_notification_preset,
|
preset = mpd_notification_preset,
|
||||||
icon = "/tmp/mpdcover.png",
|
icon = "/tmp/mpdcover.png",
|
||||||
replaces_id = mpd.id,
|
replaces_id = mpd.id,
|
||||||
screen = client.focus and client.focus.screen or 1
|
|
||||||
}).id
|
}).id
|
||||||
end
|
end
|
||||||
elseif mpd_now.state ~= "pause"
|
elseif mpd_now.state ~= "pause"
|
||||||
|
|
|
@ -88,7 +88,6 @@ local function worker(args)
|
||||||
position = "top_left",
|
position = "top_left",
|
||||||
icon = helpers.icons_dir .. "no_net.png",
|
icon = helpers.icons_dir .. "no_net.png",
|
||||||
fg = notify_fg or "#FFFFFF",
|
fg = notify_fg or "#FFFFFF",
|
||||||
screen = client.focus and client.focus.screen or 1
|
|
||||||
})
|
})
|
||||||
helpers.set_map(iface, false)
|
helpers.set_map(iface, false)
|
||||||
end
|
end
|
||||||
|
|
|
@ -167,7 +167,6 @@ function yawn.show(t_out)
|
||||||
text = weather_data,
|
text = weather_data,
|
||||||
icon = sky,
|
icon = sky,
|
||||||
timeout = t_out,
|
timeout = t_out,
|
||||||
screen = client.focus and client.focus.screen or 1
|
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue