From: luke bonham Date: Tue, 4 Feb 2014 08:22:22 +0000 (+0100) Subject: calendar: font variable added X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/6b91332a38dfd5f8758b170c592faec8b3a544fe calendar: font variable added --- diff --git a/widgets/calendar.lua b/widgets/calendar.lua index f684fd7..c9e265a 100644 --- a/widgets/calendar.lua +++ b/widgets/calendar.lua @@ -38,9 +38,6 @@ function calendar:show(t_out, inc_offset) local f, c_text local today = tonumber(os.date('%d')) 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 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) end - c_text = "" .. f:read() .. "\n\n" .. f:read() .. "\n" @@ -94,21 +91,25 @@ function calendar:show(t_out, inc_offset) .. "" f:close() - cal_notification = naughty.notify({ text = c_text, - icon = calendar.notify_icon, - position = calendar.position, - fg = calendar.fg, - bg = calendar.bg, - timeout = tims }) + cal_notification = naughty.notify({ + text = c_text, + icon = calendar.notify_icon, + position = calendar.position, + fg = calendar.fg, + bg = calendar.bg, + timeout = tims + }) end function calendar:attach(widget, args) 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.fg = args.fg or beautiful.fg_normal or "#FFFFFF" - calendar.bg = args.bg or beautiful.bg_normal or "#FFFFFF" - calendar.position = args.position or "top_right" + calendar.fg = args.fg or beautiful.fg_normal or "#FFFFFF" + calendar.bg = args.bg or beautiful.bg_normal or "#FFFFFF" + calendar.position = args.position or "top_right" calendar.offset = 0 calendar.notify_icon = nil diff --git a/wiki b/wiki index 6825e84..d424887 160000 --- a/wiki +++ b/wiki @@ -1 +1 @@ -Subproject commit 6825e84bb73415c4cbf5fcd903ea4987976e4be3 +Subproject commit d4248875dcd12ceb300c8a876001ce68f5405758