awesomewm-mirrors
/
lain
mirror of https://github.com/lcpz/lain.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

calendar: font variable added

This commit is contained in:
luke bonham 2014-02-04 09:22:22 +01:00 committed by copycat-killer
parent b40a0e83e0
commit 6b91332a38
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
widgets/calendar.lua
View File

@ -38,9 +38,6 @@ function calendar:show(t_out, inc_offset)
local f, c_text local f, c_text
local today = tonumber(os.date('%d')) local today = tonumber(os.date('%d'))
local init_t = '/usr/bin/cal | sed -r -e "s/(^| )( ' local init_t = '/usr/bin/cal | sed -r -e "s/(^| )( '
-- let's take font only, font size is set in calendar table
local font = beautiful.font:sub(beautiful.font:find(""),
beautiful.font:find(" "))
if offs == 0 if offs == 0
then -- current month showing, today highlighted then -- current month showing, today highlighted
@ -86,7 +83,7 @@ function calendar:show(t_out, inc_offset)
f = io.popen('/usr/bin/cal ' .. month .. ' ' .. year) f = io.popen('/usr/bin/cal ' .. month .. ' ' .. year)
end end
c_text = "<tt><span font='" .. font .. " " c_text = "<tt><span font='" .. calendar.font .. " "
.. calendar.font_size .. "'><b>" .. calendar.font_size .. "'><b>"
.. f:read() .. "</b>\n\n" .. f:read() .. "</b>\n\n"
.. f:read() .. "\n" .. f:read() .. "\n"
@ -94,21 +91,25 @@ function calendar:show(t_out, inc_offset)
.. "</span></tt>" .. "</span></tt>"
f:close() f:close()
cal_notification = naughty.notify({ text = c_text, cal_notification = naughty.notify({
icon = calendar.notify_icon, text = c_text,
position = calendar.position, icon = calendar.notify_icon,
fg = calendar.fg, position = calendar.position,
bg = calendar.bg, fg = calendar.fg,
timeout = tims }) bg = calendar.bg,
timeout = tims
})
end end
function calendar:attach(widget, args) function calendar:attach(widget, args)
local args = args or {} local args = args or {}
calendar.icons = args.icons or icons_dir .. "cal/white/" calendar.icons = args.icons or icons_dir .. "cal/white/"
calendar.font = args.font or beautiful.font:sub(beautiful.font:find(""),
beautiful.font:find(" "))
calendar.font_size = tonumber(args.font_size) or 11 calendar.font_size = tonumber(args.font_size) or 11
calendar.fg = args.fg or beautiful.fg_normal or "#FFFFFF" calendar.fg = args.fg or beautiful.fg_normal or "#FFFFFF"
calendar.bg = args.bg or beautiful.bg_normal or "#FFFFFF" calendar.bg = args.bg or beautiful.bg_normal or "#FFFFFF"
calendar.position = args.position or "top_right" calendar.position = args.position or "top_right"
calendar.offset = 0 calendar.offset = 0
calendar.notify_icon = nil calendar.notify_icon = nil

2
wiki

@ -1 +1 @@
Subproject commit 6825e84bb73415c4cbf5fcd903ea4987976e4be3 Subproject commit d4248875dcd12ceb300c8a876001ce68f5405758