calendar: cal variable added

This commit is contained in:
luke bonham 2014-03-30 12:30:59 +02:00
parent 67865e6426
commit a0bd2798ac
2 changed files with 5 additions and 4 deletions

View File

@ -37,13 +37,13 @@ function calendar:show(t_out, inc_offset)
local tims = t_out or 0 local tims = t_out or 0
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 = calendar.cal .. ' | sed -r -e "s/(^| )( '
if offs == 0 if offs == 0
then -- current month showing, today highlighted then -- current month showing, today highlighted
if today >= 10 if today >= 10
then then
init_t = '/usr/bin/cal | sed -r -e "s/(^| )(' init_t = calendar.cal .. ' | sed -r -e "s/(^| )('
end end
calendar.offset = 0 calendar.offset = 0
@ -80,7 +80,7 @@ function calendar:show(t_out, inc_offset)
calendar.notify_icon = nil calendar.notify_icon = nil
f = io.popen('/usr/bin/cal ' .. month .. ' ' .. year) f = io.popen(calendar.cal .. ' ' .. month .. ' ' .. year)
end end
c_text = "<tt><span font='" .. calendar.font .. " " c_text = "<tt><span font='" .. calendar.font .. " "
@ -103,6 +103,7 @@ end
function calendar:attach(widget, args) function calendar:attach(widget, args)
local args = args or {} local args = args or {}
calendar.cal = args.cal or "/usr/bin/cal"
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(""), calendar.font = args.font or beautiful.font:sub(beautiful.font:find(""),
beautiful.font:find(" ")) beautiful.font:find(" "))

2
wiki

@ -1 +1 @@
Subproject commit b35f6931d9685d53e10a051c1d558151331b041f Subproject commit bff87f6bb0d1707d0f089a4449082ce43b121275